Commit 723e9db7 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 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c
parents ada3fa15 d331d830

arch/powerpc/Kconfig

+13 −16
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ config PPC 
	select HAVE_KRETPROBES

	select HAVE_ARCH_TRACEHOOK

	select HAVE_LMB

	select HAVE_DMA_ATTRS if PPC64

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select USE_GENERIC_SMP_HELPERS if SMP

	select HAVE_OPROFILE

	select HAVE_SYSCALL_WRAPPERS if PPC64
@@ -310,10 +311,6 @@ config SWIOTLB 
	  platforms where the size of a physical address is larger

	  than the bus address.  Not all platforms support this.



config PPC_NEED_DMA_SYNC_OPS

	def_bool y

	depends on (NOT_COHERENT_CACHE || SWIOTLB)



config HOTPLUG_CPU

	bool "Support for enabling/disabling CPUs"

	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)
@@ -475,7 +472,7 @@ config PPC_16K_PAGES 
	bool "16k page size" if 44x



config PPC_64K_PAGES

	bool "64k page size" if 44x || PPC_STD_MMU_64

	bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64

	select PPC_HAS_HASH_64K if PPC_STD_MMU_64



config PPC_256K_PAGES
@@ -495,16 +492,16 @@ endchoice 


config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	range 9 64 if PPC_STD_MMU_64 && PPC_64K_PAGES

	default "9" if PPC_STD_MMU_64 && PPC_64K_PAGES

	range 13 64 if PPC_STD_MMU_64 && !PPC_64K_PAGES

	default "13" if PPC_STD_MMU_64 && !PPC_64K_PAGES

	range 9 64 if PPC_STD_MMU_32 && PPC_16K_PAGES

	default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES

	range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES

	default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES

	range 5 64 if PPC_STD_MMU_32 && PPC_256K_PAGES

	default "5" if PPC_STD_MMU_32 && PPC_256K_PAGES

	range 9 64 if PPC64 && PPC_64K_PAGES

	default "9" if PPC64 && PPC_64K_PAGES

	range 13 64 if PPC64 && !PPC_64K_PAGES

	default "13" if PPC64 && !PPC_64K_PAGES

	range 9 64 if PPC32 && PPC_16K_PAGES

	default "9" if PPC32 && PPC_16K_PAGES

	range 7 64 if PPC32 && PPC_64K_PAGES

	default "7" if PPC32 && PPC_64K_PAGES

	range 5 64 if PPC32 && PPC_256K_PAGES

	default "5" if PPC32 && PPC_256K_PAGES

	range 11 64

	default "11"

	help

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ CPP = $(CC) -E $(KBUILD_CFLAGS) 
CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__



ifeq ($(CONFIG_PPC64),y)

GCC_BROKEN_VEC	:= $(shell if [ $(call cc-version) -lt 0400 ] ; then echo "y"; fi)

GCC_BROKEN_VEC	:= $(call cc-ifversion, -lt, 0400, y)



ifeq ($(CONFIG_POWER4_ONLY),y)

ifeq ($(CONFIG_ALTIVEC),y)

arch/powerpc/boot/4xx.c

+142 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 
 *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>

 *   Copyright (c) 2003, 2004 Zultys Technologies

 *

 * Copyright (C) 2009 Wind River Systems, Inc.

 *   Updated for supporting PPC405EX on Kilauea.

 *   Tiejun Chen <tiejun.chen@windriver.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version
@@ -659,3 +663,141 @@ void ibm405ep_fixup_clocks(unsigned int sys_clk) 
	dt_fixup_clock("/plb/opb/serial@ef600300", uart0);

	dt_fixup_clock("/plb/opb/serial@ef600400", uart1);

}



static u8 ibm405ex_fwdv_multi_bits[] = {

	/* values for:  1 - 16 */

	0x01, 0x02, 0x0e, 0x09, 0x04, 0x0b, 0x10, 0x0d, 0x0c, 0x05,

	0x06, 0x0f, 0x0a, 0x07, 0x08, 0x03

};



u32 ibm405ex_get_fwdva(unsigned long cpr_fwdv)

{

	u32 index;



	for (index = 0; index < ARRAY_SIZE(ibm405ex_fwdv_multi_bits); index++)

		if (cpr_fwdv == (u32)ibm405ex_fwdv_multi_bits[index])

			return index + 1;



	return 0;

}



