lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssb: reset device only if it was enabled

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki
2011-02-17 01:50:51 +01:00
committed by John W. Linville
parent b1a1bcf714
commit 011d18350f
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/ssb/main.c
View File

@@ -1226,27 +1226,31 @@ void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
return; return;
reject = ssb_tmslow_reject_bitmask(dev); reject = ssb_tmslow_reject_bitmask(dev);
ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);
ssb_wait_bits(dev, SSB_TMSLOW, reject, 1000, 1);
ssb_wait_bits(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);
if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) { if (ssb_read32(dev, SSB_TMSLOW) & SSB_TMSLOW_CLOCK) {
val = ssb_read32(dev, SSB_IMSTATE); ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);
val |= SSB_IMSTATE_REJECT; ssb_wait_bits(dev, SSB_TMSLOW, reject, 1000, 1);
ssb_write32(dev, SSB_IMSTATE, val); ssb_wait_bits(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);
ssb_wait_bits(dev, SSB_IMSTATE, SSB_IMSTATE_BUSY, 1000, 0);
}
ssb_write32(dev, SSB_TMSLOW, if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) {
SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK | val = ssb_read32(dev, SSB_IMSTATE);
reject | SSB_TMSLOW_RESET | val |= SSB_IMSTATE_REJECT;
core_specific_flags); ssb_write32(dev, SSB_IMSTATE, val);
ssb_flush_tmslow(dev); ssb_wait_bits(dev, SSB_IMSTATE, SSB_IMSTATE_BUSY, 1000,
0);
}
if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) { ssb_write32(dev, SSB_TMSLOW,
val = ssb_read32(dev, SSB_IMSTATE); SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |
val &= ~SSB_IMSTATE_REJECT; reject | SSB_TMSLOW_RESET |
ssb_write32(dev, SSB_IMSTATE, val); core_specific_flags);
ssb_flush_tmslow(dev);
if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) {
val = ssb_read32(dev, SSB_IMSTATE);
val &= ~SSB_IMSTATE_REJECT;
ssb_write32(dev, SSB_IMSTATE, val);
}
} }
ssb_write32(dev, SSB_TMSLOW, ssb_write32(dev, SSB_TMSLOW,