Skip to content

Commit 056df57

Browse files
committed
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
2 parents aedc065 + 9fbea0b commit 056df57

27 files changed

+363
-411
lines changed

arch/arc/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ config ARC
2929
select HAVE_ARCH_KGDB
3030
select HAVE_ARCH_TRACEHOOK
3131
select HAVE_DEBUG_STACKOVERFLOW
32+
select HAVE_DEBUG_KMEMLEAK
3233
select HAVE_FUTEX_CMPXCHG if FUTEX
3334
select HAVE_IOREMAP_PROT
3435
select HAVE_KERNEL_GZIP
@@ -45,6 +46,7 @@ config ARC
4546
select OF_EARLY_FLATTREE
4647
select PCI_SYSCALL if PCI
4748
select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
49+
select HAVE_ARCH_JUMP_LABEL if ISA_ARCV2 && !CPU_ENDIAN_BE32
4850

4951
config ARCH_HAS_CACHE_LINE_SIZE
5052
def_bool y
@@ -524,6 +526,13 @@ config ARC_DW2_UNWIND
524526
config ARC_DBG_TLB_PARANOIA
525527
bool "Paranoia Checks in Low Level TLB Handlers"
526528

529+
config ARC_DBG_JUMP_LABEL
530+
bool "Paranoid checks in Static Keys (jump labels) code"
531+
depends on JUMP_LABEL
532+
default y if STATIC_KEYS_SELFTEST
533+
help
534+
Enable paranoid checks and self-test of both ARC-specific and generic
535+
part of static keys (jump labels) related code.
527536
endif
528537

529538
config ARC_BUILTIN_DTB_NAME

arch/arc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
44
#
55

6-
KBUILD_DEFCONFIG := nsim_hs_defconfig
6+
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
77

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

arch/arc/boot/dts/axc001.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
clock-frequency = <750000000>;
2929
};
3030

31+
input_clk: input-clk {
32+
#clock-cells = <0>;
33+
compatible = "fixed-clock";
34+
clock-frequency = <33333333>;
35+
};
36+
3137
core_intc: arc700-intc@cpu {
3238
compatible = "snps,arc700-intc";
3339
interrupt-controller;

arch/arc/boot/dts/axs101.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
compatible = "snps,axs101", "snps,arc-sdp";
1515

1616
chosen {
17-
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60 print-fatal-signals=1";
17+
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 print-fatal-signals=1";
1818
};
1919
};

arch/arc/boot/dts/axs103_idu.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
compatible = "snps,axs103", "snps,arc-sdp";
1818

1919
chosen {
20-
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 print-fatal-signals=1 consoleblank=0 video=1280x720@60";
20+
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 print-fatal-signals=1 consoleblank=0";
2121
};
2222
};

arch/arc/boot/dts/axs10x_mb.dtsi

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,13 @@
6161
clock-frequency = <25000000>;
6262
#clock-cells = <0>;
6363
};
64+
};
6465

65-
pguclk: pguclk {
66-
#clock-cells = <0>;
67-
compatible = "fixed-clock";
68-
clock-frequency = <74250000>;
69-
};
66+
pguclk: pguclk@10080 {
67+
compatible = "snps,axs10x-pgu-pll-clock";
68+
reg = <0x10080 0x10>, <0x110 0x10>;
69+
#clock-cells = <0>;
70+
clocks = <&input_clk>;
7071
};
7172

7273
gmac: ethernet@18000 {

arch/arc/boot/dts/haps_hs.dts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
/ {
1010
model = "snps,zebu_hs";
1111
compatible = "snps,zebu_hs";
12-
#address-cells = <1>;
13-
#size-cells = <1>;
12+
#address-cells = <2>;
13+
#size-cells = <2>;
1414
interrupt-parent = <&core_intc>;
1515

1616
memory {
1717
device_type = "memory";
18-
reg = <0x80000000 0x20000000>; /* 512 */
18+
/* CONFIG_LINUX_RAM_BASE needs to match low mem start */
19+
reg = <0x0 0x80000000 0x0 0x20000000 /* 512 MB low mem */
20+
0x1 0x00000000 0x0 0x40000000>; /* 1 GB highmem */
1921
};
2022

2123
chosen {
@@ -31,8 +33,9 @@
3133
#address-cells = <1>;
3234
#size-cells = <1>;
3335

34-
/* child and parent address space 1:1 mapped */
35-
ranges;
36+
/* only perip space at end of low mem accessible
37+
bus addr, parent bus addr, size */
38+
ranges = <0x80000000 0x0 0x80000000 0x80000000>;
3639

3740
core_clk: core_clk {
3841
#clock-cells = <0>;
@@ -47,7 +50,7 @@
4750
};
4851

4952
uart0: serial@f0000000 {
50-
compatible = "ns8250";
53+
compatible = "ns16550a";
5154
reg = <0xf0000000 0x2000>;
5255
interrupts = <24>;
5356
clock-frequency = <50000000>;

arch/arc/boot/dts/haps_hs_idu.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
};
5555

5656
uart0: serial@f0000000 {
57-
/* compatible = "ns8250"; Doesn't use FIFOs */
5857
compatible = "ns16550a";
5958
reg = <0xf0000000 0x2000>;
6059
interrupt-parent = <&idu_intc>;

arch/arc/boot/dts/nsim_700.dts

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
interrupt-parent = <&core_intc>;
1515

1616
chosen {
17-
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
17+
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 print-fatal-signals=1";
1818
};
1919

2020
aliases {
21-
serial0 = &arcuart0;
21+
serial0 = &uart0;
2222
};
2323

2424
fpga {
@@ -41,29 +41,15 @@
4141
#interrupt-cells = <1>;
4242
};
4343

44-
arcuart0: serial@c0fc1000 {
45-
compatible = "snps,arc-uart";
46-
reg = <0xc0fc1000 0x100>;
47-
interrupts = <5>;
48-
clock-frequency = <80000000>;
49-
current-speed = <115200>;
50-
status = "okay";
51-
};
52-
53-
ethernet@c0fc2000 {
54-
compatible = "snps,arc-emac";
55-
reg = <0xc0fc2000 0x3c>;
56-
interrupts = <6>;
57-
mac-address = [ 00 11 22 33 44 55 ];
58-
clock-frequency = <80000000>;
59-
max-speed = <100>;
60-
phy = <&phy0>;
61-
62-
#address-cells = <1>;
63-
#size-cells = <0>;
64-
phy0: ethernet-phy@0 {
65-
reg = <1>;
66-
};
44+
uart0: serial@f0000000 {
45+
compatible = "ns16550a";
46+
reg = <0xf0000000 0x2000>;
47+
interrupts = <24>;
48+
clock-frequency = <50000000>;
49+
baud = <115200>;
50+
reg-shift = <2>;
51+
reg-io-width = <4>;
52+
no-loopback-test = <1>;
6753
};
6854

6955
arcpct0: pct {

arch/arc/boot/dts/nsim_hs.dts

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)