niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: fman: Map the base address once

Browse source 
We don't need to remap the base address from the resource twice (once in
mac_probe() and again in set_fman_mac_params()). We still need the
resource to get the end address, but we can use a single function call
to get both at once.

While we're at it, use platform_get_mem_or_io and devm_request_resource
to map the resource. I think this is the more "correct" way to do things
here, since we use the pdev resource, instead of creating a new one.
It's still a bit tricky, since we need to ensure that the resource is a
child of the fman region when it gets requested.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Acked-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sean Anderson 2022-09-02 17:57:27 -04:00 • committed by David S. Miller
parent 45fa34bfaa
commit 262f2b782e
4 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View file

@ -218,8 +218,8 @@ static int dpaa_netdev_init(struct net_device *net_dev,
net_dev->netdev_ops = dpaa_ops; net_dev->netdev_ops = dpaa_ops;
mac_addr = priv->mac_dev->addr; mac_addr = priv->mac_dev->addr;
net_dev->mem_start = priv->mac_dev->res->start; net_dev->mem_start = (unsigned long)priv->mac_dev->vaddr;
net_dev->mem_end = priv->mac_dev->res->end; net_dev->mem_end = (unsigned long)priv->mac_dev->vaddr_end;
net_dev->min_mtu = ETH_MIN_MTU; net_dev->min_mtu = ETH_MIN_MTU;
net_dev->max_mtu = dpaa_get_max_mtu(); net_dev->max_mtu = dpaa_get_max_mtu();

2
drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c
View file

@ -18,7 +18,7 @@ static ssize_t dpaa_eth_show_addr(struct device *dev,
if (mac_dev) if (mac_dev)
return sprintf(buf, "%llx", return sprintf(buf, "%llx",
(unsigned long long)mac_dev->res->start); (unsigned long long)mac_dev->vaddr);
else else
return sprintf(buf, "none"); return sprintf(buf, "none");
} }

39
drivers/net/ethernet/freescale/fman/mac.c
View file

@ -28,7 +28,6 @@ MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("FSL FMan MAC API based driver"); MODULE_DESCRIPTION("FSL FMan MAC API based driver");
struct mac_priv_s { struct mac_priv_s {
void __iomem *vaddr;
u8 cell_index; u8 cell_index;
struct fman *fman; struct fman *fman;
/* List of multicast addresses */ /* List of multicast addresses */
@ -63,12 +62,7 @@ int set_fman_mac_params(struct mac_device *mac_dev,
{ {
struct mac_priv_s *priv = mac_dev->priv; struct mac_priv_s *priv = mac_dev->priv;
params->base_addr = (typeof(params->base_addr)) params->base_addr = mac_dev->vaddr;
devm_ioremap(mac_dev->dev, mac_dev->res->start,
resource_size(mac_dev->res));
if (!params->base_addr)
return -ENOMEM;
memcpy(&params->addr, mac_dev->addr, sizeof(mac_dev->addr)); memcpy(&params->addr, mac_dev->addr, sizeof(mac_dev->addr));
params->max_speed = priv->max_speed; params->max_speed = priv->max_speed;
params->phy_if = mac_dev->phy_if; params->phy_if = mac_dev->phy_if;
@ -305,7 +299,7 @@ static int mac_probe(struct platform_device *_of_dev)
struct device_node *mac_node, *dev_node; struct device_node *mac_node, *dev_node;
struct mac_device *mac_dev; struct mac_device *mac_dev;
struct platform_device *of_dev; struct platform_device *of_dev;
struct resource res; struct resource *res;
struct mac_priv_s *priv; struct mac_priv_s *priv;
u32 val; u32 val;
u8 fman_id; u8 fman_id;
@ -368,30 +362,25 @@ static int mac_probe(struct platform_device *_of_dev)
of_node_put(dev_node); of_node_put(dev_node);
/* Get the address of the memory mapped registers */ /* Get the address of the memory mapped registers */
err = of_address_to_resource(mac_node, 0, &res); res = platform_get_mem_or_io(_of_dev, 0);
if (err < 0) { if (!res) {
dev_err(dev, "of_address_to_resource(%pOF) = %d\n", dev_err(dev, "could not get registers\n");
mac_node, err); return -EINVAL;
}
err = devm_request_resource(dev, fman_get_mem_region(priv->fman), res);
if (err) {
dev_err_probe(dev, err, "could not request resource\n");
goto _return_of_node_put; goto _return_of_node_put;
} }
mac_dev->res = __devm_request_region(dev, mac_dev->vaddr = devm_ioremap(dev, res->start, resource_size(res));
fman_get_mem_region(priv->fman), if (!mac_dev->vaddr) {
res.start, resource_size(&res),
"mac");
if (!mac_dev->res) {
dev_err(dev, "__devm_request_mem_region(mac) failed\n");
err = -EBUSY;
goto _return_of_node_put;
}
priv->vaddr = devm_ioremap(dev, mac_dev->res->start,
resource_size(mac_dev->res));
if (!priv->vaddr) {
dev_err(dev, "devm_ioremap() failed\n"); dev_err(dev, "devm_ioremap() failed\n");
err = -EIO; err = -EIO;
goto _return_of_node_put; goto _return_of_node_put;
} }
mac_dev->vaddr_end = mac_dev->vaddr + resource_size(res);
if (!of_device_is_available(mac_node)) { if (!of_device_is_available(mac_node)) {
err = -ENODEV; err = -ENODEV;

3
drivers/net/ethernet/freescale/fman/mac.h
View file

@ -19,8 +19,9 @@ struct fman_mac;
struct mac_priv_s; struct mac_priv_s;
struct mac_device { struct mac_device {
void __iomem *vaddr;
void __iomem *vaddr_end;
struct device *dev; struct device *dev;
struct resource *res;
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
struct fman_port *port[2]; struct fman_port *port[2];
u32 if_support; u32 if_support;