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

Commit b7c8c194 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 more powerpc updates from Ben Herrenschmidt:
 "Here are the remaining bits I was mentioning earlier.  Mostly bug
  fixes and new selftests from Michael (yay !).  He also removed the WSP
  platform and A2 core support which were dead before release, so less
  clutter.

  One little "feature" I snuck in is the doorbell IPI support for
  non-virtualized P8 which speeds up IPIs significantly between threads
  of a core"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
  powerpc/book3s: Fix some ABIv2 issues in machine check code
  powerpc/book3s: Fix guest MC delivery mechanism to avoid soft lockups in guest.
  powerpc/book3s: Increment the mce counter during machine_check_early call.
  powerpc/book3s: Add stack overflow check in machine check handler.
  powerpc/book3s: Fix machine check handling for unhandled errors
  powerpc/eeh: Dump PE location code
  powerpc/powernv: Enable POWER8 doorbell IPIs
  powerpc/cpuidle: Only clear LPCR decrementer wakeup bit on fast sleep entry
  powerpc/powernv: Fix killed EEH event
  powerpc: fix typo 'CONFIG_PMAC'
  powerpc: fix typo 'CONFIG_PPC_CPU'
  powerpc/powernv: Don't escalate non-existing frozen PE
  powerpc/eeh: Report frozen parent PE prior to child PE
  powerpc/eeh: Clear frozen state for child PE
  powerpc/powernv: Reduce panic timeout from 180s to 10s
  powerpc/xmon: avoid format string leaking to printk
  selftests/powerpc: Add tests of PMU EBBs
  selftests/powerpc: Add support for skipping tests
  selftests/powerpc: Put the test in a separate process group
  selftests/powerpc: Fix instruction loop for ABIv2 (LE)
  ...
parents 88bbfb4a ad718622

arch/powerpc/Kconfig.debug

+0 −5
Original line number Original line Diff line number Diff line
@@ -235,11 +235,6 @@ config PPC_EARLY_DEBUG_USBGECKO 
	  Select this to enable early debugging for Nintendo GameCube/Wii

	  Select this to enable early debugging for Nintendo GameCube/Wii

	  consoles via an external USB Gecko adapter.

	  consoles via an external USB Gecko adapter.





config PPC_EARLY_DEBUG_WSP

	bool "Early debugging via WSP's internal UART"

	depends on PPC_WSP

	select PPC_UDBG_16550



config PPC_EARLY_DEBUG_PS3GELIC

config PPC_EARLY_DEBUG_PS3GELIC

	bool "Early debugging through the PS3 Ethernet port"

	bool "Early debugging through the PS3 Ethernet port"

	depends on PPC_PS3

	depends on PPC_PS3

arch/powerpc/configs/chroma_defconfig

deleted100644 → 0
+0 −307
Original line number Original line Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_PPC_BOOK3E_64=y

# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=256

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_AUDITSYSCALL=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=19

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEMCG=y

CONFIG_CGROUP_MEMCG_SWAP=y

CONFIG_NAMESPACES=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_INITRAMFS_COMPRESSION_GZIP=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_SCOM_DEBUGFS=y

CONFIG_PPC_A2_DD2=y

CONFIG_KVM_GUEST=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HZ_100=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_NUMA=y

# CONFIG_MIGRATION is not set

CONFIG_PPC_64K_PAGES=y

CONFIG_SCHED_SMT=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE=""

# CONFIG_SECCOMP is not set

CONFIG_PCIEPORTBUS=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_MSI=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_XFRM_SUB_POLICY=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=m

CONFIG_NET_KEY_MIGRATE=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_IPV6=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_INET6_AH=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y

CONFIG_IPV6_TUNNEL=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_PIMSM_V2=y

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_QUEUE=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_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_NET_TCPPROBE=y

# CONFIG_WIRELESS is not set

CONFIG_NET_9P=y

