Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7195439d authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

Revert "bcma: init serial console directly from ChipCommon code" 



This reverts commit 4c81acab ("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: 4c81acab ("bcma: init serial console directly from ChipCommon code")
Reported-by: default avatarFelix Fietkau <nbd@nbd.name>
Cc: stable@vger.kernel.org # 4.6+
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 60f59ce0

drivers/bcma/bcma_private.h

+3 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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(struct bcma_drv_cc *cc) 
	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 bcma_drv_cc *cc, u32 mask, u32 value) 
	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(struct bcma_drv_cc *cc) 
		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
Original line number Diff line number Diff line
@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore) 


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;