Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARC fixes for 6.13-r32 or rc4

Browse Source 
- Sundry build and miscll fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOXpuCuR6hedrdLCJadfx3eKKwl4FAmdfQAcACgkQadfx3eKK
 wl6lZA//QoPtf7KpQAnBKMwX+hVJZmHPnM4PPMXl6vdPC8whVvAccw4/6pzzkMrb
 w2hn6CW7A3ZuJ22BEstfMiUhRadL7BKbfp/R3ODzV4ta66cW1ziTl4i4RPSGS5xE
 5vPWg6OSRm/gtGByFeXYL2G6YooWs4oVbK5V/7G8eyUXeyCQpJPxg2bDOBYplDVa
 nL84yA31Q8UIFL6guQl4E0y3stJzuIg1jnL6ZB2H1+IRE0krQ3pF9zvPO3DdSWEZ
 UPN3vsuXlOt0VSqird0T+9v1hr2gMKoWYECJZemN8wX2mrCBL/qqeQERSp3Acb/c
 DLrxNlT9lTrmWecmfAH/Xe6NteYZFojqOw0dSZT1sKR43pjAPysfk0f3LeaynQ+0
 kB7DE9XOKWVOsa+FhtlC19UyvW0UFAuknPxFkFiDMpUf70kWn8mXZ5DDyAotDeGk
 62HQT4TLhWWb4qcLdYmJ5ZQH5PhN9/kp4kxNHNzpChjuQnByZURpFIm+Bln/IUyQ
 E7Ac3sZLMoPMzOqj7ENJ3YhiDFKu2prKvhjCxAN62DvGCNxa+twSBCINXsCnZ7/e
 wjHKNqhcg4xd3LcJHAsKl+KHSgwU/pQ4ne17KSlqb0fml7Xo6epkq7Esgsy2bVsg
 Ubm1xAufcumxSXYxxti0e8yMr+VyEYrSlG43yfGFAbnwga6VINk=
 =YFuZ
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-12-15 15:38:12 -08:00
commit 42a19aa170
14 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arc/Kconfig
View File

@ -297,7 +297,6 @@ config ARC_PAGE_SIZE_16K
config ARC_PAGE_SIZE_4K config ARC_PAGE_SIZE_4K
bool "4KB" bool "4KB"
select HAVE_PAGE_SIZE_4KB select HAVE_PAGE_SIZE_4KB
depends on ARC_MMU_V3 || ARC_MMU_V4
endchoice endchoice
@ -474,7 +473,8 @@ config HIGHMEM
config ARC_HAS_PAE40 config ARC_HAS_PAE40
bool "Support for the 40-bit Physical Address Extension" bool "Support for the 40-bit Physical Address Extension"
depends on ISA_ARCV2 depends on ARC_MMU_V4
depends on !ARC_PAGE_SIZE_4K
select HIGHMEM select HIGHMEM
select PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
help help

2
arch/arc/Makefile
View File

@ -6,7 +6,7 @@
KBUILD_DEFCONFIG := haps_hs_smp_defconfig KBUILD_DEFCONFIG := haps_hs_smp_defconfig
ifeq ($(CROSS_COMPILE),) ifeq ($(CROSS_COMPILE),)
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-) CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)
endif endif
cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__ cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

2
arch/arc/boot/dts/axc001.dtsi
View File

@ -54,7 +54,7 @@ ictl_intc: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <30>; ngpios = <30>;
reg = <0>; reg = <0>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;

2
arch/arc/boot/dts/axc003.dtsi
View File

@ -62,7 +62,7 @@ ictl_intc: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <30>; ngpios = <30>;
reg = <0>; reg = <0>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;

2
arch/arc/boot/dts/axc003_idu.dtsi
View File

@ -69,7 +69,7 @@ ictl_intc: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <30>; ngpios = <30>;
reg = <0>; reg = <0>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;

12
arch/arc/boot/dts/axs10x_mb.dtsi
View File

