diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-06-01 11:01:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:19:49 -0400 |
| commit | bdf492f502ad4f646e9905db1b89e11822826edd (patch) | |
| tree | f22cd5fa0fd1cfce8075885d04fd20c6ca15c571 /drivers/ssb | |
| parent | dfe21582ac5ebc460dda98c67e8589dd506d02cd (diff) | |
| download | kernel_samsung_smdk4412-bdf492f502ad4f646e9905db1b89e11822826edd.zip kernel_samsung_smdk4412-bdf492f502ad4f646e9905db1b89e11822826edd.tar.gz kernel_samsung_smdk4412-bdf492f502ad4f646e9905db1b89e11822826edd.tar.bz2 | |
ssb: fix PCI(e) driver regression causing oops on PCI cards
We were incorrectly executing PCIe specific workarounds on PCI cards.
This resulted in:
Machine check in kernel mode.
Caused by (from SRR1=149030): Transfer error ack signal
Oops: Machine check, sig: 7 [#1]
Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/driver_pcicore.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 82feb34..2a20dab 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -539,10 +539,12 @@ void ssb_pcicore_init(struct ssb_pcicore *pc) if (!pc->hostmode) ssb_pcicore_init_clientmode(pc); - /* Additional always once-executed workarounds */ - ssb_pcicore_serdes_workaround(pc); - /* TODO: ASPM */ - /* TODO: Clock Request Update */ + /* Additional PCIe always once-executed workarounds */ + if (dev->id.coreid == SSB_DEV_PCIE) { + ssb_pcicore_serdes_workaround(pc); + /* TODO: ASPM */ + /* TODO: Clock Request Update */ + } } static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address) |