3 files changed, 65 insertions, 2 deletions

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index ea60c05c2487..57b71373bae3 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -11,7 +11,11 @@
 
 #include <linux/pci.h>
 #include <linux/acpi.h>
+#include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/pci_ids.h>
+#include <linux/bcma/bcma.h>
+#include <linux/bcma/bcma_regs.h>
 #include <drm/i915_drm.h>
 #include <asm/pci-direct.h>
 #include <asm/dma.h>
@@ -21,6 +25,9 @@
 #include <asm/iommu.h>
 #include <asm/gart.h>
 #include <asm/irq_remapping.h>
+#include <asm/early_ioremap.h>
+
+#define dev_err(msg)  pr_err("pci 0000:%02x:%02x.%d: %s", bus, slot, func, msg)
 
 static void __init fix_hypertransport_config(int num, int slot, int func)
 {
@@ -597,6 +604,61 @@ static void __init force_disable_hpet(int num, int slot, int func)
 #endif
 }
 
+#define BCM4331_MMIO_SIZE       16384
+#define BCM4331_PM_CAP          0x40
+#define bcma_aread32(reg)       ioread32(mmio + 1 * BCMA_CORE_SIZE + reg)
+#define bcma_awrite32(reg, val) iowrite32(val, mmio + 1 * BCMA_CORE_SIZE + reg)
+
+static void __init apple_airport_reset(int bus, int slot, int func)
+{
+        void __iomem *mmio;
+        u16 pmcsr;
+        u64 addr;
+        int i;
+
+        if (!dmi_match(DMI_SYS_VENDOR, "Apple Inc."))
+                return;
+
+        /* Card may have been put into PCI_D3hot by grub quirk */
+        pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);
+
+        if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {
+                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+                write_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL, pmcsr);
+                mdelay(10);
+
+                pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);
+                if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {
+                        dev_err("Cannot power up Apple AirPort card\n");
+                        return;
+                }
+        }
+
+        addr  =      read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_0);
+        addr |= (u64)read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_1) << 32;
+        addr &= PCI_BASE_ADDRESS_MEM_MASK;
+
+        mmio = early_ioremap(addr, BCM4331_MMIO_SIZE);
+        if (!mmio) {
+                dev_err("Cannot iomap Apple AirPort card\n");
+                return;
+        }
+
+        pr_info("Resetting Apple AirPort card (left enabled by EFI)\n");
+
+        for (i = 0; bcma_aread32(BCMA_RESET_ST) && i < 30; i++)
+                udelay(10);
+
+        bcma_awrite32(BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
+        bcma_aread32(BCMA_RESET_CTL);
+        udelay(1);
+
+        bcma_awrite32(BCMA_RESET_CTL, 0);
+        bcma_aread32(BCMA_RESET_CTL);
+        udelay(10);
+
+        early_iounmap(mmio, BCM4331_MMIO_SIZE);
+}
 
 #define QFLAG_APPLY_ONCE        0x1
 #define QFLAG_APPLIED           0x2
@@ -639,6 +701,8 @@ static struct chipset early_qrk[] __initdata = {
          */
         { PCI_VENDOR_ID_INTEL, 0x0f00,
                 PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
+        { PCI_VENDOR_ID_BROADCOM, 0x4331,
+          PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
         {}
 };
 
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index eda09090cb52..f642c4264c27 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -8,8 +8,6 @@
 #include <linux/bcma/bcma.h>
 #include <linux/delay.h>
 
-#define BCMA_CORE_SIZE          0x1000
-
 #define bcma_err(bus, fmt, ...) \
         pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
 #define bcma_warn(bus, fmt, ...) \
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index e6b41f42602b..3db25df396cb 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -159,6 +159,7 @@ struct bcma_host_ops {
 #define BCMA_CORE_DEFAULT               0xFFF
 
 #define BCMA_MAX_NR_CORES               16
+#define BCMA_CORE_SIZE                  0x1000
 
 /* Chip IDs of PCIe devices */
 #define BCMA_CHIP_ID_BCM4313    0x4313