dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'powerpc-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Browse Source 
Pull powerpc fixes from Madhavan Srinivasan:

 - Fix to handle VDSO32 with pcrel

 - Couple of dts fixes in microwatt and mpc8315erdb

 - Fix to handle PE bridge reconfiguration in VFIO EEH recovery path

 - Fix ioctl macros related to struct termio

Thanks to Christophe Leroy, Ganesh Goudar, J.  Neuschäfer, Justin M.
Forbes, Michael Ellerman, Narayana Murty N, Tulio Magno, and Vaibhav
Jain

* tag 'powerpc-6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Fix struct termio related ioctl macros
  powerpc: dts: mpc8315erdb: Add GPIO controller node
  powerpc/microwatt: Fix model property in device tree
  powerpc/eeh: Fix missing PE bridge reconfiguration during VFIO EEH recovery
  powerpc/vdso: Fix build of VDSO32 with pcrel
This commit is contained in:
Linus Torvalds
2025-06-16 08:49:58 -07:00
parent fe78e02600 ab10727660
commit 44a5ab7a79
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/boot/dts/microwatt.dts
+1 -1
View File
@@ -4,7 +4,7 @@
/ {
#size-cells = <0x02>;
#address-cells = <0x02>;
model-name = "microwatt";
model = "microwatt";
compatible = "microwatt-soc";
aliases {
arch/powerpc/boot/dts/mpc8315erdb.dts
+10
View File
@@ -6,6 +6,7 @@
*/
/dts-v1/;
#include <dt-bindings/interrupt-controller/irq.h>
/ {
compatible = "fsl,mpc8315erdb";
@@ -358,6 +359,15 @@
interrupt-parent = <&ipic>;
fsl,mpc8313-wakeup-timer = <&gtm1>;
};
gpio: gpio-controller@c00 {
compatible = "fsl,mpc8314-gpio";
reg = <0xc00 0x100>;
interrupts = <74 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&ipic>;
gpio-controller;
#gpio-cells = <2>;
};
};
pci0: pci@e0008500 {
arch/powerpc/include/asm/ppc_asm.h
+1 -1
View File
@@ -183,7 +183,7 @@
/*
* Used to name C functions called from asm
*/
#ifdef CONFIG_PPC_KERNEL_PCREL
#if defined(__powerpc64__) && defined(CONFIG_PPC_KERNEL_PCREL)
#define CFUNC(name) name@notoc
#else
#define CFUNC(name) name
arch/powerpc/include/uapi/asm/ioctls.h
+4 -4
View File
@@ -23,10 +23,10 @@
#define TCSETSW _IOW('t', 21, struct termios)
#define TCSETSF _IOW('t', 22, struct termios)
#define TCGETA _IOR('t', 23, struct termio)
#define TCSETA _IOW('t', 24, struct termio)
#define TCSETAW _IOW('t', 25, struct termio)
#define TCSETAF _IOW('t', 28, struct termio)
#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */
#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */
#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */
#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */
#define TCSBRK _IO('t', 29)
#define TCXONC _IO('t', 30)
arch/powerpc/kernel/eeh.c
+2
View File
@@ -1509,6 +1509,8 @@ int eeh_pe_configure(struct eeh_pe *pe)
/* Invalid PE ? */
if (!pe)
return -ENODEV;
else
ret = eeh_ops->configure_bridge(pe);
return ret;
}
arch/powerpc/kernel/vdso/Makefile
+1 -1
View File
@@ -53,7 +53,7 @@ ldflags-$(CONFIG_LD_ORPHAN_WARN) += -Wl,--orphan-handling=$(CONFIG_LD_ORPHAN_WAR
ldflags-y += $(filter-out $(CC_AUTO_VAR_INIT_ZERO_ENABLER) $(CC_FLAGS_FTRACE) -Wa$(comma)%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
CC32FLAGS := -m32
CC32FLAGSREMOVE := -mcmodel=medium -mabi=elfv1 -mabi=elfv2 -mcall-aixdesc
CC32FLAGSREMOVE := -mcmodel=medium -mabi=elfv1 -mabi=elfv2 -mcall-aixdesc -mpcrel
ifdef CONFIG_CC_IS_CLANG
# This flag is supported by clang for 64-bit but not 32-bit so it will cause
# an unused command line flag warning for this file.