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

Commit ee89252b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:

 - Support for HSDK board hosting a Quad core HS38x4 based SoC running
   @1GHz (and some prerrquisite changes such as ability to scoot the
   kernel code/data from start of memory map etc)

 - Quite a few updates for EZChip (Mellanox) platform

 - Fixes to fault/exception printing

* tag 'arc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (26 commits)
  ARC: Re-enable MMU upon Machine Check exception
  ARC: Show fault information passed to show_kernel_fault_diag()
  ARC: [plat-hsdk] initial port for HSDK board
  ARC: mm: Decouple RAM base address from kernel link address
  ARCv2: IOC: Tighten up the contraints (specifically base / size alignment)
  ARC: [plat-axs103] refactor the DT fudging code
  ARC: [plat-axs103] use clk driver #2: Add core pll node to DT to manage cpu clk
  ARC: [plat-axs103] use clk driver #1: Get rid of platform specific cpu clk setting
  ARCv2: SLC: provide a line based flush routine for debugging
  ARC: Hardcode ARCH_DMA_MINALIGN to max line length we may have
  ARC: [plat-eznps] handle extra aux regs #2: kernel/entry exit
  ARC: [plat-eznps] handle extra aux regs #1: save/restore on context switch
  ARC: [plat-eznps] avoid toggling of DPC register
  ARC: [plat-eznps] Update the init sequence of aux regs per cpu.
  ARC: [plat-eznps] new command line argument for HW scheduler at MTM
  ARC: set boot print log level to PR_INFO
  ARC: [plat-eznps] Handle user memory error same in simulation and silicon
  ARC: [plat-eznps] use schd.wft instruction instead of sleep at idle task
  ARC: create cpu specific version of arch_cpu_idle()
  ARC: [plat-eznps] spinlock aware for MTM
  ...
parents 0d519f2d 1ee55a8f

Documentation/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -2764,6 +2764,15 @@ 
			If the dependencies are under your control, you can

			turn on cpu0_hotplug.



	nps_mtm_hs_ctr= [KNL,ARC]

			This parameter sets the maximum duration, in

			cycles, each HW thread of the CTOP can run

			without interruptions, before HW switches it.

			The actual maximum duration is 16 times this

			parameter's value.

			Format: integer between 1 and 255

			Default: 255



	nptcg=		[IA-64] Override max number of concurrent global TLB

			purges which is reported from either PAL_VM_SUMMARY or

			SAL PALO.

Documentation/devicetree/bindings/arc/hsdk.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Synopsys DesignWare ARC HS Development Kit Device Tree Bindings

---------------------------------------------------------------------------



ARC HSDK Board with quad-core ARC HS38x4 in silicon.



Required root node properties:

    - compatible = "snps,hsdk";

arch/arc/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ source "arch/arc/plat-tb10x/Kconfig" 
source "arch/arc/plat-axs10x/Kconfig"

#New platform adds here

source "arch/arc/plat-eznps/Kconfig"

source "arch/arc/plat-hsdk/Kconfig"



endmenu
@@ -418,7 +419,7 @@ endif # ISA_ARCV2 
endmenu   # "ARC CPU Configuration"



config LINUX_LINK_BASE

	hex "Linux Link Address"

	hex "Kernel link address"

	default "0x80000000"

	help

	  ARC700 divides the 32 bit phy address space into two equal halves
@@ -431,6 +432,14 @@ config LINUX_LINK_BASE 
	  If you don't know what the above means, leave this setting alone.

	  This needs to match memory start address specified in Device Tree



config LINUX_RAM_BASE

	hex "RAM base address"

	default LINUX_LINK_BASE

	help

	  By default Linux is linked at base of RAM. However in some special

	  cases (such as HSDK), Linux can't be linked at start of DDR, hence

	  this option.



config HIGHMEM

	bool "High Memory Support"

	select ARCH_DISCONTIGMEM_ENABLE

arch/arc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ core-y += arch/arc/plat-sim/ 
core-$(CONFIG_ARC_PLAT_TB10X)	+= arch/arc/plat-tb10x/

core-$(CONFIG_ARC_PLAT_AXS10X)	+= arch/arc/plat-axs10x/

core-$(CONFIG_ARC_PLAT_EZNPS)	+= arch/arc/plat-eznps/

core-$(CONFIG_ARC_SOC_HSDK)	+= arch/arc/plat-hsdk/



ifdef CONFIG_ARC_PLAT_EZNPS

KBUILD_CPPFLAGS += -I$(srctree)/arch/arc/plat-eznps/include

arch/arc/boot/dts/axc001.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 


	memory {

		device_type = "memory";

		/* CONFIG_KERNEL_RAM_BASE_ADDRESS needs to match low mem start */

		/* CONFIG_LINUX_RAM_BASE needs to match low mem start */

		reg = <0x0 0x80000000 0x0 0x1b000000>;	/* (512 - 32) MiB */

	};