mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 17:12:25 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31278 3c298f89-4303-0410-b956-a3cf2f4a3e73
3931 lines
117 KiB
Diff
3931 lines
117 KiB
Diff
--- a/drivers/bcma/Kconfig
|
|
+++ b/drivers/bcma/Kconfig
|
|
@@ -13,6 +13,11 @@ config BCMA
|
|
Bus driver for Broadcom specific Advanced Microcontroller Bus
|
|
Architecture.
|
|
|
|
+# Support for Block-I/O. SELECT this from the driver that needs it.
|
|
+config BCMA_BLOCKIO
|
|
+ bool
|
|
+ depends on BCMA
|
|
+
|
|
config BCMA_HOST_PCI_POSSIBLE
|
|
bool
|
|
depends on BCMA && PCI = y
|
|
@@ -22,6 +27,25 @@ config BCMA_HOST_PCI
|
|
bool "Support for BCMA on PCI-host bus"
|
|
depends on BCMA_HOST_PCI_POSSIBLE
|
|
|
|
+config BCMA_DRIVER_PCI_HOSTMODE
|
|
+ bool "Driver for PCI core working in hostmode"
|
|
+ depends on BCMA && MIPS && BCMA_HOST_PCI
|
|
+ help
|
|
+ PCI core hostmode operation (external PCI bus).
|
|
+
|
|
+config BCMA_HOST_SOC
|
|
+ bool
|
|
+ depends on BCMA_DRIVER_MIPS
|
|
+
|
|
+config BCMA_DRIVER_MIPS
|
|
+ bool "BCMA Broadcom MIPS core driver"
|
|
+ depends on BCMA && MIPS
|
|
+ help
|
|
+ Driver for the Broadcom MIPS core attached to Broadcom specific
|
|
+ Advanced Microcontroller Bus.
|
|
+
|
|
+ If unsure, say N
|
|
+
|
|
config BCMA_DEBUG
|
|
bool "BCMA debugging"
|
|
depends on BCMA
|
|
--- a/drivers/bcma/Makefile
|
|
+++ b/drivers/bcma/Makefile
|
|
@@ -1,7 +1,10 @@
|
|
-bcma-y += main.o scan.o core.o
|
|
+bcma-y += main.o scan.o core.o sprom.o
|
|
bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o
|
|
bcma-y += driver_pci.o
|
|
+bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
|
|
+bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o
|
|
bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o
|
|
+bcma-$(CONFIG_BCMA_HOST_SOC) += host_soc.o
|
|
obj-$(CONFIG_BCMA) += bcma.o
|
|
|
|
ccflags-$(CONFIG_BCMA_DEBUG) := -DDEBUG
|
|
--- a/drivers/bcma/bcma_private.h
|
|
+++ b/drivers/bcma/bcma_private.h
|
|
@@ -13,11 +13,34 @@
|
|
struct bcma_bus;
|
|
|
|
/* main.c */
|
|
-extern int bcma_bus_register(struct bcma_bus *bus);
|
|
-extern void bcma_bus_unregister(struct bcma_bus *bus);
|
|
+int __devinit bcma_bus_register(struct bcma_bus *bus);
|
|
+void bcma_bus_unregister(struct bcma_bus *bus);
|
|
+int __init bcma_bus_early_register(struct bcma_bus *bus,
|
|
+ struct bcma_device *core_cc,
|
|
+ struct bcma_device *core_mips);
|
|
+#ifdef CONFIG_PM
|
|
+int bcma_bus_suspend(struct bcma_bus *bus);
|
|
+int bcma_bus_resume(struct bcma_bus *bus);
|
|
+#endif
|
|
|
|
/* scan.c */
|
|
int bcma_bus_scan(struct bcma_bus *bus);
|
|
+int __init bcma_bus_scan_early(struct bcma_bus *bus,
|
|
+ struct bcma_device_id *match,
|
|
+ struct bcma_device *core);
|
|
+void bcma_init_bus(struct bcma_bus *bus);
|
|
+
|
|
+/* sprom.c */
|
|
+int bcma_sprom_get(struct bcma_bus *bus);
|
|
+
|
|
+/* driver_chipcommon.c */
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
+void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
|
+
|
|
+/* driver_chipcommon_pmu.c */
|
|
+u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);
|
|
+u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);
|
|
|
|
#ifdef CONFIG_BCMA_HOST_PCI
|
|
/* host_pci.c */
|
|
@@ -25,4 +48,12 @@ extern int __init bcma_host_pci_init(voi
|
|
extern void __exit bcma_host_pci_exit(void);
|
|
#endif /* CONFIG_BCMA_HOST_PCI */
|
|
|
|
+/* driver_pci.c */
|
|
+u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
|
|
+bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
|
|
+void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
|
|
+#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
|
|
+
|
|
#endif
|
|
--- a/drivers/bcma/core.c
|
|
+++ b/drivers/bcma/core.c
|
|
@@ -19,7 +19,7 @@ bool bcma_core_is_enabled(struct bcma_de
|
|
}
|
|
EXPORT_SYMBOL_GPL(bcma_core_is_enabled);
|
|
|
|
-static void bcma_core_disable(struct bcma_device *core, u32 flags)
|
|
+void bcma_core_disable(struct bcma_device *core, u32 flags)
|
|
{
|
|
if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
|
|
return;
|
|
@@ -31,6 +31,7 @@ static void bcma_core_disable(struct bcm
|
|
bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
|
|
udelay(1);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_core_disable);
|
|
|
|
int bcma_core_enable(struct bcma_device *core, u32 flags)
|
|
{
|
|
@@ -49,3 +50,77 @@ int bcma_core_enable(struct bcma_device
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(bcma_core_enable);
|
|
+
|
|
+void bcma_core_set_clockmode(struct bcma_device *core,
|
|
+ enum bcma_clkmode clkmode)
|
|
+{
|
|
+ u16 i;
|
|
+
|
|
+ WARN_ON(core->id.id != BCMA_CORE_CHIPCOMMON &&
|
|
+ core->id.id != BCMA_CORE_PCIE &&
|
|
+ core->id.id != BCMA_CORE_80211);
|
|
+
|
|
+ switch (clkmode) {
|
|
+ case BCMA_CLKMODE_FAST:
|
|
+ bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
|
|
+ udelay(64);
|
|
+ for (i = 0; i < 1500; i++) {
|
|
+ if (bcma_read32(core, BCMA_CLKCTLST) &
|
|
+ BCMA_CLKCTLST_HAVEHT) {
|
|
+ i = 0;
|
|
+ break;
|
|
+ }
|
|
+ udelay(10);
|
|
+ }
|
|
+ if (i)
|
|
+ pr_err("HT force timeout\n");
|
|
+ break;
|
|
+ case BCMA_CLKMODE_DYNAMIC:
|
|
+ pr_warn("Dynamic clockmode not supported yet!\n");
|
|
+ break;
|
|
+ }
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
|
|
+
|
|
+void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on)
|
|
+{
|
|
+ u16 i;
|
|
+
|
|
+ WARN_ON(req & ~BCMA_CLKCTLST_EXTRESREQ);
|
|
+ WARN_ON(status & ~BCMA_CLKCTLST_EXTRESST);
|
|
+
|
|
+ if (on) {
|
|
+ bcma_set32(core, BCMA_CLKCTLST, req);
|
|
+ for (i = 0; i < 10000; i++) {
|
|
+ if ((bcma_read32(core, BCMA_CLKCTLST) & status) ==
|
|
+ status) {
|
|
+ i = 0;
|
|
+ break;
|
|
+ }
|
|
+ udelay(10);
|
|
+ }
|
|
+ if (i)
|
|
+ pr_err("PLL enable timeout\n");
|
|
+ } else {
|
|
+ pr_warn("Disabling PLL not supported yet!\n");
|
|
+ }
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
|
|
+
|
|
+u32 bcma_core_dma_translation(struct bcma_device *core)
|
|
+{
|
|
+ switch (core->bus->hosttype) {
|
|
+ case BCMA_HOSTTYPE_SOC:
|
|
+ return 0;
|
|
+ case BCMA_HOSTTYPE_PCI:
|
|
+ if (bcma_aread32(core, BCMA_IOST) & BCMA_IOST_DMA64)
|
|
+ return BCMA_DMA_TRANSLATION_DMA64_CMT;
|
|
+ else
|
|
+ return BCMA_DMA_TRANSLATION_DMA32_CMT;
|
|
+ default:
|
|
+ pr_err("DMA translation unknown for host %d\n",
|
|
+ core->bus->hosttype);
|
|
+ }
|
|
+ return BCMA_DMA_TRANSLATION_NONE;
|
|
+}
|
|
+EXPORT_SYMBOL(bcma_core_dma_translation);
|
|
--- a/drivers/bcma/driver_chipcommon.c
|
|
+++ b/drivers/bcma/driver_chipcommon.c
|
|
@@ -3,7 +3,7 @@
|
|
* ChipCommon core driver
|
|
*
|
|
* Copyright 2005, Broadcom Corporation
|
|
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
|
|
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
@@ -23,6 +23,12 @@ static inline u32 bcma_cc_write32_masked
|
|
|
|
void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
|
|
{
|
|
+ u32 leddc_on = 10;
|
|
+ u32 leddc_off = 90;
|
|
+
|
|
+ if (cc->setup_done)
|
|
+ return;
|
|
+
|
|
if (cc->core->id.rev >= 11)
|
|
cc->status = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
|
|
cc->capabilities = bcma_cc_read32(cc, BCMA_CC_CAP);
|
|
@@ -38,6 +44,19 @@ void bcma_core_chipcommon_init(struct bc
|
|
bcma_pmu_init(cc);
|
|
if (cc->capabilities & BCMA_CC_CAP_PCTL)
|
|
pr_err("Power control not implemented!\n");
|
|
+
|
|
+ if (cc->core->id.rev >= 16) {
|
|
+ if (cc->core->bus->sprom.leddc_on_time &&
|
|
+ cc->core->bus->sprom.leddc_off_time) {
|
|
+ leddc_on = cc->core->bus->sprom.leddc_on_time;
|
|
+ leddc_off = cc->core->bus->sprom.leddc_off_time;
|
|
+ }
|
|
+ bcma_cc_write32(cc, BCMA_CC_GPIOTIMER,
|
|
+ ((leddc_on << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) |
|
|
+ (leddc_off << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT)));
|
|
+ }
|
|
+
|
|
+ cc->setup_done = true;
|
|
}
|
|
|
|
/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
|
|
@@ -87,3 +106,51 @@ u32 bcma_chipco_gpio_polarity(struct bcm
|
|
{
|
|
return bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
|
|
}
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
+void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
|
|
+{
|
|
+ unsigned int irq;
|
|
+ u32 baud_base;
|
|
+ u32 i;
|
|
+ unsigned int ccrev = cc->core->id.rev;
|
|
+ struct bcma_serial_port *ports = cc->serial_ports;
|
|
+
|
|
+ if (ccrev >= 11 && ccrev != 15) {
|
|
+ /* Fixed ALP clock */
|
|
+ baud_base = bcma_pmu_alp_clock(cc);
|
|
+ if (ccrev >= 21) {
|
|
+ /* Turn off UART clock before switching clocksource. */
|
|
+ bcma_cc_write32(cc, BCMA_CC_CORECTL,
|
|
+ bcma_cc_read32(cc, BCMA_CC_CORECTL)
|
|
+ & ~BCMA_CC_CORECTL_UARTCLKEN);
|
|
+ }
|
|
+ /* Set the override bit so we don't divide it */
|
|
+ bcma_cc_write32(cc, BCMA_CC_CORECTL,
|
|
+ bcma_cc_read32(cc, BCMA_CC_CORECTL)
|
|
+ | BCMA_CC_CORECTL_UARTCLK0);
|
|
+ if (ccrev >= 21) {
|
|
+ /* Re-enable the UART clock. */
|
|
+ bcma_cc_write32(cc, BCMA_CC_CORECTL,
|
|
+ bcma_cc_read32(cc, BCMA_CC_CORECTL)
|
|
+ | BCMA_CC_CORECTL_UARTCLKEN);
|
|
+ }
|
|
+ } else {
|
|
+ pr_err("serial not supported on this device ccrev: 0x%x\n",
|
|
+ ccrev);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ irq = bcma_core_mips_irq(cc->core);
|
|
+
|
|
+ /* Determine the registers of the UARTs */
|
|
+ cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
|
|
+ for (i = 0; i < cc->nr_serial_ports; i++) {
|
|
+ ports[i].regs = cc->core->io_addr + BCMA_CC_UART0_DATA +
|
|
+ (i * 256);
|
|
+ ports[i].irq = irq;
|
|
+ ports[i].baud_base = baud_base;
|
|
+ ports[i].reg_shift = 0;
|
|
+ }
|
|
+}
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
|
--- a/drivers/bcma/driver_chipcommon_pmu.c
|
|
+++ b/drivers/bcma/driver_chipcommon_pmu.c
|
|
@@ -2,7 +2,7 @@
|
|
* Broadcom specific AMBA
|
|
* ChipCommon Power Management Unit driver
|
|
*
|
|
- * Copyright 2009, Michael Buesch <mb@bu3sch.de>
|
|
+ * Copyright 2009, Michael Buesch <m@bues.ch>
|
|
* Copyright 2007, Broadcom Corporation
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
@@ -11,20 +11,47 @@
|
|
#include "bcma_private.h"
|
|
#include <linux/bcma/bcma.h>
|
|
|
|
-static void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
|
|
- u32 offset, u32 mask, u32 set)
|
|
+static u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset)
|
|
{
|
|
- u32 value;
|
|
+ bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
|
|
+ bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
|
|
+ return bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);
|
|
+}
|
|
|
|
- bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);
|
|
+void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset, u32 value)
|
|
+{
|
|
+ bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
|
|
+ bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
|
|
+ bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, value);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_pll_write);
|
|
+
|
|
+void bcma_chipco_pll_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,
|
|
+ u32 set)
|
|
+{
|
|
+ bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
|
|
+ bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
|
|
+ bcma_cc_maskset32(cc, BCMA_CC_PLLCTL_DATA, mask, set);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_pll_maskset);
|
|
+
|
|
+void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
|
|
+ u32 offset, u32 mask, u32 set)
|
|
+{
|
|
bcma_cc_write32(cc, BCMA_CC_CHIPCTL_ADDR, offset);
|
|
bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);
|
|
- value = bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);
|
|
- value &= mask;
|
|
- value |= set;
|
|
- bcma_cc_write32(cc, BCMA_CC_CHIPCTL_DATA, value);
|
|
- bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);
|
|
+ bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL_DATA, mask, set);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_chipctl_maskset);
|
|
+
|
|
+void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,
|
|
+ u32 set)
|
|
+{
|
|
+ bcma_cc_write32(cc, BCMA_CC_REGCTL_ADDR, offset);
|
|
+ bcma_cc_read32(cc, BCMA_CC_REGCTL_ADDR);
|
|
+ bcma_cc_maskset32(cc, BCMA_CC_REGCTL_DATA, mask, set);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);
|
|
|
|
static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)
|
|
{
|
|
@@ -52,7 +79,9 @@ static void bcma_pmu_resources_init(stru
|
|
min_msk = 0x200D;
|
|
max_msk = 0xFFFF;
|
|
break;
|
|
+ case 0x4331:
|
|
case 43224:
|
|
+ case 43225:
|
|
break;
|
|
default:
|
|
pr_err("PMU resource config unknown for device 0x%04X\n",
|
|
@@ -74,6 +103,7 @@ void bcma_pmu_swreg_init(struct bcma_drv
|
|
case 0x4313:
|
|
case 0x4331:
|
|
case 43224:
|
|
+ case 43225:
|
|
break;
|
|
default:
|
|
pr_err("PMU switch/regulators init unknown for device "
|
|
@@ -81,6 +111,24 @@ void bcma_pmu_swreg_init(struct bcma_drv
|
|
}
|
|
}
|
|
|
|
+/* Disable to allow reading SPROM. Don't know the adventages of enabling it. */
|
|
+void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable)
|
|
+{
|
|
+ struct bcma_bus *bus = cc->core->bus;
|
|
+ u32 val;
|
|
+
|
|
+ val = bcma_cc_read32(cc, BCMA_CC_CHIPCTL);
|
|
+ if (enable) {
|
|
+ val |= BCMA_CHIPCTL_4331_EXTPA_EN;
|
|
+ if (bus->chipinfo.pkg == 9 || bus->chipinfo.pkg == 11)
|
|
+ val |= BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;
|
|
+ } else {
|
|
+ val &= ~BCMA_CHIPCTL_4331_EXTPA_EN;
|
|
+ val &= ~BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;
|
|
+ }
|
|
+ bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val);
|
|
+}
|
|
+
|
|
void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
|
|
{
|
|
struct bcma_bus *bus = cc->core->bus;
|
|
@@ -90,17 +138,19 @@ void bcma_pmu_workarounds(struct bcma_dr
|
|
bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);
|
|
break;
|
|
case 0x4331:
|
|
- pr_err("Enabling Ext PA lines not implemented\n");
|
|
+ /* BCM4331 workaround is SPROM-related, we put it in sprom.c */
|
|
break;
|
|
case 43224:
|
|
if (bus->chipinfo.rev == 0) {
|
|
pr_err("Workarounds for 43224 rev 0 not fully "
|
|
"implemented\n");
|
|
- bcma_chipco_chipctl_maskset(cc, 0, ~0, 0xF0);
|
|
+ bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x00F000F0);
|
|
} else {
|
|
bcma_chipco_chipctl_maskset(cc, 0, ~0, 0xF0);
|
|
}
|
|
break;
|
|
+ case 43225:
|
|
+ break;
|
|
default:
|
|
pr_err("Workarounds unknown for device 0x%04X\n",
|
|
bus->chipinfo.id);
|
|
@@ -132,3 +182,129 @@ void bcma_pmu_init(struct bcma_drv_cc *c
|
|
bcma_pmu_swreg_init(cc);
|
|
bcma_pmu_workarounds(cc);
|
|
}
|
|
+
|
|
+u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc)
|
|
+{
|
|
+ struct bcma_bus *bus = cc->core->bus;
|
|
+
|
|
+ switch (bus->chipinfo.id) {
|
|
+ case 0x4716:
|
|
+ case 0x4748:
|
|
+ case 47162:
|
|
+ case 0x4313:
|
|
+ case 0x5357:
|
|
+ case 0x4749:
|
|
+ case 53572:
|
|
+ /* always 20Mhz */
|
|
+ return 20000 * 1000;
|
|
+ case 0x5356:
|
|
+ case 0x5300:
|
|
+ /* always 25Mhz */
|
|
+ return 25000 * 1000;
|
|
+ default:
|
|
+ pr_warn("No ALP clock specified for %04X device, "
|
|
+ "pmu rev. %d, using default %d Hz\n",
|
|
+ bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
|
|
+ }
|
|
+ return BCMA_CC_PMU_ALP_CLOCK;
|
|
+}
|
|
+
|
|
+/* Find the output of the "m" pll divider given pll controls that start with
|
|
+ * pllreg "pll0" i.e. 12 for main 6 for phy, 0 for misc.
|
|
+ */
|
|
+static u32 bcma_pmu_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m)
|
|
+{
|
|
+ u32 tmp, div, ndiv, p1, p2, fc;
|
|
+ struct bcma_bus *bus = cc->core->bus;
|
|
+
|
|
+ BUG_ON((pll0 & 3) || (pll0 > BCMA_CC_PMU4716_MAINPLL_PLL0));
|
|
+
|
|
+ BUG_ON(!m || m > 4);
|
|
+
|
|
+ if (bus->chipinfo.id == 0x5357 || bus->chipinfo.id == 0x4749) {
|
|
+ /* Detect failure in clock setting */
|
|
+ tmp = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
|
|
+ if (tmp & 0x40000)
|
|
+ return 133 * 1000000;
|
|
+ }
|
|
+
|
|
+ tmp = bcma_chipco_pll_read(cc, pll0 + BCMA_CC_PPL_P1P2_OFF);
|
|
+ p1 = (tmp & BCMA_CC_PPL_P1_MASK) >> BCMA_CC_PPL_P1_SHIFT;
|
|
+ p2 = (tmp & BCMA_CC_PPL_P2_MASK) >> BCMA_CC_PPL_P2_SHIFT;
|
|
+
|
|
+ tmp = bcma_chipco_pll_read(cc, pll0 + BCMA_CC_PPL_M14_OFF);
|
|
+ div = (tmp >> ((m - 1) * BCMA_CC_PPL_MDIV_WIDTH)) &
|
|
+ BCMA_CC_PPL_MDIV_MASK;
|
|
+
|
|
+ tmp = bcma_chipco_pll_read(cc, pll0 + BCMA_CC_PPL_NM5_OFF);
|
|
+ ndiv = (tmp & BCMA_CC_PPL_NDIV_MASK) >> BCMA_CC_PPL_NDIV_SHIFT;
|
|
+
|
|
+ /* Do calculation in Mhz */
|
|
+ fc = bcma_pmu_alp_clock(cc) / 1000000;
|
|
+ fc = (p1 * ndiv * fc) / p2;
|
|
+
|
|
+ /* Return clock in Hertz */
|
|
+ return (fc / div) * 1000000;
|
|
+}
|
|
+
|
|
+/* query bus clock frequency for PMU-enabled chipcommon */
|
|
+u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)
|
|
+{
|
|
+ struct bcma_bus *bus = cc->core->bus;
|
|
+
|
|
+ switch (bus->chipinfo.id) {
|
|
+ case 0x4716:
|
|
+ case 0x4748:
|
|
+ case 47162:
|
|
+ return bcma_pmu_clock(cc, BCMA_CC_PMU4716_MAINPLL_PLL0,
|
|
+ BCMA_CC_PMU5_MAINPLL_SSB);
|
|
+ case 0x5356:
|
|
+ return bcma_pmu_clock(cc, BCMA_CC_PMU5356_MAINPLL_PLL0,
|
|
+ BCMA_CC_PMU5_MAINPLL_SSB);
|
|
+ case 0x5357:
|
|
+ case 0x4749:
|
|
+ return bcma_pmu_clock(cc, BCMA_CC_PMU5357_MAINPLL_PLL0,
|
|
+ BCMA_CC_PMU5_MAINPLL_SSB);
|
|
+ case 0x5300:
|
|
+ return bcma_pmu_clock(cc, BCMA_CC_PMU4706_MAINPLL_PLL0,
|
|
+ BCMA_CC_PMU5_MAINPLL_SSB);
|
|
+ case 53572:
|
|
+ return 75000000;
|
|
+ default:
|
|
+ pr_warn("No backplane clock specified for %04X device, "
|
|
+ "pmu rev. %d, using default %d Hz\n",
|
|
+ bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);
|
|
+ }
|
|
+ return BCMA_CC_PMU_HT_CLOCK;
|
|
+}
|
|
+
|
|
+/* query cpu clock frequency for PMU-enabled chipcommon */
|
|
+u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc)
|
|
+{
|
|
+ struct bcma_bus *bus = cc->core->bus;
|
|
+
|
|
+ if (bus->chipinfo.id == 53572)
|
|
+ return 300000000;
|
|
+
|
|
+ if (cc->pmu.rev >= 5) {
|
|
+ u32 pll;
|
|
+ switch (bus->chipinfo.id) {
|
|
+ case 0x5356:
|
|
+ pll = BCMA_CC_PMU5356_MAINPLL_PLL0;
|
|
+ break;
|
|
+ case 0x5357:
|
|
+ case 0x4749:
|
|
+ pll = BCMA_CC_PMU5357_MAINPLL_PLL0;
|
|
+ break;
|
|
+ default:
|
|
+ pll = BCMA_CC_PMU4716_MAINPLL_PLL0;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ /* TODO: if (bus->chipinfo.id == 0x5300)
|
|
+ return si_4706_pmu_clock(sih, osh, cc, PMU4706_MAINPLL_PLL0, PMU5_MAINPLL_CPU); */
|
|
+ return bcma_pmu_clock(cc, pll, BCMA_CC_PMU5_MAINPLL_CPU);
|
|
+ }
|
|
+
|
|
+ return bcma_pmu_get_clockcontrol(cc);
|
|
+}
|
|
--- /dev/null
|
|
+++ b/drivers/bcma/driver_mips.c
|
|
@@ -0,0 +1,256 @@
|
|
+/*
|
|
+ * Broadcom specific AMBA
|
|
+ * Broadcom MIPS32 74K core driver
|
|
+ *
|
|
+ * Copyright 2009, Broadcom Corporation
|
|
+ * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
|
|
+ * Copyright 2010, Bernhard Loos <bernhardloos@googlemail.com>
|
|
+ * Copyright 2011, Hauke Mehrtens <hauke@hauke-m.de>
|
|
+ *
|
|
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
+ */
|
|
+
|
|
+#include "bcma_private.h"
|
|
+
|
|
+#include <linux/bcma/bcma.h>
|
|
+
|
|
+#include <linux/serial.h>
|
|
+#include <linux/serial_core.h>
|
|
+#include <linux/serial_reg.h>
|
|
+#include <linux/time.h>
|
|
+
|
|
+/* The 47162a0 hangs when reading MIPS DMP registers registers */
|
|
+static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev)
|
|
+{
|
|
+ return dev->bus->chipinfo.id == 47162 && dev->bus->chipinfo.rev == 0 &&
|
|
+ dev->id.id == BCMA_CORE_MIPS_74K;
|
|
+}
|
|
+
|
|
+/* The 5357b0 hangs when reading USB20H DMP registers */
|
|
+static inline bool bcma_core_mips_bcm5357b0_quirk(struct bcma_device *dev)
|
|
+{
|
|
+ return (dev->bus->chipinfo.id == 0x5357 ||
|
|
+ dev->bus->chipinfo.id == 0x4749) &&
|
|
+ dev->bus->chipinfo.pkg == 11 &&
|
|
+ dev->id.id == BCMA_CORE_USB20_HOST;
|
|
+}
|
|
+
|
|
+static inline u32 mips_read32(struct bcma_drv_mips *mcore,
|
|
+ u16 offset)
|
|
+{
|
|
+ return bcma_read32(mcore->core, offset);
|
|
+}
|
|
+
|
|
+static inline void mips_write32(struct bcma_drv_mips *mcore,
|
|
+ u16 offset,
|
|
+ u32 value)
|
|
+{
|
|
+ bcma_write32(mcore->core, offset, value);
|
|
+}
|
|
+
|
|
+static const u32 ipsflag_irq_mask[] = {
|
|
+ 0,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ1,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ2,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ3,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ4,
|
|
+};
|
|
+
|
|
+static const u32 ipsflag_irq_shift[] = {
|
|
+ 0,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ1_SHIFT,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ2_SHIFT,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ3_SHIFT,
|
|
+ BCMA_MIPS_IPSFLAG_IRQ4_SHIFT,
|
|
+};
|
|
+
|
|
+static u32 bcma_core_mips_irqflag(struct bcma_device *dev)
|
|
+{
|
|
+ u32 flag;
|
|
+
|
|
+ if (bcma_core_mips_bcm47162a0_quirk(dev))
|
|
+ return dev->core_index;
|
|
+ if (bcma_core_mips_bcm5357b0_quirk(dev))
|
|
+ return dev->core_index;
|
|
+ flag = bcma_aread32(dev, BCMA_MIPS_OOBSELOUTA30);
|
|
+
|
|
+ return flag & 0x1F;
|
|
+}
|
|
+
|
|
+/* Get the MIPS IRQ assignment for a specified device.
|
|
+ * If unassigned, 0 is returned.
|
|
+ */
|
|
+unsigned int bcma_core_mips_irq(struct bcma_device *dev)
|
|
+{
|
|
+ struct bcma_device *mdev = dev->bus->drv_mips.core;
|
|
+ u32 irqflag;
|
|
+ unsigned int irq;
|
|
+
|
|
+ irqflag = bcma_core_mips_irqflag(dev);
|
|
+
|
|
+ for (irq = 1; irq <= 4; irq++)
|
|
+ if (bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq)) &
|
|
+ (1 << irqflag))
|
|
+ return irq;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL(bcma_core_mips_irq);
|
|
+
|
|
+static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
|
|
+{
|
|
+ unsigned int oldirq = bcma_core_mips_irq(dev);
|
|
+ struct bcma_bus *bus = dev->bus;
|
|
+ struct bcma_device *mdev = bus->drv_mips.core;
|
|
+ u32 irqflag;
|
|
+
|
|
+ irqflag = bcma_core_mips_irqflag(dev);
|
|
+ BUG_ON(oldirq == 6);
|
|
+
|
|
+ dev->irq = irq + 2;
|
|
+
|
|
+ /* clear the old irq */
|
|
+ if (oldirq == 0)
|
|
+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
|
|
+ bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
|
|
+ ~(1 << irqflag));
|
|
+ else
|
|
+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);
|
|
+
|
|
+ /* assign the new one */
|
|
+ if (irq == 0) {
|
|
+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
|
|
+ bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
|
|
+ (1 << irqflag));
|
|
+ } else {
|
|
+ u32 oldirqflag = bcma_read32(mdev,
|
|
+ BCMA_MIPS_MIPS74K_INTMASK(irq));
|
|
+ if (oldirqflag) {
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ /* backplane irq line is in use, find out who uses
|
|
+ * it and set user to irq 0
|
|
+ */
|
|
+ list_for_each_entry_reverse(core, &bus->cores, list) {
|
|
+ if ((1 << bcma_core_mips_irqflag(core)) ==
|
|
+ oldirqflag) {
|
|
+ bcma_core_mips_set_irq(core, 0);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq),
|
|
+ 1 << irqflag);
|
|
+ }
|
|
+
|
|
+ pr_info("set_irq: core 0x%04x, irq %d => %d\n",
|
|
+ dev->id.id, oldirq + 2, irq + 2);
|
|
+}
|
|
+
|
|
+static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
|
|
+{
|
|
+ int i;
|
|
+ static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
|
|
+ printk(KERN_INFO KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
|
|
+ for (i = 0; i <= 6; i++)
|
|
+ printk(" %s%s", irq_name[i], i == irq ? "*" : " ");
|
|
+ printk("\n");
|
|
+}
|
|
+
|
|
+static void bcma_core_mips_dump_irq(struct bcma_bus *bus)
|
|
+{
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ list_for_each_entry_reverse(core, &bus->cores, list) {
|
|
+ bcma_core_mips_print_irq(core, bcma_core_mips_irq(core));
|
|
+ }
|
|
+}
|
|
+
|
|
+u32 bcma_cpu_clock(struct bcma_drv_mips *mcore)
|
|
+{
|
|
+ struct bcma_bus *bus = mcore->core->bus;
|
|
+
|
|
+ if (bus->drv_cc.capabilities & BCMA_CC_CAP_PMU)
|
|
+ return bcma_pmu_get_clockcpu(&bus->drv_cc);
|
|
+
|
|
+ pr_err("No PMU available, need this to get the cpu clock\n");
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL(bcma_cpu_clock);
|
|
+
|
|
+static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
|
|
+{
|
|
+ struct bcma_bus *bus = mcore->core->bus;
|
|
+
|
|
+ switch (bus->drv_cc.capabilities & BCMA_CC_CAP_FLASHT) {
|
|
+ case BCMA_CC_FLASHT_STSER:
|
|
+ case BCMA_CC_FLASHT_ATSER:
|
|
+ pr_err("Serial flash not supported.\n");
|
|
+ break;
|
|
+ case BCMA_CC_FLASHT_PARA:
|
|
+ pr_info("found parallel flash.\n");
|
|
+ bus->drv_cc.pflash.window = 0x1c000000;
|
|
+ bus->drv_cc.pflash.window_size = 0x02000000;
|
|
+
|
|
+ if ((bcma_read32(bus->drv_cc.core, BCMA_CC_FLASH_CFG) &
|
|
+ BCMA_CC_FLASH_CFG_DS) == 0)
|
|
+ bus->drv_cc.pflash.buswidth = 1;
|
|
+ else
|
|
+ bus->drv_cc.pflash.buswidth = 2;
|
|
+ break;
|
|
+ default:
|
|
+ pr_err("flash not supported.\n");
|
|
+ }
|
|
+}
|
|
+
|
|
+void bcma_core_mips_init(struct bcma_drv_mips *mcore)
|
|
+{
|
|
+ struct bcma_bus *bus;
|
|
+ struct bcma_device *core;
|
|
+ bus = mcore->core->bus;
|
|
+
|
|
+ pr_info("Initializing MIPS core...\n");
|
|
+
|
|
+ if (!mcore->setup_done)
|
|
+ mcore->assigned_irqs = 1;
|
|
+
|
|
+ /* Assign IRQs to all cores on the bus */
|
|
+ list_for_each_entry_reverse(core, &bus->cores, list) {
|
|
+ int mips_irq;
|
|
+ if (core->irq)
|
|
+ continue;
|
|
+
|
|
+ mips_irq = bcma_core_mips_irq(core);
|
|
+ if (mips_irq > 4)
|
|
+ core->irq = 0;
|
|
+ else
|
|
+ core->irq = mips_irq + 2;
|
|
+ if (core->irq > 5)
|
|
+ continue;
|
|
+ switch (core->id.id) {
|
|
+ case BCMA_CORE_PCI:
|
|
+ case BCMA_CORE_PCIE:
|
|
+ case BCMA_CORE_ETHERNET:
|
|
+ case BCMA_CORE_ETHERNET_GBIT:
|
|
+ case BCMA_CORE_MAC_GBIT:
|
|
+ case BCMA_CORE_80211:
|
|
+ case BCMA_CORE_USB20_HOST:
|
|
+ /* These devices get their own IRQ line if available,
|
|
+ * the rest goes on IRQ0
|
|
+ */
|
|
+ if (mcore->assigned_irqs <= 4)
|
|
+ bcma_core_mips_set_irq(core,
|
|
+ mcore->assigned_irqs++);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ pr_info("IRQ reconfiguration done\n");
|
|
+ bcma_core_mips_dump_irq(bus);
|
|
+
|
|
+ if (mcore->setup_done)
|
|
+ return;
|
|
+
|
|
+ bcma_chipco_serial_init(&bus->drv_cc);
|
|
+ bcma_core_mips_flash_detect(mcore);
|
|
+ mcore->setup_done = true;
|
|
+}
|
|
--- a/drivers/bcma/driver_pci.c
|
|
+++ b/drivers/bcma/driver_pci.c
|
|
@@ -2,8 +2,9 @@
|
|
* Broadcom specific AMBA
|
|
* PCI Core
|
|
*
|
|
- * Copyright 2005, Broadcom Corporation
|
|
- * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
|
|
+ * Copyright 2005, 2011, Broadcom Corporation
|
|
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
|
|
+ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
@@ -15,40 +16,41 @@
|
|
* R/W ops.
|
|
**************************************************/
|
|
|
|
-static u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
|
|
+u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
|
|
{
|
|
- pcicore_write32(pc, 0x130, address);
|
|
- pcicore_read32(pc, 0x130);
|
|
- return pcicore_read32(pc, 0x134);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
|
|
+ pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
|
|
+ return pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_DATA);
|
|
}
|
|
|
|
#if 0
|
|
static void bcma_pcie_write(struct bcma_drv_pci *pc, u32 address, u32 data)
|
|
{
|
|
- pcicore_write32(pc, 0x130, address);
|
|
- pcicore_read32(pc, 0x130);
|
|
- pcicore_write32(pc, 0x134, data);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
|
|
+ pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
|
|
}
|
|
#endif
|
|
|
|
static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
|
|
{
|
|
- const u16 mdio_control = 0x128;
|
|
- const u16 mdio_data = 0x12C;
|
|
u32 v;
|
|
int i;
|
|
|
|
- v = (1 << 30); /* Start of Transaction */
|
|
- v |= (1 << 28); /* Write Transaction */
|
|
- v |= (1 << 17); /* Turnaround */
|
|
- v |= (0x1F << 18);
|
|
+ v = BCMA_CORE_PCI_MDIODATA_START;
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_WRITE;
|
|
+ v |= (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
|
|
+ BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
|
|
+ v |= (BCMA_CORE_PCI_MDIODATA_BLK_ADDR <<
|
|
+ BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_TA;
|
|
v |= (phy << 4);
|
|
- pcicore_write32(pc, mdio_data, v);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
|
|
|
|
udelay(10);
|
|
for (i = 0; i < 200; i++) {
|
|
- v = pcicore_read32(pc, mdio_control);
|
|
- if (v & 0x100 /* Trans complete */)
|
|
+ v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
|
|
+ if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
|
|
break;
|
|
msleep(1);
|
|
}
|
|
@@ -56,79 +58,84 @@ static void bcma_pcie_mdio_set_phy(struc
|
|
|
|
static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)
|
|
{
|
|
- const u16 mdio_control = 0x128;
|
|
- const u16 mdio_data = 0x12C;
|
|
int max_retries = 10;
|
|
u16 ret = 0;
|
|
u32 v;
|
|
int i;
|
|
|
|
- v = 0x80; /* Enable Preamble Sequence */
|
|
- v |= 0x2; /* MDIO Clock Divisor */
|
|
- pcicore_write32(pc, mdio_control, v);
|
|
+ /* enable mdio access to SERDES */
|
|
+ v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
|
|
+ v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
|
|
|
|
if (pc->core->id.rev >= 10) {
|
|
max_retries = 200;
|
|
bcma_pcie_mdio_set_phy(pc, device);
|
|
+ v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
|
|
+ BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
|
|
+ v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
|
|
+ } else {
|
|
+ v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
|
|
+ v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
|
|
}
|
|
|
|
- v = (1 << 30); /* Start of Transaction */
|
|
- v |= (1 << 29); /* Read Transaction */
|
|
- v |= (1 << 17); /* Turnaround */
|
|
- if (pc->core->id.rev < 10)
|
|
- v |= (u32)device << 22;
|
|
- v |= (u32)address << 18;
|
|
- pcicore_write32(pc, mdio_data, v);
|
|
+ v = BCMA_CORE_PCI_MDIODATA_START;
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_READ;
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_TA;
|
|
+
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
|
|
/* Wait for the device to complete the transaction */
|
|
udelay(10);
|
|
for (i = 0; i < max_retries; i++) {
|
|
- v = pcicore_read32(pc, mdio_control);
|
|
- if (v & 0x100 /* Trans complete */) {
|
|
+ v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
|
|
+ if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE) {
|
|
udelay(10);
|
|
- ret = pcicore_read32(pc, mdio_data);
|
|
+ ret = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_DATA);
|
|
break;
|
|
}
|
|
msleep(1);
|
|
}
|
|
- pcicore_write32(pc, mdio_control, 0);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
|
|
return ret;
|
|
}
|
|
|
|
static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,
|
|
u8 address, u16 data)
|
|
{
|
|
- const u16 mdio_control = 0x128;
|
|
- const u16 mdio_data = 0x12C;
|
|
int max_retries = 10;
|
|
u32 v;
|
|
int i;
|
|
|
|
- v = 0x80; /* Enable Preamble Sequence */
|
|
- v |= 0x2; /* MDIO Clock Divisor */
|
|
- pcicore_write32(pc, mdio_control, v);
|
|
+ /* enable mdio access to SERDES */
|
|
+ v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
|
|
+ v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
|
|
|
|
if (pc->core->id.rev >= 10) {
|
|
max_retries = 200;
|
|
bcma_pcie_mdio_set_phy(pc, device);
|
|
+ v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
|
|
+ BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
|
|
+ v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
|
|
+ } else {
|
|
+ v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
|
|
+ v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
|
|
}
|
|
|
|
- v = (1 << 30); /* Start of Transaction */
|
|
- v |= (1 << 28); /* Write Transaction */
|
|
- v |= (1 << 17); /* Turnaround */
|
|
- if (pc->core->id.rev < 10)
|
|
- v |= (u32)device << 22;
|
|
- v |= (u32)address << 18;
|
|
+ v = BCMA_CORE_PCI_MDIODATA_START;
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_WRITE;
|
|
+ v |= BCMA_CORE_PCI_MDIODATA_TA;
|
|
v |= data;
|
|
- pcicore_write32(pc, mdio_data, v);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
|
|
/* Wait for the device to complete the transaction */
|
|
udelay(10);
|
|
for (i = 0; i < max_retries; i++) {
|
|
- v = pcicore_read32(pc, mdio_control);
|
|
- if (v & 0x100 /* Trans complete */)
|
|
+ v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
|
|
+ if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
|
|
break;
|
|
msleep(1);
|
|
}
|
|
- pcicore_write32(pc, mdio_control, 0);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
|
|
}
|
|
|
|
/**************************************************
|
|
@@ -137,27 +144,82 @@ static void bcma_pcie_mdio_write(struct
|
|
|
|
static u8 bcma_pcicore_polarity_workaround(struct bcma_drv_pci *pc)
|
|
{
|
|
- return (bcma_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80;
|
|
+ u32 tmp;
|
|
+
|
|
+ tmp = bcma_pcie_read(pc, BCMA_CORE_PCI_PLP_STATUSREG);
|
|
+ if (tmp & BCMA_CORE_PCI_PLP_POLARITYINV_STAT)
|
|
+ return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE |
|
|
+ BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY;
|
|
+ else
|
|
+ return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE;
|
|
}
|
|
|
|
static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc)
|
|
{
|
|
- const u8 serdes_pll_device = 0x1D;
|
|
- const u8 serdes_rx_device = 0x1F;
|
|
u16 tmp;
|
|
|
|
- bcma_pcie_mdio_write(pc, serdes_rx_device, 1 /* Control */,
|
|
- bcma_pcicore_polarity_workaround(pc));
|
|
- tmp = bcma_pcie_mdio_read(pc, serdes_pll_device, 1 /* Control */);
|
|
- if (tmp & 0x4000)
|
|
- bcma_pcie_mdio_write(pc, serdes_pll_device, 1, tmp & ~0x4000);
|
|
+ bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_RX,
|
|
+ BCMA_CORE_PCI_SERDES_RX_CTRL,
|
|
+ bcma_pcicore_polarity_workaround(pc));
|
|
+ tmp = bcma_pcie_mdio_read(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
|
|
+ BCMA_CORE_PCI_SERDES_PLL_CTRL);
|
|
+ if (tmp & BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN)
|
|
+ bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
|
|
+ BCMA_CORE_PCI_SERDES_PLL_CTRL,
|
|
+ tmp & ~BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN);
|
|
}
|
|
|
|
/**************************************************
|
|
* Init.
|
|
**************************************************/
|
|
|
|
-void bcma_core_pci_init(struct bcma_drv_pci *pc)
|
|
+static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
|
|
{
|
|
bcma_pcicore_serdes_workaround(pc);
|
|
}
|
|
+
|
|
+void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
|
|
+{
|
|
+ if (pc->setup_done)
|
|
+ return;
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
|
|
+ pc->hostmode = bcma_core_pci_is_in_hostmode(pc);
|
|
+ if (pc->hostmode)
|
|
+ bcma_core_pci_hostmode_init(pc);
|
|
+#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
|
|
+
|
|
+ if (!pc->hostmode)
|
|
+ bcma_core_pci_clientmode_init(pc);
|
|
+}
|
|
+
|
|
+int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
|
|
+ bool enable)
|
|
+{
|
|
+ struct pci_dev *pdev = pc->core->bus->host_pci;
|
|
+ u32 coremask, tmp;
|
|
+ int err = 0;
|
|
+
|
|
+ if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
|
|
+ /* This bcma device is not on a PCI host-bus. So the IRQs are
|
|
+ * not routed through the PCI core.
|
|
+ * So we must not enable routing through the PCI core. */
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
|
|
+ if (err)
|
|
+ goto out;
|
|
+
|
|
+ coremask = BIT(core->core_index) << 8;
|
|
+ if (enable)
|
|
+ tmp |= coremask;
|
|
+ else
|
|
+ tmp &= ~coremask;
|
|
+
|
|
+ err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);
|
|
+
|
|
+out:
|
|
+ return err;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
|
|
--- /dev/null
|
|
+++ b/drivers/bcma/driver_pci_host.c
|
|
@@ -0,0 +1,589 @@
|
|
+/*
|
|
+ * Broadcom specific AMBA
|
|
+ * PCI Core in hostmode
|
|
+ *
|
|
+ * Copyright 2005 - 2011, Broadcom Corporation
|
|
+ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
|
|
+ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
|
|
+ *
|
|
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
+ */
|
|
+
|
|
+#include "bcma_private.h"
|
|
+#include <linux/pci.h>
|
|
+#include <linux/export.h>
|
|
+#include <linux/bcma/bcma.h>
|
|
+#include <asm/paccess.h>
|
|
+
|
|
+/* Probe a 32bit value on the bus and catch bus exceptions.
|
|
+ * Returns nonzero on a bus exception.
|
|
+ * This is MIPS specific */
|
|
+#define mips_busprobe32(val, addr) get_dbe((val), ((u32 *)(addr)))
|
|
+
|
|
+/* Assume one-hot slot wiring */
|
|
+#define BCMA_PCI_SLOT_MAX 16
|
|
+#define PCI_CONFIG_SPACE_SIZE 256
|
|
+
|
|
+bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
|
|
+{
|
|
+ struct bcma_bus *bus = pc->core->bus;
|
|
+ u16 chipid_top;
|
|
+ u32 tmp;
|
|
+
|
|
+ chipid_top = (bus->chipinfo.id & 0xFF00);
|
|
+ if (chipid_top != 0x4700 &&
|
|
+ chipid_top != 0x5300)
|
|
+ return false;
|
|
+
|
|
+ if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
|
|
+ pr_info("This PCI core is disabled and not working\n");
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ bcma_core_enable(pc->core, 0);
|
|
+
|
|
+ return !mips_busprobe32(tmp, pc->core->io_addr);
|
|
+}
|
|
+
|
|
+static u32 bcma_pcie_read_config(struct bcma_drv_pci *pc, u32 address)
|
|
+{
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
|
|
+ pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
|
|
+ return pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_DATA);
|
|
+}
|
|
+
|
|
+static void bcma_pcie_write_config(struct bcma_drv_pci *pc, u32 address,
|
|
+ u32 data)
|
|
+{
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
|
|
+ pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_DATA, data);
|
|
+}
|
|
+
|
|
+static u32 bcma_get_cfgspace_addr(struct bcma_drv_pci *pc, unsigned int dev,
|
|
+ unsigned int func, unsigned int off)
|
|
+{
|
|
+ u32 addr = 0;
|
|
+
|
|
+ /* Issue config commands only when the data link is up (atleast
|
|
+ * one external pcie device is present).
|
|
+ */
|
|
+ if (dev >= 2 || !(bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_LSREG)
|
|
+ & BCMA_CORE_PCI_DLLP_LSREG_LINKUP))
|
|
+ goto out;
|
|
+
|
|
+ /* Type 0 transaction */
|
|
+ /* Slide the PCI window to the appropriate slot */
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
|
|
+ /* Calculate the address */
|
|
+ addr = pc->host_controller->host_cfg_addr;
|
|
+ addr |= (dev << BCMA_CORE_PCI_CFG_SLOT_SHIFT);
|
|
+ addr |= (func << BCMA_CORE_PCI_CFG_FUN_SHIFT);
|
|
+ addr |= (off & ~3);
|
|
+
|
|
+out:
|
|
+ return addr;
|
|
+}
|
|
+
|
|
+static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
|
|
+ unsigned int func, unsigned int off,
|
|
+ void *buf, int len)
|
|
+{
|
|
+ int err = -EINVAL;
|
|
+ u32 addr, val;
|
|
+ void __iomem *mmio = 0;
|
|
+
|
|
+ WARN_ON(!pc->hostmode);
|
|
+ if (unlikely(len != 1 && len != 2 && len != 4))
|
|
+ goto out;
|
|
+ if (dev == 0) {
|
|
+ /* we support only two functions on device 0 */
|
|
+ if (func > 1)
|
|
+ return -EINVAL;
|
|
+
|
|
+ /* accesses to config registers with offsets >= 256
|
|
+ * requires indirect access.
|
|
+ */
|
|
+ if (off >= PCI_CONFIG_SPACE_SIZE) {
|
|
+ addr = (func << 12);
|
|
+ addr |= (off & 0x0FFF);
|
|
+ val = bcma_pcie_read_config(pc, addr);
|
|
+ } else {
|
|
+ addr = BCMA_CORE_PCI_PCICFG0;
|
|
+ addr |= (func << 8);
|
|
+ addr |= (off & 0xfc);
|
|
+ val = pcicore_read32(pc, addr);
|
|
+ }
|
|
+ } else {
|
|
+ addr = bcma_get_cfgspace_addr(pc, dev, func, off);
|
|
+ if (unlikely(!addr))
|
|
+ goto out;
|
|
+ err = -ENOMEM;
|
|
+ mmio = ioremap_nocache(addr, len);
|
|
+ if (!mmio)
|
|
+ goto out;
|
|
+
|
|
+ if (mips_busprobe32(val, mmio)) {
|
|
+ val = 0xffffffff;
|
|
+ goto unmap;
|
|
+ }
|
|
+
|
|
+ val = readl(mmio);
|
|
+ }
|
|
+ val >>= (8 * (off & 3));
|
|
+
|
|
+ switch (len) {
|
|
+ case 1:
|
|
+ *((u8 *)buf) = (u8)val;
|
|
+ break;
|
|
+ case 2:
|
|
+ *((u16 *)buf) = (u16)val;
|
|
+ break;
|
|
+ case 4:
|
|
+ *((u32 *)buf) = (u32)val;
|
|
+ break;
|
|
+ }
|
|
+ err = 0;
|
|
+unmap:
|
|
+ if (mmio)
|
|
+ iounmap(mmio);
|
|
+out:
|
|
+ return err;
|
|
+}
|
|
+
|
|
+static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
|
|
+ unsigned int func, unsigned int off,
|
|
+ const void *buf, int len)
|
|
+{
|
|
+ int err = -EINVAL;
|
|
+ u32 addr = 0, val = 0;
|
|
+ void __iomem *mmio = 0;
|
|
+ u16 chipid = pc->core->bus->chipinfo.id;
|
|
+
|
|
+ WARN_ON(!pc->hostmode);
|
|
+ if (unlikely(len != 1 && len != 2 && len != 4))
|
|
+ goto out;
|
|
+ if (dev == 0) {
|
|
+ /* accesses to config registers with offsets >= 256
|
|
+ * requires indirect access.
|
|
+ */
|
|
+ if (off < PCI_CONFIG_SPACE_SIZE) {
|
|
+ addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
|
|
+ addr |= (func << 8);
|
|
+ addr |= (off & 0xfc);
|
|
+ mmio = ioremap_nocache(addr, len);
|
|
+ if (!mmio)
|
|
+ goto out;
|
|
+ }
|
|
+ } else {
|
|
+ addr = bcma_get_cfgspace_addr(pc, dev, func, off);
|
|
+ if (unlikely(!addr))
|
|
+ goto out;
|
|
+ err = -ENOMEM;
|
|
+ mmio = ioremap_nocache(addr, len);
|
|
+ if (!mmio)
|
|
+ goto out;
|
|
+
|
|
+ if (mips_busprobe32(val, mmio)) {
|
|
+ val = 0xffffffff;
|
|
+ goto unmap;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ switch (len) {
|
|
+ case 1:
|
|
+ val = readl(mmio);
|
|
+ val &= ~(0xFF << (8 * (off & 3)));
|
|
+ val |= *((const u8 *)buf) << (8 * (off & 3));
|
|
+ break;
|
|
+ case 2:
|
|
+ val = readl(mmio);
|
|
+ val &= ~(0xFFFF << (8 * (off & 3)));
|
|
+ val |= *((const u16 *)buf) << (8 * (off & 3));
|
|
+ break;
|
|
+ case 4:
|
|
+ val = *((const u32 *)buf);
|
|
+ break;
|
|
+ }
|
|
+ if (dev == 0 && !addr) {
|
|
+ /* accesses to config registers with offsets >= 256
|
|
+ * requires indirect access.
|
|
+ */
|
|
+ addr = (func << 12);
|
|
+ addr |= (off & 0x0FFF);
|
|
+ bcma_pcie_write_config(pc, addr, val);
|
|
+ } else {
|
|
+ writel(val, mmio);
|
|
+
|
|
+ if (chipid == 0x4716 || chipid == 0x4748)
|
|
+ readl(mmio);
|
|
+ }
|
|
+
|
|
+ err = 0;
|
|
+unmap:
|
|
+ if (mmio)
|
|
+ iounmap(mmio);
|
|
+out:
|
|
+ return err;
|
|
+}
|
|
+
|
|
+static int bcma_core_pci_hostmode_read_config(struct pci_bus *bus,
|
|
+ unsigned int devfn,
|
|
+ int reg, int size, u32 *val)
|
|
+{
|
|
+ unsigned long flags;
|
|
+ int err;
|
|
+ struct bcma_drv_pci *pc;
|
|
+ struct bcma_drv_pci_host *pc_host;
|
|
+
|
|
+ pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
|
|
+ pc = pc_host->pdev;
|
|
+
|
|
+ spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
|
|
+ err = bcma_extpci_read_config(pc, PCI_SLOT(devfn),
|
|
+ PCI_FUNC(devfn), reg, val, size);
|
|
+ spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
|
|
+
|
|
+ return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
|
|
+}
|
|
+
|
|
+static int bcma_core_pci_hostmode_write_config(struct pci_bus *bus,
|
|
+ unsigned int devfn,
|
|
+ int reg, int size, u32 val)
|
|
+{
|
|
+ unsigned long flags;
|
|
+ int err;
|
|
+ struct bcma_drv_pci *pc;
|
|
+ struct bcma_drv_pci_host *pc_host;
|
|
+
|
|
+ pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
|
|
+ pc = pc_host->pdev;
|
|
+
|
|
+ spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
|
|
+ err = bcma_extpci_write_config(pc, PCI_SLOT(devfn),
|
|
+ PCI_FUNC(devfn), reg, &val, size);
|
|
+ spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
|
|
+
|
|
+ return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
|
|
+}
|
|
+
|
|
+/* return cap_offset if requested capability exists in the PCI config space */
|
|
+static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,
|
|
+ unsigned int dev,
|
|
+ unsigned int func, u8 req_cap_id,
|
|
+ unsigned char *buf, u32 *buflen)
|
|
+{
|
|
+ u8 cap_id;
|
|
+ u8 cap_ptr = 0;
|
|
+ u32 bufsize;
|
|
+ u8 byte_val;
|
|
+
|
|
+ /* check for Header type 0 */
|
|
+ bcma_extpci_read_config(pc, dev, func, PCI_HEADER_TYPE, &byte_val,
|
|
+ sizeof(u8));
|
|
+ if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
|
|
+ return cap_ptr;
|
|
+
|
|
+ /* check if the capability pointer field exists */
|
|
+ bcma_extpci_read_config(pc, dev, func, PCI_STATUS, &byte_val,
|
|
+ sizeof(u8));
|
|
+ if (!(byte_val & PCI_STATUS_CAP_LIST))
|
|
+ return cap_ptr;
|
|
+
|
|
+ /* check if the capability pointer is 0x00 */
|
|
+ bcma_extpci_read_config(pc, dev, func, PCI_CAPABILITY_LIST, &cap_ptr,
|
|
+ sizeof(u8));
|
|
+ if (cap_ptr == 0x00)
|
|
+ return cap_ptr;
|
|
+
|
|
+ /* loop thr'u the capability list and see if the requested capabilty
|
|
+ * exists */
|
|
+ bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id, sizeof(u8));
|
|
+ while (cap_id != req_cap_id) {
|
|
+ bcma_extpci_read_config(pc, dev, func, cap_ptr + 1, &cap_ptr,
|
|
+ sizeof(u8));
|
|
+ if (cap_ptr == 0x00)
|
|
+ return cap_ptr;
|
|
+ bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id,
|
|
+ sizeof(u8));
|
|
+ }
|
|
+
|
|
+ /* found the caller requested capability */
|
|
+ if ((buf != NULL) && (buflen != NULL)) {
|
|
+ u8 cap_data;
|
|
+
|
|
+ bufsize = *buflen;
|
|
+ if (!bufsize)
|
|
+ return cap_ptr;
|
|
+
|
|
+ *buflen = 0;
|
|
+
|
|
+ /* copy the cpability data excluding cap ID and next ptr */
|
|
+ cap_data = cap_ptr + 2;
|
|
+ if ((bufsize + cap_data) > PCI_CONFIG_SPACE_SIZE)
|
|
+ bufsize = PCI_CONFIG_SPACE_SIZE - cap_data;
|
|
+ *buflen = bufsize;
|
|
+ while (bufsize--) {
|
|
+ bcma_extpci_read_config(pc, dev, func, cap_data, buf,
|
|
+ sizeof(u8));
|
|
+ cap_data++;
|
|
+ buf++;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return cap_ptr;
|
|
+}
|
|
+
|
|
+/* If the root port is capable of returning Config Request
|
|
+ * Retry Status (CRS) Completion Status to software then
|
|
+ * enable the feature.
|
|
+ */
|
|
+static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)
|
|
+{
|
|
+ u8 cap_ptr, root_ctrl, root_cap, dev;
|
|
+ u16 val16;
|
|
+ int i;
|
|
+
|
|
+ cap_ptr = bcma_find_pci_capability(pc, 0, 0, PCI_CAP_ID_EXP, NULL,
|
|
+ NULL);
|
|
+ root_cap = cap_ptr + PCI_EXP_RTCAP;
|
|
+ bcma_extpci_read_config(pc, 0, 0, root_cap, &val16, sizeof(u16));
|
|
+ if (val16 & BCMA_CORE_PCI_RC_CRS_VISIBILITY) {
|
|
+ /* Enable CRS software visibility */
|
|
+ root_ctrl = cap_ptr + PCI_EXP_RTCTL;
|
|
+ val16 = PCI_EXP_RTCTL_CRSSVE;
|
|
+ bcma_extpci_read_config(pc, 0, 0, root_ctrl, &val16,
|
|
+ sizeof(u16));
|
|
+
|
|
+ /* Initiate a configuration request to read the vendor id
|
|
+ * field of the device function's config space header after
|
|
+ * 100 ms wait time from the end of Reset. If the device is
|
|
+ * not done with its internal initialization, it must at
|
|
+ * least return a completion TLP, with a completion status
|
|
+ * of "Configuration Request Retry Status (CRS)". The root
|
|
+ * complex must complete the request to the host by returning
|
|
+ * a read-data value of 0001h for the Vendor ID field and
|
|
+ * all 1s for any additional bytes included in the request.
|
|
+ * Poll using the config reads for max wait time of 1 sec or
|
|
+ * until we receive the successful completion status. Repeat
|
|
+ * the procedure for all the devices.
|
|
+ */
|
|
+ for (dev = 1; dev < BCMA_PCI_SLOT_MAX; dev++) {
|
|
+ for (i = 0; i < 100000; i++) {
|
|
+ bcma_extpci_read_config(pc, dev, 0,
|
|
+ PCI_VENDOR_ID, &val16,
|
|
+ sizeof(val16));
|
|
+ if (val16 != 0x1)
|
|
+ break;
|
|
+ udelay(10);
|
|
+ }
|
|
+ if (val16 == 0x1)
|
|
+ pr_err("PCI: Broken device in slot %d\n", dev);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
|
|
+{
|
|
+ struct bcma_bus *bus = pc->core->bus;
|
|
+ struct bcma_drv_pci_host *pc_host;
|
|
+ u32 tmp;
|
|
+ u32 pci_membase_1G;
|
|
+ unsigned long io_map_base;
|
|
+
|
|
+ pr_info("PCIEcore in host mode found\n");
|
|
+
|
|
+ pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL);
|
|
+ if (!pc_host) {
|
|
+ pr_err("can not allocate memory");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ pc->host_controller = pc_host;
|
|
+ pc_host->pci_controller.io_resource = &pc_host->io_resource;
|
|
+ pc_host->pci_controller.mem_resource = &pc_host->mem_resource;
|
|
+ pc_host->pci_controller.pci_ops = &pc_host->pci_ops;
|
|
+ pc_host->pdev = pc;
|
|
+
|
|
+ pci_membase_1G = BCMA_SOC_PCI_DMA;
|
|
+ pc_host->host_cfg_addr = BCMA_SOC_PCI_CFG;
|
|
+
|
|
+ pc_host->pci_ops.read = bcma_core_pci_hostmode_read_config;
|
|
+ pc_host->pci_ops.write = bcma_core_pci_hostmode_write_config;
|
|
+
|
|
+ pc_host->mem_resource.name = "BCMA PCIcore external memory",
|
|
+ pc_host->mem_resource.start = BCMA_SOC_PCI_DMA;
|
|
+ pc_host->mem_resource.end = BCMA_SOC_PCI_DMA + BCMA_SOC_PCI_DMA_SZ - 1;
|
|
+ pc_host->mem_resource.flags = IORESOURCE_MEM | IORESOURCE_PCI_FIXED;
|
|
+
|
|
+ pc_host->io_resource.name = "BCMA PCIcore external I/O",
|
|
+ pc_host->io_resource.start = 0x100;
|
|
+ pc_host->io_resource.end = 0x7FF;
|
|
+ pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;
|
|
+
|
|
+ /* Reset RC */
|
|
+ udelay(3000);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
|
|
+ udelay(1000);
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
|
|
+ BCMA_CORE_PCI_CTL_RST_OE);
|
|
+
|
|
+ /* 64 MB I/O access window. On 4716, use
|
|
+ * sbtopcie0 to access the device registers. We
|
|
+ * can't use address match 2 (1 GB window) region
|
|
+ * as mips can't generate 64-bit address on the
|
|
+ * backplane.
|
|
+ */
|
|
+ if (bus->chipinfo.id == 0x4716 || bus->chipinfo.id == 0x4748) {
|
|
+ pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
|
|
+ pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
|
|
+ BCMA_SOC_PCI_MEM_SZ - 1;
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
|
|
+ BCMA_CORE_PCI_SBTOPCI_MEM | BCMA_SOC_PCI_MEM);
|
|
+ } else if (bus->chipinfo.id == 0x5300) {
|
|
+ tmp = BCMA_CORE_PCI_SBTOPCI_MEM;
|
|
+ tmp |= BCMA_CORE_PCI_SBTOPCI_PREF;
|
|
+ tmp |= BCMA_CORE_PCI_SBTOPCI_BURST;
|
|
+ if (pc->core->core_unit == 0) {
|
|
+ pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
|
|
+ pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
|
|
+ BCMA_SOC_PCI_MEM_SZ - 1;
|
|
+ pci_membase_1G = BCMA_SOC_PCIE_DMA_H32;
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
|
|
+ tmp | BCMA_SOC_PCI_MEM);
|
|
+ } else if (pc->core->core_unit == 1) {
|
|
+ pc_host->mem_resource.start = BCMA_SOC_PCI1_MEM;
|
|
+ pc_host->mem_resource.end = BCMA_SOC_PCI1_MEM +
|
|
+ BCMA_SOC_PCI_MEM_SZ - 1;
|
|
+ pci_membase_1G = BCMA_SOC_PCIE1_DMA_H32;
|
|
+ pc_host->host_cfg_addr = BCMA_SOC_PCI1_CFG;
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
|
|
+ tmp | BCMA_SOC_PCI1_MEM);
|
|
+ }
|
|
+ } else
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
|
|
+ BCMA_CORE_PCI_SBTOPCI_IO);
|
|
+
|
|
+ /* 64 MB configuration access window */
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
|
|
+
|
|
+ /* 1 GB memory access window */
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI2,
|
|
+ BCMA_CORE_PCI_SBTOPCI_MEM | pci_membase_1G);
|
|
+
|
|
+
|
|
+ /* As per PCI Express Base Spec 1.1 we need to wait for
|
|
+ * at least 100 ms from the end of a reset (cold/warm/hot)
|
|
+ * before issuing configuration requests to PCI Express
|
|
+ * devices.
|
|
+ */
|
|
+ udelay(100000);
|
|
+
|
|
+ bcma_core_pci_enable_crs(pc);
|
|
+
|
|
+ /* Enable PCI bridge BAR0 memory & master access */
|
|
+ tmp = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
|
|
+ bcma_extpci_write_config(pc, 0, 0, PCI_COMMAND, &tmp, sizeof(tmp));
|
|
+
|
|
+ /* Enable PCI interrupts */
|
|
+ pcicore_write32(pc, BCMA_CORE_PCI_IMASK, BCMA_CORE_PCI_IMASK_INTA);
|
|
+
|
|
+ /* Ok, ready to run, register it to the system.
|
|
+ * The following needs change, if we want to port hostmode
|
|
+ * to non-MIPS platform. */
|
|
+ io_map_base = (unsigned long)ioremap_nocache(BCMA_SOC_PCI_MEM,
|
|
+ 0x04000000);
|
|
+ pc_host->pci_controller.io_map_base = io_map_base;
|
|
+ set_io_port_base(pc_host->pci_controller.io_map_base);
|
|
+ /* Give some time to the PCI controller to configure itself with the new
|
|
+ * values. Not waiting at this point causes crashes of the machine. */
|
|
+ mdelay(10);
|
|
+ register_pci_controller(&pc_host->pci_controller);
|
|
+ return;
|
|
+}
|
|
+
|
|
+/* Early PCI fixup for a device on the PCI-core bridge. */
|
|
+static void bcma_core_pci_fixup_pcibridge(struct pci_dev *dev)
|
|
+{
|
|
+ if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
|
|
+ /* This is not a device on the PCI-core bridge. */
|
|
+ return;
|
|
+ }
|
|
+ if (PCI_SLOT(dev->devfn) != 0)
|
|
+ return;
|
|
+
|
|
+ pr_info("PCI: Fixing up bridge %s\n", pci_name(dev));
|
|
+
|
|
+ /* Enable PCI bridge bus mastering and memory space */
|
|
+ pci_set_master(dev);
|
|
+ if (pcibios_enable_device(dev, ~0) < 0) {
|
|
+ pr_err("PCI: BCMA bridge enable failed\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* Enable PCI bridge BAR1 prefetch and burst */
|
|
+ pci_write_config_dword(dev, BCMA_PCI_BAR1_CONTROL, 3);
|
|
+}
|
|
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_pcibridge);
|
|
+
|
|
+/* Early PCI fixup for all PCI-cores to set the correct memory address. */
|
|
+static void bcma_core_pci_fixup_addresses(struct pci_dev *dev)
|
|
+{
|
|
+ struct resource *res;
|
|
+ int pos;
|
|
+
|
|
+ if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
|
|
+ /* This is not a device on the PCI-core bridge. */
|
|
+ return;
|
|
+ }
|
|
+ if (PCI_SLOT(dev->devfn) == 0)
|
|
+ return;
|
|
+
|
|
+ pr_info("PCI: Fixing up addresses %s\n", pci_name(dev));
|
|
+
|
|
+ for (pos = 0; pos < 6; pos++) {
|
|
+ res = &dev->resource[pos];
|
|
+ if (res->flags & (IORESOURCE_IO | IORESOURCE_MEM))
|
|
+ pci_assign_resource(dev, pos);
|
|
+ }
|
|
+}
|
|
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_addresses);
|
|
+
|
|
+/* This function is called when doing a pci_enable_device().
|
|
+ * We must first check if the device is a device on the PCI-core bridge. */
|
|
+int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
|
|
+{
|
|
+ struct bcma_drv_pci_host *pc_host;
|
|
+
|
|
+ if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
|
|
+ /* This is not a device on the PCI-core bridge. */
|
|
+ return -ENODEV;
|
|
+ }
|
|
+ pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
|
|
+ pci_ops);
|
|
+
|
|
+ pr_info("PCI: Fixing up device %s\n", pci_name(dev));
|
|
+
|
|
+ /* Fix up interrupt lines */
|
|
+ dev->irq = bcma_core_mips_irq(pc_host->pdev->core) + 2;
|
|
+ pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);
|
|
+
|
|
+/* PCI device IRQ mapping. */
|
|
+int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
|
|
+{
|
|
+ struct bcma_drv_pci_host *pc_host;
|
|
+
|
|
+ if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
|
|
+ /* This is not a device on the PCI-core bridge. */
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
+ pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
|
|
+ pci_ops);
|
|
+ return bcma_core_mips_irq(pc_host->pdev->core) + 2;
|
|
+}
|
|
+EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
|
|
--- a/drivers/bcma/host_pci.c
|
|
+++ b/drivers/bcma/host_pci.c
|
|
@@ -9,6 +9,7 @@
|
|
#include <linux/slab.h>
|
|
#include <linux/bcma/bcma.h>
|
|
#include <linux/pci.h>
|
|
+#include <linux/module.h>
|
|
|
|
static void bcma_host_pci_switch_core(struct bcma_device *core)
|
|
{
|
|
@@ -20,50 +21,108 @@ static void bcma_host_pci_switch_core(st
|
|
pr_debug("Switched to core: 0x%X\n", core->id.id);
|
|
}
|
|
|
|
-static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)
|
|
-{
|
|
+/* Provides access to the requested core. Returns base offset that has to be
|
|
+ * used. It makes use of fixed windows when possible. */
|
|
+static u16 bcma_host_pci_provide_access_to_core(struct bcma_device *core)
|
|
+{
|
|
+ switch (core->id.id) {
|
|
+ case BCMA_CORE_CHIPCOMMON:
|
|
+ return 3 * BCMA_CORE_SIZE;
|
|
+ case BCMA_CORE_PCIE:
|
|
+ return 2 * BCMA_CORE_SIZE;
|
|
+ }
|
|
+
|
|
if (core->bus->mapped_core != core)
|
|
bcma_host_pci_switch_core(core);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)
|
|
+{
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
return ioread8(core->bus->mmio + offset);
|
|
}
|
|
|
|
static u16 bcma_host_pci_read16(struct bcma_device *core, u16 offset)
|
|
{
|
|
- if (core->bus->mapped_core != core)
|
|
- bcma_host_pci_switch_core(core);
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
return ioread16(core->bus->mmio + offset);
|
|
}
|
|
|
|
static u32 bcma_host_pci_read32(struct bcma_device *core, u16 offset)
|
|
{
|
|
- if (core->bus->mapped_core != core)
|
|
- bcma_host_pci_switch_core(core);
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
return ioread32(core->bus->mmio + offset);
|
|
}
|
|
|
|
static void bcma_host_pci_write8(struct bcma_device *core, u16 offset,
|
|
u8 value)
|
|
{
|
|
- if (core->bus->mapped_core != core)
|
|
- bcma_host_pci_switch_core(core);
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
iowrite8(value, core->bus->mmio + offset);
|
|
}
|
|
|
|
static void bcma_host_pci_write16(struct bcma_device *core, u16 offset,
|
|
u16 value)
|
|
{
|
|
- if (core->bus->mapped_core != core)
|
|
- bcma_host_pci_switch_core(core);
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
iowrite16(value, core->bus->mmio + offset);
|
|
}
|
|
|
|
static void bcma_host_pci_write32(struct bcma_device *core, u16 offset,
|
|
u32 value)
|
|
{
|
|
+ offset += bcma_host_pci_provide_access_to_core(core);
|
|
+ iowrite32(value, core->bus->mmio + offset);
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width)
|
|
+{
|
|
+ void __iomem *addr = core->bus->mmio + offset;
|
|
if (core->bus->mapped_core != core)
|
|
bcma_host_pci_switch_core(core);
|
|
- iowrite32(value, core->bus->mmio + offset);
|
|
+ switch (reg_width) {
|
|
+ case sizeof(u8):
|
|
+ ioread8_rep(addr, buffer, count);
|
|
+ break;
|
|
+ case sizeof(u16):
|
|
+ WARN_ON(count & 1);
|
|
+ ioread16_rep(addr, buffer, count >> 1);
|
|
+ break;
|
|
+ case sizeof(u32):
|
|
+ WARN_ON(count & 3);
|
|
+ ioread32_rep(addr, buffer, count >> 2);
|
|
+ break;
|
|
+ default:
|
|
+ WARN_ON(1);
|
|
+ }
|
|
+}
|
|
+
|
|
+void bcma_host_pci_block_write(struct bcma_device *core, const void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width)
|
|
+{
|
|
+ void __iomem *addr = core->bus->mmio + offset;
|
|
+ if (core->bus->mapped_core != core)
|
|
+ bcma_host_pci_switch_core(core);
|
|
+ switch (reg_width) {
|
|
+ case sizeof(u8):
|
|
+ iowrite8_rep(addr, buffer, count);
|
|
+ break;
|
|
+ case sizeof(u16):
|
|
+ WARN_ON(count & 1);
|
|
+ iowrite16_rep(addr, buffer, count >> 1);
|
|
+ break;
|
|
+ case sizeof(u32):
|
|
+ WARN_ON(count & 3);
|
|
+ iowrite32_rep(addr, buffer, count >> 2);
|
|
+ break;
|
|
+ default:
|
|
+ WARN_ON(1);
|
|
+ }
|
|
}
|
|
+#endif
|
|
|
|
static u32 bcma_host_pci_aread32(struct bcma_device *core, u16 offset)
|
|
{
|
|
@@ -87,12 +146,16 @@ const struct bcma_host_ops bcma_host_pci
|
|
.write8 = bcma_host_pci_write8,
|
|
.write16 = bcma_host_pci_write16,
|
|
.write32 = bcma_host_pci_write32,
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+ .block_read = bcma_host_pci_block_read,
|
|
+ .block_write = bcma_host_pci_block_write,
|
|
+#endif
|
|
.aread32 = bcma_host_pci_aread32,
|
|
.awrite32 = bcma_host_pci_awrite32,
|
|
};
|
|
|
|
-static int bcma_host_pci_probe(struct pci_dev *dev,
|
|
- const struct pci_device_id *id)
|
|
+static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
|
|
+ const struct pci_device_id *id)
|
|
{
|
|
struct bcma_bus *bus;
|
|
int err = -ENOMEM;
|
|
@@ -171,10 +234,40 @@ static void bcma_host_pci_remove(struct
|
|
pci_set_drvdata(dev, NULL);
|
|
}
|
|
|
|
+#ifdef CONFIG_PM
|
|
+static int bcma_host_pci_suspend(struct device *dev)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(dev);
|
|
+ struct bcma_bus *bus = pci_get_drvdata(pdev);
|
|
+
|
|
+ bus->mapped_core = NULL;
|
|
+
|
|
+ return bcma_bus_suspend(bus);
|
|
+}
|
|
+
|
|
+static int bcma_host_pci_resume(struct device *dev)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(dev);
|
|
+ struct bcma_bus *bus = pci_get_drvdata(pdev);
|
|
+
|
|
+ return bcma_bus_resume(bus);
|
|
+}
|
|
+
|
|
+static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,
|
|
+ bcma_host_pci_resume);
|
|
+#define BCMA_PM_OPS (&bcma_pm_ops)
|
|
+
|
|
+#else /* CONFIG_PM */
|
|
+
|
|
+#define BCMA_PM_OPS NULL
|
|
+
|
|
+#endif /* CONFIG_PM */
|
|
+
|
|
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
|
|
{ 0, },
|
|
};
|
|
@@ -185,6 +278,7 @@ static struct pci_driver bcma_pci_bridge
|
|
.id_table = bcma_pci_bridge_tbl,
|
|
.probe = bcma_host_pci_probe,
|
|
.remove = bcma_host_pci_remove,
|
|
+ .driver.pm = BCMA_PM_OPS,
|
|
};
|
|
|
|
int __init bcma_host_pci_init(void)
|
|
--- /dev/null
|
|
+++ b/drivers/bcma/host_soc.c
|
|
@@ -0,0 +1,183 @@
|
|
+/*
|
|
+ * Broadcom specific AMBA
|
|
+ * System on Chip (SoC) Host
|
|
+ *
|
|
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
+ */
|
|
+
|
|
+#include "bcma_private.h"
|
|
+#include "scan.h"
|
|
+#include <linux/bcma/bcma.h>
|
|
+#include <linux/bcma/bcma_soc.h>
|
|
+
|
|
+static u8 bcma_host_soc_read8(struct bcma_device *core, u16 offset)
|
|
+{
|
|
+ return readb(core->io_addr + offset);
|
|
+}
|
|
+
|
|
+static u16 bcma_host_soc_read16(struct bcma_device *core, u16 offset)
|
|
+{
|
|
+ return readw(core->io_addr + offset);
|
|
+}
|
|
+
|
|
+static u32 bcma_host_soc_read32(struct bcma_device *core, u16 offset)
|
|
+{
|
|
+ return readl(core->io_addr + offset);
|
|
+}
|
|
+
|
|
+static void bcma_host_soc_write8(struct bcma_device *core, u16 offset,
|
|
+ u8 value)
|
|
+{
|
|
+ writeb(value, core->io_addr + offset);
|
|
+}
|
|
+
|
|
+static void bcma_host_soc_write16(struct bcma_device *core, u16 offset,
|
|
+ u16 value)
|
|
+{
|
|
+ writew(value, core->io_addr + offset);
|
|
+}
|
|
+
|
|
+static void bcma_host_soc_write32(struct bcma_device *core, u16 offset,
|
|
+ u32 value)
|
|
+{
|
|
+ writel(value, core->io_addr + offset);
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+static void bcma_host_soc_block_read(struct bcma_device *core, void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width)
|
|
+{
|
|
+ void __iomem *addr = core->io_addr + offset;
|
|
+
|
|
+ switch (reg_width) {
|
|
+ case sizeof(u8): {
|
|
+ u8 *buf = buffer;
|
|
+
|
|
+ while (count) {
|
|
+ *buf = __raw_readb(addr);
|
|
+ buf++;
|
|
+ count--;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ case sizeof(u16): {
|
|
+ __le16 *buf = buffer;
|
|
+
|
|
+ WARN_ON(count & 1);
|
|
+ while (count) {
|
|
+ *buf = (__force __le16)__raw_readw(addr);
|
|
+ buf++;
|
|
+ count -= 2;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ case sizeof(u32): {
|
|
+ __le32 *buf = buffer;
|
|
+
|
|
+ WARN_ON(count & 3);
|
|
+ while (count) {
|
|
+ *buf = (__force __le32)__raw_readl(addr);
|
|
+ buf++;
|
|
+ count -= 4;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ default:
|
|
+ WARN_ON(1);
|
|
+ }
|
|
+}
|
|
+
|
|
+static void bcma_host_soc_block_write(struct bcma_device *core,
|
|
+ const void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width)
|
|
+{
|
|
+ void __iomem *addr = core->io_addr + offset;
|
|
+
|
|
+ switch (reg_width) {
|
|
+ case sizeof(u8): {
|
|
+ const u8 *buf = buffer;
|
|
+
|
|
+ while (count) {
|
|
+ __raw_writeb(*buf, addr);
|
|
+ buf++;
|
|
+ count--;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ case sizeof(u16): {
|
|
+ const __le16 *buf = buffer;
|
|
+
|
|
+ WARN_ON(count & 1);
|
|
+ while (count) {
|
|
+ __raw_writew((__force u16)(*buf), addr);
|
|
+ buf++;
|
|
+ count -= 2;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ case sizeof(u32): {
|
|
+ const __le32 *buf = buffer;
|
|
+
|
|
+ WARN_ON(count & 3);
|
|
+ while (count) {
|
|
+ __raw_writel((__force u32)(*buf), addr);
|
|
+ buf++;
|
|
+ count -= 4;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ default:
|
|
+ WARN_ON(1);
|
|
+ }
|
|
+}
|
|
+#endif /* CONFIG_BCMA_BLOCKIO */
|
|
+
|
|
+static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)
|
|
+{
|
|
+ return readl(core->io_wrap + offset);
|
|
+}
|
|
+
|
|
+static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,
|
|
+ u32 value)
|
|
+{
|
|
+ writel(value, core->io_wrap + offset);
|
|
+}
|
|
+
|
|
+const struct bcma_host_ops bcma_host_soc_ops = {
|
|
+ .read8 = bcma_host_soc_read8,
|
|
+ .read16 = bcma_host_soc_read16,
|
|
+ .read32 = bcma_host_soc_read32,
|
|
+ .write8 = bcma_host_soc_write8,
|
|
+ .write16 = bcma_host_soc_write16,
|
|
+ .write32 = bcma_host_soc_write32,
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+ .block_read = bcma_host_soc_block_read,
|
|
+ .block_write = bcma_host_soc_block_write,
|
|
+#endif
|
|
+ .aread32 = bcma_host_soc_aread32,
|
|
+ .awrite32 = bcma_host_soc_awrite32,
|
|
+};
|
|
+
|
|
+int __init bcma_host_soc_register(struct bcma_soc *soc)
|
|
+{
|
|
+ struct bcma_bus *bus = &soc->bus;
|
|
+ int err;
|
|
+
|
|
+ /* iomap only first core. We have to read some register on this core
|
|
+ * to scan the bus.
|
|
+ */
|
|
+ bus->mmio = ioremap_nocache(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
|
|
+ if (!bus->mmio)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ /* Host specific */
|
|
+ bus->hosttype = BCMA_HOSTTYPE_SOC;
|
|
+ bus->ops = &bcma_host_soc_ops;
|
|
+
|
|
+ /* Register */
|
|
+ err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
|
|
+ if (err)
|
|
+ iounmap(bus->mmio);
|
|
+
|
|
+ return err;
|
|
+}
|
|
--- a/drivers/bcma/main.c
|
|
+++ b/drivers/bcma/main.c
|
|
@@ -6,14 +6,23 @@
|
|
*/
|
|
|
|
#include "bcma_private.h"
|
|
+#include <linux/module.h>
|
|
#include <linux/bcma/bcma.h>
|
|
+#include <linux/slab.h>
|
|
|
|
MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
+/* contains the number the next bus should get. */
|
|
+static unsigned int bcma_bus_next_num = 0;
|
|
+
|
|
+/* bcma_buses_mutex locks the bcma_bus_next_num */
|
|
+static DEFINE_MUTEX(bcma_buses_mutex);
|
|
+
|
|
static int bcma_bus_match(struct device *dev, struct device_driver *drv);
|
|
static int bcma_device_probe(struct device *dev);
|
|
static int bcma_device_remove(struct device *dev);
|
|
+static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env);
|
|
|
|
static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
{
|
|
@@ -48,10 +57,11 @@ static struct bus_type bcma_bus_type = {
|
|
.match = bcma_bus_match,
|
|
.probe = bcma_device_probe,
|
|
.remove = bcma_device_remove,
|
|
+ .uevent = bcma_device_uevent,
|
|
.dev_attrs = bcma_device_attrs,
|
|
};
|
|
|
|
-static struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
|
|
+struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
|
|
{
|
|
struct bcma_device *core;
|
|
|
|
@@ -61,10 +71,15 @@ static struct bcma_device *bcma_find_cor
|
|
}
|
|
return NULL;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_find_core);
|
|
|
|
static void bcma_release_core_dev(struct device *dev)
|
|
{
|
|
struct bcma_device *core = container_of(dev, struct bcma_device, dev);
|
|
+ if (core->io_addr)
|
|
+ iounmap(core->io_addr);
|
|
+ if (core->io_wrap)
|
|
+ iounmap(core->io_wrap);
|
|
kfree(core);
|
|
}
|
|
|
|
@@ -79,18 +94,24 @@ static int bcma_register_cores(struct bc
|
|
case BCMA_CORE_CHIPCOMMON:
|
|
case BCMA_CORE_PCI:
|
|
case BCMA_CORE_PCIE:
|
|
+ case BCMA_CORE_MIPS_74K:
|
|
continue;
|
|
}
|
|
|
|
core->dev.release = bcma_release_core_dev;
|
|
core->dev.bus = &bcma_bus_type;
|
|
- dev_set_name(&core->dev, "bcma%d:%d", 0/*bus->num*/, dev_id);
|
|
+ dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
|
|
|
|
switch (bus->hosttype) {
|
|
case BCMA_HOSTTYPE_PCI:
|
|
core->dev.parent = &bus->host_pci->dev;
|
|
+ core->dma_dev = &bus->host_pci->dev;
|
|
+ core->irq = bus->host_pci->irq;
|
|
+ break;
|
|
+ case BCMA_HOSTTYPE_SOC:
|
|
+ core->dev.dma_mask = &core->dev.coherent_dma_mask;
|
|
+ core->dma_dev = &core->dev;
|
|
break;
|
|
- case BCMA_HOSTTYPE_NONE:
|
|
case BCMA_HOSTTYPE_SDIO:
|
|
break;
|
|
}
|
|
@@ -118,11 +139,15 @@ static void bcma_unregister_cores(struct
|
|
}
|
|
}
|
|
|
|
-int bcma_bus_register(struct bcma_bus *bus)
|
|
+int __devinit bcma_bus_register(struct bcma_bus *bus)
|
|
{
|
|
int err;
|
|
struct bcma_device *core;
|
|
|
|
+ mutex_lock(&bcma_buses_mutex);
|
|
+ bus->num = bcma_bus_next_num++;
|
|
+ mutex_unlock(&bcma_buses_mutex);
|
|
+
|
|
/* Scan for devices (cores) */
|
|
err = bcma_bus_scan(bus);
|
|
if (err) {
|
|
@@ -137,6 +162,13 @@ int bcma_bus_register(struct bcma_bus *b
|
|
bcma_core_chipcommon_init(&bus->drv_cc);
|
|
}
|
|
|
|
+ /* Init MIPS core */
|
|
+ core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
|
|
+ if (core) {
|
|
+ bus->drv_mips.core = core;
|
|
+ bcma_core_mips_init(&bus->drv_mips);
|
|
+ }
|
|
+
|
|
/* Init PCIE core */
|
|
core = bcma_find_core(bus, BCMA_CORE_PCIE);
|
|
if (core) {
|
|
@@ -144,6 +176,13 @@ int bcma_bus_register(struct bcma_bus *b
|
|
bcma_core_pci_init(&bus->drv_pci);
|
|
}
|
|
|
|
+ /* Try to get SPROM */
|
|
+ err = bcma_sprom_get(bus);
|
|
+ if (err == -ENOENT) {
|
|
+ pr_err("No SPROM available\n");
|
|
+ } else if (err)
|
|
+ pr_err("Failed to get SPROM: %d\n", err);
|
|
+
|
|
/* Register found cores */
|
|
bcma_register_cores(bus);
|
|
|
|
@@ -151,13 +190,104 @@ int bcma_bus_register(struct bcma_bus *b
|
|
|
|
return 0;
|
|
}
|
|
-EXPORT_SYMBOL_GPL(bcma_bus_register);
|
|
|
|
void bcma_bus_unregister(struct bcma_bus *bus)
|
|
{
|
|
bcma_unregister_cores(bus);
|
|
}
|
|
-EXPORT_SYMBOL_GPL(bcma_bus_unregister);
|
|
+
|
|
+int __init bcma_bus_early_register(struct bcma_bus *bus,
|
|
+ struct bcma_device *core_cc,
|
|
+ struct bcma_device *core_mips)
|
|
+{
|
|
+ int err;
|
|
+ struct bcma_device *core;
|
|
+ struct bcma_device_id match;
|
|
+
|
|
+ bcma_init_bus(bus);
|
|
+
|
|
+ match.manuf = BCMA_MANUF_BCM;
|
|
+ match.id = BCMA_CORE_CHIPCOMMON;
|
|
+ match.class = BCMA_CL_SIM;
|
|
+ match.rev = BCMA_ANY_REV;
|
|
+
|
|
+ /* Scan for chip common core */
|
|
+ err = bcma_bus_scan_early(bus, &match, core_cc);
|
|
+ if (err) {
|
|
+ pr_err("Failed to scan for common core: %d\n", err);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ match.manuf = BCMA_MANUF_MIPS;
|
|
+ match.id = BCMA_CORE_MIPS_74K;
|
|
+ match.class = BCMA_CL_SIM;
|
|
+ match.rev = BCMA_ANY_REV;
|
|
+
|
|
+ /* Scan for mips core */
|
|
+ err = bcma_bus_scan_early(bus, &match, core_mips);
|
|
+ if (err) {
|
|
+ pr_err("Failed to scan for mips core: %d\n", err);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ /* Init CC core */
|
|
+ core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
|
|
+ if (core) {
|
|
+ bus->drv_cc.core = core;
|
|
+ bcma_core_chipcommon_init(&bus->drv_cc);
|
|
+ }
|
|
+
|
|
+ /* Init MIPS core */
|
|
+ core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
|
|
+ if (core) {
|
|
+ bus->drv_mips.core = core;
|
|
+ bcma_core_mips_init(&bus->drv_mips);
|
|
+ }
|
|
+
|
|
+ pr_info("Early bus registered\n");
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_PM
|
|
+int bcma_bus_suspend(struct bcma_bus *bus)
|
|
+{
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ list_for_each_entry(core, &bus->cores, list) {
|
|
+ struct device_driver *drv = core->dev.driver;
|
|
+ if (drv) {
|
|
+ struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);
|
|
+ if (adrv->suspend)
|
|
+ adrv->suspend(core);
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+int bcma_bus_resume(struct bcma_bus *bus)
|
|
+{
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ /* Init CC core */
|
|
+ core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
|
|
+ if (core) {
|
|
+ bus->drv_cc.setup_done = false;
|
|
+ bcma_core_chipcommon_init(&bus->drv_cc);
|
|
+ }
|
|
+
|
|
+ list_for_each_entry(core, &bus->cores, list) {
|
|
+ struct device_driver *drv = core->dev.driver;
|
|
+ if (drv) {
|
|
+ struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);
|
|
+ if (adrv->resume)
|
|
+ adrv->resume(core);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
|
|
int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
|
|
{
|
|
@@ -217,6 +347,16 @@ static int bcma_device_remove(struct dev
|
|
return 0;
|
|
}
|
|
|
|
+static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
+{
|
|
+ struct bcma_device *core = container_of(dev, struct bcma_device, dev);
|
|
+
|
|
+ return add_uevent_var(env,
|
|
+ "MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X",
|
|
+ core->id.manuf, core->id.id,
|
|
+ core->id.rev, core->id.class);
|
|
+}
|
|
+
|
|
static int __init bcma_modinit(void)
|
|
{
|
|
int err;
|
|
--- a/drivers/bcma/scan.c
|
|
+++ b/drivers/bcma/scan.c
|
|
@@ -200,18 +200,174 @@ static s32 bcma_erom_get_addr_desc(struc
|
|
return addrl;
|
|
}
|
|
|
|
-int bcma_bus_scan(struct bcma_bus *bus)
|
|
+static struct bcma_device *bcma_find_core_by_index(struct bcma_bus *bus,
|
|
+ u16 index)
|
|
{
|
|
- u32 erombase;
|
|
- u32 __iomem *eromptr, *eromend;
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ list_for_each_entry(core, &bus->cores, list) {
|
|
+ if (core->core_index == index)
|
|
+ return core;
|
|
+ }
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+static struct bcma_device *bcma_find_core_reverse(struct bcma_bus *bus, u16 coreid)
|
|
+{
|
|
+ struct bcma_device *core;
|
|
+
|
|
+ list_for_each_entry_reverse(core, &bus->cores, list) {
|
|
+ if (core->id.id == coreid)
|
|
+ return core;
|
|
+ }
|
|
+ return NULL;
|
|
+}
|
|
|
|
+static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
|
|
+ struct bcma_device_id *match, int core_num,
|
|
+ struct bcma_device *core)
|
|
+{
|
|
+ s32 tmp;
|
|
+ u8 i, j;
|
|
s32 cia, cib;
|
|
u8 ports[2], wrappers[2];
|
|
|
|
+ /* get CIs */
|
|
+ cia = bcma_erom_get_ci(bus, eromptr);
|
|
+ if (cia < 0) {
|
|
+ bcma_erom_push_ent(eromptr);
|
|
+ if (bcma_erom_is_end(bus, eromptr))
|
|
+ return -ESPIPE;
|
|
+ return -EILSEQ;
|
|
+ }
|
|
+ cib = bcma_erom_get_ci(bus, eromptr);
|
|
+ if (cib < 0)
|
|
+ return -EILSEQ;
|
|
+
|
|
+ /* parse CIs */
|
|
+ core->id.class = (cia & SCAN_CIA_CLASS) >> SCAN_CIA_CLASS_SHIFT;
|
|
+ core->id.id = (cia & SCAN_CIA_ID) >> SCAN_CIA_ID_SHIFT;
|
|
+ core->id.manuf = (cia & SCAN_CIA_MANUF) >> SCAN_CIA_MANUF_SHIFT;
|
|
+ ports[0] = (cib & SCAN_CIB_NMP) >> SCAN_CIB_NMP_SHIFT;
|
|
+ ports[1] = (cib & SCAN_CIB_NSP) >> SCAN_CIB_NSP_SHIFT;
|
|
+ wrappers[0] = (cib & SCAN_CIB_NMW) >> SCAN_CIB_NMW_SHIFT;
|
|
+ wrappers[1] = (cib & SCAN_CIB_NSW) >> SCAN_CIB_NSW_SHIFT;
|
|
+ core->id.rev = (cib & SCAN_CIB_REV) >> SCAN_CIB_REV_SHIFT;
|
|
+
|
|
+ if (((core->id.manuf == BCMA_MANUF_ARM) &&
|
|
+ (core->id.id == 0xFFF)) ||
|
|
+ (ports[1] == 0)) {
|
|
+ bcma_erom_skip_component(bus, eromptr);
|
|
+ return -ENXIO;
|
|
+ }
|
|
+
|
|
+ /* check if component is a core at all */
|
|
+ if (wrappers[0] + wrappers[1] == 0) {
|
|
+ /* we could save addrl of the router
|
|
+ if (cid == BCMA_CORE_OOB_ROUTER)
|
|
+ */
|
|
+ bcma_erom_skip_component(bus, eromptr);
|
|
+ return -ENXIO;
|
|
+ }
|
|
+
|
|
+ if (bcma_erom_is_bridge(bus, eromptr)) {
|
|
+ bcma_erom_skip_component(bus, eromptr);
|
|
+ return -ENXIO;
|
|
+ }
|
|
+
|
|
+ if (bcma_find_core_by_index(bus, core_num)) {
|
|
+ bcma_erom_skip_component(bus, eromptr);
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
+ if (match && ((match->manuf != BCMA_ANY_MANUF &&
|
|
+ match->manuf != core->id.manuf) ||
|
|
+ (match->id != BCMA_ANY_ID && match->id != core->id.id) ||
|
|
+ (match->rev != BCMA_ANY_REV && match->rev != core->id.rev) ||
|
|
+ (match->class != BCMA_ANY_CLASS && match->class != core->id.class)
|
|
+ )) {
|
|
+ bcma_erom_skip_component(bus, eromptr);
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
+ /* get & parse master ports */
|
|
+ for (i = 0; i < ports[0]; i++) {
|
|
+ s32 mst_port_d = bcma_erom_get_mst_port(bus, eromptr);
|
|
+ if (mst_port_d < 0)
|
|
+ return -EILSEQ;
|
|
+ }
|
|
+
|
|
+ /* get & parse slave ports */
|
|
+ for (i = 0; i < ports[1]; i++) {
|
|
+ for (j = 0; ; j++) {
|
|
+ tmp = bcma_erom_get_addr_desc(bus, eromptr,
|
|
+ SCAN_ADDR_TYPE_SLAVE, i);
|
|
+ if (tmp < 0) {
|
|
+ /* no more entries for port _i_ */
|
|
+ /* pr_debug("erom: slave port %d "
|
|
+ * "has %d descriptors\n", i, j); */
|
|
+ break;
|
|
+ } else {
|
|
+ if (i == 0 && j == 0)
|
|
+ core->addr = tmp;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /* get & parse master wrappers */
|
|
+ for (i = 0; i < wrappers[0]; i++) {
|
|
+ for (j = 0; ; j++) {
|
|
+ tmp = bcma_erom_get_addr_desc(bus, eromptr,
|
|
+ SCAN_ADDR_TYPE_MWRAP, i);
|
|
+ if (tmp < 0) {
|
|
+ /* no more entries for port _i_ */
|
|
+ /* pr_debug("erom: master wrapper %d "
|
|
+ * "has %d descriptors\n", i, j); */
|
|
+ break;
|
|
+ } else {
|
|
+ if (i == 0 && j == 0)
|
|
+ core->wrap = tmp;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /* get & parse slave wrappers */
|
|
+ for (i = 0; i < wrappers[1]; i++) {
|
|
+ u8 hack = (ports[1] == 1) ? 0 : 1;
|
|
+ for (j = 0; ; j++) {
|
|
+ tmp = bcma_erom_get_addr_desc(bus, eromptr,
|
|
+ SCAN_ADDR_TYPE_SWRAP, i + hack);
|
|
+ if (tmp < 0) {
|
|
+ /* no more entries for port _i_ */
|
|
+ /* pr_debug("erom: master wrapper %d "
|
|
+ * has %d descriptors\n", i, j); */
|
|
+ break;
|
|
+ } else {
|
|
+ if (wrappers[0] == 0 && !i && !j)
|
|
+ core->wrap = tmp;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
|
|
+ core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
|
|
+ if (!core->io_addr)
|
|
+ return -ENOMEM;
|
|
+ core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
|
|
+ if (!core->io_wrap) {
|
|
+ iounmap(core->io_addr);
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+void bcma_init_bus(struct bcma_bus *bus)
|
|
+{
|
|
s32 tmp;
|
|
- u8 i, j;
|
|
+ struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
|
|
|
|
- int err;
|
|
+ if (bus->init_done)
|
|
+ return;
|
|
|
|
INIT_LIST_HEAD(&bus->cores);
|
|
bus->nr_cores = 0;
|
|
@@ -219,142 +375,133 @@ int bcma_bus_scan(struct bcma_bus *bus)
|
|
bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
|
|
|
|
tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
|
|
- bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
|
|
- bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
|
|
- bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
|
|
+ chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
|
|
+ chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
|
|
+ chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
|
|
+ pr_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
|
|
+ chipinfo->id, chipinfo->rev, chipinfo->pkg);
|
|
+
|
|
+ bus->init_done = true;
|
|
+}
|
|
+
|
|
+int bcma_bus_scan(struct bcma_bus *bus)
|
|
+{
|
|
+ u32 erombase;
|
|
+ u32 __iomem *eromptr, *eromend;
|
|
+
|
|
+ int err, core_num = 0;
|
|
+
|
|
+ bcma_init_bus(bus);
|
|
|
|
erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
|
|
- eromptr = bus->mmio;
|
|
+ if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
|
|
+ eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
|
|
+ if (!eromptr)
|
|
+ return -ENOMEM;
|
|
+ } else {
|
|
+ eromptr = bus->mmio;
|
|
+ }
|
|
+
|
|
eromend = eromptr + BCMA_CORE_SIZE / sizeof(u32);
|
|
|
|
bcma_scan_switch_core(bus, erombase);
|
|
|
|
while (eromptr < eromend) {
|
|
+ struct bcma_device *other_core;
|
|
struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
|
|
if (!core)
|
|
return -ENOMEM;
|
|
INIT_LIST_HEAD(&core->list);
|
|
core->bus = bus;
|
|
|
|
- /* get CIs */
|
|
- cia = bcma_erom_get_ci(bus, &eromptr);
|
|
- if (cia < 0) {
|
|
- bcma_erom_push_ent(&eromptr);
|
|
- if (bcma_erom_is_end(bus, &eromptr))
|
|
+ err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core);
|
|
+ if (err < 0) {
|
|
+ kfree(core);
|
|
+ if (err == -ENODEV) {
|
|
+ core_num++;
|
|
+ continue;
|
|
+ } else if (err == -ENXIO) {
|
|
+ continue;
|
|
+ } else if (err == -ESPIPE) {
|
|
break;
|
|
- err= -EILSEQ;
|
|
- goto out;
|
|
- }
|
|
- cib = bcma_erom_get_ci(bus, &eromptr);
|
|
- if (cib < 0) {
|
|
- err= -EILSEQ;
|
|
- goto out;
|
|
+ }
|
|
+ return err;
|
|
}
|
|
|
|
- /* parse CIs */
|
|
- core->id.class = (cia & SCAN_CIA_CLASS) >> SCAN_CIA_CLASS_SHIFT;
|
|
- core->id.id = (cia & SCAN_CIA_ID) >> SCAN_CIA_ID_SHIFT;
|
|
- core->id.manuf = (cia & SCAN_CIA_MANUF) >> SCAN_CIA_MANUF_SHIFT;
|
|
- ports[0] = (cib & SCAN_CIB_NMP) >> SCAN_CIB_NMP_SHIFT;
|
|
- ports[1] = (cib & SCAN_CIB_NSP) >> SCAN_CIB_NSP_SHIFT;
|
|
- wrappers[0] = (cib & SCAN_CIB_NMW) >> SCAN_CIB_NMW_SHIFT;
|
|
- wrappers[1] = (cib & SCAN_CIB_NSW) >> SCAN_CIB_NSW_SHIFT;
|
|
- core->id.rev = (cib & SCAN_CIB_REV) >> SCAN_CIB_REV_SHIFT;
|
|
-
|
|
- if (((core->id.manuf == BCMA_MANUF_ARM) &&
|
|
- (core->id.id == 0xFFF)) ||
|
|
- (ports[1] == 0)) {
|
|
- bcma_erom_skip_component(bus, &eromptr);
|
|
- continue;
|
|
- }
|
|
+ core->core_index = core_num++;
|
|
+ bus->nr_cores++;
|
|
+ other_core = bcma_find_core_reverse(bus, core->id.id);
|
|
+ core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
|
|
|
|
- /* check if component is a core at all */
|
|
- if (wrappers[0] + wrappers[1] == 0) {
|
|
- /* we could save addrl of the router
|
|
- if (cid == BCMA_CORE_OOB_ROUTER)
|
|
- */
|
|
- bcma_erom_skip_component(bus, &eromptr);
|
|
- continue;
|
|
- }
|
|
+ pr_info("Core %d found: %s "
|
|
+ "(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
|
|
+ core->core_index, bcma_device_name(&core->id),
|
|
+ core->id.manuf, core->id.id, core->id.rev,
|
|
+ core->id.class);
|
|
|
|
- if (bcma_erom_is_bridge(bus, &eromptr)) {
|
|
- bcma_erom_skip_component(bus, &eromptr);
|
|
- continue;
|
|
- }
|
|
+ list_add(&core->list, &bus->cores);
|
|
+ }
|
|
|
|
- /* get & parse master ports */
|
|
- for (i = 0; i < ports[0]; i++) {
|
|
- u32 mst_port_d = bcma_erom_get_mst_port(bus, &eromptr);
|
|
- if (mst_port_d < 0) {
|
|
- err= -EILSEQ;
|
|
- goto out;
|
|
- }
|
|
- }
|
|
+ if (bus->hosttype == BCMA_HOSTTYPE_SOC)
|
|
+ iounmap(eromptr);
|
|
|
|
- /* get & parse slave ports */
|
|
- for (i = 0; i < ports[1]; i++) {
|
|
- for (j = 0; ; j++) {
|
|
- tmp = bcma_erom_get_addr_desc(bus, &eromptr,
|
|
- SCAN_ADDR_TYPE_SLAVE, i);
|
|
- if (tmp < 0) {
|
|
- /* no more entries for port _i_ */
|
|
- /* pr_debug("erom: slave port %d "
|
|
- * "has %d descriptors\n", i, j); */
|
|
- break;
|
|
- } else {
|
|
- if (i == 0 && j == 0)
|
|
- core->addr = tmp;
|
|
- }
|
|
- }
|
|
- }
|
|
+ return 0;
|
|
+}
|
|
|
|
- /* get & parse master wrappers */
|
|
- for (i = 0; i < wrappers[0]; i++) {
|
|
- for (j = 0; ; j++) {
|
|
- tmp = bcma_erom_get_addr_desc(bus, &eromptr,
|
|
- SCAN_ADDR_TYPE_MWRAP, i);
|
|
- if (tmp < 0) {
|
|
- /* no more entries for port _i_ */
|
|
- /* pr_debug("erom: master wrapper %d "
|
|
- * "has %d descriptors\n", i, j); */
|
|
- break;
|
|
- } else {
|
|
- if (i == 0 && j == 0)
|
|
- core->wrap = tmp;
|
|
- }
|
|
- }
|
|
- }
|
|
+int __init bcma_bus_scan_early(struct bcma_bus *bus,
|
|
+ struct bcma_device_id *match,
|
|
+ struct bcma_device *core)
|
|
+{
|
|
+ u32 erombase;
|
|
+ u32 __iomem *eromptr, *eromend;
|
|
|
|
- /* get & parse slave wrappers */
|
|
- for (i = 0; i < wrappers[1]; i++) {
|
|
- u8 hack = (ports[1] == 1) ? 0 : 1;
|
|
- for (j = 0; ; j++) {
|
|
- tmp = bcma_erom_get_addr_desc(bus, &eromptr,
|
|
- SCAN_ADDR_TYPE_SWRAP, i + hack);
|
|
- if (tmp < 0) {
|
|
- /* no more entries for port _i_ */
|
|
- /* pr_debug("erom: master wrapper %d "
|
|
- * has %d descriptors\n", i, j); */
|
|
- break;
|
|
- } else {
|
|
- if (wrappers[0] == 0 && !i && !j)
|
|
- core->wrap = tmp;
|
|
- }
|
|
- }
|
|
- }
|
|
+ int err = -ENODEV;
|
|
+ int core_num = 0;
|
|
+
|
|
+ erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
|
|
+ if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
|
|
+ eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
|
|
+ if (!eromptr)
|
|
+ return -ENOMEM;
|
|
+ } else {
|
|
+ eromptr = bus->mmio;
|
|
+ }
|
|
|
|
+ eromend = eromptr + BCMA_CORE_SIZE / sizeof(u32);
|
|
+
|
|
+ bcma_scan_switch_core(bus, erombase);
|
|
+
|
|
+ while (eromptr < eromend) {
|
|
+ memset(core, 0, sizeof(*core));
|
|
+ INIT_LIST_HEAD(&core->list);
|
|
+ core->bus = bus;
|
|
+
|
|
+ err = bcma_get_next_core(bus, &eromptr, match, core_num, core);
|
|
+ if (err == -ENODEV) {
|
|
+ core_num++;
|
|
+ continue;
|
|
+ } else if (err == -ENXIO)
|
|
+ continue;
|
|
+ else if (err == -ESPIPE)
|
|
+ break;
|
|
+ else if (err < 0)
|
|
+ return err;
|
|
+
|
|
+ core->core_index = core_num++;
|
|
+ bus->nr_cores++;
|
|
pr_info("Core %d found: %s "
|
|
"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
|
|
- bus->nr_cores, bcma_device_name(&core->id),
|
|
+ core->core_index, bcma_device_name(&core->id),
|
|
core->id.manuf, core->id.id, core->id.rev,
|
|
core->id.class);
|
|
|
|
- core->core_index = bus->nr_cores++;
|
|
list_add(&core->list, &bus->cores);
|
|
- continue;
|
|
-out:
|
|
- return err;
|
|
+ err = 0;
|
|
+ break;
|
|
}
|
|
|
|
- return 0;
|
|
+ if (bus->hosttype == BCMA_HOSTTYPE_SOC)
|
|
+ iounmap(eromptr);
|
|
+
|
|
+ return err;
|
|
}
|
|
--- /dev/null
|
|
+++ b/drivers/bcma/sprom.c
|
|
@@ -0,0 +1,450 @@
|
|
+/*
|
|
+ * Broadcom specific AMBA
|
|
+ * SPROM reading
|
|
+ *
|
|
+ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
|
|
+ *
|
|
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
+ */
|
|
+
|
|
+#include "bcma_private.h"
|
|
+
|
|
+#include <linux/bcma/bcma.h>
|
|
+#include <linux/bcma/bcma_regs.h>
|
|
+#include <linux/pci.h>
|
|
+#include <linux/io.h>
|
|
+#include <linux/dma-mapping.h>
|
|
+#include <linux/slab.h>
|
|
+
|
|
+static int(*get_fallback_sprom)(struct bcma_bus *dev, struct ssb_sprom *out);
|
|
+
|
|
+/**
|
|
+ * bcma_arch_register_fallback_sprom - Registers a method providing a
|
|
+ * fallback SPROM if no SPROM is found.
|
|
+ *
|
|
+ * @sprom_callback: The callback function.
|
|
+ *
|
|
+ * With this function the architecture implementation may register a
|
|
+ * callback handler which fills the SPROM data structure. The fallback is
|
|
+ * used for PCI based BCMA devices, where no valid SPROM can be found
|
|
+ * in the shadow registers and to provide the SPROM for SoCs where BCMA is
|
|
+ * to controll the system bus.
|
|
+ *
|
|
+ * This function is useful for weird architectures that have a half-assed
|
|
+ * BCMA device hardwired to their PCI bus.
|
|
+ *
|
|
+ * This function is available for architecture code, only. So it is not
|
|
+ * exported.
|
|
+ */
|
|
+int bcma_arch_register_fallback_sprom(int (*sprom_callback)(struct bcma_bus *bus,
|
|
+ struct ssb_sprom *out))
|
|
+{
|
|
+ if (get_fallback_sprom)
|
|
+ return -EEXIST;
|
|
+ get_fallback_sprom = sprom_callback;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
|
|
+ struct ssb_sprom *out)
|
|
+{
|
|
+ int err;
|
|
+
|
|
+ if (!get_fallback_sprom) {
|
|
+ err = -ENOENT;
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ err = get_fallback_sprom(bus, out);
|
|
+ if (err)
|
|
+ goto fail;
|
|
+
|
|
+ pr_debug("Using SPROM revision %d provided by"
|
|
+ " platform.\n", bus->sprom.revision);
|
|
+ return 0;
|
|
+fail:
|
|
+ pr_warn("Using fallback SPROM failed (err %d)\n", err);
|
|
+ return err;
|
|
+}
|
|
+
|
|
+/**************************************************
|
|
+ * R/W ops.
|
|
+ **************************************************/
|
|
+
|
|
+static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom)
|
|
+{
|
|
+ int i;
|
|
+ for (i = 0; i < SSB_SPROMSIZE_WORDS_R4; i++)
|
|
+ sprom[i] = bcma_read16(bus->drv_cc.core,
|
|
+ offset + (i * 2));
|
|
+}
|
|
+
|
|
+/**************************************************
|
|
+ * Validation.
|
|
+ **************************************************/
|
|
+
|
|
+static inline u8 bcma_crc8(u8 crc, u8 data)
|
|
+{
|
|
+ /* Polynomial: x^8 + x^7 + x^6 + x^4 + x^2 + 1 */
|
|
+ static const u8 t[] = {
|
|
+ 0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
|
|
+ 0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
|
|
+ 0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
|
|
+ 0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
|
|
+ 0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
|
|
+ 0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
|
|
+ 0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
|
|
+ 0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
|
|
+ 0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
|
|
+ 0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
|
|
+ 0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
|
|
+ 0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
|
|
+ 0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
|
|
+ 0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
|
|
+ 0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
|
|
+ 0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
|
|
+ 0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
|
|
+ 0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
|
|
+ 0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
|
|
+ 0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
|
|
+ 0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
|
|
+ 0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
|
|
+ 0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
|
|
+ 0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
|
|
+ 0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
|
|
+ 0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
|
|
+ 0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
|
|
+ 0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
|
|
+ 0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
|
|
+ 0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
|
|
+ 0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
|
|
+ 0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F,
|
|
+ };
|
|
+ return t[crc ^ data];
|
|
+}
|
|
+
|
|
+static u8 bcma_sprom_crc(const u16 *sprom)
|
|
+{
|
|
+ int word;
|
|
+ u8 crc = 0xFF;
|
|
+
|
|
+ for (word = 0; word < SSB_SPROMSIZE_WORDS_R4 - 1; word++) {
|
|
+ crc = bcma_crc8(crc, sprom[word] & 0x00FF);
|
|
+ crc = bcma_crc8(crc, (sprom[word] & 0xFF00) >> 8);
|
|
+ }
|
|
+ crc = bcma_crc8(crc, sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & 0x00FF);
|
|
+ crc ^= 0xFF;
|
|
+
|
|
+ return crc;
|
|
+}
|
|
+
|
|
+static int bcma_sprom_check_crc(const u16 *sprom)
|
|
+{
|
|
+ u8 crc;
|
|
+ u8 expected_crc;
|
|
+ u16 tmp;
|
|
+
|
|
+ crc = bcma_sprom_crc(sprom);
|
|
+ tmp = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_CRC;
|
|
+ expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT;
|
|
+ if (crc != expected_crc)
|
|
+ return -EPROTO;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int bcma_sprom_valid(const u16 *sprom)
|
|
+{
|
|
+ u16 revision;
|
|
+ int err;
|
|
+
|
|
+ err = bcma_sprom_check_crc(sprom);
|
|
+ if (err)
|
|
+ return err;
|
|
+
|
|
+ revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_REV;
|
|
+ if (revision != 8 && revision != 9) {
|
|
+ pr_err("Unsupported SPROM revision: %d\n", revision);
|
|
+ return -ENOENT;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/**************************************************
|
|
+ * SPROM extraction.
|
|
+ **************************************************/
|
|
+
|
|
+#define SPOFF(offset) ((offset) / sizeof(u16))
|
|
+
|
|
+#define SPEX(_field, _offset, _mask, _shift) \
|
|
+ bus->sprom._field = ((sprom[SPOFF(_offset)] & (_mask)) >> (_shift))
|
|
+
|
|
+static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
|
|
+{
|
|
+ u16 v, o;
|
|
+ int i;
|
|
+ u16 pwr_info_offset[] = {
|
|
+ SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
|
|
+ SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
|
|
+ };
|
|
+ BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
|
|
+ ARRAY_SIZE(bus->sprom.core_pwr_info));
|
|
+
|
|
+ bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &
|
|
+ SSB_SPROM_REVISION_REV;
|
|
+
|
|
+ for (i = 0; i < 3; i++) {
|
|
+ v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
|
|
+ *(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
|
|
+ }
|
|
+
|
|
+ SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
|
|
+
|
|
+ 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);
|
|
+
|
|
+ SPEX(boardflags_lo, SSB_SPROM8_BFLLO, ~0, 0);
|
|
+ SPEX(boardflags_hi, SSB_SPROM8_BFLHI, ~0, 0);
|
|
+ SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);
|
|
+ SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);
|
|
+
|
|
+ SPEX(country_code, SSB_SPROM8_CCODE, ~0, 0);
|
|
+
|
|
+ /* Extract cores power info info */
|
|
+ for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
|
|
+ o = pwr_info_offset[i];
|
|
+ SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_2G_MAXP, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
|
|
+
|
|
+ SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
|
|
+ SSB_SPROM8_5G_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
|
|
+ SSB_SPROM8_5GH_MAXP, 0);
|
|
+ SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
|
|
+ SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
|
|
+
|
|
+ SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
|
|
+ SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
|
|
+ }
|
|
+
|
|
+ SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TSSIPOS,
|
|
+ SSB_SROM8_FEM_TSSIPOS_SHIFT);
|
|
+ SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_EXTPA_GAIN,
|
|
+ SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
|
|
+ SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_PDET_RANGE,
|
|
+ SSB_SROM8_FEM_PDET_RANGE_SHIFT);
|
|
+ SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TR_ISO,
|
|
+ SSB_SROM8_FEM_TR_ISO_SHIFT);
|
|
+ SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_ANTSWLUT,
|
|
+ SSB_SROM8_FEM_ANTSWLUT_SHIFT);
|
|
+
|
|
+ SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TSSIPOS,
|
|
+ SSB_SROM8_FEM_TSSIPOS_SHIFT);
|
|
+ SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_EXTPA_GAIN,
|
|
+ SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
|
|
+ SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_PDET_RANGE,
|
|
+ SSB_SROM8_FEM_PDET_RANGE_SHIFT);
|
|
+ SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TR_ISO,
|
|
+ SSB_SROM8_FEM_TR_ISO_SHIFT);
|
|
+ SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_ANTSWLUT,
|
|
+ SSB_SROM8_FEM_ANTSWLUT_SHIFT);
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Indicates the presence of external SPROM.
|
|
+ */
|
|
+static bool bcma_sprom_ext_available(struct bcma_bus *bus)
|
|
+{
|
|
+ u32 chip_status;
|
|
+ u32 srom_control;
|
|
+ u32 present_mask;
|
|
+
|
|
+ if (bus->drv_cc.core->id.rev >= 31) {
|
|
+ if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
|
|
+ return false;
|
|
+
|
|
+ srom_control = bcma_read32(bus->drv_cc.core,
|
|
+ BCMA_CC_SROM_CONTROL);
|
|
+ return srom_control & BCMA_CC_SROM_CONTROL_PRESENT;
|
|
+ }
|
|
+
|
|
+ /* older chipcommon revisions use chip status register */
|
|
+ chip_status = bcma_read32(bus->drv_cc.core, BCMA_CC_CHIPSTAT);
|
|
+ switch (bus->chipinfo.id) {
|
|
+ case 0x4313:
|
|
+ present_mask = BCMA_CC_CHIPST_4313_SPROM_PRESENT;
|
|
+ break;
|
|
+
|
|
+ case 0x4331:
|
|
+ present_mask = BCMA_CC_CHIPST_4331_SPROM_PRESENT;
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return chip_status & present_mask;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Indicates that on-chip OTP memory is present and enabled.
|
|
+ */
|
|
+static bool bcma_sprom_onchip_available(struct bcma_bus *bus)
|
|
+{
|
|
+ u32 chip_status;
|
|
+ u32 otpsize = 0;
|
|
+ bool present;
|
|
+
|
|
+ chip_status = bcma_read32(bus->drv_cc.core, BCMA_CC_CHIPSTAT);
|
|
+ switch (bus->chipinfo.id) {
|
|
+ case 0x4313:
|
|
+ present = chip_status & BCMA_CC_CHIPST_4313_OTP_PRESENT;
|
|
+ break;
|
|
+
|
|
+ case 0x4331:
|
|
+ present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT;
|
|
+ break;
|
|
+
|
|
+ case 43224:
|
|
+ case 43225:
|
|
+ /* for these chips OTP is always available */
|
|
+ present = true;
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ present = false;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (present) {
|
|
+ otpsize = bus->drv_cc.capabilities & BCMA_CC_CAP_OTPS;
|
|
+ otpsize >>= BCMA_CC_CAP_OTPS_SHIFT;
|
|
+ }
|
|
+
|
|
+ return otpsize != 0;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Verify OTP is filled and determine the byte
|
|
+ * offset where SPROM data is located.
|
|
+ *
|
|
+ * On error, returns 0; byte offset otherwise.
|
|
+ */
|
|
+static int bcma_sprom_onchip_offset(struct bcma_bus *bus)
|
|
+{
|
|
+ struct bcma_device *cc = bus->drv_cc.core;
|
|
+ u32 offset;
|
|
+
|
|
+ /* verify OTP status */
|
|
+ if ((bcma_read32(cc, BCMA_CC_OTPS) & BCMA_CC_OTPS_GU_PROG_HW) == 0)
|
|
+ return 0;
|
|
+
|
|
+ /* obtain bit offset from otplayout register */
|
|
+ offset = (bcma_read32(cc, BCMA_CC_OTPL) & BCMA_CC_OTPL_GURGN_OFFSET);
|
|
+ return BCMA_CC_SPROM + (offset >> 3);
|
|
+}
|
|
+
|
|
+int bcma_sprom_get(struct bcma_bus *bus)
|
|
+{
|
|
+ u16 offset = BCMA_CC_SPROM;
|
|
+ u16 *sprom;
|
|
+ int err = 0;
|
|
+
|
|
+ if (!bus->drv_cc.core)
|
|
+ return -EOPNOTSUPP;
|
|
+
|
|
+ if (!bcma_sprom_ext_available(bus)) {
|
|
+ /*
|
|
+ * External SPROM takes precedence so check
|
|
+ * on-chip OTP only when no external SPROM
|
|
+ * is present.
|
|
+ */
|
|
+ if (bcma_sprom_onchip_available(bus)) {
|
|
+ /* determine offset */
|
|
+ offset = bcma_sprom_onchip_offset(bus);
|
|
+ }
|
|
+ if (!offset) {
|
|
+ /*
|
|
+ * Maybe there is no SPROM on the device?
|
|
+ * Now we ask the arch code if there is some sprom
|
|
+ * available for this device in some other storage.
|
|
+ */
|
|
+ err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
|
|
+ return err;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
|
|
+ GFP_KERNEL);
|
|
+ if (!sprom)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ if (bus->chipinfo.id == 0x4331)
|
|
+ bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
|
|
+
|
|
+ pr_debug("SPROM offset 0x%x\n", offset);
|
|
+ bcma_sprom_read(bus, offset, sprom);
|
|
+
|
|
+ if (bus->chipinfo.id == 0x4331)
|
|
+ bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
|
|
+
|
|
+ err = bcma_sprom_valid(sprom);
|
|
+ if (err)
|
|
+ goto out;
|
|
+
|
|
+ bcma_sprom_extract_r8(bus, sprom);
|
|
+
|
|
+out:
|
|
+ kfree(sprom);
|
|
+ return err;
|
|
+}
|
|
--- a/include/linux/bcma/bcma.h
|
|
+++ b/include/linux/bcma/bcma.h
|
|
@@ -6,6 +6,8 @@
|
|
|
|
#include <linux/bcma/bcma_driver_chipcommon.h>
|
|
#include <linux/bcma/bcma_driver_pci.h>
|
|
+#include <linux/bcma/bcma_driver_mips.h>
|
|
+#include <linux/ssb/ssb.h> /* SPROM sharing */
|
|
|
|
#include "bcma_regs.h"
|
|
|
|
@@ -13,9 +15,9 @@ struct bcma_device;
|
|
struct bcma_bus;
|
|
|
|
enum bcma_hosttype {
|
|
- BCMA_HOSTTYPE_NONE,
|
|
BCMA_HOSTTYPE_PCI,
|
|
BCMA_HOSTTYPE_SDIO,
|
|
+ BCMA_HOSTTYPE_SOC,
|
|
};
|
|
|
|
struct bcma_chipinfo {
|
|
@@ -24,6 +26,11 @@ struct bcma_chipinfo {
|
|
u8 pkg;
|
|
};
|
|
|
|
+enum bcma_clkmode {
|
|
+ BCMA_CLKMODE_FAST,
|
|
+ BCMA_CLKMODE_DYNAMIC,
|
|
+};
|
|
+
|
|
struct bcma_host_ops {
|
|
u8 (*read8)(struct bcma_device *core, u16 offset);
|
|
u16 (*read16)(struct bcma_device *core, u16 offset);
|
|
@@ -31,6 +38,12 @@ struct bcma_host_ops {
|
|
void (*write8)(struct bcma_device *core, u16 offset, u8 value);
|
|
void (*write16)(struct bcma_device *core, u16 offset, u16 value);
|
|
void (*write32)(struct bcma_device *core, u16 offset, u32 value);
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+ void (*block_read)(struct bcma_device *core, void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width);
|
|
+ void (*block_write)(struct bcma_device *core, const void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width);
|
|
+#endif
|
|
/* Agent ops */
|
|
u32 (*aread32)(struct bcma_device *core, u16 offset);
|
|
void (*awrite32)(struct bcma_device *core, u16 offset, u32 value);
|
|
@@ -117,13 +130,20 @@ struct bcma_device {
|
|
struct bcma_device_id id;
|
|
|
|
struct device dev;
|
|
+ struct device *dma_dev;
|
|
+
|
|
+ unsigned int irq;
|
|
bool dev_registered;
|
|
|
|
u8 core_index;
|
|
+ u8 core_unit;
|
|
|
|
u32 addr;
|
|
u32 wrap;
|
|
|
|
+ void __iomem *io_addr;
|
|
+ void __iomem *io_wrap;
|
|
+
|
|
void *drvdata;
|
|
struct list_head list;
|
|
};
|
|
@@ -143,7 +163,7 @@ struct bcma_driver {
|
|
|
|
int (*probe)(struct bcma_device *dev);
|
|
void (*remove)(struct bcma_device *dev);
|
|
- int (*suspend)(struct bcma_device *dev, pm_message_t state);
|
|
+ int (*suspend)(struct bcma_device *dev);
|
|
int (*resume)(struct bcma_device *dev);
|
|
void (*shutdown)(struct bcma_device *dev);
|
|
|
|
@@ -151,12 +171,17 @@ struct bcma_driver {
|
|
};
|
|
extern
|
|
int __bcma_driver_register(struct bcma_driver *drv, struct module *owner);
|
|
-static inline int bcma_driver_register(struct bcma_driver *drv)
|
|
-{
|
|
- return __bcma_driver_register(drv, THIS_MODULE);
|
|
-}
|
|
+#define bcma_driver_register(drv) \
|
|
+ __bcma_driver_register(drv, THIS_MODULE)
|
|
+
|
|
extern void bcma_driver_unregister(struct bcma_driver *drv);
|
|
|
|
+/* Set a fallback SPROM.
|
|
+ * See kdoc at the function definition for complete documentation. */
|
|
+extern int bcma_arch_register_fallback_sprom(
|
|
+ int (*sprom_callback)(struct bcma_bus *bus,
|
|
+ struct ssb_sprom *out));
|
|
+
|
|
struct bcma_bus {
|
|
/* The MMIO area. */
|
|
void __iomem *mmio;
|
|
@@ -176,49 +201,107 @@ struct bcma_bus {
|
|
struct bcma_device *mapped_core;
|
|
struct list_head cores;
|
|
u8 nr_cores;
|
|
+ u8 init_done:1;
|
|
+ u8 num;
|
|
|
|
struct bcma_drv_cc drv_cc;
|
|
struct bcma_drv_pci drv_pci;
|
|
+ struct bcma_drv_mips drv_mips;
|
|
+
|
|
+ /* We decided to share SPROM struct with SSB as long as we do not need
|
|
+ * any hacks for BCMA. This simplifies drivers code. */
|
|
+ struct ssb_sprom sprom;
|
|
};
|
|
|
|
-extern inline u32 bcma_read8(struct bcma_device *core, u16 offset)
|
|
+static inline u32 bcma_read8(struct bcma_device *core, u16 offset)
|
|
{
|
|
return core->bus->ops->read8(core, offset);
|
|
}
|
|
-extern inline u32 bcma_read16(struct bcma_device *core, u16 offset)
|
|
+static inline u32 bcma_read16(struct bcma_device *core, u16 offset)
|
|
{
|
|
return core->bus->ops->read16(core, offset);
|
|
}
|
|
-extern inline u32 bcma_read32(struct bcma_device *core, u16 offset)
|
|
+static inline u32 bcma_read32(struct bcma_device *core, u16 offset)
|
|
{
|
|
return core->bus->ops->read32(core, offset);
|
|
}
|
|
-extern inline
|
|
+static inline
|
|
void bcma_write8(struct bcma_device *core, u16 offset, u32 value)
|
|
{
|
|
core->bus->ops->write8(core, offset, value);
|
|
}
|
|
-extern inline
|
|
+static inline
|
|
void bcma_write16(struct bcma_device *core, u16 offset, u32 value)
|
|
{
|
|
core->bus->ops->write16(core, offset, value);
|
|
}
|
|
-extern inline
|
|
+static inline
|
|
void bcma_write32(struct bcma_device *core, u16 offset, u32 value)
|
|
{
|
|
core->bus->ops->write32(core, offset, value);
|
|
}
|
|
-extern inline u32 bcma_aread32(struct bcma_device *core, u16 offset)
|
|
+#ifdef CONFIG_BCMA_BLOCKIO
|
|
+static inline void bcma_block_read(struct bcma_device *core, void *buffer,
|
|
+ size_t count, u16 offset, u8 reg_width)
|
|
+{
|
|
+ core->bus->ops->block_read(core, buffer, count, offset, reg_width);
|
|
+}
|
|
+static inline void bcma_block_write(struct bcma_device *core,
|
|
+ const void *buffer, size_t count,
|
|
+ u16 offset, u8 reg_width)
|
|
+{
|
|
+ core->bus->ops->block_write(core, buffer, count, offset, reg_width);
|
|
+}
|
|
+#endif
|
|
+static inline u32 bcma_aread32(struct bcma_device *core, u16 offset)
|
|
{
|
|
return core->bus->ops->aread32(core, offset);
|
|
}
|
|
-extern inline
|
|
+static inline
|
|
void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
|
|
{
|
|
core->bus->ops->awrite32(core, offset, value);
|
|
}
|
|
|
|
+static inline void bcma_mask32(struct bcma_device *cc, u16 offset, u32 mask)
|
|
+{
|
|
+ bcma_write32(cc, offset, bcma_read32(cc, offset) & mask);
|
|
+}
|
|
+static inline void bcma_set32(struct bcma_device *cc, u16 offset, u32 set)
|
|
+{
|
|
+ bcma_write32(cc, offset, bcma_read32(cc, offset) | set);
|
|
+}
|
|
+static inline void bcma_maskset32(struct bcma_device *cc,
|
|
+ u16 offset, u32 mask, u32 set)
|
|
+{
|
|
+ bcma_write32(cc, offset, (bcma_read32(cc, offset) & mask) | set);
|
|
+}
|
|
+static inline void bcma_mask16(struct bcma_device *cc, u16 offset, u16 mask)
|
|
+{
|
|
+ bcma_write16(cc, offset, bcma_read16(cc, offset) & mask);
|
|
+}
|
|
+static inline void bcma_set16(struct bcma_device *cc, u16 offset, u16 set)
|
|
+{
|
|
+ bcma_write16(cc, offset, bcma_read16(cc, offset) | set);
|
|
+}
|
|
+static inline void bcma_maskset16(struct bcma_device *cc,
|
|
+ u16 offset, u16 mask, u16 set)
|
|
+{
|
|
+ bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);
|
|
+}
|
|
+
|
|
+extern struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid);
|
|
extern bool bcma_core_is_enabled(struct bcma_device *core);
|
|
+extern void bcma_core_disable(struct bcma_device *core, u32 flags);
|
|
extern int bcma_core_enable(struct bcma_device *core, u32 flags);
|
|
+extern void bcma_core_set_clockmode(struct bcma_device *core,
|
|
+ enum bcma_clkmode clkmode);
|
|
+extern void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status,
|
|
+ bool on);
|
|
+#define BCMA_DMA_TRANSLATION_MASK 0xC0000000
|
|
+#define BCMA_DMA_TRANSLATION_NONE 0x00000000
|
|
+#define BCMA_DMA_TRANSLATION_DMA32_CMT 0x40000000 /* Client Mode Translation for 32-bit DMA */
|
|
+#define BCMA_DMA_TRANSLATION_DMA64_CMT 0x80000000 /* Client Mode Translation for 64-bit DMA */
|
|
+extern u32 bcma_core_dma_translation(struct bcma_device *core);
|
|
|
|
#endif /* LINUX_BCMA_H_ */
|
|
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
|
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
|
@@ -24,6 +24,7 @@
|
|
#define BCMA_CC_FLASHT_NONE 0x00000000 /* No flash */
|
|
#define BCMA_CC_FLASHT_STSER 0x00000100 /* ST serial flash */
|
|
#define BCMA_CC_FLASHT_ATSER 0x00000200 /* Atmel serial flash */
|
|
+#define BCMA_CC_FLASHT_NFLASH 0x00000200
|
|
#define BCMA_CC_FLASHT_PARA 0x00000700 /* Parallel flash */
|
|
#define BCMA_CC_CAP_PLLT 0x00038000 /* PLL Type */
|
|
#define BCMA_PLLTYPE_NONE 0x00000000
|
|
@@ -55,6 +56,9 @@
|
|
#define BCMA_CC_OTPS_HW_PROTECT 0x00000001
|
|
#define BCMA_CC_OTPS_SW_PROTECT 0x00000002
|
|
#define BCMA_CC_OTPS_CID_PROTECT 0x00000004
|
|
+#define BCMA_CC_OTPS_GU_PROG_IND 0x00000F00 /* General Use programmed indication */
|
|
+#define BCMA_CC_OTPS_GU_PROG_IND_SHIFT 8
|
|
+#define BCMA_CC_OTPS_GU_PROG_HW 0x00000100 /* HW region programmed */
|
|
#define BCMA_CC_OTPC 0x0014 /* OTP control */
|
|
#define BCMA_CC_OTPC_RECWAIT 0xFF000000
|
|
#define BCMA_CC_OTPC_PROGWAIT 0x00FFFF00
|
|
@@ -71,6 +75,8 @@
|
|
#define BCMA_CC_OTPP_READ 0x40000000
|
|
#define BCMA_CC_OTPP_START 0x80000000
|
|
#define BCMA_CC_OTPP_BUSY 0x80000000
|
|
+#define BCMA_CC_OTPL 0x001C /* OTP layout */
|
|
+#define BCMA_CC_OTPL_GURGN_OFFSET 0x00000FFF /* offset of general use region */
|
|
#define BCMA_CC_IRQSTAT 0x0020
|
|
#define BCMA_CC_IRQMASK 0x0024
|
|
#define BCMA_CC_IRQ_GPIO 0x00000001 /* gpio intr */
|
|
@@ -78,6 +84,10 @@
|
|
#define BCMA_CC_IRQ_WDRESET 0x80000000 /* watchdog reset occurred */
|
|
#define BCMA_CC_CHIPCTL 0x0028 /* Rev >= 11 only */
|
|
#define BCMA_CC_CHIPSTAT 0x002C /* Rev >= 11 only */
|
|
+#define BCMA_CC_CHIPST_4313_SPROM_PRESENT 1
|
|
+#define BCMA_CC_CHIPST_4313_OTP_PRESENT 2
|
|
+#define BCMA_CC_CHIPST_4331_SPROM_PRESENT 2
|
|
+#define BCMA_CC_CHIPST_4331_OTP_PRESENT 4
|
|
#define BCMA_CC_JCMD 0x0030 /* Rev >= 10 only */
|
|
#define BCMA_CC_JCMD_START 0x80000000
|
|
#define BCMA_CC_JCMD_BUSY 0x80000000
|
|
@@ -178,16 +188,25 @@
|
|
#define BCMA_CC_PROG_CFG 0x0120
|
|
#define BCMA_CC_PROG_WAITCNT 0x0124
|
|
#define BCMA_CC_FLASH_CFG 0x0128
|
|
+#define BCMA_CC_FLASH_CFG_DS 0x0010 /* Data size, 0=8bit, 1=16bit */
|
|
#define BCMA_CC_FLASH_WAITCNT 0x012C
|
|
-#define BCMA_CC_CLKCTLST 0x01E0 /* Clock control and status (rev >= 20) */
|
|
-#define BCMA_CC_CLKCTLST_FORCEALP 0x00000001 /* Force ALP request */
|
|
-#define BCMA_CC_CLKCTLST_FORCEHT 0x00000002 /* Force HT request */
|
|
-#define BCMA_CC_CLKCTLST_FORCEILP 0x00000004 /* Force ILP request */
|
|
-#define BCMA_CC_CLKCTLST_HAVEALPREQ 0x00000008 /* ALP available request */
|
|
-#define BCMA_CC_CLKCTLST_HAVEHTREQ 0x00000010 /* HT available request */
|
|
-#define BCMA_CC_CLKCTLST_HWCROFF 0x00000020 /* Force HW clock request off */
|
|
-#define BCMA_CC_CLKCTLST_HAVEHT 0x00010000 /* HT available */
|
|
-#define BCMA_CC_CLKCTLST_HAVEALP 0x00020000 /* APL available */
|
|
+#define BCMA_CC_SROM_CONTROL 0x0190
|
|
+#define BCMA_CC_SROM_CONTROL_START 0x80000000
|
|
+#define BCMA_CC_SROM_CONTROL_BUSY 0x80000000
|
|
+#define BCMA_CC_SROM_CONTROL_OPCODE 0x60000000
|
|
+#define BCMA_CC_SROM_CONTROL_OP_READ 0x00000000
|
|
+#define BCMA_CC_SROM_CONTROL_OP_WRITE 0x20000000
|
|
+#define BCMA_CC_SROM_CONTROL_OP_WRDIS 0x40000000
|
|
+#define BCMA_CC_SROM_CONTROL_OP_WREN 0x60000000
|
|
+#define BCMA_CC_SROM_CONTROL_OTPSEL 0x00000010
|
|
+#define BCMA_CC_SROM_CONTROL_LOCK 0x00000008
|
|
+#define BCMA_CC_SROM_CONTROL_SIZE_MASK 0x00000006
|
|
+#define BCMA_CC_SROM_CONTROL_SIZE_1K 0x00000000
|
|
+#define BCMA_CC_SROM_CONTROL_SIZE_4K 0x00000002
|
|
+#define BCMA_CC_SROM_CONTROL_SIZE_16K 0x00000004
|
|
+#define BCMA_CC_SROM_CONTROL_SIZE_SHIFT 1
|
|
+#define BCMA_CC_SROM_CONTROL_PRESENT 0x00000001
|
|
+/* 0x1E0 is defined as shared BCMA_CLKCTLST */
|
|
#define BCMA_CC_HW_WORKAROUND 0x01E4 /* Hardware workaround (rev >= 20) */
|
|
#define BCMA_CC_UART0_DATA 0x0300
|
|
#define BCMA_CC_UART0_IMR 0x0304
|
|
@@ -209,6 +228,7 @@
|
|
#define BCMA_CC_PMU_CTL 0x0600 /* PMU control */
|
|
#define BCMA_CC_PMU_CTL_ILP_DIV 0xFFFF0000 /* ILP div mask */
|
|
#define BCMA_CC_PMU_CTL_ILP_DIV_SHIFT 16
|
|
+#define BCMA_CC_PMU_CTL_PLL_UPD 0x00000400
|
|
#define BCMA_CC_PMU_CTL_NOILPONW 0x00000200 /* No ILP on wait */
|
|
#define BCMA_CC_PMU_CTL_HTREQEN 0x00000100 /* HT req enable */
|
|
#define BCMA_CC_PMU_CTL_ALPREQEN 0x00000080 /* ALP req enable */
|
|
@@ -244,6 +264,65 @@
|
|
#define BCMA_CC_REGCTL_DATA 0x065C
|
|
#define BCMA_CC_PLLCTL_ADDR 0x0660
|
|
#define BCMA_CC_PLLCTL_DATA 0x0664
|
|
+#define BCMA_CC_SPROM 0x0800 /* SPROM beginning */
|
|
+
|
|
+/* Divider allocation in 4716/47162/5356 */
|
|
+#define BCMA_CC_PMU5_MAINPLL_CPU 1
|
|
+#define BCMA_CC_PMU5_MAINPLL_MEM 2
|
|
+#define BCMA_CC_PMU5_MAINPLL_SSB 3
|
|
+
|
|
+/* PLL usage in 4716/47162 */
|
|
+#define BCMA_CC_PMU4716_MAINPLL_PLL0 12
|
|
+
|
|
+/* PLL usage in 5356/5357 */
|
|
+#define BCMA_CC_PMU5356_MAINPLL_PLL0 0
|
|
+#define BCMA_CC_PMU5357_MAINPLL_PLL0 0
|
|
+
|
|
+/* 4706 PMU */
|
|
+#define BCMA_CC_PMU4706_MAINPLL_PLL0 0
|
|
+
|
|
+/* ALP clock on pre-PMU chips */
|
|
+#define BCMA_CC_PMU_ALP_CLOCK 20000000
|
|
+/* HT clock for systems with PMU-enabled chipcommon */
|
|
+#define BCMA_CC_PMU_HT_CLOCK 80000000
|
|
+
|
|
+/* PMU rev 5 (& 6) */
|
|
+#define BCMA_CC_PPL_P1P2_OFF 0
|
|
+#define BCMA_CC_PPL_P1_MASK 0x0f000000
|
|
+#define BCMA_CC_PPL_P1_SHIFT 24
|
|
+#define BCMA_CC_PPL_P2_MASK 0x00f00000
|
|
+#define BCMA_CC_PPL_P2_SHIFT 20
|
|
+#define BCMA_CC_PPL_M14_OFF 1
|
|
+#define BCMA_CC_PPL_MDIV_MASK 0x000000ff
|
|
+#define BCMA_CC_PPL_MDIV_WIDTH 8
|
|
+#define BCMA_CC_PPL_NM5_OFF 2
|
|
+#define BCMA_CC_PPL_NDIV_MASK 0xfff00000
|
|
+#define BCMA_CC_PPL_NDIV_SHIFT 20
|
|
+#define BCMA_CC_PPL_FMAB_OFF 3
|
|
+#define BCMA_CC_PPL_MRAT_MASK 0xf0000000
|
|
+#define BCMA_CC_PPL_MRAT_SHIFT 28
|
|
+#define BCMA_CC_PPL_ABRAT_MASK 0x08000000
|
|
+#define BCMA_CC_PPL_ABRAT_SHIFT 27
|
|
+#define BCMA_CC_PPL_FDIV_MASK 0x07ffffff
|
|
+#define BCMA_CC_PPL_PLLCTL_OFF 4
|
|
+#define BCMA_CC_PPL_PCHI_OFF 5
|
|
+#define BCMA_CC_PPL_PCHI_MASK 0x0000003f
|
|
+
|
|
+/* BCM4331 ChipControl numbers. */
|
|
+#define BCMA_CHIPCTL_4331_BT_COEXIST BIT(0) /* 0 disable */
|
|
+#define BCMA_CHIPCTL_4331_SECI BIT(1) /* 0 SECI is disabled (JATG functional) */
|
|
+#define BCMA_CHIPCTL_4331_EXT_LNA BIT(2) /* 0 disable */
|
|
+#define BCMA_CHIPCTL_4331_SPROM_GPIO13_15 BIT(3) /* sprom/gpio13-15 mux */
|
|
+#define BCMA_CHIPCTL_4331_EXTPA_EN BIT(4) /* 0 ext pa disable, 1 ext pa enabled */
|
|
+#define BCMA_CHIPCTL_4331_GPIOCLK_ON_SPROMCS BIT(5) /* set drive out GPIO_CLK on sprom_cs pin */
|
|
+#define BCMA_CHIPCTL_4331_PCIE_MDIO_ON_SPROMCS BIT(6) /* use sprom_cs pin as PCIE mdio interface */
|
|
+#define BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5 BIT(7) /* aband extpa will be at gpio2/5 and sprom_dout */
|
|
+#define BCMA_CHIPCTL_4331_OVR_PIPEAUXCLKEN BIT(8) /* override core control on pipe_AuxClkEnable */
|
|
+#define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN BIT(9) /* override core control on pipe_AuxPowerDown */
|
|
+#define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN BIT(10) /* pcie_auxclkenable */
|
|
+#define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN BIT(11) /* pcie_pipe_pllpowerdown */
|
|
+#define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4 BIT(16) /* enable bt_shd0 at gpio4 */
|
|
+#define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5 BIT(17) /* enable bt_shd1 at gpio5 */
|
|
|
|
/* Data for the PMU, if available.
|
|
* Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
|
|
@@ -253,14 +332,37 @@ struct bcma_chipcommon_pmu {
|
|
u32 crystalfreq; /* The active crystal frequency (in kHz) */
|
|
};
|
|
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
+struct bcma_pflash {
|
|
+ u8 buswidth;
|
|
+ u32 window;
|
|
+ u32 window_size;
|
|
+};
|
|
+
|
|
+struct bcma_serial_port {
|
|
+ void *regs;
|
|
+ unsigned long clockspeed;
|
|
+ unsigned int irq;
|
|
+ unsigned int baud_base;
|
|
+ unsigned int reg_shift;
|
|
+};
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
|
+
|
|
struct bcma_drv_cc {
|
|
struct bcma_device *core;
|
|
u32 status;
|
|
u32 capabilities;
|
|
u32 capabilities_ext;
|
|
+ u8 setup_done:1;
|
|
/* Fast Powerup Delay constant */
|
|
u16 fast_pwrup_delay;
|
|
struct bcma_chipcommon_pmu pmu;
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
+ struct bcma_pflash pflash;
|
|
+
|
|
+ int nr_serial_ports;
|
|
+ struct bcma_serial_port serial_ports[4];
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
|
};
|
|
|
|
/* Register access */
|
|
@@ -281,6 +383,8 @@ extern void bcma_core_chipcommon_init(st
|
|
extern void bcma_chipco_suspend(struct bcma_drv_cc *cc);
|
|
extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
|
|
|
|
+void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
|
|
+
|
|
extern void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc,
|
|
u32 ticks);
|
|
|
|
@@ -299,4 +403,13 @@ u32 bcma_chipco_gpio_polarity(struct bcm
|
|
/* PMU support */
|
|
extern void bcma_pmu_init(struct bcma_drv_cc *cc);
|
|
|
|
+extern void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset,
|
|
+ u32 value);
|
|
+extern void bcma_chipco_pll_maskset(struct bcma_drv_cc *cc, u32 offset,
|
|
+ u32 mask, u32 set);
|
|
+extern void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
|
|
+ u32 offset, u32 mask, u32 set);
|
|
+extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
|
|
+ u32 offset, u32 mask, u32 set);
|
|
+
|
|
#endif /* LINUX_BCMA_DRIVER_CC_H_ */
|
|
--- /dev/null
|
|
+++ b/include/linux/bcma/bcma_driver_mips.h
|
|
@@ -0,0 +1,51 @@
|
|
+#ifndef LINUX_BCMA_DRIVER_MIPS_H_
|
|
+#define LINUX_BCMA_DRIVER_MIPS_H_
|
|
+
|
|
+#define BCMA_MIPS_IPSFLAG 0x0F08
|
|
+/* which sbflags get routed to mips interrupt 1 */
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ1 0x0000003F
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ1_SHIFT 0
|
|
+/* which sbflags get routed to mips interrupt 2 */
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ2 0x00003F00
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ2_SHIFT 8
|
|
+/* which sbflags get routed to mips interrupt 3 */
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ3 0x003F0000
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ3_SHIFT 16
|
|
+/* which sbflags get routed to mips interrupt 4 */
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ4 0x3F000000
|
|
+#define BCMA_MIPS_IPSFLAG_IRQ4_SHIFT 24
|
|
+
|
|
+/* MIPS 74K core registers */
|
|
+#define BCMA_MIPS_MIPS74K_CORECTL 0x0000
|
|
+#define BCMA_MIPS_MIPS74K_EXCEPTBASE 0x0004
|
|
+#define BCMA_MIPS_MIPS74K_BIST 0x000C
|
|
+#define BCMA_MIPS_MIPS74K_INTMASK_INT0 0x0014
|
|
+#define BCMA_MIPS_MIPS74K_INTMASK(int) \
|
|
+ ((int) * 4 + BCMA_MIPS_MIPS74K_INTMASK_INT0)
|
|
+#define BCMA_MIPS_MIPS74K_NMIMASK 0x002C
|
|
+#define BCMA_MIPS_MIPS74K_GPIOSEL 0x0040
|
|
+#define BCMA_MIPS_MIPS74K_GPIOOUT 0x0044
|
|
+#define BCMA_MIPS_MIPS74K_GPIOEN 0x0048
|
|
+#define BCMA_MIPS_MIPS74K_CLKCTLST 0x01E0
|
|
+
|
|
+#define BCMA_MIPS_OOBSELOUTA30 0x100
|
|
+
|
|
+struct bcma_device;
|
|
+
|
|
+struct bcma_drv_mips {
|
|
+ struct bcma_device *core;
|
|
+ u8 setup_done:1;
|
|
+ unsigned int assigned_irqs;
|
|
+};
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
+extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
|
|
+#else
|
|
+static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
|
|
+#endif
|
|
+
|
|
+extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
|
|
+
|
|
+extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
|
|
+
|
|
+#endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
|
|
--- a/include/linux/bcma/bcma_driver_pci.h
|
|
+++ b/include/linux/bcma/bcma_driver_pci.h
|
|
@@ -53,6 +53,35 @@ struct pci_dev;
|
|
#define BCMA_CORE_PCI_SBTOPCI1_MASK 0xFC000000
|
|
#define BCMA_CORE_PCI_SBTOPCI2 0x0108 /* Backplane to PCI translation 2 (sbtopci2) */
|
|
#define BCMA_CORE_PCI_SBTOPCI2_MASK 0xC0000000
|
|
+#define BCMA_CORE_PCI_CONFIG_ADDR 0x0120 /* pcie config space access */
|
|
+#define BCMA_CORE_PCI_CONFIG_DATA 0x0124 /* pcie config space access */
|
|
+#define BCMA_CORE_PCI_MDIO_CONTROL 0x0128 /* controls the mdio access */
|
|
+#define BCMA_CORE_PCI_MDIOCTL_DIVISOR_MASK 0x7f /* clock to be used on MDIO */
|
|
+#define BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL 0x2
|
|
+#define BCMA_CORE_PCI_MDIOCTL_PREAM_EN 0x80 /* Enable preamble sequnce */
|
|
+#define BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE 0x100 /* Tranaction complete */
|
|
+#define BCMA_CORE_PCI_MDIO_DATA 0x012c /* Data to the mdio access */
|
|
+#define BCMA_CORE_PCI_MDIODATA_MASK 0x0000ffff /* data 2 bytes */
|
|
+#define BCMA_CORE_PCI_MDIODATA_TA 0x00020000 /* Turnaround */
|
|
+#define BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD 18 /* Regaddr shift (rev < 10) */
|
|
+#define BCMA_CORE_PCI_MDIODATA_REGADDR_MASK_OLD 0x003c0000 /* Regaddr Mask (rev < 10) */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD 22 /* Physmedia devaddr shift (rev < 10) */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK_OLD 0x0fc00000 /* Physmedia devaddr Mask (rev < 10) */
|
|
+#define BCMA_CORE_PCI_MDIODATA_REGADDR_SHF 18 /* Regaddr shift */
|
|
+#define BCMA_CORE_PCI_MDIODATA_REGADDR_MASK 0x007c0000 /* Regaddr Mask */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF 23 /* Physmedia devaddr shift */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK 0x0f800000 /* Physmedia devaddr Mask */
|
|
+#define BCMA_CORE_PCI_MDIODATA_WRITE 0x10000000 /* write Transaction */
|
|
+#define BCMA_CORE_PCI_MDIODATA_READ 0x20000000 /* Read Transaction */
|
|
+#define BCMA_CORE_PCI_MDIODATA_START 0x40000000 /* start of Transaction */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEV_ADDR 0x0 /* dev address for serdes */
|
|
+#define BCMA_CORE_PCI_MDIODATA_BLK_ADDR 0x1F /* blk address for serdes */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEV_PLL 0x1d /* SERDES PLL Dev */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEV_TX 0x1e /* SERDES TX Dev */
|
|
+#define BCMA_CORE_PCI_MDIODATA_DEV_RX 0x1f /* SERDES RX Dev */
|
|
+#define BCMA_CORE_PCI_PCIEIND_ADDR 0x0130 /* indirect access to the internal register */
|
|
+#define BCMA_CORE_PCI_PCIEIND_DATA 0x0134 /* Data to/from the internal regsiter */
|
|
+#define BCMA_CORE_PCI_CLKREQENCTRL 0x0138 /* >= rev 6, Clkreq rdma control */
|
|
#define BCMA_CORE_PCI_PCICFG0 0x0400 /* PCI config space 0 (rev >= 8) */
|
|
#define BCMA_CORE_PCI_PCICFG1 0x0500 /* PCI config space 1 (rev >= 8) */
|
|
#define BCMA_CORE_PCI_PCICFG2 0x0600 /* PCI config space 2 (rev >= 8) */
|
|
@@ -72,18 +101,114 @@ struct pci_dev;
|
|
#define BCMA_CORE_PCI_SBTOPCI_RC_READL 0x00000010 /* Memory read line */
|
|
#define BCMA_CORE_PCI_SBTOPCI_RC_READM 0x00000020 /* Memory read multiple */
|
|
|
|
+/* PCIE protocol PHY diagnostic registers */
|
|
+#define BCMA_CORE_PCI_PLP_MODEREG 0x200 /* Mode */
|
|
+#define BCMA_CORE_PCI_PLP_STATUSREG 0x204 /* Status */
|
|
+#define BCMA_CORE_PCI_PLP_POLARITYINV_STAT 0x10 /* Status reg PCIE_PLP_STATUSREG */
|
|
+#define BCMA_CORE_PCI_PLP_LTSSMCTRLREG 0x208 /* LTSSM control */
|
|
+#define BCMA_CORE_PCI_PLP_LTLINKNUMREG 0x20c /* Link Training Link number */
|
|
+#define BCMA_CORE_PCI_PLP_LTLANENUMREG 0x210 /* Link Training Lane number */
|
|
+#define BCMA_CORE_PCI_PLP_LTNFTSREG 0x214 /* Link Training N_FTS */
|
|
+#define BCMA_CORE_PCI_PLP_ATTNREG 0x218 /* Attention */
|
|
+#define BCMA_CORE_PCI_PLP_ATTNMASKREG 0x21C /* Attention Mask */
|
|
+#define BCMA_CORE_PCI_PLP_RXERRCTR 0x220 /* Rx Error */
|
|
+#define BCMA_CORE_PCI_PLP_RXFRMERRCTR 0x224 /* Rx Framing Error */
|
|
+#define BCMA_CORE_PCI_PLP_RXERRTHRESHREG 0x228 /* Rx Error threshold */
|
|
+#define BCMA_CORE_PCI_PLP_TESTCTRLREG 0x22C /* Test Control reg */
|
|
+#define BCMA_CORE_PCI_PLP_SERDESCTRLOVRDREG 0x230 /* SERDES Control Override */
|
|
+#define BCMA_CORE_PCI_PLP_TIMINGOVRDREG 0x234 /* Timing param override */
|
|
+#define BCMA_CORE_PCI_PLP_RXTXSMDIAGREG 0x238 /* RXTX State Machine Diag */
|
|
+#define BCMA_CORE_PCI_PLP_LTSSMDIAGREG 0x23C /* LTSSM State Machine Diag */
|
|
+
|
|
+/* PCIE protocol DLLP diagnostic registers */
|
|
+#define BCMA_CORE_PCI_DLLP_LCREG 0x100 /* Link Control */
|
|
+#define BCMA_CORE_PCI_DLLP_LSREG 0x104 /* Link Status */
|
|
+#define BCMA_CORE_PCI_DLLP_LAREG 0x108 /* Link Attention */
|
|
+#define BCMA_CORE_PCI_DLLP_LSREG_LINKUP (1 << 16)
|
|
+#define BCMA_CORE_PCI_DLLP_LAMASKREG 0x10C /* Link Attention Mask */
|
|
+#define BCMA_CORE_PCI_DLLP_NEXTTXSEQNUMREG 0x110 /* Next Tx Seq Num */
|
|
+#define BCMA_CORE_PCI_DLLP_ACKEDTXSEQNUMREG 0x114 /* Acked Tx Seq Num */
|
|
+#define BCMA_CORE_PCI_DLLP_PURGEDTXSEQNUMREG 0x118 /* Purged Tx Seq Num */
|
|
+#define BCMA_CORE_PCI_DLLP_RXSEQNUMREG 0x11C /* Rx Sequence Number */
|
|
+#define BCMA_CORE_PCI_DLLP_LRREG 0x120 /* Link Replay */
|
|
+#define BCMA_CORE_PCI_DLLP_LACKTOREG 0x124 /* Link Ack Timeout */
|
|
+#define BCMA_CORE_PCI_DLLP_PMTHRESHREG 0x128 /* Power Management Threshold */
|
|
+#define BCMA_CORE_PCI_DLLP_RTRYWPREG 0x12C /* Retry buffer write ptr */
|
|
+#define BCMA_CORE_PCI_DLLP_RTRYRPREG 0x130 /* Retry buffer Read ptr */
|
|
+#define BCMA_CORE_PCI_DLLP_RTRYPPREG 0x134 /* Retry buffer Purged ptr */
|
|
+#define BCMA_CORE_PCI_DLLP_RTRRWREG 0x138 /* Retry buffer Read/Write */
|
|
+#define BCMA_CORE_PCI_DLLP_ECTHRESHREG 0x13C /* Error Count Threshold */
|
|
+#define BCMA_CORE_PCI_DLLP_TLPERRCTRREG 0x140 /* TLP Error Counter */
|
|
+#define BCMA_CORE_PCI_DLLP_ERRCTRREG 0x144 /* Error Counter */
|
|
+#define BCMA_CORE_PCI_DLLP_NAKRXCTRREG 0x148 /* NAK Received Counter */
|
|
+#define BCMA_CORE_PCI_DLLP_TESTREG 0x14C /* Test */
|
|
+#define BCMA_CORE_PCI_DLLP_PKTBIST 0x150 /* Packet BIST */
|
|
+#define BCMA_CORE_PCI_DLLP_PCIE11 0x154 /* DLLP PCIE 1.1 reg */
|
|
+
|
|
+/* SERDES RX registers */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_CTRL 1 /* Rx cntrl */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE 0x80 /* rxpolarity_force */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY 0x40 /* rxpolarity_value */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_TIMER1 2 /* Rx Timer1 */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_CDR 6 /* CDR */
|
|
+#define BCMA_CORE_PCI_SERDES_RX_CDRBW 7 /* CDR BW */
|
|
+
|
|
+/* SERDES PLL registers */
|
|
+#define BCMA_CORE_PCI_SERDES_PLL_CTRL 1 /* PLL control reg */
|
|
+#define BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN 0x4000 /* bit 14 is FREQDET on */
|
|
+
|
|
/* PCIcore specific boardflags */
|
|
#define BCMA_CORE_PCI_BFL_NOPCI 0x00000400 /* Board leaves PCI floating */
|
|
|
|
+/* PCIE Config space accessing MACROS */
|
|
+#define BCMA_CORE_PCI_CFG_BUS_SHIFT 24 /* Bus shift */
|
|
+#define BCMA_CORE_PCI_CFG_SLOT_SHIFT 19 /* Slot/Device shift */
|
|
+#define BCMA_CORE_PCI_CFG_FUN_SHIFT 16 /* Function shift */
|
|
+#define BCMA_CORE_PCI_CFG_OFF_SHIFT 0 /* Register shift */
|
|
+
|
|
+#define BCMA_CORE_PCI_CFG_BUS_MASK 0xff /* Bus mask */
|
|
+#define BCMA_CORE_PCI_CFG_SLOT_MASK 0x1f /* Slot/Device mask */
|
|
+#define BCMA_CORE_PCI_CFG_FUN_MASK 7 /* Function mask */
|
|
+#define BCMA_CORE_PCI_CFG_OFF_MASK 0xfff /* Register mask */
|
|
+
|
|
+/* PCIE Root Capability Register bits (Host mode only) */
|
|
+#define BCMA_CORE_PCI_RC_CRS_VISIBILITY 0x0001
|
|
+
|
|
+struct bcma_drv_pci;
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
|
|
+struct bcma_drv_pci_host {
|
|
+ struct bcma_drv_pci *pdev;
|
|
+
|
|
+ u32 host_cfg_addr;
|
|
+ spinlock_t cfgspace_lock;
|
|
+
|
|
+ struct pci_controller pci_controller;
|
|
+ struct pci_ops pci_ops;
|
|
+ struct resource mem_resource;
|
|
+ struct resource io_resource;
|
|
+};
|
|
+#endif
|
|
+
|
|
struct bcma_drv_pci {
|
|
struct bcma_device *core;
|
|
u8 setup_done:1;
|
|
+ u8 hostmode:1;
|
|
+
|
|
+#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
|
|
+ struct bcma_drv_pci_host *host_controller;
|
|
+#endif
|
|
};
|
|
|
|
/* Register access */
|
|
#define pcicore_read32(pc, offset) bcma_read32((pc)->core, offset)
|
|
#define pcicore_write32(pc, offset, val) bcma_write32((pc)->core, offset, val)
|
|
|
|
-extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
|
|
+extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
|
|
+extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
|
|
+ struct bcma_device *core, bool enable);
|
|
+
|
|
+extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
|
|
+extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
|
|
|
|
#endif /* LINUX_BCMA_DRIVER_PCI_H_ */
|
|
--- a/include/linux/bcma/bcma_regs.h
|
|
+++ b/include/linux/bcma/bcma_regs.h
|
|
@@ -1,13 +1,38 @@
|
|
#ifndef LINUX_BCMA_REGS_H_
|
|
#define LINUX_BCMA_REGS_H_
|
|
|
|
+/* Some single registers are shared between many cores */
|
|
+/* BCMA_CLKCTLST: ChipCommon (rev >= 20), PCIe, 80211 */
|
|
+#define BCMA_CLKCTLST 0x01E0 /* Clock control and status */
|
|
+#define BCMA_CLKCTLST_FORCEALP 0x00000001 /* Force ALP request */
|
|
+#define BCMA_CLKCTLST_FORCEHT 0x00000002 /* Force HT request */
|
|
+#define BCMA_CLKCTLST_FORCEILP 0x00000004 /* Force ILP request */
|
|
+#define BCMA_CLKCTLST_HAVEALPREQ 0x00000008 /* ALP available request */
|
|
+#define BCMA_CLKCTLST_HAVEHTREQ 0x00000010 /* HT available request */
|
|
+#define BCMA_CLKCTLST_HWCROFF 0x00000020 /* Force HW clock request off */
|
|
+#define BCMA_CLKCTLST_EXTRESREQ 0x00000700 /* Mask of external resource requests */
|
|
+#define BCMA_CLKCTLST_HAVEALP 0x00010000 /* ALP available */
|
|
+#define BCMA_CLKCTLST_HAVEHT 0x00020000 /* HT available */
|
|
+#define BCMA_CLKCTLST_BP_ON_ALP 0x00040000 /* RO: running on ALP clock */
|
|
+#define BCMA_CLKCTLST_BP_ON_HT 0x00080000 /* RO: running on HT clock */
|
|
+#define BCMA_CLKCTLST_EXTRESST 0x07000000 /* Mask of external resource status */
|
|
+/* Is there any BCM4328 on BCMA bus? */
|
|
+#define BCMA_CLKCTLST_4328A0_HAVEHT 0x00010000 /* 4328a0 has reversed bits */
|
|
+#define BCMA_CLKCTLST_4328A0_HAVEALP 0x00020000 /* 4328a0 has reversed bits */
|
|
+
|
|
/* Agent registers (common for every core) */
|
|
-#define BCMA_IOCTL 0x0408
|
|
+#define BCMA_IOCTL 0x0408 /* IO control */
|
|
#define BCMA_IOCTL_CLK 0x0001
|
|
#define BCMA_IOCTL_FGC 0x0002
|
|
#define BCMA_IOCTL_CORE_BITS 0x3FFC
|
|
#define BCMA_IOCTL_PME_EN 0x4000
|
|
#define BCMA_IOCTL_BIST_EN 0x8000
|
|
+#define BCMA_IOST 0x0500 /* IO status */
|
|
+#define BCMA_IOST_CORE_BITS 0x0FFF
|
|
+#define BCMA_IOST_DMA64 0x1000
|
|
+#define BCMA_IOST_GATED_CLK 0x2000
|
|
+#define BCMA_IOST_BIST_ERROR 0x4000
|
|
+#define BCMA_IOST_BIST_DONE 0x8000
|
|
#define BCMA_RESET_CTL 0x0800
|
|
#define BCMA_RESET_CTL_RESET 0x0001
|
|
|
|
@@ -31,4 +56,31 @@
|
|
#define BCMA_PCI_GPIO_XTAL 0x40 /* PCI config space GPIO 14 for Xtal powerup */
|
|
#define BCMA_PCI_GPIO_PLL 0x80 /* PCI config space GPIO 15 for PLL powerdown */
|
|
|
|
+/* SiliconBackplane Address Map.
|
|
+ * All regions may not exist on all chips.
|
|
+ */
|
|
+#define BCMA_SOC_SDRAM_BASE 0x00000000U /* Physical SDRAM */
|
|
+#define BCMA_SOC_PCI_MEM 0x08000000U /* Host Mode sb2pcitranslation0 (64 MB) */
|
|
+#define BCMA_SOC_PCI_MEM_SZ (64 * 1024 * 1024)
|
|
+#define BCMA_SOC_PCI_CFG 0x0c000000U /* Host Mode sb2pcitranslation1 (64 MB) */
|
|
+#define BCMA_SOC_SDRAM_SWAPPED 0x10000000U /* Byteswapped Physical SDRAM */
|
|
+#define BCMA_SOC_SDRAM_R2 0x80000000U /* Region 2 for sdram (512 MB) */
|
|
+
|
|
+
|
|
+#define BCMA_SOC_PCI_DMA 0x40000000U /* Client Mode sb2pcitranslation2 (1 GB) */
|
|
+#define BCMA_SOC_PCI_DMA2 0x80000000U /* Client Mode sb2pcitranslation2 (1 GB) */
|
|
+#define BCMA_SOC_PCI_DMA_SZ 0x40000000U /* Client Mode sb2pcitranslation2 size in bytes */
|
|
+#define BCMA_SOC_PCIE_DMA_L32 0x00000000U /* PCIE Client Mode sb2pcitranslation2
|
|
+ * (2 ZettaBytes), low 32 bits
|
|
+ */
|
|
+#define BCMA_SOC_PCIE_DMA_H32 0x80000000U /* PCIE Client Mode sb2pcitranslation2
|
|
+ * (2 ZettaBytes), high 32 bits
|
|
+ */
|
|
+
|
|
+#define BCMA_SOC_PCI1_MEM 0x40000000U /* Host Mode sb2pcitranslation0 (64 MB) */
|
|
+#define BCMA_SOC_PCI1_CFG 0x44000000U /* Host Mode sb2pcitranslation1 (64 MB) */
|
|
+#define BCMA_SOC_PCIE1_DMA_H32 0xc0000000U /* PCIE Client Mode sb2pcitranslation2
|
|
+ * (2 ZettaBytes), high 32 bits
|
|
+ */
|
|
+
|
|
#endif /* LINUX_BCMA_REGS_H_ */
|
|
--- /dev/null
|
|
+++ b/include/linux/bcma/bcma_soc.h
|
|
@@ -0,0 +1,16 @@
|
|
+#ifndef LINUX_BCMA_SOC_H_
|
|
+#define LINUX_BCMA_SOC_H_
|
|
+
|
|
+#include <linux/bcma/bcma.h>
|
|
+
|
|
+struct bcma_soc {
|
|
+ struct bcma_bus bus;
|
|
+ struct bcma_device core_cc;
|
|
+ struct bcma_device core_mips;
|
|
+};
|
|
+
|
|
+int __init bcma_host_soc_register(struct bcma_soc *soc);
|
|
+
|
|
+int bcma_bus_register(struct bcma_bus *bus);
|
|
+
|
|
+#endif /* LINUX_BCMA_SOC_H_ */
|