kernel: backport ssb patches up to changes queued for 4.1

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 020-ssb_update.patch

diff --git a/target/linux/generic/patches-3.18/020-ssb_update.patch b/target/linux/generic/patches-3.18/020-ssb_update.patch
index 9171b2470472d07290c00f01bb99bde0257978bf..7afba077638c63de572f65115849b2152fe94c72 100644 (file)
--- a/target/linux/generic/patches-3.18/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.18/020-ssb_update.patch
@@ -76,3 +76,58 @@
  
        return pci_register_driver(driver);
  }
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -357,6 +357,15 @@ static void ssb_pcicore_init_hostmode(st
+       pcicore_write32(pc, SSB_PCICORE_SBTOPCI2,
+                       SSB_PCICORE_SBTOPCI_MEM | SSB_PCI_DMA);
+ 
++      /*
++       * Accessing PCI config without a proper delay after devices reset (not
++       * GPIO reset) was causing reboots on WRT300N v1.0.
++       * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it
++       * completely. Flushing all writes was also tested but with no luck.
++       */
++      if (pc->dev->bus->chip_id == 0x4704)
++              usleep_range(1000, 2000);
++
+       /* Enable PCI bridge BAR0 prefetch and burst */
+       val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+       ssb_extpci_write_config(pc, 0, 0, 0, PCI_COMMAND, &val, 2);
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -90,25 +90,6 @@ found:
+ }
+ #endif /* CONFIG_SSB_PCMCIAHOST */
+ 
+-#ifdef CONFIG_SSB_SDIOHOST
+-struct ssb_bus *ssb_sdio_func_to_bus(struct sdio_func *func)
+-{
+-      struct ssb_bus *bus;
+-
+-      ssb_buses_lock();
+-      list_for_each_entry(bus, &buses, list) {
+-              if (bus->bustype == SSB_BUSTYPE_SDIO &&
+-                  bus->host_sdio == func)
+-                      goto found;
+-      }
+-      bus = NULL;
+-found:
+-      ssb_buses_unlock();
+-
+-      return bus;
+-}
+-#endif /* CONFIG_SSB_SDIOHOST */
+-
+ int ssb_for_each_bus_call(unsigned long data,
+                         int (*func)(struct ssb_bus *bus, unsigned long data))
+ {
+@@ -1154,6 +1135,8 @@ static u32 ssb_tmslow_reject_bitmask(str
+       case SSB_IDLOW_SSBREV_25:     /* TODO - find the proper REJECT bit */
+       case SSB_IDLOW_SSBREV_27:     /* same here */
+               return SSB_TMSLOW_REJECT;       /* this is a guess */
++      case SSB_IDLOW_SSBREV:
++              break;
+       default:
+               WARN(1, KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
+       }