Commit 06ca7c43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Here are a few more fixes for powerpc.  Some are regressions, the rest
is simple/obvious/nasty enough that I deemed it good to go now.

Here's also step one of deprecating legacy iSeries support: we are
removing it from the main defconfig.

Nobody seems to be using it anymore and the code is nasty to maintain,
(involves horrible hacks in various low level areas of the kernel) so we
plan to actually rip it out at some point.  For now let's just avoid
building it by default.  Stephen will proceed to do the actual removal
later (probably 3.4 or 3.5).

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events
  powerpc/adb: Use set_current_state()
  powerpc: Disable interrupts early in Program Check
  powerpc: Remove legacy iSeries from ppc64_defconfig
  powerpc/fsl/pci: Fix PCIe fixup regression
  powerpc: Fix kernel log of oops/panic instruction dump
parents 7bcd5b46 9a45a940

arch/powerpc/configs/ppc64_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ CONFIG_PPC_SPLPAR=y 
CONFIG_SCANLOG=m

CONFIG_PPC_SMLPAR=y

CONFIG_DTL=y

CONFIG_PPC_ISERIES=y

CONFIG_VIODASD=y

CONFIG_VIOCD=m

CONFIG_VIOTAPE=m

CONFIG_PPC_MAPLE=y

CONFIG_PPC_PASEMI=y

CONFIG_PPC_PASEMI_IOMMU=y
@@ -259,7 +255,6 @@ CONFIG_PASEMI_MAC=y 
CONFIG_MLX4_EN=m

CONFIG_QLGE=m

CONFIG_BE2NET=m

CONFIG_ISERIES_VETH=m

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ program_check_common: 
	EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)

	bl	.save_nvgprs

	addi	r3,r1,STACK_FRAME_OVERHEAD

	ENABLE_INTS

	DISABLE_INTS

	bl	.program_check_exception

	b	.ret_from_except

arch/powerpc/kernel/perf_event.c

+7 −1
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ static void power_pmu_start(struct perf_event *event, int ef_flags) 
{

	unsigned long flags;

	s64 left;

	unsigned long val;



	if (!event->hw.idx || !event->hw.sample_period)

		return;
@@ -880,7 +881,12 @@ static void power_pmu_start(struct perf_event *event, int ef_flags) 


	event->hw.state = 0;

	left = local64_read(&event->hw.period_left);

	write_pmc(event->hw.idx, left);



	val = 0;

	if (left < 0x80000000L)

		val = 0x80000000L - left;



	write_pmc(event->hw.idx, val);



	perf_event_update_userpage(event);

	perf_pmu_enable(event->pmu);

arch/powerpc/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -566,12 +566,12 @@ static void show_instructions(struct pt_regs *regs) 
		 */

		if (!__kernel_text_address(pc) ||

		     __get_user(instr, (unsigned int __user *)pc)) {

			printk("XXXXXXXX ");

			printk(KERN_CONT "XXXXXXXX ");

		} else {

			if (regs->nip == pc)

				printk("<%08x> ", instr);

				printk(KERN_CONT "<%08x> ", instr);

			else

				printk("%08x ", instr);

				printk(KERN_CONT "%08x ", instr);

		}



		pc += sizeof(int);

arch/powerpc/sysdev/fsl_pci.c

+29 −19
Original line number Diff line number Diff line
@@ -385,26 +385,36 @@ static void __init setup_pci_cmd(struct pci_controller *hose) 
void fsl_pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_controller *hose = pci_bus_to_host(bus);

	int i;

	int i, is_pcie = 0, no_link;



	if ((bus->parent == hose->bus) &&

	    ((fsl_pcie_bus_fixup &&

	      early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) ||

	     (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK)))

	{

		for (i = 0; i < 4; ++i) {

	/* The root complex bridge comes up with bogus resources,

	 * we copy the PHB ones in.

	 *

	 * With the current generic PCI code, the PHB bus no longer

	 * has bus->resource[0..4] set, so things are a bit more

	 * tricky.

	 */



	if (fsl_pcie_bus_fixup)

		is_pcie = early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP);

	no_link = !!(hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK);



	if (bus->parent == hose->bus && (is_pcie || no_link)) {

		for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; ++i) {

			struct resource *res = bus->resource[i];

			struct resource *par = bus->parent->resource[i];

			if (res) {

				res->start = 0;

				res->end   = 0;

				res->flags = 0;

			}

			if (res && par) {

				res->start = par->start;

				res->end   = par->end;

				res->flags = par->flags;

			}

			struct resource *par;



			if (!res)

				continue;

			if (i == 0)

				par = &hose->io_resource;

			else if (i < 4)

				par = &hose->mem_resources[i-1];

			else par = NULL;



			res->start = par ? par->start : 0;

			res->end   = par ? par->end   : 0;

			res->flags = par ? par->flags : 0;

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE