From 0c9b05716ac0e597ae0f81a96ff68e54716decc9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 13 Mar 2013 10:02:58 +0100 Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling --- arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h | 6 + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 + arch/mips/lantiq/xway/Makefile | 3 + arch/mips/lantiq/xway/ath_eep.c | 206 ++++++++++++++++++++ arch/mips/lantiq/xway/eth_mac.c | 76 ++++++++ arch/mips/lantiq/xway/pci-ath-fixup.c | 109 +++++++++++ arch/mips/lantiq/xway/rt_eep.c | 60 ++++++ drivers/net/ethernet/lantiq_etop.c | 10 +- 8 files changed, 469 insertions(+), 4 deletions(-) create mode 100644 arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h create mode 100644 arch/mips/lantiq/xway/ath_eep.c create mode 100644 arch/mips/lantiq/xway/eth_mac.c create mode 100644 arch/mips/lantiq/xway/pci-ath-fixup.c create mode 100644 arch/mips/lantiq/xway/rt_eep.c diff --git a/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h new file mode 100644 index 0000000..095d2619 --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h @@ -0,0 +1,6 @@ +#ifndef _PCI_ATH_FIXUP +#define _PCI_ATH_FIXUP + +void ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) __init; + +#endif /* _PCI_ATH_FIXUP */ diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h index 133336b..779715c 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -90,5 +90,8 @@ int xrx200_gphy_boot(struct device *dev, unsigned int id, dma_addr_t dev_addr); extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_disable(unsigned int module); +/* allow the ethernet driver to load a flash mapped mac addr */ +const u8* ltq_get_eth_mac(void); + #endif /* CONFIG_SOC_TYPE_XWAY */ #endif /* _LTQ_XWAY_H__ */ diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile index 087497d..51f0eba 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,3 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o +obj-y += eth_mac.o +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o + obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o diff --git a/arch/mips/lantiq/xway/ath_eep.c b/arch/mips/lantiq/xway/ath_eep.c new file mode 100644 index 0000000..96da7c1 --- /dev/null +++ b/arch/mips/lantiq/xway/ath_eep.c @@ -0,0 +1,206 @@ +/* + * Copyright (C) 2011 Luca Olivetti + * Copyright (C) 2011 John Crispin + * Copyright (C) 2011 Andrej Vlašić + * Copyright (C) 2013 Álvaro Fernández Rojas + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev); +struct ath5k_platform_data ath5k_pdata; +struct ath9k_platform_data ath9k_pdata = { + .led_pin = -1, +}; +static u16 ath5k_eeprom_data[ATH5K_PLAT_EEP_MAX_WORDS]; +static u8 athxk_eeprom_mac[6]; + +static int ath9k_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &ath9k_pdata; + return 0; +} + +int __init of_ath9k_eeprom_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct resource *eep_res, *mac_res; + void __iomem *eep, *mac; + int mac_offset; + u32 mac_inc = 0, pci_slot = 0; + int i; + u16 *eepdata, sum, el; + + eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + + if (!eep_res) { + dev_err(&pdev->dev, "failed to load eeprom address\n"); + return -ENODEV; + } + if (resource_size(eep_res) != ATH9K_PLAT_EEP_MAX_WORDS) { + dev_err(&pdev->dev, "eeprom has an invalid size\n"); + return -EINVAL; + } + + eep = ioremap(eep_res->start, resource_size(eep_res)); + memcpy_fromio(ath9k_pdata.eeprom_data, eep, ATH9K_PLAT_EEP_MAX_WORDS); + + if (of_find_property(np, "ath,eep-swap", NULL)) { + ath9k_pdata.endian_check = true; + + dev_info(&pdev->dev, "endian check enabled.\n"); + } + + if (of_find_property(np, "ath,eep-csum", NULL)) { + sum = ath9k_pdata.eeprom_data[0x200>>1]; + el = sum / sizeof(u16) - 2; /* skip length and (old) checksum */ + eepdata = (u16 *) (&ath9k_pdata.eeprom_data[0x204>>1]); /* after checksum */ + for (i = 0; i < el; i++) + sum ^= *eepdata++; + sum ^= 0xffff; + ath9k_pdata.eeprom_data[0x202>>1] = sum; + + dev_info(&pdev->dev, "checksum fixed.\n"); + } + + if (!of_property_read_u32(np, "ath,mac-offset", &mac_offset)) { + memcpy_fromio(athxk_eeprom_mac, (void*) ath9k_pdata.eeprom_data, 6); + } else if (mac_res) { + if (resource_size(mac_res) != 6) { + dev_err(&pdev->dev, "mac has an invalid size\n"); + return -EINVAL; + } + mac = ioremap(mac_res->start, resource_size(mac_res)); + memcpy_fromio(athxk_eeprom_mac, mac, 6); + } else { + dev_warn(&pdev->dev, "using random mac\n"); + random_ether_addr(athxk_eeprom_mac); + } + + if (!of_property_read_u32(np, "ath,mac-increment", &mac_inc)) + athxk_eeprom_mac[5] += mac_inc; + + ath9k_pdata.macaddr = athxk_eeprom_mac; + ltq_pci_plat_dev_init = ath9k_pci_plat_dev_init; + + if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) { + ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data); + + dev_info(&pdev->dev, "pci slot: %u\n", pci_slot); + } + + dev_info(&pdev->dev, "loaded ath9k eeprom\n"); + + return 0; +} + +static struct of_device_id ath9k_eeprom_ids[] = { + { .compatible = "ath9k,eeprom" }, + { } +}; + +static struct platform_driver ath9k_eeprom_driver = { + .driver = { + .name = "ath9k,eeprom", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ath9k_eeprom_ids), + }, +}; + +static int __init of_ath9k_eeprom_init(void) +{ + return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); +} +arch_initcall(of_ath9k_eeprom_init); + + +static int ath5k_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &ath5k_pdata; + return 0; +} + +int __init of_ath5k_eeprom_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct resource *eep_res, *mac_res; + void __iomem *eep, *mac; + int mac_offset; + u32 mac_inc = 0; + int i; + + eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + + if (!eep_res) { + dev_err(&pdev->dev, "failed to load eeprom address\n"); + return -ENODEV; + } + if (resource_size(eep_res) != ATH5K_PLAT_EEP_MAX_WORDS) { + dev_err(&pdev->dev, "eeprom has an invalid size\n"); + return -EINVAL; + } + + eep = ioremap(eep_res->start, resource_size(eep_res)); + memcpy_fromio(ath5k_eeprom_data, eep, ATH5K_PLAT_EEP_MAX_WORDS); + + if (of_find_property(np, "ath,eep-swap", NULL)) + for (i = 0; i < (ATH5K_PLAT_EEP_MAX_WORDS >> 1); i++) + ath5k_eeprom_data[i] = swab16(ath5k_eeprom_data[i]); + + if (!of_property_read_u32(np, "ath,mac-offset", &mac_offset)) { + memcpy_fromio(athxk_eeprom_mac, (void*) ath5k_eeprom_data, 6); + } else if (mac_res) { + if (resource_size(mac_res) != 6) { + dev_err(&pdev->dev, "mac has an invalid size\n"); + return -EINVAL; + } + mac = ioremap(mac_res->start, resource_size(mac_res)); + memcpy_fromio(athxk_eeprom_mac, mac, 6); + } else { + dev_warn(&pdev->dev, "using random mac\n"); + random_ether_addr(athxk_eeprom_mac); + } + + if (!of_property_read_u32(np, "ath,mac-increment", &mac_inc)) + athxk_eeprom_mac[5] += mac_inc; + + ath5k_pdata.eeprom_data = ath5k_eeprom_data; + ath5k_pdata.macaddr = athxk_eeprom_mac; + ltq_pci_plat_dev_init = ath5k_pci_plat_dev_init; + + dev_info(&pdev->dev, "loaded ath5k eeprom\n"); + + return 0; +} + +static struct of_device_id ath5k_eeprom_ids[] = { + { .compatible = "ath5k,eeprom" }, + { } +}; + +static struct platform_driver ath5k_eeprom_driver = { + .driver = { + .name = "ath5k,eeprom", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ath5k_eeprom_ids), + }, +}; + +static int __init of_ath5k_eeprom_init(void) +{ + return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); +} +device_initcall(of_ath5k_eeprom_init); diff --git a/arch/mips/lantiq/xway/eth_mac.c b/arch/mips/lantiq/xway/eth_mac.c new file mode 100644 index 0000000..d288a0e --- /dev/null +++ b/arch/mips/lantiq/xway/eth_mac.c @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2012 John Crispin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include + +static u8 eth_mac[6]; +static int eth_mac_set; + +const u8* ltq_get_eth_mac(void) +{ + return eth_mac; +} + +static int __init setup_ethaddr(char *str) +{ + eth_mac_set = mac_pton(str, eth_mac); + return !eth_mac_set; +} +__setup("ethaddr=", setup_ethaddr); + +int __init of_eth_mac_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct resource *mac_res; + void __iomem *mac; + u32 mac_inc = 0; + + if (eth_mac_set) { + dev_err(&pdev->dev, "mac was already set by bootloader\n"); + return -EINVAL; + } + mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + if (!mac_res) { + dev_err(&pdev->dev, "failed to load mac\n"); + return -EINVAL; + } + if (resource_size(mac_res) != 6) { + dev_err(&pdev->dev, "mac has an invalid size\n"); + return -EINVAL; + } + mac = ioremap(mac_res->start, resource_size(mac_res)); + memcpy_fromio(eth_mac, mac, 6); + + if (!of_property_read_u32(np, "mac-increment", &mac_inc)) + eth_mac[5] += mac_inc; + + return 0; +} + +static struct of_device_id eth_mac_ids[] = { + { .compatible = "lantiq,eth-mac" }, + { /* sentinel */ } +}; + +static struct platform_driver eth_mac_driver = { + .driver = { + .name = "lantiq,eth-mac", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(eth_mac_ids), + }, +}; + +static int __init of_eth_mac_init(void) +{ + return platform_driver_probe(ð_mac_driver, of_eth_mac_probe); +} +device_initcall(of_eth_mac_init); diff --git a/arch/mips/lantiq/xway/pci-ath-fixup.c b/arch/mips/lantiq/xway/pci-ath-fixup.c new file mode 100644 index 0000000..c87ffb2 --- /dev/null +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c @@ -0,0 +1,109 @@ +/* + * Atheros AP94 reference board PCI initialization + * + * Copyright (C) 2009-2010 Gabor Juhos + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include + +#define LTQ_PCI_MEM_BASE 0x18000000 + +struct ath_fixup { + u16 *cal_data; + unsigned slot; +}; + +static int ath_num_fixups; +static struct ath_fixup ath_fixups[2]; + +static void ath_pci_fixup(struct pci_dev *dev) +{ + void __iomem *mem; + u16 *cal_data = NULL; + u16 cmd; + u32 bar0; + u32 val; + unsigned i; + + for (i = 0; i < ath_num_fixups; i++) { + if (ath_fixups[i].cal_data == NULL) + continue; + + if (ath_fixups[i].slot != PCI_SLOT(dev->devfn)) + continue; + + cal_data = ath_fixups[i].cal_data; + break; + } + + if (cal_data == NULL) + return; + + if (*cal_data != 0xa55a) { + pr_err("pci %s: invalid calibration data\n", pci_name(dev)); + return; + } + + pr_info("pci %s: fixup device configuration\n", pci_name(dev)); + + mem = ioremap(LTQ_PCI_MEM_BASE, 0x10000); + if (!mem) { + pr_err("pci %s: ioremap error\n", pci_name(dev)); + return; + } + + pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0); + pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, LTQ_PCI_MEM_BASE); + pci_read_config_word(dev, PCI_COMMAND, &cmd); + cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY; + pci_write_config_word(dev, PCI_COMMAND, cmd); + + /* set pointer to first reg address */ + cal_data += 3; + while (*cal_data != 0xffff) { + u32 reg; + reg = *cal_data++; + val = *cal_data++; + val |= (*cal_data++) << 16; + + ltq_w32(swab32(val), mem + reg); + udelay(100); + } + + pci_read_config_dword(dev, PCI_VENDOR_ID, &val); + dev->vendor = val & 0xffff; + dev->device = (val >> 16) & 0xffff; + + pci_read_config_dword(dev, PCI_CLASS_REVISION, &val); + dev->revision = val & 0xff; + dev->class = val >> 8; /* upper 3 bytes */ + + pr_info("pci %s: fixup info: [%04x:%04x] revision %02x class %#08x\n", + pci_name(dev), dev->vendor, dev->device, dev->revision, dev->class); + + pci_read_config_word(dev, PCI_COMMAND, &cmd); + cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY); + pci_write_config_word(dev, PCI_COMMAND, cmd); + + pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0); + + iounmap(mem); +} +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath_pci_fixup); + +void __init ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) +{ + if (ath_num_fixups >= ARRAY_SIZE(ath_fixups)) + return; + + ath_fixups[ath_num_fixups].slot = slot; + ath_fixups[ath_num_fixups].cal_data = cal_data; + ath_num_fixups++; +} diff --git a/arch/mips/lantiq/xway/rt_eep.c b/arch/mips/lantiq/xway/rt_eep.c new file mode 100644 index 0000000..00f2d4c --- /dev/null +++ b/arch/mips/lantiq/xway/rt_eep.c @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2011 John Crispin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include + +extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev); +static struct rt2x00_platform_data rt2x00_pdata; + +static int rt2x00_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &rt2x00_pdata; + return 0; +} + +int __init of_ralink_eeprom_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const char *eeprom; + + if (of_property_read_string(np, "ralink,eeprom", &eeprom)) { + dev_err(&pdev->dev, "failed to load eeprom filename\n"); + return 0; + } + + rt2x00_pdata.eeprom_file_name = kstrdup(eeprom, GFP_KERNEL); +// rt2x00_pdata.mac_address = mac; + ltq_pci_plat_dev_init = rt2x00_pci_plat_dev_init; + + dev_info(&pdev->dev, "using %s as eeprom\n", eeprom); + + return 0; +} + +static struct of_device_id ralink_eeprom_ids[] = { + { .compatible = "ralink,eeprom" }, + { } +}; + +static struct platform_driver ralink_eeprom_driver = { + .driver = { + .name = "ralink,eeprom", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ralink_eeprom_ids), + }, +}; + +static int __init of_ralink_eeprom_init(void) +{ + return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe); +} +device_initcall(of_ralink_eeprom_init); diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 91a37f1..fa23a7e 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -826,7 +826,8 @@ ltq_etop_init(struct net_device *dev) ltq_etop_change_mtu(dev, 1500); - memcpy(&mac.sa_data, priv->mac, ETH_ALEN); + if (priv->mac) + memcpy(&mac.sa_data, priv->mac, ETH_ALEN); if (!is_valid_ether_addr(mac.sa_data)) { pr_warn("etop: invalid MAC, using random\n"); random_ether_addr(mac.sa_data); @@ -885,8 +886,7 @@ static const struct net_device_ops ltq_eth_netdev_ops = { .ndo_tx_timeout = ltq_etop_tx_timeout, }; -static int __devinit -ltq_etop_probe(struct platform_device *pdev) +static int ltq_etop_probe(struct platform_device *pdev) { struct net_device *dev; struct ltq_etop_priv *priv; @@ -950,7 +950,9 @@ ltq_etop_probe(struct platform_device *pdev) priv->tx_irq = irqres[0].start; priv->rx_irq = irqres[1].start; priv->mii_mode = of_get_phy_mode(pdev->dev.of_node); - priv->mac = of_get_mac_address(pdev->dev.of_node); + priv->mac = ltq_get_eth_mac(); + if (!priv->mac) + priv->mac = of_get_mac_address(pdev->dev.of_node); priv->clk_ppe = clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk_ppe)) -- 1.7.10.4