KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lantiq: make macs loadable from mtd partitions

Browse source 
This is a really ugly hack but it will have to do until we copy the ramips patches to the lantiq tree

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37539
This commit is contained in:
John Crispin 2013-07-25 20:29:05 +00:00
parent 32f7ae4ce6
commit a4d31c0353
1 changed files with 72 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
View file

@ -19,8 +19,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
create mode 100644 arch/mips/lantiq/xway/pci-ath-fixup.c create mode 100644 arch/mips/lantiq/xway/pci-ath-fixup.c
create mode 100644 arch/mips/lantiq/xway/rt_eep.c create mode 100644 arch/mips/lantiq/xway/rt_eep.c
--- /dev/null Index: linux-3.8.13/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h
+++ b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.13/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h 2013-07-25 20:47:01.531327796 +0200
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#ifndef _PCI_ATH_FIXUP +#ifndef _PCI_ATH_FIXUP
+#define _PCI_ATH_FIXUP +#define _PCI_ATH_FIXUP
@ -28,9 +30,11 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+void ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) __init; +void ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) __init;
+ +
+#endif /* _PCI_ATH_FIXUP */ +#endif /* _PCI_ATH_FIXUP */
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h Index: linux-3.8.13/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, --- linux-3.8.13.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2013-07-25 20:46:52.599327583 +0200
+++ linux-3.8.13/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2013-07-25 20:47:01.531327796 +0200
@@ -90,5 +90,8 @@
extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_enable(unsigned int module);
extern void ltq_pmu_disable(unsigned int module); extern void ltq_pmu_disable(unsigned int module);
@ -39,8 +43,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ +
#endif /* CONFIG_SOC_TYPE_XWAY */ #endif /* CONFIG_SOC_TYPE_XWAY */
#endif /* _LTQ_XWAY_H__ */ #endif /* _LTQ_XWAY_H__ */
--- a/arch/mips/lantiq/xway/Makefile Index: linux-3.8.13/arch/mips/lantiq/xway/Makefile
+++ b/arch/mips/lantiq/xway/Makefile ===================================================================
--- linux-3.8.13.orig/arch/mips/lantiq/xway/Makefile 2013-07-25 20:47:01.371327792 +0200
+++ linux-3.8.13/arch/mips/lantiq/xway/Makefile 2013-07-25 21:31:31.287391412 +0200
@@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
@ -48,8 +54,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o
+ +
obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o
--- /dev/null Index: linux-3.8.13/arch/mips/lantiq/xway/ath_eep.c
+++ b/arch/mips/lantiq/xway/ath_eep.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.13/arch/mips/lantiq/xway/ath_eep.c 2013-07-25 20:47:01.535327796 +0200
@@ -0,0 +1,248 @@ @@ -0,0 +1,248 @@
+/* +/*
+ * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> + * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org>
@ -194,7 +202,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+{ +{
+ return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); + return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+} +}
+arch_initcall(of_ath9k_eeprom_init); +late_initcall(of_ath9k_eeprom_init);
+ +
+ +
+static int ath5k_pci_plat_dev_init(struct pci_dev *dev) +static int ath5k_pci_plat_dev_init(struct pci_dev *dev)
@ -299,9 +307,11 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); + return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
+} +}
+device_initcall(of_ath5k_eeprom_init); +device_initcall(of_ath5k_eeprom_init);
--- /dev/null Index: linux-3.8.13/arch/mips/lantiq/xway/eth_mac.c
+++ b/arch/mips/lantiq/xway/eth_mac.c ===================================================================
@@ -0,0 +1,76 @@ --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.13/arch/mips/lantiq/xway/eth_mac.c 2013-07-25 21:28:37.743387278 +0200
@@ -0,0 +1,98 @@
+/* +/*
+ * Copyright (C) 2012 John Crispin <blogic@openwrt.org> + * Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ * + *
@ -314,6 +324,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+#include <linux/module.h> +#include <linux/module.h>
+#include <linux/of_platform.h> +#include <linux/of_platform.h>
+#include <linux/if_ether.h> +#include <linux/if_ether.h>
+#include <linux/mtd/mtd.h>
+ +
+static u8 eth_mac[6]; +static u8 eth_mac[6];
+static int eth_mac_set; +static int eth_mac_set;
@ -332,28 +343,49 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ +
+int __init of_eth_mac_probe(struct platform_device *pdev) +int __init of_eth_mac_probe(struct platform_device *pdev)
+{ +{
+ struct device_node *np = pdev->dev.of_node; + struct device_node *np = pdev->dev.of_node, *mtd_np;
+ struct resource *mac_res; + struct resource *mac_res;
+ void __iomem *mac; + void __iomem *mac;
+ u32 mac_inc = 0; + u32 mac_inc = 0;
+ phandle phandle;
+ size_t flash_readlen;
+ const __be32 *list;
+ const char *part;
+ struct mtd_info *the_mtd;
+ int i;
+ +
+ if (eth_mac_set) { + if (eth_mac_set) {
+ dev_err(&pdev->dev, "mac was already set by bootloader\n"); + dev_err(&pdev->dev, "mac was already set by bootloader\n");
+ return -EINVAL; + return -EINVAL;
+ } + }
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if ((list = of_get_property(np, "ath,eep-mac", &i)) && i == 2 *
+ sizeof(*list) && (phandle = be32_to_cpup(list++)) &&
+ (mtd_np = of_find_node_by_phandle(phandle)) && ((part =
+ of_get_property(mtd_np, "label", NULL)) || (part =
+ mtd_np->name)) && (the_mtd = get_mtd_device_nm(part))
+ != ERR_PTR(-ENODEV)) {
+ i = mtd_read(the_mtd, be32_to_cpup(list), 6, &flash_readlen,
+ (void *) eth_mac);
+ put_mtd_device(the_mtd);
+ if ((sizeof(eth_mac) != flash_readlen) || i) {
+ dev_err(&pdev->dev, "failed to load eeprom from mtd\n");
+ return -ENODEV;
+ }
+ } else {
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ +
+ if (!mac_res) { + if (!mac_res) {
+ dev_err(&pdev->dev, "failed to load mac\n"); + dev_err(&pdev->dev, "failed to load mac\n");
+ return -EINVAL; + return -EINVAL;
+ } + }
+ if (resource_size(mac_res) != 6) { + if (resource_size(mac_res) != 6) {
+ dev_err(&pdev->dev, "mac has an invalid size\n"); + dev_err(&pdev->dev, "mac has an invalid size\n");
+ return -EINVAL; + return -EINVAL;
+ } + }
+ mac = ioremap(mac_res->start, resource_size(mac_res)); + mac = ioremap(mac_res->start, resource_size(mac_res));
+ memcpy_fromio(eth_mac, mac, 6); + memcpy_fromio(eth_mac, mac, 6);
+ +
+ }
+ if (!of_property_read_u32(np, "mac-increment", &mac_inc)) + if (!of_property_read_u32(np, "mac-increment", &mac_inc))
+ eth_mac[5] += mac_inc; + eth_mac[5] += mac_inc;
+ +
@ -378,8 +410,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ return platform_driver_probe(&eth_mac_driver, of_eth_mac_probe); + return platform_driver_probe(&eth_mac_driver, of_eth_mac_probe);
+} +}
+device_initcall(of_eth_mac_init); +device_initcall(of_eth_mac_init);
--- /dev/null Index: linux-3.8.13/arch/mips/lantiq/xway/pci-ath-fixup.c
+++ b/arch/mips/lantiq/xway/pci-ath-fixup.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.13/arch/mips/lantiq/xway/pci-ath-fixup.c 2013-07-25 20:47:01.535327796 +0200
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* +/*
+ * Atheros AP94 reference board PCI initialization + * Atheros AP94 reference board PCI initialization
@ -490,8 +524,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ ath_fixups[ath_num_fixups].cal_data = cal_data; + ath_fixups[ath_num_fixups].cal_data = cal_data;
+ ath_num_fixups++; + ath_num_fixups++;
+} +}
--- /dev/null Index: linux-3.8.13/arch/mips/lantiq/xway/rt_eep.c
+++ b/arch/mips/lantiq/xway/rt_eep.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.13/arch/mips/lantiq/xway/rt_eep.c 2013-07-25 20:47:01.535327796 +0200
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* +/*
+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org> + * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
@ -553,9 +589,11 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe); + return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe);
+} +}
+device_initcall(of_ralink_eeprom_init); +device_initcall(of_ralink_eeprom_init);
--- a/drivers/net/ethernet/lantiq_etop.c Index: linux-3.8.13/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c ===================================================================
@@ -826,7 +826,8 @@ ltq_etop_init(struct net_device *dev) --- linux-3.8.13.orig/drivers/net/ethernet/lantiq_etop.c 2013-07-25 20:46:52.599327583 +0200
+++ linux-3.8.13/drivers/net/ethernet/lantiq_etop.c 2013-07-25 20:47:01.535327796 +0200
@@ -829,7 +829,8 @@
ltq_etop_change_mtu(dev, 1500); ltq_etop_change_mtu(dev, 1500);
@ -565,7 +603,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
if (!is_valid_ether_addr(mac.sa_data)) { if (!is_valid_ether_addr(mac.sa_data)) {
pr_warn("etop: invalid MAC, using random\n"); pr_warn("etop: invalid MAC, using random\n");
random_ether_addr(mac.sa_data); random_ether_addr(mac.sa_data);
@@ -885,8 +886,7 @@ static const struct net_device_ops ltq_e @@ -888,8 +889,7 @@
.ndo_tx_timeout = ltq_etop_tx_timeout, .ndo_tx_timeout = ltq_etop_tx_timeout,
}; };
@ -575,7 +613,7 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
{ {
struct net_device *dev; struct net_device *dev;
struct ltq_etop_priv *priv; struct ltq_etop_priv *priv;
@@ -950,7 +950,9 @@ ltq_etop_probe(struct platform_device *p @@ -953,7 +953,9 @@
priv->tx_irq = irqres[0].start; priv->tx_irq = irqres[0].start;
priv->rx_irq = irqres[1].start; priv->rx_irq = irqres[1].start;
priv->mii_mode = of_get_phy_mode(pdev->dev.of_node); priv->mii_mode = of_get_phy_mode(pdev->dev.of_node);