power-next
Hi folks ! So I've finally got to setup a branch on github for powerpc next. I've also committed a bunch of stuff to it, so here it is. I'll go back to kernel.org as soon as it's been fixed. https://github.com/ozbenh/linux/commits/next Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: power-next
On Tue, 2011-09-20 at 16:46 +1000, Benjamin Herrenschmidt wrote: Hi folks ! So I've finally got to setup a branch on github for powerpc next. I've also committed a bunch of stuff to it, so here it is. I'll go back to kernel.org as soon as it's been fixed. https://github.com/ozbenh/linux/commits/next BTW. Current log is: Anshuman Khandual (1): perf events, powerpc: Add POWER7 stalled-cycles-frontend/backend events Anton Blanchard (11): powerpc/pseries: Avoid spurious error during hotplug CPU add powerpc/numa: Enable SD_WAKE_AFFINE in node definition sched: Allow SD_NODES_PER_DOMAIN to be overridden powerpc/numa: Increase SD_NODES_PER_DOMAIN to 32. powerpc/numa: Disable NEWIDLE balancing at node level powerpc/numa: Remove duplicate RECLAIM_DISTANCE definition powerpc/numa: Remove double of_node_put in hot_add_node_scn_to_nid powerpc: Use for_each_node_by_type instead of open coding it powerpc: Coding style cleanups powerpc: Fix oops when echoing bad values to /sys/devices/system/memory/probe powerpc: Fix deadlock in icswx code Arnaud Lacombe (1): powerpc/xics: Add __init to marker icp_native_init() Arnd Bergmann (1): serial/8250: Move UPIO_TSI to powerpc Ayman El-Khashab (1): powerpc/4xx: enable and fix pcie gen1/gen2 on the 460sx Becky Bruce (1): powerpc: Hugetlb for BookE Benjamin Herrenschmidt (24): Merge remote-tracking branch 'jwb/next' into next Merge remote-tracking branch 'origin/master' into next powerpc/wsp: Add PCIe Root support to PowerEN/WSP Merge remote-tracking branch 'origin/master' into next powerpc/udbg: Fix Kconfig entry for avoiding 44x early debug with KVM powerpc/smp: More generic support for soft hotplug powerpc/pci: Call pcie_bus_configure_settings() powerpc/powernv: Don't clobber r9 in relative_toc() powerpc: Add skeleton PowerNV platform of: Change logic to overwrite cmd_line with CONFIG_CMDLINE powerpc/powernv: Add CPU hotplug support powerpc/powernv: Add OPAL takeover from PowerVM powerpc/powernv: Get kernel command line accross OPAL takeover powerpc/powernv: Basic support for OPAL powerpc/powernv: Add support for instanciating OPAL v2 from Open Firmware powerpc/powernv: Support for OPAL console powerpc/powernv: Hookup reboot and poweroff functions powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks powerpc/powernv: Add OPAL ICS backend powerpc/powernv: Register and handle OPAL interrupts powerpc/powernv: Machine check and other system interrupts powerpc/powernv: Add support for p5ioc2 PCI-X and PCIe powerpc/powernv: Implement MSI support for p5ioc2 PCIe powerpc/powernv: Handle PCI-X/PCIe reset delay Brian King (1): hvcs: Ensure page aligned partner info buffer Dmitry Eremin-Solenikov (1): cpc925_edac: Support single-processor configurations Hector Martin (1): powerpc/ps3: Add gelic udbg driver Jim Keniston (1): powerpc/nvram: Add compression to fit more oops output into NVRAM Jimi Xenidis (1): powerpc/wsp: Fix Wire Speed Processor platform configs Josh Boyer (1): powerpc/40x: Remove obsolete HCU4 board Julia Lawall (1): pseries/iommu: Add missing kfree Matthew McClintock (1): powerpc: Fix build dependencies for epapr.c which needs libfdt.h Michael Ellerman (1): powerpc/wsp: Add MSI support for PCI on PowerEN Mike Williams (1): powerpc/4xx: edac: Add comma to fix build error Milton Miller (4): powerpc: Override dma_get_required_mask by platform hook and ops dma-mapping: Add get_required_mask if arch overrides default powerpc: Use the newly added get_required_mask dma_map_ops hook powerpc: Tidy up dma_map_ops after adding new hook Scott Wood (1): powerpc/32: Pass device tree address as u64 to machine_init Stefan Roese (1): powerpc/44x: Add NOR flash device to Yosemite dts Suzuki Poulose (1): powerpc/44x: Kexec support for PPC440X chipsets Tang Yuantian (1): powerpc/mm: Fix the call trace when resumed from hibernation Thadeu Lima de Souza Cascardo (1): powerpc/eeh: Fix /proc/ppc64/eeh creation Timur Tabi (1): powerpc/mpic: Add support for discontiguous cores Tony Breeds (1): powerpc/4xx/pci: Add __init annotations for *init_port_hw() functions. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 0/5] ppc64 scheduler fixes
On Tue, 2011-09-20 at 10:19 +1000, Anton Blanchard wrote: Acked-by: Peter Zijlstra a.p.zijls...@chello.nl Are you OK if Ben takes this, or would you prefer to send it via the scheduler tree? I was expecting Ben to pick it up, and I see he already did so. Thanks! ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: power-next
Hi Ben, On Tue, 20 Sep 2011 16:46:14 +1000 Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Hi folks ! So I've finally got to setup a branch on github for powerpc next. I've also committed a bunch of stuff to it, so here it is. I'll go back to kernel.org as soon as it's been fixed. https://github.com/ozbenh/linux/commits/next OK, tomorrow I will switch to the next branch of git://github.com/ozbenh/linux.git ... are you also going to create a merge branch? -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpH7SriAZmL2.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc: reserve iommu page 0
Some devices have a dma-window that starts at the address 0. This allows DMA addresses to be mapped to this address and returned to drivers as a valid DMA address. Some drivers may not behave well in this case, since the address 0 is considered an error or not allocated. The solution to avoid this kind of error from happening is reserve the page addressed as 0 so it cannot be allocated for a DMA mapping. Ben Herrenschmidt deserves the credit for this patch. He pointed out the solution and what code would do the job. Signed-off-by: Thadeu Lima de Souza Cascardo casca...@linux.vnet.ibm.com Cc: Benjamin Herrenschmidt b...@kernel.crashing.org Cc: Paul Mackerras pau...@samba.org Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/kernel/iommu.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 961bb03..53411bc 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -501,6 +501,9 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid) tbl-it_map = page_address(page); memset(tbl-it_map, 0, sz); + if (tbl-it_offset == 0) + set_bit(0, tbl-it_map); + tbl-it_hint = 0; tbl-it_largehint = tbl-it_halfpoint; spin_lock_init(tbl-it_lock); -- 1.7.4.4 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 2/2] powerpc: update 512x-defconfig
Activate all MPC512x related boards. Also enable GPIO-driver, SPI driver and at25 to test SPI. Enable DEVTMPFS. Bump to 3.1-rc6. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Anatolij Gustschin ag...@denx.de Cc: Benjamin Herrenschmidt b...@kernel.crashing.org --- arch/powerpc/configs/mpc512x_defconfig | 19 +++ 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig index c02bbb2..211fcc9 100644 --- a/arch/powerpc/configs/mpc512x_defconfig +++ b/arch/powerpc/configs/mpc512x_defconfig @@ -1,9 +1,9 @@ CONFIG_EXPERIMENTAL=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y +CONFIG_SPARSE_IRQ=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y CONFIG_MODULES=y @@ -13,10 +13,11 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_PPC_CHRP is not set CONFIG_PPC_MPC512x=y CONFIG_MPC5121_ADS=y +CONFIG_MPC5121_GENERIC=y +CONFIG_PDM360NG=y # CONFIG_PPC_PMAC is not set CONFIG_NO_HZ=y CONFIG_HZ_1000=y -CONFIG_SPARSE_IRQ=y # CONFIG_MIGRATION is not set # CONFIG_SECCOMP is not set # CONFIG_PCI is not set @@ -35,18 +36,16 @@ CONFIG_CAN=y CONFIG_CAN_RAW=y CONFIG_CAN_BCM=y CONFIG_CAN_VCAN=y -CONFIG_CAN_DEV=y CONFIG_CAN_MSCAN=y CONFIG_CAN_DEBUG_DEVICES=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH=/sbin/hotplug +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y @@ -63,6 +62,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_XIP=y CONFIG_MISC_DEVICES=y CONFIG_EEPROM_AT24=y +CONFIG_EEPROM_AT25=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -99,10 +99,14 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MPC=y +CONFIG_SPI=y +CONFIG_SPI_MPC512x_PSC=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MPC8XXX=y # CONFIG_HWMON is not set CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y -# CONFIG_VIDEO_ALLOW_V4L1 is not set CONFIG_VIDEO_ADV_DEBUG=y # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set CONFIG_VIDEO_SAA711X=y @@ -132,6 +136,5 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set -- 1.7.5.4 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 1/2] gpio: move mpc8xxx/512x gpio driver to drivers/gpio
Move the driver to the place where it is expected to be nowadays. Also rename its CONFIG-name to match the rest and adapt the defconfigs. Finally, move selection of REQUIRE_GPIOLIB or WANTS_OPTIONAL_GPIOLIB to the platforms, because this option is per-platform and not per-driver. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Anatolij Gustschin ag...@denx.de Cc: Grant Likely grant.lik...@secretlab.ca Cc: Benjamin Herrenschmidt b...@kernel.crashing.org --- I'd think this should go via ppc, so it is in sync with the defconfig update of patch 2/2. arch/powerpc/configs/85xx/p1023rds_defconfig|2 +- arch/powerpc/configs/85xx/xes_mpc85xx_defconfig |2 +- arch/powerpc/configs/mpc85xx_defconfig |2 +- arch/powerpc/configs/mpc85xx_smp_defconfig |2 +- arch/powerpc/configs/ppc6xx_defconfig |2 +- arch/powerpc/platforms/512x/Kconfig |1 + arch/powerpc/platforms/83xx/Kconfig |9 +- arch/powerpc/platforms/85xx/Kconfig | 12 +- arch/powerpc/platforms/86xx/Kconfig |1 + arch/powerpc/platforms/Kconfig | 10 - arch/powerpc/sysdev/Makefile|1 - arch/powerpc/sysdev/mpc8xxx_gpio.c | 395 --- drivers/gpio/Kconfig|8 + drivers/gpio/Makefile |1 + drivers/gpio/gpio-mpc8xxx.c | 395 +++ 15 files changed, 425 insertions(+), 418 deletions(-) delete mode 100644 arch/powerpc/sysdev/mpc8xxx_gpio.c create mode 100644 drivers/gpio/gpio-mpc8xxx.c diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig index 3ff5a81..c091aaf 100644 --- a/arch/powerpc/configs/85xx/p1023rds_defconfig +++ b/arch/powerpc/configs/85xx/p1023rds_defconfig @@ -24,7 +24,7 @@ CONFIG_P1023_RDS=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_CPM2=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index 5ea3124..1cd6fcb 100644 --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig @@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_XES_MPC85xx=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_MATH_EMULATION=y CONFIG_SPARSE_IRQ=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index a3467bf..2500912 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -41,7 +41,7 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 9693f6e..a4ba13b 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -42,7 +42,7 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 04360f9..c47f2be 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -70,7 +70,7 @@ CONFIG_TAU_AVERAGE=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_PPC_BESTCOMM=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_MCU_MPC8349EMITX=m CONFIG_HIGHMEM=y CONFIG_NO_HZ=y diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig index 27b0651..b3ebce1 100644 --- a/arch/powerpc/platforms/512x/Kconfig +++ b/arch/powerpc/platforms/512x/Kconfig @@ -6,6 +6,7 @@ config PPC_MPC512x select PPC_CLOCK select PPC_PCI_CHOICE select FSL_PCI if PCI + select ARCH_WANT_OPTIONAL_GPIOLIB config MPC5121_ADS bool Freescale MPC5121E ADS diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index 73f4135..670a033 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig @@ -114,18 +114,21 @@ config KMETER1 endif -# used for usb +# used for usb gpio config PPC_MPC831x bool + select ARCH_WANT_OPTIONAL_GPIOLIB # used for math-emu config PPC_MPC832x bool -# used for usb +# used for usb gpio config PPC_MPC834x bool + select ARCH_WANT_OPTIONAL_GPIOLIB -# used for usb +# used for usb gpio config PPC_MPC837x bool + select ARCH_WANT_OPTIONAL_GPIOLIB diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index
Re: [PATCH 1/2] gpio: move mpc8xxx/512x gpio driver to drivers/gpio
On Tue, Sep 20, 2011 at 07:32:20PM +0200, Wolfram Sang wrote: Move the driver to the place where it is expected to be nowadays. Also rename its CONFIG-name to match the rest and adapt the defconfigs. Finally, move selection of REQUIRE_GPIOLIB or WANTS_OPTIONAL_GPIOLIB to the platforms, because this option is per-platform and not per-driver. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Anatolij Gustschin ag...@denx.de Cc: Grant Likely grant.lik...@secretlab.ca Cc: Benjamin Herrenschmidt b...@kernel.crashing.org --- I'd think this should go via ppc, so it is in sync with the defconfig update of patch 2/2. Forgot to mention: Both patches tested on a MPC5121-based board with linux 3.1-rc6 (couldn't find an alternative location for ppc-next). -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 1/2] gpio: move mpc8xxx/512x gpio driver to drivers/gpio
On Tue, Sep 20, 2011 at 07:32:20PM +0200, Wolfram Sang wrote: Move the driver to the place where it is expected to be nowadays. Also rename its CONFIG-name to match the rest and adapt the defconfigs. Finally, move selection of REQUIRE_GPIOLIB or WANTS_OPTIONAL_GPIOLIB to the platforms, because this option is per-platform and not per-driver. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Anatolij Gustschin ag...@denx.de Cc: Grant Likely grant.lik...@secretlab.ca Cc: Benjamin Herrenschmidt b...@kernel.crashing.org --- I'd think this should go via ppc, so it is in sync with the defconfig update of patch 2/2. arch/powerpc/configs/85xx/p1023rds_defconfig|2 +- arch/powerpc/configs/85xx/xes_mpc85xx_defconfig |2 +- arch/powerpc/configs/mpc85xx_defconfig |2 +- arch/powerpc/configs/mpc85xx_smp_defconfig |2 +- arch/powerpc/configs/ppc6xx_defconfig |2 +- arch/powerpc/platforms/512x/Kconfig |1 + arch/powerpc/platforms/83xx/Kconfig |9 +- arch/powerpc/platforms/85xx/Kconfig | 12 +- arch/powerpc/platforms/86xx/Kconfig |1 + arch/powerpc/platforms/Kconfig | 10 - arch/powerpc/sysdev/Makefile|1 - arch/powerpc/sysdev/mpc8xxx_gpio.c | 395 --- drivers/gpio/Kconfig|8 + drivers/gpio/Makefile |1 + drivers/gpio/gpio-mpc8xxx.c | 395 +++ Please resubmit and use the --find-renames flag so to keep the diff showing only the actual changes. g. 15 files changed, 425 insertions(+), 418 deletions(-) delete mode 100644 arch/powerpc/sysdev/mpc8xxx_gpio.c create mode 100644 drivers/gpio/gpio-mpc8xxx.c diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig index 3ff5a81..c091aaf 100644 --- a/arch/powerpc/configs/85xx/p1023rds_defconfig +++ b/arch/powerpc/configs/85xx/p1023rds_defconfig @@ -24,7 +24,7 @@ CONFIG_P1023_RDS=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_CPM2=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index 5ea3124..1cd6fcb 100644 --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig @@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_XES_MPC85xx=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_MATH_EMULATION=y CONFIG_SPARSE_IRQ=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index a3467bf..2500912 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -41,7 +41,7 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 9693f6e..a4ba13b 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -42,7 +42,7 @@ CONFIG_TQM8560=y CONFIG_SBC8548=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_HIGHMEM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 04360f9..c47f2be 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -70,7 +70,7 @@ CONFIG_TAU_AVERAGE=y CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_PPC_BESTCOMM=y -CONFIG_MPC8xxx_GPIO=y +CONFIG_GPIO_MPC8XXX=y CONFIG_MCU_MPC8349EMITX=m CONFIG_HIGHMEM=y CONFIG_NO_HZ=y diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig index 27b0651..b3ebce1 100644 --- a/arch/powerpc/platforms/512x/Kconfig +++ b/arch/powerpc/platforms/512x/Kconfig @@ -6,6 +6,7 @@ config PPC_MPC512x select PPC_CLOCK select PPC_PCI_CHOICE select FSL_PCI if PCI + select ARCH_WANT_OPTIONAL_GPIOLIB config MPC5121_ADS bool Freescale MPC5121E ADS diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index 73f4135..670a033 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig @@ -114,18 +114,21 @@ config KMETER1 endif -# used for usb +# used for usb gpio config PPC_MPC831x bool + select ARCH_WANT_OPTIONAL_GPIOLIB # used for math-emu config PPC_MPC832x bool -# used for usb +# used for usb
[PATCH] drivers/tty: don't use the byte channel handle as a parameter in ehv_bytechan.c
The ePAPR hypervisor byte channel console driver only supports one byte
channel as a console, and the byte channel handle is stored in a global
variable. It doesn't make any sense to pass that handle as a parameter
to the console functions, since these functions already have access to the
global variable.
This change also fixes this compilation warning on a 64-bit kernel:
CC drivers/tty/ehv_bytechan.o
drivers/tty/ehv_bytechan.c: In function 'ehv_bc_console_write':
drivers/tty/ehv_bytechan.c:289:24: warning: cast from pointer to integer of
different size
drivers/tty/ehv_bytechan.c: In function 'ehv_bc_console_init':
drivers/tty/ehv_bytechan.c:355:24: warning: cast to pointer from integer of
different size
This warning is because the driver is converting the integer byte channel
handle to/from the void* 'data' field of struct console. Rather than fix
the warning, we just eliminate the code altogether.
Signed-off-by: Timur Tabi ti...@freescale.com
---
drivers/tty/ehv_bytechan.c |7 ++-
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index e67f70b..b24e6f7 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -286,7 +286,6 @@ static int ehv_bc_console_byte_channel_send(unsigned int
handle, const char *s,
static void ehv_bc_console_write(struct console *co, const char *s,
unsigned int count)
{
- unsigned int handle = (unsigned int)co-data;
char s2[EV_BYTE_CHANNEL_MAX_BYTES];
unsigned int i, j = 0;
char c;
@@ -299,14 +298,14 @@ static void ehv_bc_console_write(struct console *co,
const char *s,
s2[j++] = c;
if (j = (EV_BYTE_CHANNEL_MAX_BYTES - 1)) {
- if (ehv_bc_console_byte_channel_send(handle, s2, j))
+ if (ehv_bc_console_byte_channel_send(stdout_bc, s2, j))
return;
j = 0;
}
}
if (j)
- ehv_bc_console_byte_channel_send(handle, s2, j);
+ ehv_bc_console_byte_channel_send(stdout_bc, s2, j);
}
/*
@@ -352,8 +351,6 @@ static int __init ehv_bc_console_init(void)
CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE);
#endif
- ehv_bc_console.data = (void *)stdout_bc;
-
/* add_preferred_console() must be called before register_console(),
otherwise it won't work. However, we don't want to enumerate all the
byte channels here, either, since we only care about one. */
--
1.7.3.4
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: power-next
On Tue, 2011-09-20 at 20:30 +1000, Stephen Rothwell wrote: Hi Ben, On Tue, 20 Sep 2011 16:46:14 +1000 Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Hi folks ! So I've finally got to setup a branch on github for powerpc next. I've also committed a bunch of stuff to it, so here it is. I'll go back to kernel.org as soon as it's been fixed. https://github.com/ozbenh/linux/commits/next OK, tomorrow I will switch to the next branch of git://github.com/ozbenh/linux.git ... are you also going to create a merge branch? Only if/when I need it. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] fsl-diu-fb: remove the ioctl interface
Anatolij,
I'm sorry to resurrect an old thread, but ...
On Wed, Jun 22, 2011 at 3:11 PM, Anatolij Gustschin ag...@denx.de wrote:
On Tue, 21 Jun 2011 23:13:11 +
Tabi Timur-B04825 b04...@freescale.com wrote:
Anatolij Gustschin wrote:
No! We are using ioctl interface of this driver in many video
rendering applications on overlay planes on huge number of boards.
So, please don't remove it.
Ok, I had no idea anyone was using it.
Can you email me details about how you use the ioctl interface? If I can't
remove it, maybe I can clean it up.
Following DIU specific ioctls are used:
MFB_SET_CHROMA_KEY
MFB_SET_PIXFMT
MFB_GET_PIXFMT
MFB_SET_AOID
MFB_GET_AOID
MFB_GET_ALPHA
MFB_SET_ALPHA
The definitions of MFB_SET_PIXFMT and MFB_GET_PIXFMT are wrong:
#define MFB_SET_PIXFMT 0x80014d08
#define MFB_GET_PIXFMT 0x40014d08
The 01 is the size. However, these ioctls take a __u32 as a parameter.
This means that I have to fix the definitions to this:
#define MFB_SET_PIXFMT _IOW('M', 8, __u32)
#define MFB_GET_PIXFMT _IOR('M', 8, __u32)
This will change the values and break binary compatibility with your
applications. Are you okay with that?
Other ioctls can be removed. I'm not sure if someone
uses FBIOGET_GWINFO. If there are no objections from
other people, it can also be dropped.
I'm going to remove FBIOGET_GWINFO because no one is using it, and the
ioctl value is malformed (it doesn't define a direction or size).
--
Timur Tabi
Linux kernel developer at Freescale
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the tty tree with the powerpc tree
Hi Greg, Today's linux-next merge of the tty tree got conflicts in arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between commit c26afe9e8591 (powerpc/ps3: Add gelic udbg driver) from the powerpc tree and commit dcd83aaff1c8 (tty/powerpc: introduce the ePAPR embedded hypervisor byte channel driver) from the tty tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/powerpc/include/asm/udbg.h index 6587ec7,5354ae9..000 --- a/arch/powerpc/include/asm/udbg.h +++ b/arch/powerpc/include/asm/udbg.h @@@ -54,9 -54,7 +54,10 @@@ extern void __init udbg_init_40x_realmo extern void __init udbg_init_cpm(void); extern void __init udbg_init_usbgecko(void); extern void __init udbg_init_wsp(void); +extern void __init udbg_init_ps3gelic(void); +extern void __init udbg_init_debug_opal_raw(void); +extern void __init udbg_init_debug_opal_hvsi(void); + extern void __init udbg_init_ehv_bc(void); #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_UDBG_H */ diff --cc arch/powerpc/kernel/udbg.c index 35f9482,b4607a9..000 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c @@@ -67,12 -67,8 +67,14 @@@ void __init udbg_early_init(void udbg_init_usbgecko(); #elif defined(CONFIG_PPC_EARLY_DEBUG_WSP) udbg_init_wsp(); +#elif defined(CONFIG_PPC_EARLY_DEBUG_PS3GELIC) + udbg_init_ps3gelic(); +#elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_RAW) + udbg_init_debug_opal_raw(); +#elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI) + udbg_init_debug_opal_hvsi(); + #elif defined(CONFIG_PPC_EARLY_DEBUG_EHV_BC) + udbg_init_ehv_bc(); #endif #ifdef CONFIG_PPC_EARLY_DEBUG ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the moduleh tree with the powerpc tree
Hi Paul, Today's linux-next merge of the moduleh tree got a conflict in arch/powerpc/mm/tlb_nohash.c between commit 41151e77a4d9 (powerpc: Hugetlb for BookE) from the powerpc tree and commit 09773e3bc0e4 (powerpc: include export.h for files using EXPORT_SYMBOL/THIS_MODULE) from the moduleh tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/powerpc/mm/tlb_nohash.c index afc95c7,ab06aea..000 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c @@@ -36,7 -36,7 +36,8 @@@ #include linux/spinlock.h #include linux/memblock.h #include linux/of_fdt.h +#include linux/hugetlb.h + #include linux/export.h #include asm/tlbflush.h #include asm/tlb.h ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc: Fix hugetlb with CONFIG_PPC_MM_SLICES=y
Commit 41151e77a4 (powerpc: Hugetlb for BookE) added some
#ifdef CONFIG_MM_SLICES conditionals to hugetlb_get_unmapped_area()
and vma_mmu_pagesize(). Unfortunately this is not the correct config
symbol; it should be CONFIG_PPC_MM_SLICES. The result is that
attempting to use hugetlbfs on 64-bit Power server processors results
in an infinite stack recursion between get_unmapped_area() and
hugetlb_get_unmapped_area().
This fixes it by changing the #ifdef to use CONFIG_PPC_MM_SLICES
in those functions and also in book3e_hugetlb_preload().
Signed-off-by: Paul Mackerras pau...@samba.org
---
arch/powerpc/mm/hugetlbpage-book3e.c |2 +-
arch/powerpc/mm/hugetlbpage.c|4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c
b/arch/powerpc/mm/hugetlbpage-book3e.c
index 1295b7c..343ad0b 100644
--- a/arch/powerpc/mm/hugetlbpage-book3e.c
+++ b/arch/powerpc/mm/hugetlbpage-book3e.c
@@ -52,7 +52,7 @@ void book3e_hugetlb_preload(struct mm_struct *mm, unsigned
long ea, pte_t pte)
if (unlikely(is_kernel_addr(ea)))
return;
-#ifdef CONFIG_MM_SLICES
+#ifdef CONFIG_PPC_MM_SLICES
psize = mmu_get_tsize(get_slice_psize(mm, ea));
tsize = mmu_get_psize(psize);
shift = mmu_psize_defs[psize].shift;
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 3a5f59d..48b65be 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -690,7 +690,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file,
unsigned long addr,
unsigned long len, unsigned long pgoff,
unsigned long flags)
{
-#ifdef CONFIG_MM_SLICES
+#ifdef CONFIG_PPC_MM_SLICES
struct hstate *hstate = hstate_file(file);
int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate));
@@ -702,7 +702,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file,
unsigned long addr,
unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
{
-#ifdef CONFIG_MM_SLICES
+#ifdef CONFIG_PPC_MM_SLICES
unsigned int psize = get_slice_psize(vma-vm_mm, vma-vm_start);
return 1UL mmu_psize_to_shift(psize);
--
1.7.5.4
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
