93 lines
3.1 KiB
Diff
93 lines
3.1 KiB
Diff
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||
|
|
Subject: [PATCH] Revert "bcma: init serial console directly from ChipCommon
|
||
|
|
code"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This reverts commit 4c81acab3816 ("bcma: init serial console directly
|
||
|
|
from ChipCommon code") as it broke IRQ assignment. Getting IRQ with
|
||
|
|
bcma_core_irq helper on SoC requires MIPS core to be set. It happens
|
||
|
|
*after* ChipCommon initialization so we can't do this so early.
|
||
|
|
|
||
|
|
This fixes a user reported regression. It wasn't critical as serial was
|
||
|
|
still somehow working but lack of IRQs was making in unreliable.
|
||
|
|
|
||
|
|
Fixes: 4c81acab3816 ("bcma: init serial console directly from ChipCommon code")
|
||
|
|
Reported-by: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Cc: stable@vger.kernel.org # 4.6+
|
||
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||
|
|
---
|
||
|
|
drivers/bcma/bcma_private.h | 3 +++
|
||
|
|
drivers/bcma/driver_chipcommon.c | 11 +++--------
|
||
|
|
drivers/bcma/driver_mips.c | 3 +++
|
||
|
|
3 files changed, 9 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/bcma/bcma_private.h
|
||
|
|
+++ b/drivers/bcma/bcma_private.h
|
||
|
|
@@ -45,6 +45,9 @@ int bcma_sprom_get(struct bcma_bus *bus)
|
||
|
|
void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
|
||
|
|
void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
|
||
|
|
void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
|
||
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
||
|
|
+void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
|
||
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
||
|
|
|
||
|
|
/* driver_chipcommon_b.c */
|
||
|
|
int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
|
||
|
|
--- a/drivers/bcma/driver_chipcommon.c
|
||
|
|
+++ b/drivers/bcma/driver_chipcommon.c
|
||
|
|
@@ -15,8 +15,6 @@
|
||
|
|
#include <linux/platform_device.h>
|
||
|
|
#include <linux/bcma/bcma.h>
|
||
|
|
|
||
|
|
-static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
|
||
|
|
-
|
||
|
|
static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
|
||
|
|
u32 mask, u32 value)
|
||
|
|
{
|
||
|
|
@@ -186,9 +184,6 @@ void bcma_core_chipcommon_early_init(str
|
||
|
|
if (cc->capabilities & BCMA_CC_CAP_PMU)
|
||
|
|
bcma_pmu_early_init(cc);
|
||
|
|
|
||
|
|
- if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)
|
||
|
|
- bcma_chipco_serial_init(cc);
|
||
|
|
-
|
||
|
|
if (bus->hosttype == BCMA_HOSTTYPE_SOC)
|
||
|
|
bcma_core_chipcommon_flash_detect(cc);
|
||
|
|
|
||
|
|
@@ -378,9 +373,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcm
|
||
|
|
return res;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
|
||
|
|
+#ifdef CONFIG_BCMA_DRIVER_MIPS
|
||
|
|
+void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
|
||
|
|
{
|
||
|
|
-#if IS_BUILTIN(CONFIG_BCM47XX)
|
||
|
|
unsigned int irq;
|
||
|
|
u32 baud_base;
|
||
|
|
u32 i;
|
||
|
|
@@ -422,5 +417,5 @@ static void bcma_chipco_serial_init(stru
|
||
|
|
ports[i].baud_base = baud_base;
|
||
|
|
ports[i].reg_shift = 0;
|
||
|
|
}
|
||
|
|
-#endif /* CONFIG_BCM47XX */
|
||
|
|
}
|
||
|
|
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
||
|
|
--- a/drivers/bcma/driver_mips.c
|
||
|
|
+++ b/drivers/bcma/driver_mips.c
|
||
|
|
@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(st
|
||
|
|
|
||
|
|
void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
|
||
|
|
{
|
||
|
|
+ struct bcma_bus *bus = mcore->core->bus;
|
||
|
|
+
|
||
|
|
if (mcore->early_setup_done)
|
||
|
|
return;
|
||
|
|
|
||
|
|
+ bcma_chipco_serial_init(&bus->drv_cc);
|
||
|
|
bcma_core_mips_nvram_init(mcore);
|
||
|
|
|
||
|
|
mcore->early_setup_done = true;
|