tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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

Linus Torvalds 44a5ab7a fe78e026

+19 -7
+1 -1
arch/powerpc/boot/dts/microwatt.dts
··· 4 4 / { 5 5 #size-cells = <0x02>; 6 6 #address-cells = <0x02>; 7 - model-name = "microwatt"; 7 + model = "microwatt"; 8 8 compatible = "microwatt-soc"; 9 9 10 10 aliases {
+10
arch/powerpc/boot/dts/mpc8315erdb.dts
··· 6 6 */ 7 7 8 8 /dts-v1/; 9 + #include <dt-bindings/interrupt-controller/irq.h> 9 10 10 11 / { 11 12 compatible = "fsl,mpc8315erdb"; ··· 358 357 interrupts = <80 8>; 359 358 interrupt-parent = <&ipic>; 360 359 fsl,mpc8313-wakeup-timer = <&gtm1>; 360 + }; 361 + 362 + gpio: gpio-controller@c00 { 363 + compatible = "fsl,mpc8314-gpio"; 364 + reg = <0xc00 0x100>; 365 + interrupts = <74 IRQ_TYPE_LEVEL_LOW>; 366 + interrupt-parent = <&ipic>; 367 + gpio-controller; 368 + #gpio-cells = <2>; 361 369 }; 362 370 }; 363 371
+1 -1
arch/powerpc/include/asm/ppc_asm.h
··· 183 183 /* 184 184 * Used to name C functions called from asm 185 185 */ 186 - #ifdef CONFIG_PPC_KERNEL_PCREL 186 + #if defined(__powerpc64__) && defined(CONFIG_PPC_KERNEL_PCREL) 187 187 #define CFUNC(name) name@notoc 188 188 #else 189 189 #define CFUNC(name) name
+4 -4
arch/powerpc/include/uapi/asm/ioctls.h
··· 23 23 #define TCSETSW _IOW('t', 21, struct termios) 24 24 #define TCSETSF _IOW('t', 22, struct termios) 25 25 26 - #define TCGETA _IOR('t', 23, struct termio) 27 - #define TCSETA _IOW('t', 24, struct termio) 28 - #define TCSETAW _IOW('t', 25, struct termio) 29 - #define TCSETAF _IOW('t', 28, struct termio) 26 + #define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */ 27 + #define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */ 28 + #define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */ 29 + #define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */ 30 30 31 31 #define TCSBRK _IO('t', 29) 32 32 #define TCXONC _IO('t', 30)
+2
arch/powerpc/kernel/eeh.c
··· 1509 1509 /* Invalid PE ? */ 1510 1510 if (!pe) 1511 1511 return -ENODEV; 1512 + else 1513 + ret = eeh_ops->configure_bridge(pe); 1512 1514 1513 1515 return ret; 1514 1516 }
+1 -1
arch/powerpc/kernel/vdso/Makefile
··· 53 53 ldflags-y += $(filter-out $(CC_AUTO_VAR_INIT_ZERO_ENABLER) $(CC_FLAGS_FTRACE) -Wa$(comma)%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)) 54 54 55 55 CC32FLAGS := -m32 56 - CC32FLAGSREMOVE := -mcmodel=medium -mabi=elfv1 -mabi=elfv2 -mcall-aixdesc 56 + CC32FLAGSREMOVE := -mcmodel=medium -mabi=elfv1 -mabi=elfv2 -mcall-aixdesc -mpcrel 57 57 ifdef CONFIG_CC_IS_CLANG 58 58 # This flag is supported by clang for 64-bit but not 32-bit so it will cause 59 59 # an unused command line flag warning for this file.