3 files changed, 105 insertions, 28 deletions

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index c68b3dc19e11..3918d2cc5856 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -383,6 +383,35 @@ static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
                              ssb_dev->id.revision);
 }
 
+#define ssb_config_attr(attrib, field, format_string) \
+static ssize_t \
+attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \
+{ \
+        return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \
+}
+
+ssb_config_attr(core_num, core_index, "%u\n")
+ssb_config_attr(coreid, id.coreid, "0x%04x\n")
+ssb_config_attr(vendor, id.vendor, "0x%04x\n")
+ssb_config_attr(revision, id.revision, "%u\n")
+ssb_config_attr(irq, irq, "%u\n")
+static ssize_t
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%s\n",
+                       ssb_core_name(dev_to_ssb_dev(dev)->id.coreid));
+}
+
+static struct device_attribute ssb_device_attrs[] = {
+        __ATTR_RO(name),
+        __ATTR_RO(core_num),
+        __ATTR_RO(coreid),
+        __ATTR_RO(vendor),
+        __ATTR_RO(revision),
+        __ATTR_RO(irq),
+        __ATTR_NULL,
+};
+
 static struct bus_type ssb_bustype = {
         .name           = "ssb",
         .match          = ssb_bus_match,
@@ -392,6 +421,7 @@ static struct bus_type ssb_bustype = {
         .suspend        = ssb_device_suspend,
         .resume         = ssb_device_resume,
         .uevent         = ssb_device_uevent,
+        .dev_attrs      = ssb_device_attrs,
 };
 
 static void ssb_buses_lock(void)
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 6e88d2b603b4..158449e55044 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -406,6 +406,46 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         out->antenna_gain.ghz5.a3 = gain;
 }
 
+/* Revs 4 5 and 8 have partially shared layout */
+static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
+{
+        SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01,
+             SSB_SPROM4_TXPID2G0, SSB_SPROM4_TXPID2G0_SHIFT);
+        SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01,
+             SSB_SPROM4_TXPID2G1, SSB_SPROM4_TXPID2G1_SHIFT);
+        SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23,
+             SSB_SPROM4_TXPID2G2, SSB_SPROM4_TXPID2G2_SHIFT);
+        SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23,
+             SSB_SPROM4_TXPID2G3, SSB_SPROM4_TXPID2G3_SHIFT);
+
+        SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01,
+             SSB_SPROM4_TXPID5GL0, SSB_SPROM4_TXPID5GL0_SHIFT);
+        SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01,
+             SSB_SPROM4_TXPID5GL1, SSB_SPROM4_TXPID5GL1_SHIFT);
+        SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23,
+             SSB_SPROM4_TXPID5GL2, SSB_SPROM4_TXPID5GL2_SHIFT);
+        SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23,
+             SSB_SPROM4_TXPID5GL3, SSB_SPROM4_TXPID5GL3_SHIFT);
+
+        SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01,
+             SSB_SPROM4_TXPID5G0, SSB_SPROM4_TXPID5G0_SHIFT);
+        SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01,
+             SSB_SPROM4_TXPID5G1, SSB_SPROM4_TXPID5G1_SHIFT);
+        SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23,
+             SSB_SPROM4_TXPID5G2, SSB_SPROM4_TXPID5G2_SHIFT);
+        SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23,
+             SSB_SPROM4_TXPID5G3, SSB_SPROM4_TXPID5G3_SHIFT);
+
+        SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01,
+             SSB_SPROM4_TXPID5GH0, SSB_SPROM4_TXPID5GH0_SHIFT);
+        SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01,
+             SSB_SPROM4_TXPID5GH1, SSB_SPROM4_TXPID5GH1_SHIFT);
+        SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23,
+             SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
+        SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
+             SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
+}
+
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 {
         int i;
@@ -471,6 +511,8 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
         memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
                sizeof(out->antenna_gain.ghz5));
 
+        sprom_extract_r458(out, in);
+
         /* TODO - get remaining rev 4 stuff needed */
 }
 
@@ -561,6 +603,8 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
         memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
                sizeof(out->antenna_gain.ghz5));
 
+        sprom_extract_r458(out, in);
+
         /* TODO - get remaining rev 8 stuff needed */
 }
 
@@ -573,37 +617,34 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
         ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
         memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
         memset(out->et1mac, 0xFF, 6);
+
         if ((bus->chip_id & 0xFF00) == 0x4400) {
                 /* Workaround: The BCM44XX chip has a stupid revision
                  * number stored in the SPROM.
                  * Always extract r1. */
                 out->revision = 1;
+                ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
+        }
+
+        switch (out->revision) {
+        case 1:
+        case 2:
+        case 3:
                 sprom_extract_r123(out, in);
-        } else if (bus->chip_id == 0x4321) {
-                /* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
-                out->revision = 4;
+                break;
+        case 4:
+        case 5:
                 sprom_extract_r45(out, in);
-        } else {
-                switch (out->revision) {
-                case 1:
-                case 2:
-                case 3:
-                        sprom_extract_r123(out, in);
-                        break;
-                case 4:
-                case 5:
-                        sprom_extract_r45(out, in);
-                        break;
-                case 8:
-                        sprom_extract_r8(out, in);
-                        break;
-                default:
-                        ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
-                                   "  revision %d detected. Will extract"
-                                   " v1\n", out->revision);
-                        out->revision = 1;
-                        sprom_extract_r123(out, in);
-                }
+                break;
+        case 8:
+                sprom_extract_r8(out, in);
+                break;
+        default:
+                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
+                           "  revision %d detected. Will extract"
+                           " v1\n", out->revision);
+                out->revision = 1;
+                sprom_extract_r123(out, in);
         }
 
         if (out->boardflags_lo == 0xFFFF)
@@ -618,7 +659,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                              struct ssb_sprom *sprom)
 {
         const struct ssb_sprom *fallback;
-        int err = -ENOMEM;
+        int err;
         u16 *buf;
 
         if (!ssb_is_sprom_available(bus)) {
@@ -645,7 +686,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
         if (!buf)
-                goto out;
+                return -ENOMEM;
         bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
         sprom_do_read(bus, buf);
         err = sprom_check_crc(buf, bus->sprom_size);
@@ -655,7 +696,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                 buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
                               GFP_KERNEL);
                 if (!buf)
-                        goto out;
+                        return -ENOMEM;
                 bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;
                 sprom_do_read(bus, buf);
                 err = sprom_check_crc(buf, bus->sprom_size);
@@ -677,7 +718,6 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
 out_free:
         kfree(buf);
-out:
         return err;
 }
 
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index 6536a041d90d..f6c8c81a0025 100644
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -59,6 +59,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
         struct ssb_bus *ssb;
         int err = -ENOMEM;
         const char *name;
+        u32 val;
 
         ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
         if (!ssb)
@@ -74,6 +75,12 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
                 goto err_pci_disable;
         pci_set_master(dev);
 
+        /* Disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_read_config_dword(dev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(dev, 0x40, val & 0xffff00ff);
+
         err = ssb_bus_pcibus_register(ssb, dev);
         if (err)
                 goto err_pci_release_regions;