hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lantiq: Add support for loading athxk eeproms through mtd 

This patch enables retrieving the wifi calibration data from an MTD partition.
Try to copy mac address from ethernet before generating a random one.
This fixes DGN3500 ath9k support.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37087 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2013-06-29 16:33:46 +00:00
parent 858714fd06
commit 1b8ff1a334
2 changed files with 85 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/lantiq/dts/DGN3500.dtsi
View File

@ -116,6 +116,7 @@
compatible = "ath9k,eeprom"; compatible = "ath9k,eeprom";
ath,eep-flash = <&ath9k_cal 0xf000>; ath,eep-flash = <&ath9k_cal 0xf000>;
ath,pci-slot = <14>; ath,pci-slot = <14>;
ath,eep-endian;
ath,eep-swap; ath,eep-swap;
}; };

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

@ -50,12 +50,13 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o
--- /dev/null --- /dev/null
+++ b/arch/mips/lantiq/xway/ath_eep.c +++ b/arch/mips/lantiq/xway/ath_eep.c
@@ -0,0 +1,195 @@ @@ -0,0 +1,248 @@
+/* +/*
+ * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> + * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org>
+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org> + * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ * Copyright (C) 2011 Andrej Vlašić <andrej.vlasic0@gmail.com> + * Copyright (C) 2011 Andrej Vlašić <andrej.vlasic0@gmail.com>
+ * Copyright (C) 2013 Álvaro Fernández Rojas <noltari@gmail.com> + * Copyright (C) 2013 Álvaro Fernández Rojas <noltari@gmail.com>
+ * Copyright (C) 2013 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+ * + *
+ * This program is free software; you can redistribute it and/or modify it + * 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 + * under the terms of the GNU General Public License version 2 as published
@ -69,7 +70,10 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+#include <linux/ath5k_platform.h> +#include <linux/ath5k_platform.h>
+#include <linux/ath9k_platform.h> +#include <linux/ath9k_platform.h>
+#include <linux/pci.h> +#include <linux/pci.h>
+#include <linux/err.h>
+#include <linux/mtd/mtd.h>
+#include <pci-ath-fixup.h> +#include <pci-ath-fixup.h>
+#include <lantiq_soc.h>
+ +
+extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev); +extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev);
+struct ath5k_platform_data ath5k_pdata; +struct ath5k_platform_data ath5k_pdata;
@ -86,27 +90,49 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ +
+int __init of_ath9k_eeprom_probe(struct platform_device *pdev) +int __init of_ath9k_eeprom_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 *eep_res, *mac_res; + struct resource *eep_res, *mac_res = NULL;
+ void __iomem *eep, *mac; + void __iomem *eep, *mac;
+ int mac_offset; + int mac_offset;
+ u32 mac_inc = 0, pci_slot = 0; + u32 mac_inc = 0, pci_slot = 0;
+ int i; + int i;
+ struct mtd_info *the_mtd;
+ size_t flash_readlen;
+ const __be32 *list;
+ const char *part;
+ phandle phandle;
+ +
+ eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if ((list = of_get_property(np, "ath,eep-flash", &i)) && i == 2 *
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + 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),
+ ATH9K_PLAT_EEP_MAX_WORDS << 1, &flash_readlen,
+ (void *) ath9k_pdata.eeprom_data);
+ put_mtd_device(the_mtd);
+ if ((sizeof(ath9k_pdata.eeprom_data) != flash_readlen) || i) {
+ dev_err(&pdev->dev, "failed to load eeprom from mtd\n");
+ return -ENODEV;
+ }
+ } else {
+ eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ +
+ if (!eep_res) { + if (!eep_res) {
+ dev_err(&pdev->dev, "failed to load eeprom address\n"); + dev_err(&pdev->dev, "failed to load eeprom address\n");
+ return -ENODEV; + return -ENODEV;
+ }
+ if (resource_size(eep_res) != ATH9K_PLAT_EEP_MAX_WORDS << 1) {
+ 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 << 1);
+ } + }
+ if (resource_size(eep_res) != ATH9K_PLAT_EEP_MAX_WORDS << 1) {
+ 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 << 1);
+ +
+ if (of_find_property(np, "ath,eep-swap", NULL)) + if (of_find_property(np, "ath,eep-swap", NULL))
+ for (i = 0; i < ATH9K_PLAT_EEP_MAX_WORDS; i++) + for (i = 0; i < ATH9K_PLAT_EEP_MAX_WORDS; i++)
@ -127,7 +153,9 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ } + }
+ mac = ioremap(mac_res->start, resource_size(mac_res)); + mac = ioremap(mac_res->start, resource_size(mac_res));
+ memcpy_fromio(athxk_eeprom_mac, mac, 6); + memcpy_fromio(athxk_eeprom_mac, mac, 6);
+ } else { + } else if (ltq_get_eth_mac())
+ memcpy(athxk_eeprom_mac, ltq_get_eth_mac(), 6);
+ else {
+ dev_warn(&pdev->dev, "using random mac\n"); + dev_warn(&pdev->dev, "using random mac\n");
+ random_ether_addr(athxk_eeprom_mac); + random_ether_addr(athxk_eeprom_mac);
+ } + }
@ -177,27 +205,50 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ +
+int __init of_ath5k_eeprom_probe(struct platform_device *pdev) +int __init of_ath5k_eeprom_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 *eep_res, *mac_res; + struct resource *eep_res, *mac_res = NULL;
+ void __iomem *eep, *mac; + void __iomem *eep, *mac;
+ int mac_offset; + int mac_offset;
+ u32 mac_inc = 0; + u32 mac_inc = 0;
+ int i; + int i;
+ struct mtd_info *the_mtd;
+ size_t flash_readlen;
+ const __be32 *list;
+ const char *part;
+ phandle phandle;
+ +
+ eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if ((list = of_get_property(np, "ath,eep-flash", &i)) && i == 2 *
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + 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),
+ ATH5K_PLAT_EEP_MAX_WORDS << 1, &flash_readlen,
+ (void *) ath5k_pdata.eeprom_data);
+ put_mtd_device(the_mtd);
+ if ((sizeof(ATH5K_PLAT_EEP_MAX_WORDS << 1) != flash_readlen)
+ || i) {
+ dev_err(&pdev->dev, "failed to load eeprom from mtd\n");
+ return -ENODEV;
+ }
+ } else {
+ eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ +
+ if (!eep_res) { + if (!eep_res) {
+ dev_err(&pdev->dev, "failed to load eeprom address\n"); + dev_err(&pdev->dev, "failed to load eeprom address\n");
+ return -ENODEV; + return -ENODEV;
+ }
+ if (resource_size(eep_res) != ATH5K_PLAT_EEP_MAX_WORDS << 1) {
+ dev_err(&pdev->dev, "eeprom has an invalid size\n");
+ return -EINVAL;
+ }
+
+ eep = ioremap(eep_res->start, resource_size(eep_res));
+ memcpy_fromio(ath5k_pdata.eeprom_data, eep,
+ ATH5K_PLAT_EEP_MAX_WORDS << 1);
+ } + }
+ if (resource_size(eep_res) != ATH5K_PLAT_EEP_MAX_WORDS << 1) {
+ dev_err(&pdev->dev, "eeprom has an invalid size\n");
+ return -EINVAL;
+ }
+
+ eep = ioremap(eep_res->start, resource_size(eep_res));
+ memcpy_fromio(ath5k_pdata.eeprom_data, eep, ATH5K_PLAT_EEP_MAX_WORDS << 1);
+ +
+ if (of_find_property(np, "ath,eep-swap", NULL)) + if (of_find_property(np, "ath,eep-swap", NULL))
+ for (i = 0; i < ATH5K_PLAT_EEP_MAX_WORDS; i++) + for (i = 0; i < ATH5K_PLAT_EEP_MAX_WORDS; i++)
@ -212,7 +263,9 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling
+ } + }
+ mac = ioremap(mac_res->start, resource_size(mac_res)); + mac = ioremap(mac_res->start, resource_size(mac_res));
+ memcpy_fromio(athxk_eeprom_mac, mac, 6); + memcpy_fromio(athxk_eeprom_mac, mac, 6);
+ } else { + } else if (ltq_get_eth_mac())
+ memcpy(athxk_eeprom_mac, ltq_get_eth_mac(), 6);
+ else {
+ dev_warn(&pdev->dev, "using random mac\n"); + dev_warn(&pdev->dev, "using random mac\n");
+ random_ether_addr(athxk_eeprom_mac); + random_ether_addr(athxk_eeprom_mac);
+ } + }