Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527d1511 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc LE updates from Ben Herrenschmidt:
 "With my previous pull request I mentioned some remaining Little Endian
  patches, notably support for our new ABI, which I was sitting on
  making sure it was all finalized.

  The toolchain folks confirmed it now, the new ABI is stable and merged
  with gcc, so we are all good.  Oh and we actually missed the actual
  Kconfig switch for LE so here it is, along with a couple more bug
  fixes.

  I have more fixes but not related to LE so I'll send them as a
  separate pull request tomorrow, let's get this one out of the way.

  Note that this supports running user space binaries using the new ABI,
  but the kernel itself still needs to be built with the old one.  We'll
  bring fixes for that after -rc1.

  Here's Anton log that goes with this series:

     This patch series adds support for the new ABI, LPAR support for
     H_SET_MODE and finally adds a kconfig option and defconfig.

     ABIv2 support was recently committed to binutils and gcc, and should
     be merged into glibc soon.  There are a number of very nice
     improvements including the removal of function descriptors.  Rusty's
     kernel patches allow binaries of either ABI to work, easing the
     transition"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Wrong DWARF CFI in the kernel vdso for little-endian / ELFv2
  powerpc: Add pseries_le_defconfig
  powerpc: Add CONFIG_CPU_LITTLE_ENDIAN kernel config option.
  powerpc: Don't use ELFv2 ABI to build the kernel
  powerpc: ELF2 binaries signal handling
  powerpc: ELF2 binaries launched directly.
  powerpc: Set eflags correctly for ELF ABIv2 core dumps.
  powerpc: Add TIF_ELF2ABI flag.
  pseries: Add H_SET_MODE to change exception endianness
  powerpc/pseries: Fix endian issues in pseries EEH code
parents d5bdaf4f 28027082

arch/powerpc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ endif 
endif



CFLAGS-$(CONFIG_PPC64)	:= -mtraceback=no -mcall-aixdesc

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,-mminimal-toc)

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)

CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 $(MULTIPLEWORD)

arch/powerpc/configs/pseries_le_defconfig

0 → 100644
+352 −0
Original line number Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_ALTIVEC=y

CONFIG_VSX=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2048

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

CONFIG_AUDITSYSCALL=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PPC_SPLPAR=y

CONFIG_SCANLOG=m

CONFIG_PPC_SMLPAR=y

CONFIG_DTL=y

# CONFIG_PPC_PMAC is not set

CONFIG_RTAS_FLASH=m

CONFIG_IBMEBUS=y

CONFIG_HZ_100=y

CONFIG_BINFMT_MISC=m

CONFIG_PPC_TRANSACTIONAL_MEM=y

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_CMA=y

CONFIG_PPC_64K_PAGES=y

CONFIG_PPC_SUBPAGE_PROT=y

CONFIG_SCHED_SMT=y

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_RPA=m

CONFIG_HOTPLUG_PCI_RPA_DLPAR=m

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_NET_IPIP=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_IRC=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_CT_NETLINK=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFLOG=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m

CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

CONFIG_NETFILTER_XT_MATCH_DCCP=m

CONFIG_NETFILTER_XT_MATCH_DSCP=m

CONFIG_NETFILTER_XT_MATCH_ESP=m

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m

CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SCTP=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_TIME=m

CONFIG_NETFILTER_XT_MATCH_U32=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_PROC_DEVICETREE=y

CONFIG_PARPORT=m

CONFIG_PARPORT_PC=m

CONFIG_BLK_DEV_FD=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_VIRTIO_BLK=m

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_AMD74XX=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_CXGB3_ISCSI=m

CONFIG_SCSI_CXGB4_ISCSI=m

CONFIG_SCSI_BNX2_ISCSI=m

CONFIG_BE2ISCSI=m

CONFIG_SCSI_MPT2SAS=m

CONFIG_SCSI_IBMVSCSI=y

CONFIG_SCSI_IBMVFC=m

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0

CONFIG_SCSI_IPR=y

CONFIG_SCSI_QLA_FC=m

CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_LPFC=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_ALUA=m

CONFIG_ATA=y

# CONFIG_ATA_SFF is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=y

CONFIG_MD_RAID0=y

CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=m

CONFIG_MD_RAID456=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_MULTIPATH_QL=m

CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_UEVENT=y

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_NETCONSOLE=y

CONFIG_NETPOLL_TRAP=y

CONFIG_TUN=m

CONFIG_VIRTIO_NET=m

CONFIG_VORTEX=y

CONFIG_ACENIC=m

CONFIG_ACENIC_OMIT_TIGON_I=y

CONFIG_PCNET32=y

CONFIG_TIGON3=y

CONFIG_CHELSIO_T1=m

CONFIG_BE2NET=m

CONFIG_S2IO=m

CONFIG_IBMVETH=y

CONFIG_EHEA=y

CONFIG_E100=y

CONFIG_E1000=y

CONFIG_E1000E=y

CONFIG_IXGB=m

