mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Xtensa updates for v6.8 

- small cleanups in the xtensa PCI and asmmacro code
 - fix kernel build with FDPIC toolchain
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmWns1gTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRE9xD/9AiJxY8ZUvTWmOCOf0/gMj6XHEopMQ
 MifpNGGuwJMtOYqJQUl8D9D27JTD+mYLk+n81B2t+/C6TN2W7XbLAR37hHOwFDiq
 cWJztV17zzGl3tEoPBxBzUp86AL7fTodH9O5+swfzh6vMD877Q/Lp4osp7T1K19K
 EMMsz5Oy+oHotflE4j+A5XaPaXF/GvKLBXLP+LvCVaI+reVXHBC/pYfkTDI0Wgco
 rkbnVtpA5RlK2vSXkO5w0Nx/6z7XlGtNMhrIbgJPzN0fO1r5It6a5X91OVw/HtaM
 f8TT8G4+8bB8DVpgx5BgrFyELX/313sARX8sJ+RkrDWeP0pSEZsDVosYN48LrDIh
 uVIBr/Akl4mch8ICuCMpySzK8arcKRuSQvUOPQHKOTRf0zUOtRTgVKd6cqqSBOWE
 Z9S51QvggOQKdTz98xzJoMcoHGEVCXq6Qw/xZi2Zft+9rt3GNfB3xBb69Ro7fWtH
 rR02xPKgPeFussPFL0nr4bDFPhZCt33aZiW93OlnHzC5oYhBuRcVPFNyeB25dJoN
 c+JZXFPV0Pmqfh/7E+VTuQ//v5K/Vst9zcNtf3lAjtsrRuifVu2ulQVIfw73tW2j
 rJ4yAm8Ji8AMcUG7H+rXQvScFAa26dIeuoz6HxLIii9BnAR9PCI1gUBBUo9ws+pI
 XBPlI2ZhWhJBTA==
 =2QMt
 -----END PGP SIGNATURE-----

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

Pull Xtensa updates from Max Filippov:

 - small cleanups in the xtensa PCI and asmmacro code

 - fix kernel build with FDPIC toolchain

* tag 'xtensa-20240117' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: don't produce FDPIC output with fdpic toolchain
  xtensa: Use PCI_HEADER_TYPE_MFD instead of literal
  xtensa: replace <asm-generic/export.h> with <linux/export.h>
  xtensa: fix variants path in the Kconfig help
This commit is contained in:
Linus Torvalds 2024-01-17 11:40:52 -08:00
parent c4c6044d35 a03cd7602a
commit 47ce834fbb
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/Kconfig
View File

@ -144,7 +144,7 @@ config XTENSA_VARIANT_CUSTOM_NAME
depends on XTENSA_VARIANT_CUSTOM
help
Provide the name of a custom Xtensa processor variant.
This CORENAME selects arch/xtensa/variant/CORENAME.
This CORENAME selects arch/xtensa/variants/CORENAME.
Don't forget you have to select MMU if you have one.
config XTENSA_VARIANT_NAME

6
arch/xtensa/Makefile
View File

@ -35,15 +35,19 @@ KBUILD_CFLAGS += -ffreestanding -D__linux__
KBUILD_CFLAGS += -pipe -mlongcalls -mtext-section-literals
KBUILD_CFLAGS += $(call cc-option,-mforce-no-pic,)
KBUILD_CFLAGS += $(call cc-option,-mno-serialize-volatile,)
KBUILD_CFLAGS += $(call cc-option,-mno-fdpic,)
ifneq ($(CONFIG_KERNEL_ABI_CALL0),)
KBUILD_CFLAGS += -mabi=call0
KBUILD_AFLAGS += -mabi=call0
endif
KBUILD_AFLAGS += -mlongcalls -mtext-section-literals
KBUILD_AFLAGS += $(call cc-option,-mno-fdpic,)
KBUILD_LDFLAGS += -m elf32xtensa
ifneq ($(CONFIG_LD_NO_RELAX),)
KBUILD_LDFLAGS := --no-relax
KBUILD_LDFLAGS += --no-relax
endif
CHECKFLAGS += -D$(if $(CONFIG_CPU_BIG_ENDIAN),__XTENSA_EB__,__XTENSA_EL__)

2
arch/xtensa/include/asm/asmmacro.h
View File

@ -11,7 +11,7 @@
#ifndef _XTENSA_ASMMACRO_H
#define _XTENSA_ASMMACRO_H
#include <asm-generic/export.h>
#include <linux/export.h>
#include <asm/core.h>
/*

8
arch/xtensa/lib/pci-auto.c
View File

@ -11,6 +11,7 @@
* Based on work from Matt Porter <mporter@mvista.com>
*/
#include <linux/bitfield.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
@ -222,10 +223,11 @@ pciauto_postscan_setup_bridge(struct pci_dev *dev, int current_bus, int sub_bus,
int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
{
int sub_bus, pci_devfn, pci_class, cmdstat, found_multi=0;
int sub_bus, pci_devfn, pci_class, cmdstat;
unsigned short vid;
unsigned char header_type;
struct pci_dev *dev = &pciauto_dev;
bool found_multi = false;
pciauto_dev.bus = &pciauto_bus;
pciauto_dev.sysdata = pci_ctrl;
@ -261,11 +263,11 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
continue;
if (!PCI_FUNC(pci_devfn))
found_multi = header_type & 0x80;
found_multi = FIELD_GET(PCI_HEADER_TYPE_MFD, header_type);
pci_read_config_word(dev, PCI_VENDOR_ID, &vid);
if (vid == 0xffff || vid == 0x0000) {
found_multi = 0;
found_multi = false;
continue;
}