CONFIG_NET_9P_DEBUG=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_LE_BYTE_SWAP=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_CDROM_PKTCDVD=y

CONFIG_MISC_DEVICES=y

CONFIG_BLK_DEV_SD=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_SPI_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_ISCSI_ATTRS=m

CONFIG_SCSI_SAS_ATTRS=m

CONFIG_SCSI_SRP_ATTRS=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_SIL24=y

CONFIG_SATA_MV=y

CONFIG_SATA_SIL=y

CONFIG_PATA_CMD64X=y

CONFIG_PATA_MARVELL=y

CONFIG_PATA_SIL680=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_MIRROR=y

CONFIG_DM_ZERO=y

CONFIG_DM_UEVENT=y

CONFIG_NETDEVICES=y

CONFIG_TUN=y

CONFIG_E1000E=y

CONFIG_TIGON3=y

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_RAW_DRIVER=y

CONFIG_MAX_RAW_DEVS=1024

# CONFIG_HWMON is not set

# CONFIG_VGA_ARB is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1511=y

CONFIG_RTC_DRV_DS1553=y

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_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_FUSE_FS=y

CONFIG_ISO9660_FS=y

CONFIG_JOLIET=y

CONFIG_ZISOFS=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_CONFIGFS_FS=m

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=y

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_CRC_CCITT=m

CONFIG_CRC_T10DIF=y

CONFIG_LIBCRC32C=m

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_INFO=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_PPC_EMULATED_STATS=y

CONFIG_XMON=y

CONFIG_XMON_DEFAULT=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_PPC_EARLY_DEBUG=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=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_VIRTUALIZATION=y

arch/powerpc/include/asm/cpm2.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -489,7 +489,6 @@ typedef struct scc_trans { 
#define FCC_GFMR_TCI		((uint)0x20000000)

#define FCC_GFMR_TCI		((uint)0x20000000)

#define FCC_GFMR_TRX		((uint)0x10000000)

#define FCC_GFMR_TRX		((uint)0x10000000)

#define FCC_GFMR_TTX		((uint)0x08000000)

#define FCC_GFMR_TTX		((uint)0x08000000)

#define FCC_GFMR_TTX		((uint)0x08000000)

#define FCC_GFMR_CDP		((uint)0x04000000)

#define FCC_GFMR_CDP		((uint)0x04000000)

#define FCC_GFMR_CTSP		((uint)0x02000000)

#define FCC_GFMR_CTSP		((uint)0x02000000)

#define FCC_GFMR_CDS		((uint)0x01000000)

#define FCC_GFMR_CDS		((uint)0x01000000)

arch/powerpc/include/asm/eeh.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -254,6 +254,7 @@ void *eeh_pe_traverse(struct eeh_pe *root, 
void *eeh_pe_dev_traverse(struct eeh_pe *root,

void *eeh_pe_dev_traverse(struct eeh_pe *root,

		eeh_traverse_func fn, void *flag);

		eeh_traverse_func fn, void *flag);

void eeh_pe_restore_bars(struct eeh_pe *pe);

void eeh_pe_restore_bars(struct eeh_pe *pe);

const char *eeh_pe_loc_get(struct eeh_pe *pe);

struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe);

struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe);





void *eeh_dev_init(struct device_node *dn, void *data);

void *eeh_dev_init(struct device_node *dn, void *data);

arch/powerpc/include/asm/eeh_event.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ struct eeh_event { 




int eeh_event_init(void);

int eeh_event_init(void);

int eeh_send_failure_event(struct eeh_pe *pe);

int eeh_send_failure_event(struct eeh_pe *pe);

void eeh_remove_event(struct eeh_pe *pe);

void eeh_remove_event(struct eeh_pe *pe, bool force);

void eeh_handle_event(struct eeh_pe *pe);

void eeh_handle_event(struct eeh_pe *pe);





#endif /* __KERNEL__ */

#endif /* __KERNEL__ */