static u8 ibm405ex_fbdv_multi_bits[] = {

	/* values for:  1 - 100 */

	0x00, 0xff, 0x7e, 0xfd, 0x7a, 0xf5, 0x6a, 0xd5, 0x2a, 0xd4,

	0x29, 0xd3, 0x26, 0xcc, 0x19, 0xb3, 0x67, 0xce, 0x1d, 0xbb,

	0x77, 0xee, 0x5d, 0xba, 0x74, 0xe9, 0x52, 0xa5, 0x4b, 0x96,

	0x2c, 0xd8, 0x31, 0xe3, 0x46, 0x8d, 0x1b, 0xb7, 0x6f, 0xde,

	0x3d, 0xfb, 0x76, 0xed, 0x5a, 0xb5, 0x6b, 0xd6, 0x2d, 0xdb,

	0x36, 0xec, 0x59, 0xb2, 0x64, 0xc9, 0x12, 0xa4, 0x48, 0x91,

	0x23, 0xc7, 0x0e, 0x9c, 0x38, 0xf0, 0x61, 0xc2, 0x05, 0x8b,

	0x17, 0xaf, 0x5f, 0xbe, 0x7c, 0xf9, 0x72, 0xe5, 0x4a, 0x95,

	0x2b, 0xd7, 0x2e, 0xdc, 0x39, 0xf3, 0x66, 0xcd, 0x1a, 0xb4,

	0x68, 0xd1, 0x22, 0xc4, 0x09, 0x93, 0x27, 0xcf, 0x1e, 0xbc,

	/* values for:  101 - 200 */

	0x78, 0xf1, 0x62, 0xc5, 0x0a, 0x94, 0x28, 0xd0, 0x21, 0xc3,

	0x06, 0x8c, 0x18, 0xb0, 0x60, 0xc1, 0x02, 0x84, 0x08, 0x90,

	0x20, 0xc0, 0x01, 0x83, 0x07, 0x8f, 0x1f, 0xbf, 0x7f, 0xfe,

	0x7d, 0xfa, 0x75, 0xea, 0x55, 0xaa, 0x54, 0xa9, 0x53, 0xa6,

	0x4c, 0x99, 0x33, 0xe7, 0x4e, 0x9d, 0x3b, 0xf7, 0x6e, 0xdd,

	0x3a, 0xf4, 0x69, 0xd2, 0x25, 0xcb, 0x16, 0xac, 0x58, 0xb1,

	0x63, 0xc6, 0x0d, 0x9b, 0x37, 0xef, 0x5e, 0xbd, 0x7b, 0xf6,

	0x6d, 0xda, 0x35, 0xeb, 0x56, 0xad, 0x5b, 0xb6, 0x6c, 0xd9,

	0x32, 0xe4, 0x49, 0x92, 0x24, 0xc8, 0x11, 0xa3, 0x47, 0x8e,

	0x1c, 0xb8, 0x70, 0xe1, 0x42, 0x85, 0x0b, 0x97, 0x2f, 0xdf,

	/* values for:  201 - 255 */

	0x3e, 0xfc, 0x79, 0xf2, 0x65, 0xca, 0x15, 0xab, 0x57, 0xae,

	0x5c, 0xb9, 0x73, 0xe6, 0x4d, 0x9a, 0x34, 0xe8, 0x51, 0xa2,

	0x44, 0x89, 0x13, 0xa7, 0x4f, 0x9e, 0x3c, 0xf8, 0x71, 0xe2,

	0x45, 0x8a, 0x14, 0xa8, 0x50, 0xa1, 0x43, 0x86, 0x0c, 0x98,

	0x30, 0xe0, 0x41, 0x82, 0x04, 0x88, 0x10, 0xa0, 0x40, 0x81,

	0x03, 0x87, 0x0f, 0x9f, 0x3f  /* END */

};



u32 ibm405ex_get_fbdv(unsigned long cpr_fbdv)

{

	u32 index;



	for (index = 0; index < ARRAY_SIZE(ibm405ex_fbdv_multi_bits); index++)

		if (cpr_fbdv == (u32)ibm405ex_fbdv_multi_bits[index])

			return index + 1;



	return 0;

}



void ibm405ex_fixup_clocks(unsigned int sys_clk, unsigned int uart_clk)

{

	/* PLL config */

	u32 pllc  = CPR0_READ(DCRN_CPR0_PLLC);

	u32 plld  = CPR0_READ(DCRN_CPR0_PLLD);

	u32 cpud  = CPR0_READ(DCRN_CPR0_PRIMAD);

	u32 plbd  = CPR0_READ(DCRN_CPR0_PRIMBD);

	u32 opbd  = CPR0_READ(DCRN_CPR0_OPBD);

	u32 perd  = CPR0_READ(DCRN_CPR0_PERD);



	/* Dividers */

	u32 fbdv   = ibm405ex_get_fbdv(__fix_zero((plld >> 24) & 0xff, 1));



	u32 fwdva  = ibm405ex_get_fwdva(__fix_zero((plld >> 16) & 0x0f, 1));



	u32 cpudv0 = __fix_zero((cpud >> 24) & 7, 8);



	/* PLBDV0 is hardwared to 010. */

	u32 plbdv0 = 2;

	u32 plb2xdv0 = __fix_zero((plbd >> 16) & 7, 8);



	u32 opbdv0 = __fix_zero((opbd >> 24) & 3, 4);



	u32 perdv0 = __fix_zero((perd >> 24) & 3, 4);



	/* Resulting clocks */

	u32 cpu, plb, opb, ebc, vco, tb, uart0, uart1;



	/* PLL's VCO is the source for primary forward ? */

	if (pllc & 0x40000000) {

		u32 m;



		/* Feedback path */

		switch ((pllc >> 24) & 7) {

		case 0:

			/* PLLOUTx */

			m = fbdv;

			break;

		case 1:

			/* CPU */

			m = fbdv * fwdva * cpudv0;

			break;

		case 5:

			/* PERClk */

			m = fbdv * fwdva * plb2xdv0 * plbdv0 * opbdv0 * perdv0;

			break;

		default:

			printf("WARNING ! Invalid PLL feedback source !\n");

			goto bypass;

		}



		vco = (unsigned int)(sys_clk * m);

	} else {

bypass:

		/* Bypass system PLL */

		vco = 0;

	}



	/* CPU = VCO / ( FWDVA x CPUDV0) */

	cpu = vco / (fwdva * cpudv0);

	/* PLB = VCO / ( FWDVA x PLB2XDV0 x PLBDV0) */

	plb = vco / (fwdva * plb2xdv0 * plbdv0);

	/* OPB = PLB / OPBDV0 */

	opb = plb / opbdv0;

	/* EBC = OPB / PERDV0 */

	ebc = opb / perdv0;



	tb = cpu;

	uart0 = uart1 = uart_clk;



	dt_fixup_cpu_clocks(cpu, tb, 0);

	dt_fixup_clock("/plb", plb);

	dt_fixup_clock("/plb/opb", opb);

	dt_fixup_clock("/plb/opb/ebc", ebc);

	dt_fixup_clock("/plb/opb/serial@ef600200", uart0);

	dt_fixup_clock("/plb/opb/serial@ef600300", uart1);

}

arch/powerpc/boot/4xx.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ void ibm4xx_fixup_ebc_ranges(const char *ebc); 


void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);

void ibm405ep_fixup_clocks(unsigned int sys_clk);

void ibm405ex_fixup_clocks(unsigned int sys_clk, unsigned int uart_clk);

void ibm440gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);

void ibm440ep_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk,

			   unsigned int tmr_clk);

arch/powerpc/boot/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ DTS_FLAGS ?= -p 1024 


$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405

$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
@@ -67,7 +68,7 @@ src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ 
		cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \

		fsl-soc.c mpc8xx.c pq2.c

src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \

		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \

		cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \

		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \

		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \

		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
@@ -75,7 +76,7 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c 
		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \

		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \

		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \

		cuboot-acadia.c cuboot-amigaone.c

		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c

src-boot := $(src-wlib) $(src-plat) empty.c



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -190,6 +191,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage 


# Board ports in arch/powerpc/platform/40x/Kconfig

image-$(CONFIG_EP405)			+= dtbImage.ep405

image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot

image-$(CONFIG_WALNUT)			+= treeImage.walnut

image-$(CONFIG_ACADIA)			+= cuImage.acadia

CRA Git | Maintained and supported by SUSTech CRA and CCSE