Skip to content

Commit 42a19aa

Browse files
torvaldstorvalds
committed
Merge tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta: - Sundry build and misc fixes * tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: build: Try to guess GCC variant of cross compiler ARC: bpf: Correct conditional check in 'check_jmp_32' ARC: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices ARC: build: Use __force to suppress per-CPU cmpxchg warnings ARC: fix reference of dependency for PAE40 config ARC: build: disallow invalid PAE40 + 4K page config arc: rename aux.h to arc_aux.h
2 parents 7031a38 + 824927e commit 42a19aa

14 files changed

+19
-19
lines changed

‎arch/arc/Kconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ config ARC_PAGE_SIZE_16K
297297
config ARC_PAGE_SIZE_4K
298298
bool "4KB"
299299
select HAVE_PAGE_SIZE_4KB
300-
depends on ARC_MMU_V3 || ARC_MMU_V4
301300

302301
endchoice
303302

@@ -474,7 +473,8 @@ config HIGHMEM
474473

475474
config ARC_HAS_PAE40
476475
bool "Support for the 40-bit Physical Address Extension"
477-
depends on ISA_ARCV2
476+
depends on ARC_MMU_V4
477+
depends on !ARC_PAGE_SIZE_4K
478478
select HIGHMEM
479479
select PHYS_ADDR_T_64BIT
480480
help

‎arch/arc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
77

88
ifeq ($(CROSS_COMPILE),)
9-
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)
9+
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)
1010
endif
1111

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

‎arch/arc/boot/dts/axc001.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
compatible = "snps,dw-apb-gpio-port";
5555
gpio-controller;
5656
#gpio-cells = <2>;
57-
snps,nr-gpios = <30>;
57+
ngpios = <30>;
5858
reg = <0>;
5959
interrupt-controller;
6060
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axc003.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
compatible = "snps,dw-apb-gpio-port";
6363
gpio-controller;
6464
#gpio-cells = <2>;
65-
snps,nr-gpios = <30>;
65+
ngpios = <30>;
6666
reg = <0>;
6767
interrupt-controller;
6868
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axc003_idu.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
compatible = "snps,dw-apb-gpio-port";
7070
gpio-controller;
7171
#gpio-cells = <2>;
72-
snps,nr-gpios = <30>;
72+
ngpios = <30>;
7373
reg = <0>;
7474
interrupt-controller;
7575
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axs10x_mb.dtsi

+6-6
Original file line numberDiff line numberDiff line change
@@ -250,23 +250,23 @@
250250
compatible = "snps,dw-apb-gpio-port";
251251
gpio-controller;
252252
#gpio-cells = <2>;
253-
snps,nr-gpios = <32>;
253+
ngpios = <32>;
254254
reg = <0>;
255255
};
256256

257257
gpio0_bankb: gpio-controller@1 {
258258
compatible = "snps,dw-apb-gpio-port";
259259
gpio-controller;
260260
#gpio-cells = <2>;
261-
snps,nr-gpios = <8>;
261+
ngpios = <8>;
262262
reg = <1>;
263263
};
264264

265265
gpio0_bankc: gpio-controller@2 {
266266
compatible = "snps,dw-apb-gpio-port";
267267
gpio-controller;
268268
#gpio-cells = <2>;
269-
snps,nr-gpios = <8>;
269+
ngpios = <8>;
270270
reg = <2>;
271271
};
272272
};
@@ -281,23 +281,23 @@
281281
compatible = "snps,dw-apb-gpio-port";
282282
gpio-controller;
283283
#gpio-cells = <2>;
284-
snps,nr-gpios = <30>;
284+
ngpios = <30>;
285285
reg = <0>;
286286
};
287287

288288
gpio1_bankb: gpio-controller@1 {
289289
compatible = "snps,dw-apb-gpio-port";
290290
gpio-controller;
291291
#gpio-cells = <2>;
292-
snps,nr-gpios = <10>;
292+
ngpios = <10>;
293293
reg = <1>;
294294
};
295295

296296
gpio1_bankc: gpio-controller@2 {
297297
compatible = "snps,dw-apb-gpio-port";
298298
gpio-controller;
299299
#gpio-cells = <2>;
300-
snps,nr-gpios = <8>;
300+
ngpios = <8>;
301301
reg = <2>;
302302
};
303303
};

‎arch/arc/boot/dts/hsdk.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
compatible = "snps,dw-apb-gpio-port";
309309
gpio-controller;
310310
#gpio-cells = <2>;
311-
snps,nr-gpios = <24>;
311+
ngpios = <24>;
312312
reg = <0>;
313313
};
314314
};

‎arch/arc/include/asm/arcregs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
#ifndef __ASSEMBLY__
148148

149-
#include <soc/arc/aux.h>
149+
#include <soc/arc/arc_aux.h>
150150

151151
/* Helpers */
152152
#define TO_KB(bytes) ((bytes) >> 10)

‎arch/arc/include/asm/cmpxchg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
\
4949
switch(sizeof((_p_))) { \
5050
case 1: \
51-
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
51+
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *__force)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
5252
break; \
5353
case 4: \
5454
_prev_ = __cmpxchg(_p_, _o_, _n_); \

‎arch/arc/include/asm/mmu-arcv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef _ASM_ARC_MMU_ARCV2_H
1010
#define _ASM_ARC_MMU_ARCV2_H
1111

12-
#include <soc/arc/aux.h>
12+
#include <soc/arc/arc_aux.h>
1313

1414
/*
1515
* TLB Management regs

‎arch/arc/net/bpf_jit_arcv2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2916,7 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
29162916
addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
29172917
disp = get_displacement(curr_off + addendum, targ_off);
29182918

2919-
if (ARC_CC_AL)
2919+
if (cond == ARC_CC_AL)
29202920
return is_valid_far_disp(disp);
29212921
else
29222922
return is_valid_near_disp(disp);

‎include/soc/arc/aux.h ‎include/soc/arc/arc_aux.h

File renamed without changes.

‎include/soc/arc/mcip.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef __SOC_ARC_MCIP_H
99
#define __SOC_ARC_MCIP_H
1010

11-
#include <soc/arc/aux.h>
11+
#include <soc/arc/arc_aux.h>
1212

1313
#define ARC_REG_MCIP_BCR 0x0d0
1414
#define ARC_REG_MCIP_IDU_BCR 0x0D5

‎include/soc/arc/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __SOC_ARC_TIMERS_H
77
#define __SOC_ARC_TIMERS_H
88

9-
#include <soc/arc/aux.h>
9+
#include <soc/arc/arc_aux.h>
1010

1111
/* Timer related Aux registers */
1212
#define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */

0 commit comments

Comments
 (0)