Commit 71354661 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'brcm/stb-smp-uart' into next/drivers 



This resolves a nonobvious merge conflict that I got wrong the
first time.

* brcm/stb-smp-uart:
  bus: brcmstb_gisb: save and restore GISB timeout
  bus: brcmstb_gisb: register the fault code hook
  ARM: brcmstb: Kconfig: drop unneeded symbol selections
  ARM: brcmstb: reintroduce SMP support
  ARM: brcmstb: add debug UART for earlyprintk support

Conflicts:
	drivers/bus/brcmstb_gisb.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reported-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 6b34df9e 203bb85e

arch/arm/Kconfig.debug

+15 −1
Original line number Diff line number Diff line
@@ -139,6 +139,17 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on Marvell Berlin SoC based platforms.



	config DEBUG_BRCMSTB_UART

		bool "Use BRCMSTB UART for low-level debug"

		depends on ARCH_BRCMSTB

		select DEBUG_UART_8250

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the first serial port on these devices.



		  If you have a Broadcom STB chip and would like early print

		  messages to appear over the UART, select this option.



	config DEBUG_CLPS711X_UART1

		bool "Kernel low-level debugging messages via UART1"

		depends on ARCH_CLPS711X
@@ -1153,6 +1164,7 @@ config DEBUG_UART_PHYS 
	default 0xe0000000 if ARCH_SPEAR13XX

	default 0xe4007000 if DEBUG_HIP04_UART

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf040ab00 if DEBUG_BRCMSTB_UART

	default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE

	default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \

				ARCH_ORION5X
@@ -1204,6 +1216,7 @@ config DEBUG_UART_VIRT 
	default 0xfb002000 if DEBUG_CNS3XXX

	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfc40ab00 if DEBUG_BRCMSTB_UART

	default 0xfcfe8600 if DEBUG_UART_BCM63XX

	default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX

	default 0xfd000000 if ARCH_SPEAR13XX
@@ -1260,7 +1273,8 @@ config DEBUG_UART_8250_WORD 
		ARCH_KEYSTONE || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \

		DEBUG_BRCMSTB_UART



config DEBUG_UART_8250_FLOW_CONTROL

	bool "Enable flow control for 8250 UART"

arch/arm/mach-bcm/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -118,10 +118,7 @@ config ARCH_BCM_63XX 


config ARCH_BRCMSTB

	bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7

	depends on MMU

	select ARM_GIC

	select MIGHT_HAVE_PCI

	select HAVE_SMP

	select HAVE_ARM_ARCH_TIMER

	select BRCMSTB_GISB_ARB

	select BRCMSTB_L2_IRQ

arch/arm/mach-bcm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -38,5 +38,7 @@ obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o 
obj-$(CONFIG_ARCH_BCM_63XX)	:= bcm63xx.o



ifeq ($(CONFIG_ARCH_BRCMSTB),y)

CFLAGS_platsmp-brcmstb.o	+= -march=armv7-a

obj-y				+= brcmstb.o

obj-$(CONFIG_SMP)		+= headsmp-brcmstb.o platsmp-brcmstb.o

endif

arch/arm/mach-bcm/brcmstb.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2014 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __BRCMSTB_H__

#define __BRCMSTB_H__



void brcmstb_secondary_startup(void);



#endif /* __BRCMSTB_H__ */

arch/arm/mach-bcm/headsmp-brcmstb.S

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * SMP boot code for secondary CPUs

 * Based on arch/arm/mach-tegra/headsmp.S

 *

 * Copyright (C) 2010 NVIDIA, Inc.

 * Copyright (C) 2013-2014 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <asm/assembler.h>

#include <linux/linkage.h>

#include <linux/init.h>



        .section ".text.head", "ax"



ENTRY(brcmstb_secondary_startup)

        /*

         * Ensure CPU is in a sane state by disabling all IRQs and switching

         * into SVC mode.

         */

        setmode	PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0



        bl      v7_invalidate_l1

        b       secondary_startup

ENDPROC(brcmstb_secondary_startup)

CRA Git | Maintained and supported by SUSTech CRA and CCSE