diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-13 15:56:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-14 15:35:09 -0400 |
| commit | fa9bfd61e03e8dbcf110a93b373234d17a732233 (patch) | |
| tree | d2d3b0e6ac74ffba6eda683246098bb7d34016a5 /drivers/net/wireless/ath/ath5k/pci.c | |
| parent | 0cb9e06b6359bfa82f46c38a0b43e72d90b84081 (diff) | |
ath5k: add a new bus op for reading the mac address
On AHB, the calibration data usually does not contain a valid MAC address,
the correct MAC address is stored in the board config.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/pci.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/pci.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c index 66598a0d1df..5cc4a2fe47b 100644 --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/nl80211.h> | 17 | #include <linux/nl80211.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/pci-aspm.h> | 19 | #include <linux/pci-aspm.h> |
| 20 | #include <linux/etherdevice.h> | ||
| 20 | #include "../ath.h" | 21 | #include "../ath.h" |
| 21 | #include "ath5k.h" | 22 | #include "ath5k.h" |
| 22 | #include "debug.h" | 23 | #include "debug.h" |
| @@ -108,11 +109,42 @@ int ath5k_hw_read_srev(struct ath5k_hw *ah) | |||
| 108 | return 0; | 109 | return 0; |
| 109 | } | 110 | } |
| 110 | 111 | ||
| 112 | /* | ||
| 113 | * Read the MAC address from eeprom or platform_data | ||
| 114 | */ | ||
| 115 | static int ath5k_pci_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) | ||
| 116 | { | ||
| 117 | u8 mac_d[ETH_ALEN] = {}; | ||
| 118 | u32 total, offset; | ||
| 119 | u16 data; | ||
| 120 | int octet; | ||
| 121 | |||
| 122 | AR5K_EEPROM_READ(0x20, data); | ||
| 123 | |||
| 124 | for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) { | ||
| 125 | AR5K_EEPROM_READ(offset, data); | ||
| 126 | |||
| 127 | total += data; | ||
| 128 | mac_d[octet + 1] = data & 0xff; | ||
| 129 | mac_d[octet] = data >> 8; | ||
| 130 | octet += 2; | ||
| 131 | } | ||
| 132 | |||
| 133 | if (!total || total == 3 * 0xffff) | ||
| 134 | return -EINVAL; | ||
| 135 | |||
| 136 | memcpy(mac, mac_d, ETH_ALEN); | ||
| 137 | |||
| 138 | return 0; | ||
| 139 | } | ||
| 140 | |||
| 141 | |||
| 111 | /* Common ath_bus_opts structure */ | 142 | /* Common ath_bus_opts structure */ |
| 112 | static const struct ath_bus_ops ath_pci_bus_ops = { | 143 | static const struct ath_bus_ops ath_pci_bus_ops = { |
| 113 | .ath_bus_type = ATH_PCI, | 144 | .ath_bus_type = ATH_PCI, |
| 114 | .read_cachesize = ath5k_pci_read_cachesize, | 145 | .read_cachesize = ath5k_pci_read_cachesize, |
| 115 | .eeprom_read = ath5k_pci_eeprom_read, | 146 | .eeprom_read = ath5k_pci_eeprom_read, |
| 147 | .eeprom_read_mac = ath5k_pci_eeprom_read_mac, | ||
| 116 | }; | 148 | }; |
| 117 | 149 | ||
| 118 | /********************\ | 150 | /********************\ |