Commit 44a5ab7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fe78e026 ab107276

arch/powerpc/boot/dts/microwatt.dts

+1 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	compatible = "fsl,mpc8315erdb";
@@ -358,6 +359,15 @@ pmc: power@b00 { 
			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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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;

}