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

Commit 369af92c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes/updates from Vineet Gupta

 - Missing reads{x}()/writes{x}() getting in the way of some drivers [Jose Abreu]

 - Builds defaulting to ARCv2 ISA based configsa [Kevin Hilman]

 - Misc fixes

* tag 'arc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: io.h: Implement reads{x}()/writes{x}()
  ARC: change defconfig defaults to ARCv2
  arc: [devboards] Add support of NFSv3 ACL
  ARC: mm: fix uninitialised signal code in do_page_fault
  ARC: [plat-hsdk] Enable DW APB GPIO support
  ARCv2: boot log unaligned access in use
  ARC: IOC: panic if kernel was started with previously enabled IOC
  ARC: remove redundant 'default n' from Kconfig
parents 2f0799a0 10d44343

arch/arc/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ endmenu 


choice

	prompt "ARC Instruction Set"

	default ISA_ARCOMPACT

	default ISA_ARCV2



config ISA_ARCOMPACT

	bool "ARCompact ISA"
@@ -176,13 +176,11 @@ endchoice 


config CPU_BIG_ENDIAN

	bool "Enable Big Endian Mode"

	default n

	help

	  Build kernel for Big Endian Mode of ARC CPU



config SMP

	bool "Symmetric Multi-Processing"

	default n

	select ARC_MCIP if ISA_ARCV2

	help

	  This enables support for systems with more than one CPU.
@@ -254,7 +252,6 @@ config ARC_CACHE_PAGES 
config ARC_CACHE_VIPT_ALIASING

	bool "Support VIPT Aliasing D$"

	depends on ARC_HAS_DCACHE && ISA_ARCOMPACT

	default n



endif	#ARC_CACHE
@@ -262,7 +259,6 @@ config ARC_HAS_ICCM 
	bool "Use ICCM"

	help

	  Single Cycle RAMS to store Fast Path Code

	default n



config ARC_ICCM_SZ

	int "ICCM Size in KB"
@@ -273,7 +269,6 @@ config ARC_HAS_DCCM 
	bool "Use DCCM"

	help

	  Single Cycle RAMS to store Fast Path Data

	default n



config ARC_DCCM_SZ

	int "DCCM Size in KB"
@@ -366,13 +361,11 @@ if ISA_ARCOMPACT 


config ARC_COMPACT_IRQ_LEVELS

	bool "Setup Timer IRQ as high Priority"

	default n

	# if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy

	depends on !SMP



config ARC_FPU_SAVE_RESTORE

	bool "Enable FPU state persistence across context switch"

	default n

	help

	  Double Precision Floating Point unit had dedicated regs which

	  need to be saved/restored across context-switch.
@@ -453,7 +446,6 @@ config HIGHMEM 


config ARC_HAS_PAE40

	bool "Support for the 40-bit Physical Address Extension"

	default n

	depends on ISA_ARCV2

	select HIGHMEM

	select PHYS_ADDR_T_64BIT
@@ -496,7 +488,6 @@ config HZ 


config ARC_METAWARE_HLINK

	bool "Support for Metaware debugger assisted Host access"

	default n

	help

	  This options allows a Linux userland apps to directly access

	  host file system (open/creat/read/write etc) with help from
@@ -524,13 +515,11 @@ config ARC_DW2_UNWIND 


config ARC_DBG_TLB_PARANOIA

	bool "Paranoia Checks in Low Level TLB Handlers"

	default n



endif



config ARC_UBOOT_SUPPORT

	bool "Support uboot arg Handling"

	default n

	help

	  ARC Linux by default checks for uboot provided args as pointers to

	  external cmdline or DTB. This however breaks in absence of uboot,

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# published by the Free Software Foundation.

#



KBUILD_DEFCONFIG := nsim_700_defconfig

KBUILD_DEFCONFIG := nsim_hs_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

arch/arc/boot/dts/hsdk.dts

+15 −0
Original line number Diff line number Diff line
@@ -222,6 +222,21 @@ 
			bus-width = <4>;

			dma-coherent;

		};



		gpio: gpio@3000 {

			compatible = "snps,dw-apb-gpio";

			reg = <0x3000 0x20>;

			#address-cells = <1>;

			#size-cells = <0>;



			gpio_port_a: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <24>;

				reg = <0>;

			};

		};

	};



	memory@80000000 {

arch/arc/configs/axs101_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_ISA_ARCOMPACT=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y
@@ -95,6 +96,7 @@ CONFIG_VFAT_FS=y 
CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

arch/arc/configs/axs103_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_VFAT_FS=y 
CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set