superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Xtensa updates for v6.16 

- migrate to the generic rule for built-in DTB
 - cleanups in code and common_defconfig
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmg+1XQTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRP/aD/4wQ7ETg9DvpFt32XsJKt8GwtTzk3pi
 u3TnpIfRr+ur3glrUENkH8BBn/uU76RFe7aVdH9t8I/S9znTpKKftpvtzcZw2DT6
 IasHkY4AB4zv2F0ksTUecFGVRAxEblx8QtCgYHVXIykICrgAXnq2vUqp3OwN75nJ
 kfhug0xeH4yrJe/CVxh976IQY1eB8BUZo0VzFfy+98TgXBJRBfeYwFuHbev6VE1T
 O/wZj3BWc1WXFL9Jjtz7dAeXButzgSS9mPw9vXvmh6NTEd+XbxymeFOHb8Aofq8Y
 lG/1t+NFGISu4AUwii6fS459hN2lO8QGLJ6410cRtC+357FmBAsxZigoqoSnRKO2
 J8h4OFxqtlavvnSd/XNC03VUCGQM6CyvQfQwPPEGw/68wBzpsE8bK5mEEcFmvxME
 osM6kPnfLJZ1MpDMm0rIsz1G5M/Dw2RA3Zsa3KwvP5MG/OGNOJjLJMLTGdKYiDiA
 1FqNjPyasiPz3xcd2RbplnNMeSncYOQMwXwrkdfSJgTuTS49VAJmAjk2DFNAS2ZR
 Vw07P1niD34hDW551WV7G6Q07L5VEe5TYVqwakED3xZkhjfFsOWGcAWSAIVmWWAh
 wyVYE0/7Lt166ppPOlyR7b4cLd58htounDJ1Z+6RifhctcOk/9lvhRN0aWeA6qpv
 WQ9A7y2r2FO9Eg==
 =IrOy
 -----END PGP SIGNATURE-----

Merge tag 'xtensa-20250603' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa updates from Max Filippov:

 - migrate to the generic rule for built-in DTB

 - cleanups in code and common_defconfig

* tag 'xtensa-20250603' of https://github.com/jcmvbkbc/linux-xtensa:
  arch: xtensa: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX
  xtensa: migrate to the generic rule for built-in DTB
  xtensa: ptrace: Remove zero-length alignment array
pull/1285/head
Linus Torvalds 2025-06-03 09:05:01 -07:00
parent c00b285024 3d6d238851
commit f5164456c6
12 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/Kbuild
View File

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += kernel/ mm/ platforms/ boot/dts/
obj-y += kernel/ mm/ platforms/

3
arch/xtensa/Kconfig
View File

@ -20,6 +20,7 @@ config XTENSA
select ARCH_USE_QUEUED_SPINLOCKS
select ARCH_WANT_IPC_PARSE_VERSION
select BUILDTIME_TABLE_SORT
select GENERIC_BUILTIN_DTB
select CLONE_BACKWARDS
select COMMON_CLK
select DMA_NONCOHERENT_MMAP if MMU
@ -462,7 +463,7 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.
config BUILTIN_DTB_SOURCE
config BUILTIN_DTB_NAME
string "DTB to build into the kernel image"
depends on OF

2
arch/xtensa/boot/dts/Makefile
View File

@ -7,7 +7,7 @@
#
#
obj-$(CONFIG_OF) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE))
dtb-$(CONFIG_OF) += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))
# for CONFIG_OF_ALL_DTBS test
dtb- := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))

2
arch/xtensa/configs/audio_kc705_defconfig
View File

@ -30,7 +30,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="kc705"
CONFIG_BUILTIN_DTB_NAME="kc705"
# CONFIG_COMPACTION is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM=y

2
arch/xtensa/configs/cadence_csp_defconfig
View File

@ -34,7 +34,7 @@ CONFIG_HIGHMEM=y
# CONFIG_PCI is not set
CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="csp"
CONFIG_BUILTIN_DTB_NAME="csp"
# CONFIG_COMPACTION is not set
CONFIG_XTFPGA_LCD=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

1
arch/xtensa/configs/common_defconfig
View File

@ -32,7 +32,6 @@ CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m

2
arch/xtensa/configs/generic_kc705_defconfig
View File

@ -29,7 +29,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="kc705"
CONFIG_BUILTIN_DTB_NAME="kc705"
# CONFIG_COMPACTION is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_NET=y

2
arch/xtensa/configs/nommu_kc705_defconfig
View File

@ -36,7 +36,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=256M@0x60000000"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="kc705_nommu"
CONFIG_BUILTIN_DTB_NAME="kc705_nommu"
CONFIG_BINFMT_FLAT=y
CONFIG_NET=y
CONFIG_PACKET=y

2
arch/xtensa/configs/smp_lx200_defconfig
View File

@ -33,7 +33,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=96M@0"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="lx200mx"
CONFIG_BUILTIN_DTB_NAME="lx200mx"
# CONFIG_COMPACTION is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_NET=y

2
arch/xtensa/configs/virt_defconfig
View File

@ -24,7 +24,7 @@ CONFIG_HIGHMEM=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x80000000@0"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="virt"
CONFIG_BUILTIN_DTB_NAME="virt"
# CONFIG_PARSE_BOOTPARAM is not set
CONFIG_JUMP_LABEL=y
CONFIG_MODULES=y

2
arch/xtensa/configs/xip_kc705_defconfig
View File

@ -29,7 +29,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="kc705"
CONFIG_BUILTIN_DTB_NAME="kc705"
# CONFIG_PARSE_BOOTPARAM is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_COMPACTION is not set

5
arch/xtensa/include/asm/ptrace.h
View File

@ -72,13 +72,10 @@ struct pt_regs {
/* Additional configurable registers that are used by the compiler. */
xtregs_opt_t xtregs_opt;
/* Make sure the areg field is 16 bytes aligned. */
int align[0] __attribute__ ((aligned(16)));
/* current register frame.
* Note: The ESF for kernel exceptions ends after 16 registers!
*/
unsigned long areg[XCHAL_NUM_AREGS];
unsigned long areg[XCHAL_NUM_AREGS] __aligned(16);
};
# define arch_has_single_step() (1)