b43: N-PHY: implement and add reading one element tables

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 39 insertions, 11 deletions

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 671fbcfdc0ec..7eac0ae2b15e 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -1628,12 +1628,11 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev)
                 regs[4] = b43_phy_read(dev, B43_NPHY_BBCFG);
                 b43_phy_mask(dev, B43_NPHY_BBCFG, ~B43_NPHY_BBCFG_RSTRX);
 
-                /* TODO: Read an N PHY Table with ID 8, length 1, offset 3,
-                        width 16, and data pointing to tmp */
+                tmp = b43_ntab_read(dev, B43_NTAB16(8, 3));
                 regs[5] = tmp;
                 b43_ntab_write(dev, B43_NTAB16(8, 3), 0);
-                /* TODO: Read an N PHY Table with ID 8, length 1, offset 19,
-                        width 16, and data pointing to tmp */
+
+                tmp = b43_ntab_read(dev, B43_NTAB16(8, 19));
                 regs[6] = tmp;
                 b43_ntab_write(dev, B43_NTAB16(8, 19), 0);
                 regs[7] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);
@@ -1653,13 +1652,11 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev)
                 tmp = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);
                 regs[2] = tmp;
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp | 0x3000);
-                /* TODO: Read an N PHY Table with ID 8, length 1, offset 2,
-                        width 16, and data pointing to tmp */
+                tmp = b43_ntab_read(dev, B43_NTAB16(8, 2));
                 regs[3] = tmp;
                 tmp |= 0x2000;
                 b43_ntab_write(dev, B43_NTAB16(8, 2), tmp);
-                /* TODO: Read an N PHY Table with ID 8, length 1, offset 18,
-                        width 16, and data pointer tmp */
+                tmp = b43_ntab_read(dev, B43_NTAB16(8, 18));
                 regs[4] = tmp;
                 tmp |= 0x2000;
                 b43_ntab_write(dev, B43_NTAB16(8, 18), tmp);
@@ -1877,9 +1874,8 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
                         b43_phy_write(dev, B43_NPHY_IQLOCAL_CMDNNUM, tmp);
 
                         if (type == 1 || type == 3 || type == 4) {
-                                /* TODO: Read an N PHY Table with ID 15,
-                                        length 1, offset 69 + core,
-                                        width 16, and data pointer buffer */
+                                buffer[0] = b43_ntab_read(dev,
+                                                B43_NTAB16(15, 69 + core));
                                 diq_start = buffer[0];
                                 buffer[0] = 0;
                                 b43_ntab_write(dev, B43_NTAB16(15, 69 + core),
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index fc08be0b976e..b8aed456da1f 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -2919,6 +2919,37 @@ static inline void assert_ntab_array_sizes(void)
 #undef check
 }
 
+u32 b43_ntab_read(struct b43_wldev *dev, u32 offset)
+{
+        u32 type, value;
+
+        type = offset & B43_NTAB_TYPEMASK;
+        offset &= ~B43_NTAB_TYPEMASK;
+        B43_WARN_ON(offset > 0xFFFF);
+
+        switch (type) {
+        case B43_NTAB_8BIT:
+                b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
+                value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO) & 0xFF;
+                break;
+        case B43_NTAB_16BIT:
+                b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
+                value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                break;
+        case B43_NTAB_32BIT:
+                b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
+                value = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);
+                value <<= 16;
+                value |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                break;
+        default:
+                B43_WARN_ON(1);
+                value = 0;
+        }
+
+        return value;
+}
+
 void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value)
 {
         u32 type;
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index d5605df5d6b8..64e990a14de3 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -142,6 +142,7 @@ b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel);
 #define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL               10
 #define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL_REV3          12
 
+u32 b43_ntab_read(struct b43_wldev *dev, u32 offset);
 void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value);
 void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
                           unsigned int nr_elements, const void *_data);