2013-01-12 06:07:32

by Nathan Hintz

Subject: [PATCH v2] bcma: fix bcm4716/bcm4748 i2s irqflag

The default irqflag assignment for the I2S core on some Broadcom
4716/4748 devices is invalid and needs to be corrected (from the
Broadcom SDK).

Signed-off-by: Nathan Hintz <[email protected]>
---
drivers/bcma/driver_mips.c | 28 ++++++++++++++++++++++++++++
include/linux/bcma/bcma_driver_mips.h | 1 +
2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index a808404..9fe86ee 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -256,6 +256,32 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
mcore->early_setup_done = true;
}

+static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)
+{
+ struct bcma_device *cpu, *pcie, *i2s;
+
+ /* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)
+ * (IRQ flags > 7 are ignored when setting the interrupt masks)
+ */
+ if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&
+ bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)
+ return;
+
+ cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ pcie = bcma_find_core(bus, BCMA_CORE_PCIE);
+ i2s = bcma_find_core(bus, BCMA_CORE_I2S);
+ if (cpu && pcie && i2s &&
+ bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
+ bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
+ bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {
+ bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);
+ bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);
+ bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);
+ bcma_debug(bus,
+ "Moved i2s interrupt to oob line 7 instead of 8\n");
+ }
+}
+
void bcma_core_mips_init(struct bcma_drv_mips *mcore)
{
struct bcma_bus *bus;
@@ -269,6 +295,8 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)

bcma_core_mips_early_init(mcore);

+ bcma_fix_i2s_irqflag(bus);
+
switch (bus->chipinfo.id) {
case BCMA_CHIP_ID_BCM4716:
case BCMA_CHIP_ID_BCM4748:
diff --git a/include/linux/bcma/bcma_driver_mips.h b/include/linux/bcma/bcma_driver_mips.h
index 73c7f4b..0d1ea29 100644
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
@@ -28,6 +28,7 @@
#define BCMA_MIPS_MIPS74K_GPIOEN 0x0048
#define BCMA_MIPS_MIPS74K_CLKCTLST 0x01E0

+#define BCMA_MIPS_OOBSELINA74 0x004
#define BCMA_MIPS_OOBSELOUTA30 0x100

struct bcma_device;
--
1.7.7.6

2013-01-12 14:52:26

by Hauke Mehrtens

Subject: Re: [PATCH v2] bcma: fix bcm4716/bcm4748 i2s irqflag

On 01/12/2013 07:07 AM, Nathan Hintz wrote:
> The default irqflag assignment for the I2S core on some Broadcom
> 4716/4748 devices is invalid and needs to be corrected (from the
> Broadcom SDK).
>
> Signed-off-by: Nathan Hintz <[email protected]>

Acked-by: Hauke Mehrtens <[email protected]>

> ---
> drivers/bcma/driver_mips.c | 28 ++++++++++++++++++++++++++++
> include/linux/bcma/bcma_driver_mips.h | 1 +
> 2 files changed, 29 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
> index a808404..9fe86ee 100644
> --- a/drivers/bcma/driver_mips.c
> +++ b/drivers/bcma/driver_mips.c
> @@ -256,6 +256,32 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
> mcore->early_setup_done = true;
> }
>
> +static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)
> +{
> + struct bcma_device *cpu, *pcie, *i2s;
> +
> + /* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)
> + * (IRQ flags > 7 are ignored when setting the interrupt masks)
> + */
> + if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&
> + bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)
> + return;
> +
> + cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
> + pcie = bcma_find_core(bus, BCMA_CORE_PCIE);
> + i2s = bcma_find_core(bus, BCMA_CORE_I2S);
> + if (cpu && pcie && i2s &&
> + bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
> + bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
> + bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {
> + bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);
> + bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);
> + bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);
> + bcma_debug(bus,
> + "Moved i2s interrupt to oob line 7 instead of 8\n");
> + }
> +}
> +
> void bcma_core_mips_init(struct bcma_drv_mips *mcore)
> {
> struct bcma_bus *bus;
> @@ -269,6 +295,8 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
>
> bcma_core_mips_early_init(mcore);
>
> + bcma_fix_i2s_irqflag(bus);
> +
> switch (bus->chipinfo.id) {
> case BCMA_CHIP_ID_BCM4716:
> case BCMA_CHIP_ID_BCM4748:
> diff --git a/include/linux/bcma/bcma_driver_mips.h b/include/linux/bcma/bcma_driver_mips.h
> index 73c7f4b..0d1ea29 100644
> --- a/include/linux/bcma/bcma_driver_mips.h
> +++ b/include/linux/bcma/bcma_driver_mips.h
> @@ -28,6 +28,7 @@
> #define BCMA_MIPS_MIPS74K_GPIOEN 0x0048
> #define BCMA_MIPS_MIPS74K_CLKCTLST 0x01E0
>
> +#define BCMA_MIPS_OOBSELINA74 0x004
> #define BCMA_MIPS_OOBSELOUTA30 0x100
>
> struct bcma_device;
>