CONFIG_IXGBE=m

CONFIG_MLX4_EN=m

CONFIG_MYRI10GE=m

CONFIG_QLGE=m

CONFIG_NETXEN_NIC=m

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPPOE=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_PCSPKR=m

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_ICOM=m

CONFIG_SERIAL_JSM=m

CONFIG_HVC_CONSOLE=y

CONFIG_HVC_RTAS=y

CONFIG_HVCS=m

CONFIG_VIRTIO_CONSOLE=m

CONFIG_IBM_BSR=m

CONFIG_GEN_RTC=y

CONFIG_RAW_DRIVER=y

CONFIG_MAX_RAW_DEVS=1024

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_OF=y

CONFIG_FB_MATROX=y

CONFIG_FB_MATROX_MILLENIUM=y

CONFIG_FB_MATROX_MYSTIQUE=y

CONFIG_FB_MATROX_G=y

CONFIG_FB_RADEON=y

CONFIG_FB_IBM_GXT4500=y

CONFIG_LCD_PLATFORM=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_HID_GYRATION=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SUNPLUS=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_MON=m

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_HCD_PPC_OF is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=m

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_MAD=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_INFINIBAND_MTHCA=m

CONFIG_INFINIBAND_EHCA=m

CONFIG_INFINIBAND_CXGB3=m

CONFIG_INFINIBAND_CXGB4=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_INFINIBAND_IPOIB=m

CONFIG_INFINIBAND_IPOIB_CM=y

CONFIG_INFINIBAND_SRP=m

CONFIG_INFINIBAND_ISER=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT2_FS_XIP=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_REISERFS_FS=y

CONFIG_REISERFS_FS_XATTR=y

CONFIG_REISERFS_FS_POSIX_ACL=y

CONFIG_REISERFS_FS_SECURITY=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_JFS_SECURITY=y

CONFIG_XFS_FS=m

CONFIG_XFS_POSIX_ACL=y

CONFIG_BTRFS_FS=m

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_ISO9660_FS=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZO=y

CONFIG_SQUASHFS_XZ=y

CONFIG_PSTORE=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFSD=m

CONFIG_NFSD_V3_ACL=y

CONFIG_NFSD_V4=y

CONFIG_CIFS=m

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_CRC_T10DIF=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_CODE_PATCHING_SELFTEST=y

CONFIG_FTR_FIXUP_SELFTEST=y

CONFIG_MSI_BITMAP_SELFTEST=y

CONFIG_XMON=y

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_NX=y

CONFIG_CRYPTO_DEV_NX_ENCRYPT=m

arch/powerpc/include/asm/elf.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
extern unsigned long randomize_et_dyn(unsigned long base);

#define ELF_ET_DYN_BASE		(randomize_et_dyn(0x20000000))



#define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)



/*

 * Our registers are always unsigned longs, whether we're a 32 bit

 * process or 64 bit, on either a 64 bit or 32 bit kernel.
@@ -86,6 +88,8 @@ typedef elf_vrregset_t elf_fpxregset_t; 
#ifdef __powerpc64__

# define SET_PERSONALITY(ex)					\

do {								\

	if (((ex).e_flags & 0x3) == 2)				\

		set_thread_flag(TIF_ELF2ABI);			\

	if ((ex).e_ident[EI_CLASS] == ELFCLASS32)		\

		set_thread_flag(TIF_32BIT);			\

	else							\

arch/powerpc/include/asm/hvcall.h

+2 −0
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ static inline unsigned long cmo_get_page_size(void) 
extern long pSeries_enable_reloc_on_exc(void);

extern long pSeries_disable_reloc_on_exc(void);



extern long pseries_big_endian_exceptions(void);



#else



#define pSeries_enable_reloc_on_exc()  do {} while (0)

arch/powerpc/include/asm/plpar_wrappers.h

+26 −0
Original line number Diff line number Diff line
@@ -287,6 +287,32 @@ static inline long disable_reloc_on_exceptions(void) { 
	return plpar_set_mode(0, 3, 0, 0);

}



/*

 * Take exceptions in big endian mode on this partition

 *

 * Note: this call has a partition wide scope and can take a while to complete.

 * If it returns H_LONG_BUSY_* it should be retried periodically until it

 * returns H_SUCCESS.

 */

static inline long enable_big_endian_exceptions(void)

{

	/* mflags = 0: big endian exceptions */

	return plpar_set_mode(0, 4, 0, 0);

}



/*

 * Take exceptions in little endian mode on this partition

 *

 * Note: this call has a partition wide scope and can take a while to complete.

 * If it returns H_LONG_BUSY_* it should be retried periodically until it

 * returns H_SUCCESS.

 */

static inline long enable_little_endian_exceptions(void)

{

	/* mflags = 1: little endian exceptions */

	return plpar_set_mode(1, 4, 0, 0);

}



static inline long plapr_set_ciabr(unsigned long ciabr)

{

	return plpar_set_mode(0, 1, ciabr, 0);