Patch "Revert "bcma: init serial console directly from ChipCommon code"" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
Revert "bcma: init serial console directly from ChipCommon code"
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-bcma-init-serial-console-directly-from-chipcommon-code.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7195439d1d71bc4a6c33cfb57bc669a7cd041041Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
Date: Fri, 13 Jan 2017 12:23:35 +0100
Subject: Revert "bcma: init serial console directly from ChipCommon code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Rafał Miłecki <[email protected]>
commit 7195439d1d71bc4a6c33cfb57bc669a7cd041041 upstream.
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.
--- 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(-)
drivers/bcma/bcma_private.h +3 -0
@@ -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);
drivers/bcma/driver_chipcommon.c +3 -8
@@ -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(strif (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 bcmreturn 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 */
drivers/bcma/driver_mips.c +3 -0
@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(stvoid 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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/revert-bcma-init-serial-console-directly-from-chipcommon-code.patch