Commit 04ad1fb2 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

ssb: update reject bit for Target State Low



My 14e4:4315 is SSB_IDLOW_SSBREV_26:
read32 0xfaafcff8 -> 0x600422d5
My 14e4:4328 is SSB_IDLOW_SSBREV_24:
read32 0xfaafcff8 -> 0x400422c5
My 14e4:432b is SSB_IDLOW_SSBREV_26 again:
read32 0xfaafcff8 -> 0x600422d5

For all of them wl driver is using 0x2 reject bit:
write32(0xf98) <- 0x00010002
So it seems SSB 2.3 is the exception using another bit.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a6ef8143
...@@ -1117,23 +1117,22 @@ static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev) ...@@ -1117,23 +1117,22 @@ static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
{ {
u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV; u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
/* The REJECT bit changed position in TMSLOW between /* The REJECT bit seems to be different for Backplane rev 2.3 */
* Backplane revisions. */
switch (rev) { switch (rev) {
case SSB_IDLOW_SSBREV_22: case SSB_IDLOW_SSBREV_22:
return SSB_TMSLOW_REJECT_22; case SSB_IDLOW_SSBREV_24:
case SSB_IDLOW_SSBREV_26:
return SSB_TMSLOW_REJECT;
case SSB_IDLOW_SSBREV_23: case SSB_IDLOW_SSBREV_23:
return SSB_TMSLOW_REJECT_23; return SSB_TMSLOW_REJECT_23;
case SSB_IDLOW_SSBREV_24: /* TODO - find the proper REJECT bits */ case SSB_IDLOW_SSBREV_25: /* TODO - find the proper REJECT bit */
case SSB_IDLOW_SSBREV_25: /* same here */
case SSB_IDLOW_SSBREV_26: /* same here */
case SSB_IDLOW_SSBREV_27: /* same here */ case SSB_IDLOW_SSBREV_27: /* same here */
return SSB_TMSLOW_REJECT_23; /* this is a guess */ return SSB_TMSLOW_REJECT; /* this is a guess */
default: default:
printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev); printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
WARN_ON(1); WARN_ON(1);
} }
return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23); return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23);
} }
int ssb_device_is_enabled(struct ssb_device *dev) int ssb_device_is_enabled(struct ssb_device *dev)
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
#define SSB_INTVEC_ENET1 0x00000040 /* Enable interrupts for enet 1 */ #define SSB_INTVEC_ENET1 0x00000040 /* Enable interrupts for enet 1 */
#define SSB_TMSLOW 0x0F98 /* SB Target State Low */ #define SSB_TMSLOW 0x0F98 /* SB Target State Low */
#define SSB_TMSLOW_RESET 0x00000001 /* Reset */ #define SSB_TMSLOW_RESET 0x00000001 /* Reset */
#define SSB_TMSLOW_REJECT_22 0x00000002 /* Reject (Backplane rev 2.2) */ #define SSB_TMSLOW_REJECT 0x00000002 /* Reject (Standard Backplane) */
#define SSB_TMSLOW_REJECT_23 0x00000004 /* Reject (Backplane rev 2.3) */ #define SSB_TMSLOW_REJECT_23 0x00000004 /* Reject (Backplane rev 2.3) */
#define SSB_TMSLOW_CLOCK 0x00010000 /* Clock Enable */ #define SSB_TMSLOW_CLOCK 0x00010000 /* Clock Enable */
#define SSB_TMSLOW_FGC 0x00020000 /* Force Gated Clocks On */ #define SSB_TMSLOW_FGC 0x00020000 /* Force Gated Clocks On */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment