[rt2x00-users] [PATCH 3/4] rt2x00: Added code for reading rt3090 EEPROM

[Thadeu Lima de Souza Cascardo]

rt3090 has a differente EEPROM called efuse in the legacy driver. This
adds the code to read from it when we identify the chip as RT3090.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
---
 drivers/net/wireless/rt2x00/rt2800pci.c |   38 +++++++++++++++++++++++++++++++
 drivers/net/wireless/rt2x00/rt2800pci.h |   12 +++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index d83075b..5284715 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -334,10 +334,45 @@ static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
 	eeprom_93cx6_multiread(&eeprom, EEPROM_BASE, rt2x00dev->eeprom,
 			       EEPROM_SIZE / sizeof(u16));
 }
+
+static void rt2800pci_efuse_read(struct rt2x00_dev *rt2x00dev,
+                                 const unsigned int i)
+{
+        u32 reg;
+        rt2x00pci_register_read(rt2x00dev, EFUSE_CTRL, &reg);
+        rt2x00_set_field32(&reg, EFUSE_CTRL_ADDRESS_IN, i << 1);
+        rt2x00_set_field32(&reg, EFUSE_CTRL_MODE, 0);
+        rt2x00_set_field32(&reg, EFUSE_CTRL_KICK, 1);
+        rt2x00pci_register_write(rt2x00dev, EFUSE_CTRL, reg);
+        rt2x00pci_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, &reg);
+        rt2x00pci_register_read(rt2x00dev, EFUSE_DATA3, &reg);
+        rt2x00dev->eeprom[i] = reg;
+        rt2x00dev->eeprom[i+1] = reg >> 16;
+        rt2x00pci_register_read(rt2x00dev, EFUSE_DATA2, &reg);
+        rt2x00dev->eeprom[i+2] = reg;
+        rt2x00dev->eeprom[i+3] = reg >> 16;
+        rt2x00pci_register_read(rt2x00dev, EFUSE_DATA1, &reg);
+        rt2x00dev->eeprom[i+4] = reg;
+        rt2x00dev->eeprom[i+5] = reg >> 16;
+        rt2x00pci_register_read(rt2x00dev, EFUSE_DATA0, &reg);
+        rt2x00dev->eeprom[i+6] = reg;
+        rt2x00dev->eeprom[i+7] = reg >> 16;
+}
+
+static void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
+{
+	unsigned int i;
+	for (i = 0; i < EEPROM_SIZE / sizeof(u16); i += 8)
+		rt2800pci_efuse_read(rt2x00dev, i);
+}
 #else
 static inline void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
 {
 }
+
+static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
+{
+}
 #endif /* CONFIG_RT2800PCI_PCI */
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
@@ -2553,6 +2588,9 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 	case RT3052:
 		rt2800pci_read_eeprom_soc(rt2x00dev);
 		break;
+	case RT3090:
+		rt2800pci_read_eeprom_efuse(rt2x00dev);
+		break;
 	default:
 		rt2800pci_read_eeprom_pci(rt2x00dev);
 		break;
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index 3877dd4..d592be2 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -102,6 +102,18 @@
 #define E2PROM_CSR_RELOAD		FIELD32(0x00000080)
 
 /*
+ * EFUSE_CSR: RT3090 EEPROM
+ */
+#define EFUSE_CTRL			0x0580
+#define EFUSE_CTRL_ADDRESS_IN		FIELD32(0x03ff0000)
+#define EFUSE_CTRL_MODE			FIELD32(0x000000c0)
+#define EFUSE_CTRL_KICK			FIELD32(0x40000000)
+#define EFUSE_DATA0			0x0590
+#define EFUSE_DATA1			0x0594
+#define EFUSE_DATA2			0x0598
+#define EFUSE_DATA3			0x059c
+
+/*
  * HOST-MCU shared memory
  */
 #define HOST_CMD_CSR			0x0404
-- 
1.6.3.3