Commit 056df578 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC updates from Vineet Gupta

 - Jump Label support for ARC

 - kmemleak enabled

 - arc mm backend TLB Miss / flush optimizations

 - nSIM platform switching to dwuart (vs. arcuart) and ensuing defconfig
   updates and cleanups

 - axs platform pll / video-mode updates

* tag 'arc-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: add kmemleak support
  ARC: [plat-axs10x]: remove hardcoded video mode from bootargs
  ARC: [plat-axs10x]: use pgu pll instead of fixed clock
  ARC: ARCv2: jump label: implement jump label patching
  ARC: mm: tlb flush optim: elide redundant uTLB invalidates for MMUv3
  ARC: mm: tlb flush optim: elide repeated uTLB invalidate in loop
  ARC: mm: tlb flush optim: Make TLBWriteNI fallback to TLBWrite if not available
  ARC: mm: TLB Miss optim: avoid re-reading ECR
  ARCv2: mm: TLB Miss optim: Use double world load/stores LDD/STD
  ARCv2: mm: TLB Miss optim: SMP builds can cache pgd pointer in mmu scratch reg
  ARC: nSIM_700: remove unused network options
  ARC: nSIM_700: switch to DW UART usage
  ARC: merge HAPS-HS with nSIM-HS configs
  ARC: HAPS: cleanup defconfigs from unused ETH drivers
  ARC: HAPS: add HIGHMEM memory zone to DTS
  ARC: HAPS: use same UART configuration everywhere
  ARC: HAPS: cleanup defconfigs from unused IO-related options
  ARC: regenerate nSIM and HAPS defconfigs
parents aedc0650 9fbea0b7

arch/arc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config ARC 
	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_IOREMAP_PROT

	select HAVE_KERNEL_GZIP
@@ -45,6 +46,7 @@ config ARC 
	select OF_EARLY_FLATTREE

	select PCI_SYSCALL if PCI

	select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING

	select HAVE_ARCH_JUMP_LABEL if ISA_ARCV2 && !CPU_ENDIAN_BE32



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y
@@ -524,6 +526,13 @@ config ARC_DW2_UNWIND 
config ARC_DBG_TLB_PARANOIA

	bool "Paranoia Checks in Low Level TLB Handlers"



config ARC_DBG_JUMP_LABEL

	bool "Paranoid checks in Static Keys (jump labels) code"

	depends on JUMP_LABEL

	default y if STATIC_KEYS_SELFTEST

	help

	  Enable paranoid checks and self-test of both ARC-specific and generic

	  part of static keys (jump labels) related code.

endif



config ARC_BUILTIN_DTB_NAME

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)

#



KBUILD_DEFCONFIG := nsim_hs_defconfig

KBUILD_DEFCONFIG := haps_hs_smp_defconfig



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)

arch/arc/boot/dts/axc001.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ 
			clock-frequency = <750000000>;

		};



		input_clk: input-clk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <33333333>;

		};



		core_intc: arc700-intc@cpu {

			compatible = "snps,arc700-intc";

			interrupt-controller;

arch/arc/boot/dts/axs101.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
	compatible = "snps,axs101", "snps,arc-sdp";



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60 print-fatal-signals=1";

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 print-fatal-signals=1";

	};

};

arch/arc/boot/dts/axs103_idu.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
	compatible = "snps,axs103", "snps,arc-sdp";



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 print-fatal-signals=1 consoleblank=0 video=1280x720@60";

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 print-fatal-signals=1 consoleblank=0";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE