mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
83216e3988
of_get_mac_address() returns a "const void*" pointer to a MAC address. Lately, support to fetch the MAC address by an NVMEM provider was added. But this will only work with platform devices. It will not work with PCI devices (e.g. of an integrated root complex) and esp. not with DSA ports. There is an of_* variant of the nvmem binding which works without devices. The returned data of a nvmem_cell_read() has to be freed after use. On the other hand the return of_get_mac_address() points to some static data without a lifetime. The trick for now, was to allocate a device resource managed buffer which is then returned. This will only work if we have an actual device. Change it, so that the caller of of_get_mac_address() has to supply a buffer where the MAC address is written to. Unfortunately, this will touch all drivers which use the of_get_mac_address(). Usually the code looks like: const char *addr; addr = of_get_mac_address(np); if (!IS_ERR(addr)) ether_addr_copy(ndev->dev_addr, addr); This can then be simply rewritten as: of_get_mac_address(np, ndev->dev_addr); Sometimes is_valid_ether_addr() is used to test the MAC address. of_get_mac_address() already makes sure, it just returns a valid MAC address. Thus we can just test its return code. But we have to be careful if there are still other sources for the MAC address before the of_get_mac_address(). In this case we have to keep the is_valid_ether_addr() call. The following coccinelle patch was used to convert common cases to the new style. Afterwards, I've manually gone over the drivers and fixed the return code variable: either used a new one or if one was already available use that. Mansour Moufid, thanks for that coccinelle patch! <spml> @a@ identifier x; expression y, z; @@ - x = of_get_mac_address(y); + x = of_get_mac_address(y, z); <... - ether_addr_copy(z, x); ...> @@ identifier a.x; @@ - if (<+... x ...+>) {} @@ identifier a.x; @@ if (<+... x ...+>) { ... } - else {} @@ identifier a.x; expression e; @@ - if (<+... x ...+>@e) - {} - else + if (!(e)) {...} @@ expression x, y, z; @@ - x = of_get_mac_address(y, z); + of_get_mac_address(y, z); ... when != x </spml> All drivers, except drivers/net/ethernet/aeroflex/greth.c, were compile-time tested. Suggested-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
154 lines
3.5 KiB
C
154 lines
3.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* tsi108/109 device setup code
|
|
*
|
|
* Maintained by Roy Zang < tie-fei.zang@freescale.com >
|
|
*/
|
|
|
|
#include <linux/stddef.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/major.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/export.h>
|
|
#include <linux/device.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of_net.h>
|
|
#include <asm/tsi108.h>
|
|
|
|
#include <linux/atomic.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/prom.h>
|
|
#include <mm/mmu_decl.h>
|
|
|
|
#undef DEBUG
|
|
|
|
#ifdef DEBUG
|
|
#define DBG(fmt...) do { printk(fmt); } while(0)
|
|
#else
|
|
#define DBG(fmt...) do { } while(0)
|
|
#endif
|
|
|
|
static phys_addr_t tsi108_csr_base = -1;
|
|
|
|
phys_addr_t get_csrbase(void)
|
|
{
|
|
struct device_node *tsi;
|
|
|
|
if (tsi108_csr_base != -1)
|
|
return tsi108_csr_base;
|
|
|
|
tsi = of_find_node_by_type(NULL, "tsi-bridge");
|
|
if (tsi) {
|
|
unsigned int size;
|
|
const void *prop = of_get_property(tsi, "reg", &size);
|
|
tsi108_csr_base = of_translate_address(tsi, prop);
|
|
of_node_put(tsi);
|
|
}
|
|
return tsi108_csr_base;
|
|
}
|
|
|
|
u32 get_vir_csrbase(void)
|
|
{
|
|
return (u32) (ioremap(get_csrbase(), 0x10000));
|
|
}
|
|
|
|
EXPORT_SYMBOL(get_csrbase);
|
|
EXPORT_SYMBOL(get_vir_csrbase);
|
|
|
|
static int __init tsi108_eth_of_init(void)
|
|
{
|
|
struct device_node *np;
|
|
unsigned int i = 0;
|
|
struct platform_device *tsi_eth_dev;
|
|
struct resource res;
|
|
int ret;
|
|
|
|
for_each_compatible_node(np, "network", "tsi108-ethernet") {
|
|
struct resource r[2];
|
|
struct device_node *phy, *mdio;
|
|
hw_info tsi_eth_data;
|
|
const unsigned int *phy_id;
|
|
const phandle *ph;
|
|
|
|
memset(r, 0, sizeof(r));
|
|
memset(&tsi_eth_data, 0, sizeof(tsi_eth_data));
|
|
|
|
ret = of_address_to_resource(np, 0, &r[0]);
|
|
DBG("%s: name:start->end = %s:%pR\n",
|
|
__func__, r[0].name, &r[0]);
|
|
if (ret)
|
|
goto err;
|
|
|
|
r[1].name = "tx";
|
|
r[1].start = irq_of_parse_and_map(np, 0);
|
|
r[1].end = irq_of_parse_and_map(np, 0);
|
|
r[1].flags = IORESOURCE_IRQ;
|
|
DBG("%s: name:start->end = %s:%pR\n",
|
|
__func__, r[1].name, &r[1]);
|
|
|
|
tsi_eth_dev =
|
|
platform_device_register_simple("tsi-ethernet", i++, &r[0],
|
|
1);
|
|
|
|
if (IS_ERR(tsi_eth_dev)) {
|
|
ret = PTR_ERR(tsi_eth_dev);
|
|
goto err;
|
|
}
|
|
|
|
of_get_mac_address(np, tsi_eth_data.mac_addr);
|
|
|
|
ph = of_get_property(np, "mdio-handle", NULL);
|
|
mdio = of_find_node_by_phandle(*ph);
|
|
ret = of_address_to_resource(mdio, 0, &res);
|
|
of_node_put(mdio);
|
|
if (ret)
|
|
goto unreg;
|
|
|
|
ph = of_get_property(np, "phy-handle", NULL);
|
|
phy = of_find_node_by_phandle(*ph);
|
|
|
|
if (phy == NULL) {
|
|
ret = -ENODEV;
|
|
goto unreg;
|
|
}
|
|
|
|
phy_id = of_get_property(phy, "reg", NULL);
|
|
|
|
tsi_eth_data.regs = r[0].start;
|
|
tsi_eth_data.phyregs = res.start;
|
|
tsi_eth_data.phy = *phy_id;
|
|
tsi_eth_data.irq_num = irq_of_parse_and_map(np, 0);
|
|
|
|
/* Some boards with the TSI108 bridge (e.g. Holly)
|
|
* have a miswiring of the ethernet PHYs which
|
|
* requires a workaround. The special
|
|
* "txc-rxc-delay-disable" property enables this
|
|
* workaround. FIXME: Need to port the tsi108_eth
|
|
* driver itself to phylib and use a non-misleading
|
|
* name for the workaround flag - it's not actually to
|
|
* do with the model of PHY in use */
|
|
if (of_get_property(phy, "txc-rxc-delay-disable", NULL))
|
|
tsi_eth_data.phy_type = TSI108_PHY_BCM54XX;
|
|
of_node_put(phy);
|
|
|
|
ret =
|
|
platform_device_add_data(tsi_eth_dev, &tsi_eth_data,
|
|
sizeof(hw_info));
|
|
if (ret)
|
|
goto unreg;
|
|
}
|
|
return 0;
|
|
unreg:
|
|
platform_device_unregister(tsi_eth_dev);
|
|
err:
|
|
of_node_put(np);
|
|
return ret;
|
|
}
|
|
|
|
arch_initcall(tsi108_eth_of_init);
|