kernel: backport ssb patches up to changes queued for 4.1
[openwrt/openwrt.git] / target / linux / generic / patches-4.0 / 020-ssb_update.patch
1 --- a/drivers/ssb/driver_pcicore.c
2 +++ b/drivers/ssb/driver_pcicore.c
3 @@ -357,6 +357,15 @@ static void ssb_pcicore_init_hostmode(st
4 pcicore_write32(pc, SSB_PCICORE_SBTOPCI2,
5 SSB_PCICORE_SBTOPCI_MEM | SSB_PCI_DMA);
6
7 + /*
8 + * Accessing PCI config without a proper delay after devices reset (not
9 + * GPIO reset) was causing reboots on WRT300N v1.0.
10 + * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it
11 + * completely. Flushing all writes was also tested but with no luck.
12 + */
13 + if (pc->dev->bus->chip_id == 0x4704)
14 + usleep_range(1000, 2000);
15 +
16 /* Enable PCI bridge BAR0 prefetch and burst */
17 val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
18 ssb_extpci_write_config(pc, 0, 0, 0, PCI_COMMAND, &val, 2);
19 --- a/drivers/ssb/main.c
20 +++ b/drivers/ssb/main.c
21 @@ -1135,6 +1135,8 @@ static u32 ssb_tmslow_reject_bitmask(str
22 case SSB_IDLOW_SSBREV_25: /* TODO - find the proper REJECT bit */
23 case SSB_IDLOW_SSBREV_27: /* same here */
24 return SSB_TMSLOW_REJECT; /* this is a guess */
25 + case SSB_IDLOW_SSBREV:
26 + break;
27 default:
28 WARN(1, KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
29 }