Skip to contentSkip to conversation

ssb-pcmcia: Fix 32bit register access in early bus scanning

PATCH New Michael Buesch 1 participant 1 message Nov 6, 2009 Sonics silicon backplane driver (ssb)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ssb-pcmcia: Fix 32bit register access in early bus scanning

From: Martin Fuzzey <[email protected]>

The scan function was using 32 bit access which does not work on 16bit CF cards.

This patch corrects this by doing two 16 bit reads like ssb_pcmcia_read32 already does.

mb -- Removed locking. That early in init there's no need for locking.

---

drivers/ssb/scan.c +5 -1
Index: wireless-testing/drivers/ssb/scan.c
===================================================================
@@ -162,6 +162,8 @@ static u8 chipid_to_nrcores(u16 chipid)
 static u32 scan_read32(struct ssb_bus *bus, u8 current_coreidx,
 		       u16 offset)
 {
+	u32 lo, hi;
+
 	switch (bus->bustype) {
 	case SSB_BUSTYPE_SSB:
 		offset += current_coreidx * SSB_CORE_SIZE;
@@ -174,7 +176,9 @@ static u32 scan_read32(struct ssb_bus *b
 			offset -= 0x800;
 		} else
 			ssb_pcmcia_switch_segment(bus, 0);
-		break;
+		lo = readw(bus->mmio + offset);
+		hi = readw(bus->mmio + offset + 2);
+		return lo | (hi << 16);
 	case SSB_BUSTYPE_SDIO:
 		offset += current_coreidx * SSB_CORE_SIZE;
 		return ssb_sdio_scan_read32(bus, offset);
Signature · 1 line
Greetings, Michael.