b43: Fix chip access validation for new devices

This fixes chip access validation for newer devices
(4318 and up, I think)

This patch fixes probing of a PCMCIA based 4318 device.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 30 insertions, 15 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 813b2409f0c3..bcaa60924381 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -50,6 +50,9 @@
 #define B43_MMIO_XMITSTAT_1             0x174
 #define B43_MMIO_REV3PLUS_TSF_LOW       0x180   /* core rev >= 3 only */
 #define B43_MMIO_REV3PLUS_TSF_HIGH      0x184   /* core rev >= 3 only */
+#define B43_MMIO_TSF_CFP_REP            0x188
+#define B43_MMIO_TSF_CFP_START          0x18C
+#define B43_MMIO_TSF_CFP_MAXDUR         0x190
 
 /* 32-bit DMA */
 #define B43_MMIO_DMA32_BASE0            0x200
@@ -88,6 +91,8 @@
 #define B43_MMIO_RADIO_HWENABLED_LO     0x49A
 #define B43_MMIO_GPIO_CONTROL           0x49C
 #define B43_MMIO_GPIO_MASK              0x49E
+#define B43_MMIO_TSF_CFP_START_LOW      0x604
+#define B43_MMIO_TSF_CFP_START_HIGH     0x606
 #define B43_MMIO_TSF_0                  0x632   /* core rev < 3 only */
 #define B43_MMIO_TSF_1                  0x634   /* core rev < 3 only */
 #define B43_MMIO_TSF_2                  0x636   /* core rev < 3 only */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index f4c14272332b..6b3013c2d96d 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2408,32 +2408,42 @@ static void b43_periodic_tasks_setup(struct b43_wldev *dev)
         queue_delayed_work(dev->wl->hw->workqueue, work, 0);
 }
 
-/* Validate access to the chip (SHM) */
+/* Check if communication with the device works correctly. */
 static int b43_validate_chipaccess(struct b43_wldev *dev)
 {
-        u32 value;
-        u32 shm_backup;
+        u32 v, backup;
 
-        shm_backup = b43_shm_read32(dev, B43_SHM_SHARED, 0);
-        b43_shm_write32(dev, B43_SHM_SHARED, 0, 0xAA5555AA);
-        if (b43_shm_read32(dev, B43_SHM_SHARED, 0) != 0xAA5555AA)
-                goto error;
+        backup = b43_shm_read32(dev, B43_SHM_SHARED, 0);
+
+        /* Check for read/write and endianness problems. */
         b43_shm_write32(dev, B43_SHM_SHARED, 0, 0x55AAAA55);
         if (b43_shm_read32(dev, B43_SHM_SHARED, 0) != 0x55AAAA55)
                 goto error;
-        b43_shm_write32(dev, B43_SHM_SHARED, 0, shm_backup);
-
-        value = b43_read32(dev, B43_MMIO_MACCTL);
-        if ((value | B43_MACCTL_GMODE) !=
-            (B43_MACCTL_GMODE | B43_MACCTL_IHR_ENABLED))
+        b43_shm_write32(dev, B43_SHM_SHARED, 0, 0xAA5555AA);
+        if (b43_shm_read32(dev, B43_SHM_SHARED, 0) != 0xAA5555AA)
                 goto error;
 
-        value = b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);
-        if (value)
+        b43_shm_write32(dev, B43_SHM_SHARED, 0, backup);
+
+        if ((dev->dev->id.revision >= 3) && (dev->dev->id.revision <= 10)) {
+                /* The 32bit register shadows the two 16bit registers
+                 * with update sideeffects. Validate this. */
+                b43_write16(dev, B43_MMIO_TSF_CFP_START, 0xAAAA);
+                b43_write32(dev, B43_MMIO_TSF_CFP_START, 0xCCCCBBBB);
+                if (b43_read16(dev, B43_MMIO_TSF_CFP_START_LOW) != 0xBBBB)
+                        goto error;
+                if (b43_read16(dev, B43_MMIO_TSF_CFP_START_HIGH) != 0xCCCC)
+                        goto error;
+        }
+        b43_write32(dev, B43_MMIO_TSF_CFP_START, 0);
+
+        v = b43_read32(dev, B43_MMIO_MACCTL);
+        v |= B43_MACCTL_GMODE;
+        if (v != (B43_MACCTL_GMODE | B43_MACCTL_IHR_ENABLED))
                 goto error;
 
         return 0;
-      error:
+error:
         b43err(dev->wl, "Failed to validate the chipaccess\n");
         return -ENODEV;
 }