@ -250,7 +250,7 @@ gpio0_banka: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <32>; ngpios = <32>;
reg = <0>; reg = <0>;
}; };
@ -258,7 +258,7 @@ gpio0_bankb: gpio-controller@1 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <8>; ngpios = <8>;
reg = <1>; reg = <1>;
}; };
@ -266,7 +266,7 @@ gpio0_bankc: gpio-controller@2 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <8>; ngpios = <8>;
reg = <2>; reg = <2>;
}; };
}; };
@ -281,7 +281,7 @@ gpio1_banka: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <30>; ngpios = <30>;
reg = <0>; reg = <0>;
}; };
@ -289,7 +289,7 @@ gpio1_bankb: gpio-controller@1 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <10>; ngpios = <10>;
reg = <1>; reg = <1>;
}; };
@ -297,7 +297,7 @@ gpio1_bankc: gpio-controller@2 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <8>; ngpios = <8>;
reg = <2>; reg = <2>;
}; };
}; };

2
arch/arc/boot/dts/hsdk.dts
View File

@ -308,7 +308,7 @@ gpio_port_a: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <24>; ngpios = <24>;
reg = <0>; reg = <0>;
}; };
}; };

2
arch/arc/include/asm/arcregs.h
View File

@ -146,7 +146,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <soc/arc/aux.h> #include <soc/arc/arc_aux.h>
/* Helpers */ /* Helpers */
#define TO_KB(bytes) ((bytes) >> 10) #define TO_KB(bytes) ((bytes) >> 10)

2
arch/arc/include/asm/cmpxchg.h
View File

@ -48,7 +48,7 @@
\ \
switch(sizeof((_p_))) { \ switch(sizeof((_p_))) { \
case 1: \ case 1: \
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \ _prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *__force)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
break; \ break; \
case 4: \ case 4: \
_prev_ = __cmpxchg(_p_, _o_, _n_); \ _prev_ = __cmpxchg(_p_, _o_, _n_); \

2
arch/arc/include/asm/mmu-arcv2.h
View File

@ -9,7 +9,7 @@
#ifndef _ASM_ARC_MMU_ARCV2_H #ifndef _ASM_ARC_MMU_ARCV2_H
#define _ASM_ARC_MMU_ARCV2_H #define _ASM_ARC_MMU_ARCV2_H
#include <soc/arc/aux.h> #include <soc/arc/arc_aux.h>
/* /*
* TLB Management regs * TLB Management regs

2
arch/arc/net/bpf_jit_arcv2.c
View File

@ -2916,7 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal; addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
disp = get_displacement(curr_off + addendum, targ_off); disp = get_displacement(curr_off + addendum, targ_off);
if (ARC_CC_AL) if (cond == ARC_CC_AL)
return is_valid_far_disp(disp); return is_valid_far_disp(disp);
else else
return is_valid_near_disp(disp); return is_valid_near_disp(disp);

0
include/soc/arc/aux.h → include/soc/arc/arc_aux.h
View File

2
include/soc/arc/mcip.h
View File

@ -8,7 +8,7 @@
#ifndef __SOC_ARC_MCIP_H #ifndef __SOC_ARC_MCIP_H
#define __SOC_ARC_MCIP_H #define __SOC_ARC_MCIP_H
#include <soc/arc/aux.h> #include <soc/arc/arc_aux.h>
#define ARC_REG_MCIP_BCR 0x0d0 #define ARC_REG_MCIP_BCR 0x0d0
#define ARC_REG_MCIP_IDU_BCR 0x0D5 #define ARC_REG_MCIP_IDU_BCR 0x0D5

2
include/soc/arc/timers.h
View File

@ -6,7 +6,7 @@
#ifndef __SOC_ARC_TIMERS_H #ifndef __SOC_ARC_TIMERS_H
#define __SOC_ARC_TIMERS_H #define __SOC_ARC_TIMERS_H
#include <soc/arc/aux.h> #include <soc/arc/arc_aux.h>
/* Timer related Aux registers */ /* Timer related Aux registers */
#define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */ #define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */