Modernise powerpc 40x
Subsystems (10)
v5 cover Modernise powerpc 40x
v1 and v2 of this series were aiming at removing 40x entirely, but it led to protests.
v3 is trying to start modernising powerpc 40x:
- Rework TLB miss handlers to not use PTE_ATOMIC_UPDATES and _PAGE_HWWRITE
- Remove old versions of 40x processors, namely 403 and 405GP and associated errata.
- Last two patches are trivial changes in TLB miss handlers to reduce number of scratch registers.
v4:
- Fixing a build failure with patch 2 due to a missing ;
- There was in patch 5 some stuff belonging to patch 6. Moved them.
- Rebased to today's powerpc/merge
v5:
- Rebase on top of 35a26089dd1c Automatic merge of 'next-test' into merge-test (2020-05-22 00:14)
I would have liked to test it with QEMU, but I get the following error when trying to start QEMU for machine ref405ep.
qemu-system-ppc: Could not load PowerPC BIOS 'ppc405_rom.bin'
Can someone help with that ?
Christophe Leroy (12):
powerpc/40x: Rework 40x PTE access and TLB miss powerpc/pgtable: Drop PTE_ATOMIC_UPDATES powerpc/40x: Remove support for IBM 403GCX powerpc/40x: Remove STB03xxx
powerpc/40x: Remove WALNUT
powerpc/40x: Remove EP405
powerpc/40x: Remove support for ISS Simulator powerpc/40x: Remove support for IBM 405GP powerpc/40x: Remove IBM405 Erratum #51
powerpc: Remove IBM405 Erratum #77 powerpc/40x: Avoid using r12 in TLB miss handlers powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6
Michal Simek (1):
powerpc: Remove Xilinx PPC405/PPC440 support
Documentation/devicetree/bindings/xilinx.txt | 143 ------ Documentation/powerpc/bootwrapper.rst | 28 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/boot/Makefile | 14 +- arch/powerpc/boot/dts/Makefile | 1 - arch/powerpc/boot/dts/ep405.dts | 230 --------- arch/powerpc/boot/dts/virtex440-ml507.dts | 406 ---------------- arch/powerpc/boot/dts/virtex440-ml510.dts | 466 ------------------- arch/powerpc/boot/dts/walnut.dts | 246 ---------- arch/powerpc/boot/ep405.c | 71 --- arch/powerpc/boot/ops.h | 1 - arch/powerpc/boot/serial.c | 5 - arch/powerpc/boot/treeboot-walnut.c | 81 ---- arch/powerpc/boot/uartlite.c | 79 ---- arch/powerpc/boot/virtex.c | 97 ---- arch/powerpc/boot/virtex405-head.S | 31 -- arch/powerpc/boot/wrapper | 8 - arch/powerpc/configs/40x/acadia_defconfig | 1 - arch/powerpc/configs/40x/ep405_defconfig | 62 --- arch/powerpc/configs/40x/kilauea_defconfig | 1 - arch/powerpc/configs/40x/klondike_defconfig | 1 - arch/powerpc/configs/40x/makalu_defconfig | 1 - arch/powerpc/configs/40x/obs600_defconfig | 1 - arch/powerpc/configs/40x/virtex_defconfig | 75 --- arch/powerpc/configs/44x/virtex5_defconfig | 74 --- arch/powerpc/configs/ppc40x_defconfig | 9 - arch/powerpc/configs/ppc44x_defconfig | 8 - arch/powerpc/include/asm/asm-405.h | 19 - arch/powerpc/include/asm/atomic.h | 11 - arch/powerpc/include/asm/bitops.h | 4 - arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/cmpxchg.h | 11 - arch/powerpc/include/asm/futex.h | 3 - arch/powerpc/include/asm/nohash/32/pgtable.h | 16 - arch/powerpc/include/asm/nohash/32/pte-40x.h | 23 +- arch/powerpc/include/asm/nohash/pgtable.h | 2 - arch/powerpc/include/asm/reg_booke.h | 54 --- arch/powerpc/include/asm/spinlock.h | 4 - arch/powerpc/include/asm/time.h | 12 - arch/powerpc/include/asm/xilinx_intc.h | 16 - arch/powerpc/include/asm/xilinx_pci.h | 21 - arch/powerpc/kernel/cputable.c | 102 ---- arch/powerpc/kernel/entry_32.S | 11 - arch/powerpc/kernel/head_40x.S | 316 +++---------- arch/powerpc/kernel/misc_32.S | 9 - arch/powerpc/kernel/setup-common.c | 4 - arch/powerpc/mm/nohash/40x.c | 4 +- arch/powerpc/platforms/40x/Kconfig | 76 --- arch/powerpc/platforms/40x/Makefile | 3 - arch/powerpc/platforms/40x/ep405.c | 123 ----- arch/powerpc/platforms/40x/virtex.c | 54 --- arch/powerpc/platforms/40x/walnut.c | 65 --- arch/powerpc/platforms/44x/Kconfig | 40 +- arch/powerpc/platforms/44x/Makefile | 2 - arch/powerpc/platforms/44x/virtex.c | 60 --- arch/powerpc/platforms/44x/virtex_ml510.c | 30 -- arch/powerpc/platforms/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/xilinx_intc.c | 88 ---- arch/powerpc/sysdev/xilinx_pci.c | 132 ------ drivers/char/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 2 +- 62 files changed, 83 insertions(+), 3386 deletions(-) delete mode 100644 arch/powerpc/boot/dts/ep405.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts delete mode 100644 arch/powerpc/boot/dts/walnut.dts delete mode 100644 arch/powerpc/boot/ep405.c delete mode 100644 arch/powerpc/boot/treeboot-walnut.c delete mode 100644 arch/powerpc/boot/uartlite.c delete mode 100644 arch/powerpc/boot/virtex.c delete mode 100644 arch/powerpc/boot/virtex405-head.S delete mode 100644 arch/powerpc/configs/40x/ep405_defconfig delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig delete mode 100644 arch/powerpc/include/asm/asm-405.h delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h delete mode 100644 arch/powerpc/include/asm/xilinx_pci.h delete mode 100644 arch/powerpc/platforms/40x/ep405.c delete mode 100644 arch/powerpc/platforms/40x/virtex.c delete mode 100644 arch/powerpc/platforms/40x/walnut.c delete mode 100644 arch/powerpc/platforms/44x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c
Signature · 1 line
2.25.0
PATCH v5 1/13 powerpc: Remove Xilinx PPC405/PPC440 support
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
PowerPC 405/440 port is orphan from 2013 by
commit cdeb89943bfc ("MAINTAINERS: Fix incorrect status tag") and commit 19624236cce1 ("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.
--- Documentation/devicetree/bindings/xilinx.txt | 143 ------ Documentation/powerpc/bootwrapper.rst | 28 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/boot/Makefile | 7 +- arch/powerpc/boot/dts/Makefile | 1 - arch/powerpc/boot/dts/virtex440-ml507.dts | 406 ---------------- arch/powerpc/boot/dts/virtex440-ml510.dts | 466 ------------------- arch/powerpc/boot/ops.h | 1 - arch/powerpc/boot/serial.c | 5 - arch/powerpc/boot/uartlite.c | 79 ---- arch/powerpc/boot/virtex.c | 97 ---- arch/powerpc/boot/virtex405-head.S | 31 -- arch/powerpc/boot/wrapper | 8 - arch/powerpc/configs/40x/virtex_defconfig | 75 --- arch/powerpc/configs/44x/virtex5_defconfig | 74 --- arch/powerpc/configs/ppc40x_defconfig | 8 - arch/powerpc/configs/ppc44x_defconfig | 8 - arch/powerpc/include/asm/xilinx_intc.h | 16 - arch/powerpc/include/asm/xilinx_pci.h | 21 - arch/powerpc/kernel/cputable.c | 39 -- arch/powerpc/platforms/40x/Kconfig | 31 -- arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/virtex.c | 54 --- arch/powerpc/platforms/44x/Kconfig | 37 -- arch/powerpc/platforms/44x/Makefile | 2 - arch/powerpc/platforms/44x/virtex.c | 60 --- arch/powerpc/platforms/44x/virtex_ml510.c | 30 -- arch/powerpc/platforms/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/xilinx_intc.c | 88 ---- arch/powerpc/sysdev/xilinx_pci.c | 132 ------ drivers/char/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 2 +- 33 files changed, 7 insertions(+), 1953 deletions(-) delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts delete mode 100644 arch/powerpc/boot/uartlite.c delete mode 100644 arch/powerpc/boot/virtex.c delete mode 100644 arch/powerpc/boot/virtex405-head.S delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h delete mode 100644 arch/powerpc/include/asm/xilinx_pci.h delete mode 100644 arch/powerpc/platforms/40x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c
Documentation/devicetree/bindings/xilinx.txt +0 -143
@@ -86,149 +86,6 @@ xlnx,use-parity = <0>; }; - Some IP cores actually implement 2 or more logical devices. In - this case, the device should still describe the whole IP core with - a single node and add a child node for each logical device. The - ranges property can be used to translate from parent IP-core to the - registers of each device. In addition, the parent node should be - compatible with the bus type 'xlnx,compound', and should contain - #address-cells and #size-cells, as with any other bus. (Note: this - makes the assumption that both logical devices have the same bus - binding. If this is not true, then separate nodes should be used - for each logical device). The 'cell-index' property can be used to - enumerate logical devices within an IP core. For example, the - following is the system.mhs entry for the dual ps2 controller found - on the ml403 reference design. - - BEGIN opb_ps2_dual_ref - PARAMETER INSTANCE = opb_ps2_dual_ref_0 - PARAMETER HW_VER = 1.00.a - PARAMETER C_BASEADDR = 0xA9000000 - PARAMETER C_HIGHADDR = 0xA9001FFF - BUS_INTERFACE SOPB = opb_v20_0 - PORT Sys_Intr1 = ps2_1_intr - PORT Sys_Intr2 = ps2_2_intr - PORT Clkin1 = ps2_clk_rx_1 - PORT Clkin2 = ps2_clk_rx_2 - PORT Clkpd1 = ps2_clk_tx_1 - PORT Clkpd2 = ps2_clk_tx_2 - PORT Rx1 = ps2_d_rx_1 - PORT Rx2 = ps2_d_rx_2 - PORT Txpd1 = ps2_d_tx_1 - PORT Txpd2 = ps2_d_tx_2 - END - - It would result in the following device tree nodes: - - opb_ps2_dual_ref_0: opb-ps2-dual-ref@a9000000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "xlnx,compound"; - ranges = <0 a9000000 2000>; - // If this device had extra parameters, then they would - // go here. - ps2@0 { - compatible = "xlnx,opb-ps2-dual-ref-1.00.a"; - reg = <0 40>; - interrupt-parent = <&opb_intc_0>; - interrupts = <3 0>; - cell-index = <0>; - }; - ps2@1000 { - compatible = "xlnx,opb-ps2-dual-ref-1.00.a"; - reg = <1000 40>; - interrupt-parent = <&opb_intc_0>; - interrupts = <3 0>; - cell-index = <0>; - }; - }; - - Also, the system.mhs file defines bus attachments from the processor - to the devices. The device tree structure should reflect the bus - attachments. Again an example; this system.mhs fragment: - - BEGIN ppc405_virtex4 - PARAMETER INSTANCE = ppc405_0 - PARAMETER HW_VER = 1.01.a - BUS_INTERFACE DPLB = plb_v34_0 - BUS_INTERFACE IPLB = plb_v34_0 - END - - BEGIN opb_intc - PARAMETER INSTANCE = opb_intc_0 - PARAMETER HW_VER = 1.00.c - PARAMETER C_BASEADDR = 0xD1000FC0 - PARAMETER C_HIGHADDR = 0xD1000FDF - BUS_INTERFACE SOPB = opb_v20_0 - END - - BEGIN opb_uart16550 - PARAMETER INSTANCE = opb_uart16550_0 - PARAMETER HW_VER = 1.00.d - PARAMETER C_BASEADDR = 0xa0000000 - PARAMETER C_HIGHADDR = 0xa0001FFF - BUS_INTERFACE SOPB = opb_v20_0 - END - - BEGIN plb_v34 - PARAMETER INSTANCE = plb_v34_0 - PARAMETER HW_VER = 1.02.a - END - - BEGIN plb_bram_if_cntlr - PARAMETER INSTANCE = plb_bram_if_cntlr_0 - PARAMETER HW_VER = 1.00.b - PARAMETER C_BASEADDR = 0xFFFF0000 - PARAMETER C_HIGHADDR = 0xFFFFFFFF - BUS_INTERFACE SPLB = plb_v34_0 - END - - BEGIN plb2opb_bridge - PARAMETER INSTANCE = plb2opb_bridge_0 - PARAMETER HW_VER = 1.01.a - PARAMETER C_RNG0_BASEADDR = 0x20000000 - PARAMETER C_RNG0_HIGHADDR = 0x3FFFFFFF - PARAMETER C_RNG1_BASEADDR = 0x60000000 - PARAMETER C_RNG1_HIGHADDR = 0x7FFFFFFF - PARAMETER C_RNG2_BASEADDR = 0x80000000 - PARAMETER C_RNG2_HIGHADDR = 0xBFFFFFFF - PARAMETER C_RNG3_BASEADDR = 0xC0000000 - PARAMETER C_RNG3_HIGHADDR = 0xDFFFFFFF - BUS_INTERFACE SPLB = plb_v34_0 - BUS_INTERFACE MOPB = opb_v20_0 - END - - Gives this device tree (some properties removed for clarity): - - plb@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "xlnx,plb-v34-1.02.a"; - device_type = "ibm,plb"; - ranges; // 1:1 translation - - plb_bram_if_cntrl_0: bram@ffff0000 { - reg = <ffff0000 10000>; - } - - opb@20000000 { - #address-cells = <1>; - #size-cells = <1>; - ranges = <20000000 20000000 20000000 - 60000000 60000000 20000000 - 80000000 80000000 40000000 - c0000000 c0000000 20000000>; - - opb_uart16550_0: serial@a0000000 { - reg = <a00000000 2000>; - }; - - opb_intc_0: interrupt-controller@d1000fc0 { - reg = <d1000fc0 20>; - }; - }; - }; - That covers the general approach to binding xilinx IP cores into the device tree. The following are bindings for specific devices:
Documentation/powerpc/bootwrapper.rst +2 -26
@@ -70,28 +70,6 @@ Currently, the following image format targets exist: kernel with this image type and it depends entirely on the embedded device tree for all information. - The simpleImage is useful for booting systems with - an unknown firmware interface or for booting from - a debugger when no firmware is present (such as on - the Xilinx Virtex platform). The only assumption that - simpleImage makes is that RAM is correctly initialized - and that the MMU is either off or has RAM mapped to - base address 0. - - simpleImage also supports inserting special platform - specific initialization code to the start of the bootup - sequence. The virtex405 platform uses this feature to - ensure that the cache is invalidated before caching - is enabled. Platform specific initialization code is - added as part of the wrapper script and is keyed on - the image target name. For example, all - simpleImage.virtex405-* targets will add the - virtex405-head.S initialization code (This also means - that the dts file for virtex405 targets should be - named (virtex405-<board>.dts). Search the wrapper - script for 'virtex405' and see the file - arch/powerpc/boot/virtex405-head.S for details. - treeImage.%; Image format for used with OpenBIOS firmware found on some ppc4xx hardware. This image embeds a device tree blob inside the image.
@@ -116,10 +94,8 @@ Image types which embed a device tree blob (simpleImage, dtbImage, treeImage, and cuImage) all generate the device tree blob from a file in the arch/powerpc/boot/dts/ directory. The Makefile selects the correct device tree source based on the name of the target. Therefore, if the kernel is -built with 'make treeImage.walnut simpleImage.virtex405-ml403', then the -build system will use arch/powerpc/boot/dts/walnut.dts to build -treeImage.walnut and arch/powerpc/boot/dts/virtex405-ml403.dts to build -the simpleImage.virtex405-ml403. +built with 'make treeImage.walnut', then the build system will use +arch/powerpc/boot/dts/walnut.dts to build treeImage.walnut. Two special targets called 'zImage' and 'zImage.initrd' also exist. These targets build all the default images as selected by the kernel configuration.
arch/powerpc/Kconfig.debug +1 -1
@@ -230,7 +230,7 @@ config PPC_EARLY_DEBUG_40x help Select this to enable early debugging for IBM 40x chips via the inbuilt serial port. This works on chips with a 16550 compatible - UART. Xilinx chips with uartlite cannot use this option. + UART. config PPC_EARLY_DEBUG_CPM bool "Early serial debugging for Freescale CPM-based serial ports"
arch/powerpc/boot/Makefile +2 -5
@@ -79,7 +79,6 @@ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-akebono.o: BOOTCFLAGS += -mcpu=405 -$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 # The pre-boot decompressors pull in a lot of kernel headers and other source # files. This creates a bit of a dependency headache since we need to copy
@@ -129,14 +128,12 @@ src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c src-wlib-$(CONFIG_PPC_8xx) += mpc8xx.c planetcore.c fsl-soc.c src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c src-wlib-$(CONFIG_EMBEDDED6xx) += ugecon.c fsl-soc.c -src-wlib-$(CONFIG_XILINX_VIRTEX) += uartlite.c src-wlib-$(CONFIG_CPM) += cpm-serial.c src-plat-y := of.c epapr.c src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \ treeboot-walnut.c cuboot-acadia.c \ - cuboot-kilauea.c simpleboot.c \ - virtex405-head.S virtex.c + cuboot-kilauea.c simpleboot.c src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ cuboot-bamboo.c cuboot-sam440ep.c \ cuboot-sequoia.c cuboot-rainier.c \
@@ -144,7 +141,7 @@ src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ cuboot-warp.c cuboot-yosemite.c \ treeboot-iss4xx.c treeboot-currituck.c \ treeboot-akebono.c \ - simpleboot.c fixed-head.S virtex.c + simpleboot.c fixed-head.S src-plat-$(CONFIG_PPC_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c
arch/powerpc/boot/dts/Makefile +0 -1
@@ -4,4 +4,3 @@ subdir-y += fsl dtstree := $(srctree)/$(src) dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) -dtb-$(CONFIG_XILINX_VIRTEX440_GENERIC_BOARD) += virtex440-ml507.dtb virtex440-ml510.dtb
arch/powerpc/boot/dts/virtex440-ml507.dts deleted +0 -406
406 lines not on this page · raw message
arch/powerpc/boot/dts/virtex440-ml510.dts deleted +0 -466
466 lines not on this page · raw message
arch/powerpc/boot/ops.h +0 -1
@@ -88,7 +88,6 @@ int serial_console_init(void);int ns16550_console_init (void *devp,struct serial_console_data *scdp);int cpm_console_init (void *devp,struct serial_console_data *scdp);int mpc5200_psc_console_init (void *devp,struct serial_console_data *scdp); -int uartlite_console_init (void *devp,struct serial_console_data *scdp);int opal_console_init (void *devp,struct serial_console_data *scdp);void *simple_alloc_init (char *base,unsigned long heap_size,unsigned long granularity,unsigned long max_allocs);
arch/powerpc/boot/serial.c +0 -5
@@ -132,11 +132,6 @@ int serial_console_init(void) else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart")) rc =mpc5200_psc_console_init (devp, &serial_cd);#endif -#ifdef CONFIG_XILINX_VIRTEX - else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") || - dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a")) - rc =uartlite_console_init (devp, &serial_cd); -#endif #ifdef CONFIG_PPC64_BOOT_WRAPPER else if (dt_is_compatible(devp, "ibm,opal-console-raw")) rc =opal_console_init (devp, &serial_cd);
arch/powerpc/boot/uartlite.c deleted +0 -79
79 lines not on this page · raw message
arch/powerpc/boot/virtex.c deleted +0 -97
97 lines not on this page · raw message
arch/powerpc/boot/virtex405-head.S deleted +0 -31
@@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include "ppc_asm.h" - - .text - .global _zimage_start -_zimage_start: - - /* PPC errata 213: needed by Virtex-4 FX */ - mfccr0 0 - oris 0,0,0x50000000@h - mtccr0 0 - - /* - * Invalidate the data cache if the data cache is turned off. - * - The 405 core does not invalidate the data cache on power-up - * or reset but does turn off the data cache. We cannot assume - * that the cache contents are valid. - * - If the data cache is turned on this must have been done by - * a bootloader and we assume that the cache contents are - * valid. - */ - mfdccr r9 - cmplwi r9,0 - bne 2f - lis r9,0 - li r8,256 - mtctr r8 -1: dccci r0,r9 - addi r9,r9,0x20 - bdnz 1b -2: b _zimage_start_lib
arch/powerpc/boot/wrapper +0 -8
@@ -324,14 +324,6 @@ adder875-redboot) platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; -simpleboot-virtex405-*) - platformo="$object/virtex405-head.o $object/simpleboot.o $object/virtex.o" - binary=y - ;; -simpleboot-virtex440-*) - platformo="$object/fixed-head.o $object/simpleboot.o $object/virtex.o" - binary=y - ;; simpleboot-*) platformo="$object/fixed-head.o $object/simpleboot.o" binary=y
arch/powerpc/configs/40x/virtex_defconfig deleted +0 -75
75 lines not on this page · raw message
arch/powerpc/configs/44x/virtex5_defconfig deleted +0 -74
74 lines not on this page · raw message
arch/powerpc/configs/ppc40x_defconfig +0 -8
@@ -14,7 +14,6 @@ CONFIG_EP405=y CONFIG_HOTFOOT=y CONFIG_KILAUEA=y CONFIG_MAKALU=y -CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
@@ -37,33 +36,26 @@ CONFIG_MTD_UBI=m CONFIG_MTD_UBI_GLUEBI=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=35000 -CONFIG_XILINX_SYSACE=m CONFIG_NETDEVICES=y CONFIG_IBM_EMAC=y # CONFIG_INPUT is not set CONFIG_SERIO=m # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_XILINX_XPS_PS2=m # CONFIG_VT is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y # CONFIG_HW_RANDOM is not set -CONFIG_XILINX_HWICAP=m CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_GPIO=m CONFIG_I2C_IBM_IIC=m -CONFIG_GPIO_XILINX=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_FB=m -CONFIG_FB_XILINX=m CONFIG_EXT2_FS=y CONFIG_EXT4_FS=m CONFIG_VFAT_FS=m
arch/powerpc/configs/ppc44x_defconfig +0 -8
@@ -22,7 +22,6 @@ CONFIG_GLACIER=y CONFIG_REDWOOD=y CONFIG_EIGER=y CONFIG_YOSEMITE=y -CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y CONFIG_PPC4xx_GPIO=y CONFIG_MATH_EMULATION=y CONFIG_NET=y
@@ -46,7 +45,6 @@ CONFIG_MTD_UBI=m CONFIG_MTD_UBI_GLUEBI=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=35000 -CONFIG_XILINX_SYSACE=m CONFIG_SCSI=m CONFIG_BLK_DEV_SD=m # CONFIG_SCSI_LOWLEVEL is not set
@@ -57,7 +55,6 @@ CONFIG_IBM_EMAC=y CONFIG_SERIO=m # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_XILINX_XPS_PS2=m # CONFIG_VT is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y
@@ -65,18 +62,13 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y # CONFIG_HW_RANDOM is not set -CONFIG_XILINX_HWICAP=m CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_GPIO=m CONFIG_I2C_IBM_IIC=m -CONFIG_GPIO_XILINX=y # CONFIG_HWMON is not set CONFIG_FB=m -CONFIG_FB_XILINX=m CONFIG_USB=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_OHCI_HCD=m
arch/powerpc/include/asm/xilinx_intc.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* -* Xilinx intc external definitions -* -* Copyright 2007 Secret Lab Technologies Ltd. -*/ -#ifndef _ASM_POWERPC_XILINX_INTC_H -#define _ASM_POWERPC_XILINX_INTC_H - -#ifdef __KERNEL__ - -extern void __init xilinx_intc_init_tree (void ); -extern unsigned int xintc_get_irq (void ); - -#endif /* __KERNEL__ */ -#endif /* _ASM_POWERPC_XILINX_INTC_H */
arch/powerpc/include/asm/xilinx_pci.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* Xilinx pci external definitions -* -* Copyright 2009 Roderick Colenbrander -* Copyright 2009 Secret Lab Technologies Ltd. -* -* This file is licensed under the terms of the GNU General Public License -* version 2. This program is licensed "as is" without any warranty of any -* kind, whether express or implied. -*/ - -#ifndef INCLUDE_XILINX_PCI -#define INCLUDE_XILINX_PCI - -#ifdef CONFIG_XILINX_PCI -extern void __init xilinx_pci_init (void ); -#else -static inline void __init xilinx_pci_init (void ) {return ; } -#endif - -#endif /* INCLUDE_XILINX_PCI */
arch/powerpc/kernel/cputable.c +0 -39
@@ -1385,32 +1385,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_4xx, .platform = "ppc405", }, - {/* Xilinx Virtex-II Pro */ - .pvr_mask = 0xfffff000, - .pvr_value = 0x20010000, - .cpu_name = "Virtex-II Pro", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features =PPC_FEATURE_32 | - PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 32, - .dcache_bsize = 32, - .machine_check = machine_check_4xx, - .platform = "ppc405", - }, - { /* Xilinx Virtex-4 FX */ - .pvr_mask = 0xfffff000, - .pvr_value = 0x20011000, - .cpu_name = "Virtex-4 FX", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features =PPC_FEATURE_32 | - PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 32, - .dcache_bsize = 32, - .machine_check = machine_check_4xx, - .platform = "ppc405", - }, {/* 405EP */ .pvr_mask = 0xffff0000, .pvr_value = 0x51210000,
@@ -1800,19 +1774,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_440A, .platform = "ppc440", }, - {/* 440 in Xilinx Virtex-5 FXT */ - .pvr_mask = 0xfffffff0, - .pvr_value = 0x7ff21910, - .cpu_name = "440 in Virtex-5 FXT", - .cpu_features = CPU_FTRS_44X, - .cpu_user_features = COMMON_USER_BOOKE, - .mmu_features = MMU_FTR_TYPE_44x, - .icache_bsize = 32, - .dcache_bsize = 32, - .cpu_setup = __setup_cpu_440x5, - .machine_check = machine_check_440A, - .platform = "ppc440", - }, {/* 460EX */ .pvr_mask = 0xffff0006, .pvr_value = 0x13020002,
arch/powerpc/platforms/40x/Kconfig +0 -31
@@ -55,23 +55,6 @@ config WALNUT help This option enables support for the IBM PPC405GP evaluation board. -config XILINX_VIRTEX_GENERIC_BOARD - bool "Generic Xilinx Virtex board" - depends on 40x - select XILINX_VIRTEX_II_PRO - select XILINX_VIRTEX_4_FX - select XILINX_INTC - help - This option enables generic support for Xilinx Virtex based boards. - - The generic virtex board support matches any device tree which - specifies 'xilinx,virtex' in its compatible field. This includes - the Xilinx ML3xx and ML4xx reference designs using the powerpc - core. - - Most Virtex designs should use this unless it needs to do some - special configuration at board probe time. - config OBS600 bool "OpenBlockS 600" depends on 40x
@@ -109,20 +92,6 @@ config 405EZ select IBM_EMAC_MAL_CLR_ICINTSTAT if IBM_EMAC select IBM_EMAC_MAL_COMMON_ERR if IBM_EMAC -config XILINX_VIRTEX - bool - select DEFAULT_UIMAGE - -config XILINX_VIRTEX_II_PRO - bool - select XILINX_VIRTEX - select IBM405_ERR77 - select IBM405_ERR51 - -config XILINX_VIRTEX_4_FX - bool - select XILINX_VIRTEX - config STB03xxx bool select IBM405_ERR77
arch/powerpc/platforms/40x/Makefile +0 -1
@@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_WALNUT) += walnut.o -obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o obj-$(CONFIG_EP405) += ep405.o obj-$(CONFIG_PPC40x_SIMPLE) += ppc40x_simple.o
arch/powerpc/platforms/40x/virtex.c deleted +0 -54
54 lines not on this page · raw message
arch/powerpc/platforms/44x/Kconfig +0 -37
@@ -232,33 +232,6 @@ config ICON help This option enables support for the AMCC PPC440SPe evaluation board. -config XILINX_VIRTEX440_GENERIC_BOARD - bool "Generic Xilinx Virtex 5 FXT board support" - depends on 44x - select XILINX_VIRTEX_5_FXT - select XILINX_INTC - help - This option enables generic support for Xilinx Virtex based boards - that use a 440 based processor in the Virtex 5 FXT FPGA architecture. - - The generic virtex board support matches any device tree which - specifies 'xlnx,virtex440' in its compatible field. This includes - the Xilinx ML5xx reference designs using the powerpc core. - - Most Virtex 5 designs should use this unless it needs to do some - special configuration at board probe time. - -config XILINX_ML510 - bool "Xilinx ML510 extra support" - depends on XILINX_VIRTEX440_GENERIC_BOARD - select HAVE_PCI - select XILINX_PCI if PCI - select PPC_INDIRECT_PCI if PCI - select PPC_I8259 if PCI - help - This option enables extra support for features on the Xilinx ML510 - board. The ML510 has a PCI bus with ALI south bridge. - config PPC44x_SIMPLE bool "Simple PowerPC 44x board support" depends on 44x
@@ -354,13 +327,3 @@ config 476FPE_ERR46 config IBM440EP_ERR42 bool -# Xilinx specific config options. -config XILINX_VIRTEX - bool - select DEFAULT_UIMAGE - -# Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above -config XILINX_VIRTEX_5_FXT - bool - select XILINX_VIRTEX -
arch/powerpc/platforms/44x/Makefile +0 -2
@@ -7,8 +7,6 @@ obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o obj-$(CONFIG_EBONY) += ebony.o obj-$(CONFIG_SAM440EP) += sam440ep.o obj-$(CONFIG_WARP) += warp.o -obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o -obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o obj-$(CONFIG_ISS4xx) += iss4xx.o obj-$(CONFIG_CANYONLANDS)+= canyonlands.o obj-$(CONFIG_CURRITUCK) += ppc476.o
arch/powerpc/platforms/44x/virtex.c deleted +0 -60
60 lines not on this page · raw message
arch/powerpc/platforms/44x/virtex_ml510.c deleted +0 -30
@@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <asm/i8259.h> -#include <linux/pci.h> -#include "44x.h" - -/** -* ml510_ail_quirk -*/ -static void ml510_ali_quirk (struct pci_dev *dev) -{ -/* Enable the IDE controller */ -pci_write_config_byte (dev,0x58 ,0x4c ); -/* Assign irq 14 to the primary ide channel */ -pci_write_config_byte (dev,0x44 ,0x0d ); -/* Assign irq 15 to the secondary ide channel */ -pci_write_config_byte (dev,0x75 ,0x0f ); -/* Set the ide controller in native mode */ -pci_write_config_byte (dev,0x09 ,0xff ); - -/* INTB = disabled, INTA = disabled */ -pci_write_config_byte (dev,0x48 ,0x00 ); -/* INTD = disabled, INTC = disabled */ -pci_write_config_byte (dev,0x4a ,0x00 ); -/* Audio = INT7, Modem = disabled. */ -pci_write_config_byte (dev,0x4b ,0x60 ); -/* USB = INT7 */ -pci_write_config_byte (dev,0x74 ,0x06 ); -} -DECLARE_PCI_FIXUP_EARLY (0x10b9 ,0x1533 , ml510_ali_quirk); -
arch/powerpc/platforms/Kconfig +0 -4
@@ -317,8 +317,4 @@ config MCU_MPC8349EMITX also register MCU GPIOs with the generic GPIO API, so you'll able to use MCU pins as GPIOs. -config XILINX_PCI - bool "Xilinx PCI host bridge support" - depends on PCI && XILINX_VIRTEX - endmenu
arch/powerpc/sysdev/Makefile +0 -2
@@ -31,8 +31,6 @@ obj-$(CONFIG_RTC_DRV_CMOS) += rtc_cmos_setup.o obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o obj-$(CONFIG_PPC_I8259) += i8259.o obj-$(CONFIG_IPIC) += ipic.o -obj-$(CONFIG_XILINX_VIRTEX) += xilinx_intc.o -obj-$(CONFIG_XILINX_PCI) += xilinx_pci.o obj-$(CONFIG_OF_RTC) += of_rtc.o obj-$(CONFIG_CPM) += cpm_common.o
arch/powerpc/sysdev/xilinx_intc.c deleted +0 -88
88 lines not on this page · raw message
arch/powerpc/sysdev/xilinx_pci.c deleted +0 -132
132 lines not on this page · raw message
drivers/char/Kconfig +1 -1
@@ -209,7 +209,7 @@ config DTLK config XILINX_HWICAP tristate "Xilinx HWICAP Support" - depends on XILINX_VIRTEX || MICROBLAZE + depends on MICROBLAZE help This option enables support for Xilinx Internal Configuration Access Port (ICAP) driver. The ICAP is used on Xilinx Virtex
drivers/video/fbdev/Kconfig +1 -1
@@ -2008,7 +2008,7 @@ config FB_PS3_DEFAULT_SIZE_M config FB_XILINX tristate "Xilinx frame buffer support" - depends on FB && (XILINX_VIRTEX || MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + depends on FB && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
Signature · 1 line
2.25.0
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 6 lines · Christophe Leroy
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
Quoted 8 lines
PowerPC 405/440 port is orphan from 2013 by
commitcdeb89943bfc("MAINTAINERS: Fix incorrect status tag") and commit19624236cce1("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.Signed-off-by Michal Simek <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Christophe Leroy <[email protected]>
This patch causes qemu-system-ppc to fail to load ppc44x_defconfig:
$ make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc distclean ppc44x_defconfig zImage
$ timeout --foreground 30s unbuffer \ qemu-system-ppc \ -machine bamboo \ -no-reboot \ -append "console=ttyS0" \ -display none \ -initrd ../../cbl/github/boot-utils/images/ppc32/rootfs.cpio \ -kernel out/ppc/arch/powerpc/boot/zImage \ -m 128m \ -nodefaults \ -serial mon:stdio qemu-system-ppc: could not load kernel 'out/ppc/arch/powerpc/boot/zImage'
$ ls out/ppc/arch/powerpc/boot/zImage out/ppc/arch/powerpc/boot/zImage
Is this expected? Is there some other config or machine that we should be testing instead?
Cheers,
Nathan
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 16 lines · Nathan Chancellor
Quoted 6 lines · Christophe Leroy
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
Quoted 8 lines
PowerPC 405/440 port is orphan from 2013 by
commitcdeb89943bfc("MAINTAINERS: Fix incorrect status tag") and commit19624236cce1("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.Signed-off-by Michal Simek <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Christophe Leroy <[email protected]>
Quoted 7 lines
This patch causes qemu-system-ppc to fail to load
ppc44x_defconfig:$ make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc distclean ppc44x_defconfig zImage$ timeout --foreground 30s unbuffer \ qemu-system-ppc \ -machine bamboo \
Did you bisect it that you found that this patch is causing problem for you on any bamboo machine?
Or this was caused by the whole series?
Thanks,
Michal
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Hi Michal,
Quoted 27 lines · Michal Simek
Quoted 16 lines · Nathan Chancellor
Quoted 6 lines · Christophe Leroy
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
Quoted 8 lines
PowerPC 405/440 port is orphan from 2013 by
commitcdeb89943bfc("MAINTAINERS: Fix incorrect status tag") and commit19624236cce1("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.Signed-off-by Michal Simek <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Christophe Leroy <[email protected]>Quoted 7 lines
This patch causes qemu-system-ppc to fail to load
ppc44x_defconfig:$ make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc distclean ppc44x_defconfig zImage$ timeout --foreground 30s unbuffer \ qemu-system-ppc \ -machine bamboo \
Quoted 7 lines
Did you bisect it that you found that this patch is causing problem for you on any bamboo machine?
Or this was caused by the whole series?
Thanks,
Michal
Yes, this conclusion was the result of the following bisect:
$ cat test.sh #!/usr/bin/env bash
cd "${HOME}"/src/linux || exit 125
set -x
PATH=${HOME}/toolchains/gcc/10.1.0/bin:${PATH} \
make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc32 distclean ppc44x_defconfig zImage || exit 125
"${HOME}"/cbl/github/boot-utils/boot-qemu.sh -a ppc32 -k out/ppc32 -t 30s
$ git bisect start v5.8-rc1 v5.7 ...
$ git bisect run test.sh ...
$ git bisect log # bad: [b3a9e3b9622ae10064826dccb4f7a52bd88c7407] Linux 5.8-rc1 # good: [3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162] Linux 5.7 git bisect start 'v5.8-rc1' 'v5.7' # good: [ee01c4d72adffb7d424535adf630f2955748fa8b] Merge branch 'akpm' (patches from Andrew) git bisect good ee01c4d72adffb7d424535adf630f2955748fa8b # bad: [6f2dc3d335457d9c815be9f4fd3dc8eff92fcef7] Merge tag 'dma-mapping-5.8-2' of git://git.infradead.org/users/hch/dma-mapping git bisect bad 6f2dc3d335457d9c815be9f4fd3dc8eff92fcef7 # skip: [828f3e18e1cb98c68fc6db4d5113513d4a267775] Merge tag 'arm-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc git bisect skip 828f3e18e1cb98c68fc6db4d5113513d4a267775 # good: [c46241a370a61f0f264791abb9fc869016e749ce] powerpc/pkeys: Check vma before returning key fault error to the user git bisect good c46241a370a61f0f264791abb9fc869016e749ce # good: [3f0be4df50a7854a831c80a74d7cf2cfd61f2fde] Merge tag 'versatile-dts-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/dt git bisect good 3f0be4df50a7854a831c80a74d7cf2cfd61f2fde # bad: [bd55e792de0844631d34487d43eaf3f13294ebfe] powerpc/module_64: Use special stub for _mcount() with -mprofile-kernel git bisect bad bd55e792de0844631d34487d43eaf3f13294ebfe # good: [303e6a9ddcdc168e92253c78cdb4bbe1e10d78b3] powerpc/watchpoint: Convert thread_struct->hw_brk to an array git bisect good 303e6a9ddcdc168e92253c78cdb4bbe1e10d78b3 # good: [0755e85570a4615ca674ad6489d44d63916f1f3e] powerpc/xive: Do not expose a debugfs file when XIVE is disabled git bisect good 0755e85570a4615ca674ad6489d44d63916f1f3e # bad: [b4ac18eead28611ff470d0f47a35c4e0ac080d9c] powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run git bisect bad b4ac18eead28611ff470d0f47a35c4e0ac080d9c # bad: [3aacaa719b7bf135551cabde2480e8f7bfdf7c7d] powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6 git bisect bad 3aacaa719b7bf135551cabde2480e8f7bfdf7c7d # bad: [1b5c0967ab8aa9424cdd5108de4e055d8aeaa9d0] powerpc/40x: Remove support for IBM 403GCX git bisect bad 1b5c0967ab8aa9424cdd5108de4e055d8aeaa9d0 # good: [0bdad33d6bd7b80722e2f9e588d3d7c6d6e34978] powerpc/64: Refactor interrupt exit irq disabling sequence git bisect good 0bdad33d6bd7b80722e2f9e588d3d7c6d6e34978 # bad: [2c74e2586bb96012ffc05f1c819b05d9cad86d6e] powerpc/40x: Rework 40x PTE access and TLB miss git bisect bad 2c74e2586bb96012ffc05f1c819b05d9cad86d6e # bad: [7ade8495dcfd788a76e6877c9ea86f5207369ea4] powerpc: Remove Xilinx PPC405/PPC440 support git bisect bad 7ade8495dcfd788a76e6877c9ea86f5207369ea4 # first bad commit: [7ade8495dcfd788a76e6877c9ea86f5207369ea4] powerpc: Remove Xilinx PPC405/PPC440 support
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Hi Nathan,
Quoted 83 lines · Nathan Chancellor
Hi Michal,
Quoted 27 lines · Michal Simek
Quoted 16 lines · Nathan Chancellor
Quoted 6 lines · Christophe Leroy
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
Quoted 8 lines
PowerPC 405/440 port is orphan from 2013 by
commitcdeb89943bfc("MAINTAINERS: Fix incorrect status tag") and commit19624236cce1("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.Signed-off-by Michal Simek <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Christophe Leroy <[email protected]>Quoted 7 lines
This patch causes qemu-system-ppc to fail to load
ppc44x_defconfig:$ make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc distclean ppc44x_defconfig zImage$ timeout --foreground 30s unbuffer \ qemu-system-ppc \ -machine bamboo \Quoted 7 lines
Did you bisect it that you found that this patch is causing problem for you on any bamboo machine?
Or this was caused by the whole series?
Thanks,
MichalYes, this conclusion was the result of the following bisect:
$ cat test.sh #!/usr/bin/env bashcd "${HOME}"/src/linux || exit 125
set -x
PATH=${HOME}/toolchains/gcc/10.1.0/bin:${PATH} \
make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc32 distcleanppc44x_defconfigzImage || exit 125"${HOME}"/cbl/github/boot-utils/boot-qemu.sh -a ppc32 -k out/ppc32 -t 30s
$ git bisect start v5.8-rc1 v5.7 ...$ git bisect run test.sh ...$ git bisect log # bad: [b3a9e3b9622ae10064826dccb4f7a52bd88c7407] Linux 5.8-rc1 # good: [3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162] Linux 5.7 git bisect start 'v5.8-rc1' 'v5.7' # good: [ee01c4d72adffb7d424535adf630f2955748fa8b] Merge branch 'akpm' (patches from Andrew) git bisect good ee01c4d72adffb7d424535adf630f2955748fa8b # bad: [6f2dc3d335457d9c815be9f4fd3dc8eff92fcef7] Merge tag 'dma-mapping-5.8-2' of git://git.infradead.org/users/hch/dma-mapping git bisect bad 6f2dc3d335457d9c815be9f4fd3dc8eff92fcef7 # skip: [828f3e18e1cb98c68fc6db4d5113513d4a267775] Merge tag 'arm-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc git bisect skip 828f3e18e1cb98c68fc6db4d5113513d4a267775 # good: [c46241a370a61f0f264791abb9fc869016e749ce] powerpc/pkeys: Check vma before returning key fault error to the user git bisect good c46241a370a61f0f264791abb9fc869016e749ce # good: [3f0be4df50a7854a831c80a74d7cf2cfd61f2fde] Merge tag 'versatile-dts-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/dt git bisect good 3f0be4df50a7854a831c80a74d7cf2cfd61f2fde # bad: [bd55e792de0844631d34487d43eaf3f13294ebfe] powerpc/module_64: Use special stub for _mcount() with -mprofile-kernel git bisect bad bd55e792de0844631d34487d43eaf3f13294ebfe # good: [303e6a9ddcdc168e92253c78cdb4bbe1e10d78b3] powerpc/watchpoint: Convert thread_struct->hw_brk to an array git bisect good 303e6a9ddcdc168e92253c78cdb4bbe1e10d78b3 # good: [0755e85570a4615ca674ad6489d44d63916f1f3e] powerpc/xive: Do not expose a debugfs file when XIVE is disabled git bisect good 0755e85570a4615ca674ad6489d44d63916f1f3e # bad: [b4ac18eead28611ff470d0f47a35c4e0ac080d9c] powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run git bisect bad b4ac18eead28611ff470d0f47a35c4e0ac080d9c # bad: [3aacaa719b7bf135551cabde2480e8f7bfdf7c7d] powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6 git bisect bad 3aacaa719b7bf135551cabde2480e8f7bfdf7c7d # bad: [1b5c0967ab8aa9424cdd5108de4e055d8aeaa9d0] powerpc/40x: Remove support for IBM 403GCX
Quoted 9 lines
git bisect bad 1b5c0967ab8aa9424cdd5108de4e055d8aeaa9d0 # good: [0bdad33d6bd7b80722e2f9e588d3d7c6d6e34978] powerpc/64: Refactor interrupt exit irq disabling sequence git bisect good 0bdad33d6bd7b80722e2f9e588d3d7c6d6e34978 # bad: [2c74e2586bb96012ffc05f1c819b05d9cad86d6e] powerpc/40x: Rework 40x PTE access and TLB miss git bisect bad 2c74e2586bb96012ffc05f1c819b05d9cad86d6e # bad: [7ade8495dcfd788a76e6877c9ea86f5207369ea4] powerpc: Remove Xilinx PPC405/PPC440 support git bisect bad 7ade8495dcfd788a76e6877c9ea86f5207369ea4 # first bad commit: [7ade8495dcfd788a76e6877c9ea86f5207369ea4] powerpc: Remove Xilinx PPC405/PPC440 support
I have took a look at it and was able to run qemu and also saw your issue. What happened is that when xilinx platforms were removed zImage is generated but it is not u-boot legacy image.
Don't know details about zImage/uImage in ppc world but if you dump zImage you should see this.
Before this patch:
[qemu](master)$ hexdump -C /mnt/disk/linux/arch/powerpc/boot/zImage | head -n 20
00000000 27 05 19 56 bc 4d 17 ce 5e e9 cb 0f 00 2c 8d 98
|'..V.M..^....,..|
00000010 00 00 00 00 00 00 00 00 69 04 b6 eb 05 07 02 01
|........i.......|
00000020 4c 69 6e 75 78 2d 35 2e 37 2e 30 2d 72 63 32 2d
|Linux-5.7.0-rc2-|
00000030 30 30 32 34 39 2d 67 32 38 31 65 65 36 66 36 38
|00249-g281ee6f68|
00000040 1f 8b 08 00 00 00 00 00 02 03 ec 5a 7b 70 54 65
|...........Z{pTe|
00000050 96 3f b7 bb d3 34 49 30 8d b6 1a 16 d4 ce 43 4c
|.?...4I0......CL|
00000060 42 84 b8 cb ec de 9e 3c b8 21 c0 dc 24 ac 26 63
|B......<.!..$.&c|
00000070 32 04 74 9c ce 36 28 49 b4 16 04 6a db f5 5e fa
|2.t..6(I...j..^.|
00000080 36 dd b8 49 00 ab 33 60 15 28 8f 46 42 17 a0 56
|6..I..3`.(.FB..V|
00000090 65 5c 58 99 42 a0 2d 20 15 02 6c 31 2b ce 04 70 |e\X.B.-
..l1+..p|After this patch:
[qemu](master)$ hexdump -C /mnt/disk/linux/arch/powerpc/boot/zImage | head -n 20
00000000 00 52 50 4f 00 60 00 00 00 00 17 73 00 00 00 00
|.RPO.`.....s....| 00000010 00 60 00 70 a8 22 53 af 00 00 00 00 00 00 00 00 |.`.p."S.........| 00000020 00 01 7e a4 94 21 ff f0 3c 80 08 00 7c 08 02 a6 |..~..!..<...|...| 00000030 42 9f 00 05 38 a0 00 20 38 c0 00 40 93 c1 00 08 |B...8.. 8..@....| 00000040 90 01 00 14 7f c8 02 a6 80 1e ff ec 7f c0 f2 14 |................| 00000050 80 7e 80 00 7c 83 20 50 48 00 1b 8d 80 01 00 14 |.~..|. PH.......|
It means only Xilinx platforms have been asking for uImage format and bamboo doesn't require it. It also looks like that qemu expect uImage format.
You should know what format qemu expects.
Anyway if you build it by make uImage and then pass it to qemu you should boot just fine.
Or if bamboo requires uImage to be built by default you can do it via Kconfig.
(quoted diff) +0 -0
b/arch/powerpc/platforms/44x/Kconfig
index 39e93d23fb38..300864d7b8c9 100644
arch/powerpc/platforms/44x/Kconfig +1 -0
@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.
Hope that this help with resolving your issue.
Thanks,
Michal
Michael Ellerman
reviewerRe: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 20 lines · Michal Simek
Quoted 19 lines · Nathan Chancellor
Quoted 18 lines · Michal Simek
Quoted 17 lines · Nathan Chancellor
Quoted 6 lines · Christophe Leroy
From: Michal Simek <[email protected]>
The latest Xilinx design tools called ISE and EDK has been released in October 2013. New tool doesn't support any PPC405/PPC440 new designs. These platforms are no longer supported and tested.
Quoted 8 lines
PowerPC 405/440 port is orphan from 2013 by
commitcdeb89943bfc("MAINTAINERS: Fix incorrect status tag") and commit19624236cce1("MAINTAINERS: Update Grant's email address and maintainership") that's why it is time to remove the support fot these platforms.Signed-off-by Michal Simek <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Christophe Leroy <[email protected]>This patch causes qemu-system-ppc to fail to load
ppc44x_defconfig:
<snip>
Quoted 5 lines
I have took a look at it and was able to run qemu and also saw your issue. What happened is that when xilinx platforms were removed zImage is generated but it is not u-boot legacy image.
Don't know details about zImage/uImage in ppc world but if you dump zImage you should see this.
<snip>
Quoted 3 lines
It means only Xilinx platforms have been asking for uImage format and bamboo doesn't require it. It also looks like that qemu expect uImage format.
Yeah, prior to the patch the result of make ppc44x_defconfig contains CONFIG_DEFAULT_UIMAGE, afterward it doesn't.
That means previously arch/powerpc/boot/zImage was just a hardlink to the uImage:
$ ls -li build~/arch/powerpc/boot/{z,u}Image
7472 -rw-rw-r-- 2 michael michael 3073824 Jun 17 20:02 build~/arch/powerpc/boot/uImage
7472 -rw-rw-r-- 2 michael michael 3073824 Jun 17 20:02 build~/arch/powerpc/boot/zImage$ file build~/arch/powerpc/boot/zImage build~/arch/powerpc/boot/zImage: u-boot legacy uImage, Linux-5.7.0-rc2-00247-g0bdad33d6\037\213\010, Linux/PowerPC, OS Kernel Image (gzip), 3073760 bytes, Wed Jun 17 10:14:32 2020, Load Address: 0x00000000, Entry Point: 0x00000000, Header CRC: 0xF0283815, Data CRC: 0x5E5A4D98
Quoted 3 lines
You should know what format qemu expects.
Anyway if you build it by make uImage and then pass it to qemu you should boot just fine.
Yep so you can explicitly build the uImage with:
$ make -skj"$(nproc)" ARCH=powerpc CROSS_COMPILE=powerpc-linux- O=out/ppc distclean ppc44x_defconfig uImage
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0
arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.
Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
cheers
Michael Ellerman
reviewerRe: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 1 line · Michael Ellerman
Michal Simek <[email protected]> writes:
<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I just went to see why my CI boot of 44x didn't catch this, and it's because I don't use the uImage, I just boot the vmlinux directly:
$ qemu-system-ppc -M bamboo -m 128m -display none -kernel build~/vmlinux -append "console=ttyS0" -display none -nodefaults -serial mon:stdio Linux version 5.8.0-rc1-00118-g69119673bd50 (michael@alpine1-p1) (gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #4 Wed Jun 17 20:19:22 AEST 2020 Using PowerPC 44x Platform machine description ioremap() called early from find_legacy_serial_ports+0x690/0x770. Use early_ioremap() instead printk: bootconsole [udbg0] enabled
So that's probably the simplest solution?
cheers
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 28 lines · Michael Ellerman
Quoted 1 line · Michael Ellerman
Michal Simek <[email protected]> writes:
<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I just went to see why my CI boot of 44x didn't catch this, and it's because I don't use the uImage, I just boot the vmlinux directly:
Quoted 8 lines
$ qemu-system-ppc -M bamboo -m 128m -display none -kernel build~/vmlinux -append "console=ttyS0" -display none -nodefaults -serial mon:stdio Linux version 5.8.0-rc1-00118-g69119673bd50 (michael@alpine1-p1) (gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #4 Wed Jun 17 20:19:22 AEST 2020 Using PowerPC 44x Platform machine description ioremap() called early from find_legacy_serial_ports+0x690/0x770. Use early_ioremap() instead printk: bootconsole [udbg0] enabledSo that's probably the simplest solution?
If the uImage or zImage self decompresses, I would prefer to test that as well.
Quoted 2 lines
That means previously
arch/powerpc/boot/zImagewas just a hardlink to the uImage:
It sounds like we can just boot the zImage, or is that no longer created with the uImage?
Signature · 2 lines
Thanks, ~Nick Desaulniers
Michael Ellerman
reviewerRe: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 35 lines · Nick Desaulniers
Quoted 34 lines · Michael Ellerman
Quoted 1 line · Michael Ellerman
Michal Simek <[email protected]> writes:
<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I just went to see why my CI boot of 44x didn't catch this, and it's because I don't use the uImage, I just boot the vmlinux directly:
$ qemu-system-ppc -M bamboo -m 128m -display none -kernel build~/vmlinux -append "console=ttyS0" -display none -nodefaults -serial mon:stdio Linux version 5.8.0-rc1-00118-g69119673bd50 (michael@alpine1-p1) (gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #4 Wed Jun 17 20:19:22 AEST 2020 Using PowerPC 44x Platform machine description ioremap() called early from find_legacy_serial_ports+0x690/0x770. Use early_ioremap() instead printk: bootconsole [udbg0] enabled
Quoted 3 lines
Quoted 1 line
So that's probably the simplest solution?
If the uImage or zImage self decompresses, I would prefer to test that as well.
The uImage is decompressed by qemu AIUI.
Quoted 5 lines
Quoted 2 lines
That means previously
arch/powerpc/boot/zImagewas just a hardlink to the uImage:It sounds like we can just boot the zImage, or is that no longer created with the uImage?
The zImage won't boot on bamboo.
Because of the vagaries of the arch/powerpc/boot/Makefile the zImage ends up pointing to treeImage.ebony, which is for a different board.
The zImage link is made to the first item in $(image-y):
$(obj)/zImage: $(addprefix $(obj)/, $(image-y))
$(Q)rm -f $@; ln $< $@
^
first preqrequisiteWhich for this defconfig happens to be:
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
If you turned off CONFIG_EBONY then the zImage will be a link to treeImage.bamboo, but qemu can't boot that either.
It's kind of nuts that the zImage points to some arbitrary image depending on what's configured and the order of things in the Makefile. But I'm not sure how we make it less nuts without risking breaking people's existing setups.
cheers
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 67 lines · Michael Ellerman
Quoted 35 lines · Nick Desaulniers
Quoted 34 lines · Michael Ellerman
Quoted 1 line · Michael Ellerman
Michal Simek <[email protected]> writes:
<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I just went to see why my CI boot of 44x didn't catch this, and it's because I don't use the uImage, I just boot the vmlinux directly:
$ qemu-system-ppc -M bamboo -m 128m -display none -kernel build~/vmlinux -append "console=ttyS0" -display none -nodefaults -serial mon:stdio Linux version 5.8.0-rc1-00118-g69119673bd50 (michael@alpine1-p1) (gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #4 Wed Jun 17 20:19:22 AEST 2020 Using PowerPC 44x Platform machine description ioremap() called early from find_legacy_serial_ports+0x690/0x770. Use early_ioremap() instead printk: bootconsole [udbg0] enabledQuoted 3 lines
Quoted 1 line
So that's probably the simplest solution?
If the uImage or zImage self decompresses, I would prefer to test that as well.
The uImage is decompressed by qemu AIUI.
Quoted 5 lines
Quoted 2 lines
That means previously
arch/powerpc/boot/zImagewas just a hardlink to the uImage:It sounds like we can just boot the zImage, or is that no longer created with the uImage?
The zImage won't boot on bamboo.
Because of the vagaries of the
arch/powerpc/boot/Makefilethe zImage ends up pointing to treeImage.ebony, which is for a different board.The zImage link is made to the first item in $(image-y):
$(obj)/zImage: $(addprefix $(obj)/, $(image-y))
$(Q)rm -f $@; ln $< $@ ^ first preqrequisiteWhich for this defconfig happens to be:
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
If you turned off
CONFIG_EBONYthen the zImage will be a link to treeImage.bamboo, but qemu can't boot that either.
Quoted 6 lines
It's kind of nuts that the zImage points to some arbitrary image depending on what's configured and the order of things in the
Makefile. But I'm not sure how we make it less nuts without risking breaking people's existing setups.cheers
Hi Michael,
For what it's worth, this is squared this away in terms of our CI by just building and booting the uImage directly, rather than implicitly using the zImage:
https://github.com/ClangBuiltLinux/continuous-integration/pull/282
https://github.com/ClangBuiltLinux/boot-utils/pull/22
We were only using the zImage because that is what Joel Stanley intially set us up with when PowerPC 32-bit was added to our CI:
https://github.com/ClangBuiltLinux/continuous-integration/pull/100
Admittedly, we really do not have many PowerPC experts in our organization so we are supporting it on a "best effort" basis, which often involves using whatever knowledge is floating around or can be gained from interactions such as this :) so thank you for that!
Cheers,
Nathan
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 3 lines · Nathan Chancellor
Admittedly, we really do not have many PowerPC experts in our organization
Not with that attitude. :P /s
https://www.youtube.com/watch?v=Kck_upSlx60
Quoted 3 lines
so we are supporting it on a "best effort" basis, which often involves using whatever knowledge is floating around or can be gained from interactions such as this :) so thank you for that!
That said, Google does have a significant amount of POWER machines in the fleet used by our "prodkernel" teams. Anecdotally, I've been getting cc'ed on more and more internal bugs regarding ppc+clang+linux kernels. "prodkernel" is still in the process of moving a massive fleet over to clang built kernels, but ppc is very important to Google. ppc32...I'm not so sure...let me ask some of our ppc folks more about which uarch's and word sizes they really care about...
--
Thanks,
~Nick Desaulniers
Michael Ellerman
reviewerRe: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
In reply to Nathan ChancellorQuoted 73 lines · Nathan Chancellor
Quoted 64 lines · Michael Ellerman
Quoted 35 lines · Nick Desaulniers
Quoted 34 lines · Michael Ellerman
Quoted 1 line · Michael Ellerman
Michal Simek <[email protected]> writes:
<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I just went to see why my CI boot of 44x didn't catch this, and it's because I don't use the uImage, I just boot the vmlinux directly:
$ qemu-system-ppc -M bamboo -m 128m -display none -kernel build~/vmlinux -append "console=ttyS0" -display none -nodefaults -serial mon:stdio Linux version 5.8.0-rc1-00118-g69119673bd50 (michael@alpine1-p1) (gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #4 Wed Jun 17 20:19:22 AEST 2020 Using PowerPC 44x Platform machine description ioremap() called early from find_legacy_serial_ports+0x690/0x770. Use early_ioremap() instead printk: bootconsole [udbg0] enabledQuoted 3 lines
Quoted 1 line
So that's probably the simplest solution?
If the uImage or zImage self decompresses, I would prefer to test that as well.
The uImage is decompressed by qemu AIUI.
Quoted 5 lines
Quoted 2 lines
That means previously
arch/powerpc/boot/zImagewas just a hardlink to the uImage:It sounds like we can just boot the zImage, or is that no longer created with the uImage?
The zImage won't boot on bamboo.
Because of the vagaries of the
arch/powerpc/boot/Makefilethe zImage ends up pointing to treeImage.ebony, which is for a different board.The zImage link is made to the first item in $(image-y):
$(obj)/zImage: $(addprefix $(obj)/, $(image-y))
$(Q)rm -f $@; ln $< $@ ^ first preqrequisiteWhich for this defconfig happens to be:
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
Quoted 7 lines
If you turned off
CONFIG_EBONYthen the zImage will be a link to treeImage.bamboo, but qemu can't boot that either.It's kind of nuts that the zImage points to some arbitrary image depending on what's configured and the order of things in the
Makefile. But I'm not sure how we make it less nuts without risking breaking people's existing setups.
Quoted 8 lines
Hi Michael,
For what it's worth, this is squared this away in terms of our CI by just building and booting the uImage directly, rather than implicitly using the zImage:
https://github.com/ClangBuiltLinux/continuous-integration/pull/282
https://github.com/ClangBuiltLinux/boot-utils/pull/22
Great.
Quoted 4 lines
We were only using the zImage because that is what Joel Stanley intially set us up with when PowerPC 32-bit was added to our CI:
https://github.com/ClangBuiltLinux/continuous-integration/pull/100
Ah, so Joel owes us all beers then ;)
Quoted 4 lines
Admittedly, we really do not have many PowerPC experts in our organization so we are supporting it on a "best effort" basis, which often involves using whatever knowledge is floating around or can be gained from interactions such as this :) so thank you for that!
No worries. I definitely don't expect you folks to invest much effort in powerpc, especially the old 32-bit stuff, so always happy to help debug things, and really appreciate the testing you do.
cheers
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
Quoted 16 lines · Michael Ellerman
Quoted 5 lines · Nathan Chancellor
Quoted 4 lines
It's kind of nuts that the zImage points to some arbitrary image depending on what's configured and the order of things in the
Makefile. But I'm not sure how we make it less nuts without risking breaking people's existing setups.Quoted 8 lines
Hi Michael,
For what it's worth, this is squared this away in terms of our CI by just building and booting the uImage directly, rather than implicitly using the zImage:
https://github.com/ClangBuiltLinux/continuous-integration/pull/282
https://github.com/ClangBuiltLinux/boot-utils/pull/22
Quoted 8 lines
Great.
Quoted 4 lines
We were only using the zImage because that is what Joel Stanley intially set us up with when PowerPC 32-bit was added to our CI:
https://github.com/ClangBuiltLinux/continuous-integration/pull/100
Ah, so Joel owes us all beers then ;)
Hey, you owe me beers for finding broken machines!
This machine was picked from a vague discussion on an internal chat. The two requirements were that it would build, and boot in qemu.
If there's a better supported 32 bit machine then we should switch the CI over. We don't want the Clang CI to be the only user and give the false impression that someone out there is still booting upstream kernels on it.
Quoted 8 lines
Quoted 4 lines
Admittedly, we really do not have many PowerPC experts in our organization so we are supporting it on a "best effort" basis, which often involves using whatever knowledge is floating around or can be gained from interactions such as this :) so thank you for that!
No worries. I definitely don't expect you folks to invest much effort in powerpc, especially the old 32-bit stuff, so always happy to help debug things, and really appreciate the testing you do.
+1
Cheers,
Joel
Re: [PATCH v5 01/13] powerpc: Remove Xilinx PPC405/PPC440 support
In reply to Michael Ellerman<snip>
Quoted 19 lines
Quoted 9 lines
Or if bamboo requires uImage to be built by default you can do it via
Kconfig.arch/powerpc/platforms/44x/Kconfig +0
-0arch/powerpc/platforms/44x/Kconfig config BAMBOO · line 18
Quoted 6 lines
arch/powerpc/platforms/44x/Kconfig +1
-0@@ -13,6 +13,7 @@ config BAMBOO select PPC44x_SIMPLE select 440EP select FORCE_PCI + select DEFAULT_UIMAGE help This option enables support for the IBM PPC440EP evaluation board.Who knows what the actual bamboo board used. But I'd be happy to take a SOB'ed patch to do the above, because these days the qemu emulation is much more likely to be used than the actual board.
I have no problem to send this as regular patch but someone with more bamboo experience should tell if this is correct configuration. But truth is if that symlink was there for quite a long time it should likely stay there.
Thanks,
Michal
PATCH v5 2/13 powerpc/40x: Rework 40x PTE access and TLB miss
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
Commit 1bc54c03117b ("powerpc: rework 4xx PTE access and TLB miss") reworked 44x PTE access to avoid atomic pte updates, and left 8xx, 40x and fsl booke with atomic pte updates. Commit 6cfd8990e27d ("powerpc: rework FSL Book-E PTE access and TLB miss") removed atomic pte updates on fsl booke.
It went away on 8xx with commit ddfc20a3b9ae ("powerpc/8xx: Remove PTE_ATOMIC_UPDATES").
40x is the last platform setting PTE_ATOMIC_UPDATES.
Rework PTE access and TLB miss to remove PTE_ATOMIC_UPDATES for 40x:
- Always handle DSI as a fault.
- Bail out of TLB miss handler when CONFIG_SWAP is set and _PAGE_ACCESSED is not set.
- Bail out of ITLB miss handler when _PAGE_EXEC is not set.
- Only set WR bit when both _PAGE_RW and _PAGE_DIRTY are set.
- Remove _PAGE_HWWRITE
- Don't require PTE_ATOMIC_UPDATES anymore
---
v4: Fixed build failure (missing ;)
--- arch/powerpc/include/asm/nohash/32/pte-40x.h | 23 +-- arch/powerpc/include/asm/nohash/pgtable.h | 2 - arch/powerpc/kernel/head_40x.S | 177 +++---------------- arch/powerpc/mm/nohash/40x.c | 4 +- 4 files changed, 34 insertions(+), 172 deletions(-)
arch/powerpc/include/asm/nohash/32/pte-40x.h +3 -20
@@ -44,9 +44,8 @@#define _PAGE_WRITETHRU 0x008/* W: caching is write-through */ #define _PAGE_USER 0x010/* matches one of the zone permission bits */ #define _PAGE_SPECIAL 0x020/* software: Special page */ -#define _PAGE_RW 0x040/* software: Writes permitted */ #define _PAGE_DIRTY 0x080/* software: dirty page */ -#define _PAGE_HWWRITE 0x100/* hardware: Dirty & RW, set in exception */ +#define _PAGE_RW 0x100/* hardware: WR, anded with dirty in exception */ #define _PAGE_EXEC 0x200/* hardware: EX permission */ #define _PAGE_ACCESSED 0x400/* software: R: page referenced */
@@ -58,8 +57,8 @@#define _PAGE_KERNEL_RO 0#define _PAGE_KERNEL_ROX _PAGE_EXEC -#define _PAGE_KERNEL_RW (_PAGE_DIRTY | _PAGE_RW | _PAGE_HWWRITE) -#define _PAGE_KERNEL_RWX (_PAGE_DIRTY | _PAGE_RW | _PAGE_HWWRITE | _PAGE_EXEC) +#define _PAGE_KERNEL_RW (_PAGE_DIRTY | _PAGE_RW) +#define _PAGE_KERNEL_RWX (_PAGE_DIRTY | _PAGE_RW | _PAGE_EXEC)#define _PMD_PRESENT 0x400/* PMD points to page of PTEs */ #define _PMD_PRESENT_MASK _PMD_PRESENT
@@ -85,21 +84,5 @@#define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER)#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) -#ifndef __ASSEMBLY__ -static inline pte_t pte_wrprotect (pte_t pte) -{ -return __pte (pte_val (pte) & ~(_PAGE_RW | _PAGE_HWWRITE)); -} - -#define pte_wrprotect pte_wrprotect - -static inline pte_t pte_mkclean (pte_t pte) -{ -return __pte (pte_val (pte) & ~(_PAGE_DIRTY | _PAGE_HWWRITE)); -} - -#define pte_mkclean pte_mkclean -#endif -#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_NOHASH_32_PTE_40x_H */
arch/powerpc/include/asm/nohash/pgtable.h +0 -2
@@ -130,12 +130,10 @@ static inline pte_t pte_exprotect(pte_t pte)return __pte (pte_val (pte) & ~_PAGE_EXEC); } -#ifndef pte_mkcleanstatic inline pte_t pte_mkclean (pte_t pte) {return __pte (pte_val (pte) & ~_PAGE_DIRTY); } -#endif static inline pte_t pte_mkold (pte_t pte) {
arch/powerpc/kernel/head_40x.S +29 -148
211 lines not on this page · raw message
arch/powerpc/mm/nohash/40x.c +2 -2
@@ -102,7 +102,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)while (s >=LARGE_PAGE_SIZE_16M ) {pmd_t *pmdp; -unsigned long val = p | _PMD_SIZE_16M | _PAGE_EXEC | _PAGE_HWWRITE; +unsigned long val = p | _PMD_SIZE_16M | _PAGE_EXEC | _PAGE_RW; pmdp =pmd_ptr_k (v); *pmdp++ =__pmd (val);
@@ -117,7 +117,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)while (s >=LARGE_PAGE_SIZE_4M ) {pmd_t *pmdp; -unsigned long val = p | _PMD_SIZE_4M | _PAGE_EXEC | _PAGE_HWWRITE; +unsigned long val = p | _PMD_SIZE_4M | _PAGE_EXEC | _PAGE_RW; pmdp =pmd_ptr_k (v); *pmdp =__pmd (val);
Signature · 1 line
2.25.0
PATCH v5 3/13 powerpc/pgtable: Drop PTE_ATOMIC_UPDATES
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
40x was the last user of PTE_ATOMIC_UPDATES.
Drop everything related to PTE_ATOMIC_UPDATES.
---
v5: Rebased on top of the 8xx hugepage series
--- arch/powerpc/include/asm/nohash/32/pgtable.h | 15 --------------- 1 file changed, 15 deletions(-)
arch/powerpc/include/asm/nohash/32/pgtable.h +0 -15
@@ -259,25 +259,10 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pstatic inline pte_basic_t pte_update (struct mm_struct *mm,unsigned long addr,pte_t *p,unsigned long clr,unsigned long set,int huge) { -#if defined(PTE_ATOMIC_UPDATES ) && !defined(CONFIG_PTE_64BIT ) -unsigned long old, tmp; - - __asm__ __volatile__("\ -1: lwarx %0,0,%3\n\ -andc %1,%0,%4\n\ -or %1,%1,%5\n" - PPC405_ERR77(0,%3) -" stwcx. %1,0,%3\n\ - bne- 1b" - : "=&r" (old), "=&r" (tmp), "=m" (*p) - : "r" (p), "r" (clr), "r" (set), "m" (*p) - : "cc" ); -#else /* PTE_ATOMIC_UPDATES */ pte_basic_t old =pte_val (*p);pte_basic_t new = (old & ~(pte_basic_t )clr) | set; *p =__pte (new); -#endif /* !PTE_ATOMIC_UPDATES */ #ifdef CONFIG_44xif ((old & _PAGE_USER) && (old & _PAGE_EXEC))
Signature · 1 line
2.25.0
PATCH v5 4/13 powerpc/40x: Remove support for IBM 403GCX
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
CONFIG_403GCX is not user selectable and is not
selected by any platform.
Remove it.
--- arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/reg_booke.h | 54 ---------------------------- arch/powerpc/include/asm/time.h | 12 ------- arch/powerpc/kernel/cputable.c | 37 ------------------- arch/powerpc/kernel/head_40x.S | 45 ----------------------- arch/powerpc/kernel/misc_32.S | 9 ----- arch/powerpc/kernel/setup-common.c | 4 --- arch/powerpc/platforms/40x/Kconfig | 6 ---- 8 files changed, 1 insertion(+), 168 deletions(-)
arch/powerpc/include/asm/cache.h +1 -1
@@ -6,7 +6,7 @@/* bytes per L1 cache line */ -#if defined(CONFIG_PPC_8xx) || defined(CONFIG_403GCX ) +#if defined(CONFIG_PPC_8xx)#define L1_CACHE_SHIFT 4#define MAX_COPY_PREFETCH 1#define IFETCH_ALIGN_SHIFT 2
arch/powerpc/include/asm/reg_booke.h +0 -54
60 lines not on this page · raw message
arch/powerpc/include/asm/time.h +0 -12
@@ -51,24 +51,12 @@ struct div_result {static inline unsigned long get_tbl (void ) { -#if defined(CONFIG_403GCX ) -unsigned long tbl; - asmvolatile ("mfspr %0, 0x3dd" :"=r" (tbl)); -return tbl; -#else return mftbl (); -#endif }static inline unsigned int get_tbu (void ) { -#ifdef CONFIG_403GCX -unsigned int tbu; - asmvolatile ("mfspr %0, 0x3dc" :"=r" (tbu)); -return tbu; -#else return mftbu (); -#endif }#endif /* !CONFIG_PPC64 */
arch/powerpc/kernel/cputable.c +0 -37
@@ -1232,43 +1232,6 @@ static struct cpu_spec __initdata cpu_specs[] = { },#endif /* CONFIG_PPC_8xx */ #ifdef CONFIG_40x - {/* 403GC */ - .pvr_mask = 0xffffff00, - .pvr_value = 0x00200200, - .cpu_name = "403GC", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 16, - .dcache_bsize = 16, - .machine_check = machine_check_4xx, - .platform = "ppc403", - }, - { /* 403GCX */ - .pvr_mask = 0xffffff00, - .pvr_value = 0x00201400, - .cpu_name = "403GCX", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features =PPC_FEATURE_32 | - PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 16, - .dcache_bsize = 16, - .machine_check = machine_check_4xx, - .platform = "ppc403", - }, - { /* 403G ?? */ - .pvr_mask = 0xffff0000, - .pvr_value = 0x00200000, - .cpu_name = "403G ??", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 16, - .dcache_bsize = 16, - .machine_check = machine_check_4xx, - .platform = "ppc403", - }, {/* 405GP */ .pvr_mask = 0xffff0000, .pvr_value = 0x40110000,
arch/powerpc/kernel/head_40x.S +0 -45
105 lines not on this page · raw message
arch/powerpc/kernel/misc_32.S +0 -9
@@ -274,17 +274,8 @@ _GLOBAL(real_writeb) #ifndef CONFIG_PPC_8xx _GLOBAL(flush_instruction_cache) #if defined(CONFIG_4xx) -#ifdef CONFIG_403GCX - li r3, 512 - mtctr r3 - lis r4, KERNELBASE@h -1: iccci 0, r4 - addi r4, r4, 16 - bdnz 1b -#else lis r3, KERNELBASE@h iccci 0,r3 -#endif #elif defined(CONFIG_FSL_BOOKE) #ifdef CONFIG_E200 mfspr r3,SPRN_L1CSR0
arch/powerpc/kernel/setup-common.c +0 -4
@@ -306,10 +306,6 @@ static int show_cpuinfo(struct seq_file *m, void *v) } }else {switch (PVR_VER (pvr)) { -case 0x0020 :/* 403 family */ - maj =PVR_MAJ (pvr) +1 ; - min =PVR_MIN (pvr); -break ;case 0x1008 :/* 740P/750P ?? */ maj = ((pvr >>8 ) &0xFF ) -1 ; min = pvr &0xFF ;
arch/powerpc/platforms/40x/Kconfig +0 -6
@@ -69,12 +69,6 @@ config PPC40x_SIMPLE help This option enables the simple PowerPC 40x platform support. -# OAK doesn't exist but wanted to keep this around for any future 403GCX boards -config 403GCX - bool - #depends on OAK - select IBM405_ERR51 - config 405GP bool select IBM405_ERR77
Signature · 1 line
2.25.0
PATCH v5 5/13 powerpc/40x: Remove STB03xxx
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
CONFIG_STB03xxx is not user selectable and is not selected by any config.
Remove it.
--- arch/powerpc/kernel/cputable.c | 13 ------------- arch/powerpc/platforms/40x/Kconfig | 5 ----- 2 files changed, 18 deletions(-)
arch/powerpc/kernel/cputable.c +0 -13
@@ -1245,19 +1245,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_4xx, .platform = "ppc405", }, - {/* STB 03xxx */ - .pvr_mask = 0xffff0000, - .pvr_value = 0x40130000, - .cpu_name = "STB03xxx", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features =PPC_FEATURE_32 | - PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 32, - .dcache_bsize = 32, - .machine_check = machine_check_4xx, - .platform = "ppc405", - }, {/* STB 04xxx */ .pvr_mask = 0xffff0000, .pvr_value = 0x41810000,
arch/powerpc/platforms/40x/Kconfig +0 -5
@@ -86,11 +86,6 @@ config 405EZ select IBM_EMAC_MAL_CLR_ICINTSTAT if IBM_EMAC select IBM_EMAC_MAL_COMMON_ERR if IBM_EMAC -config STB03xxx - bool - select IBM405_ERR77 - select IBM405_ERR51 - config PPC4xx_GPIO bool "PPC4xx GPIO support" depends on 40x
Signature · 1 line
2.25.0
PATCH v5 6/13 powerpc/40x: Remove WALNUT
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
CONFIG_WALNUT is not selected by any config and is based on 405GP which is obsolete.
Remove it.
---
v4: Moved a few things related to EP405 to next patch
--- arch/powerpc/boot/Makefile | 4 +- arch/powerpc/boot/dts/walnut.dts | 246 -------------------- arch/powerpc/boot/treeboot-walnut.c | 81 ------- arch/powerpc/configs/40x/acadia_defconfig | 1 - arch/powerpc/configs/40x/kilauea_defconfig | 1 - arch/powerpc/configs/40x/klondike_defconfig | 1 - arch/powerpc/configs/40x/makalu_defconfig | 1 - arch/powerpc/configs/40x/obs600_defconfig | 1 - arch/powerpc/platforms/40x/Kconfig | 10 - arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/walnut.c | 65 ------ 11 files changed, 1 insertion(+), 411 deletions(-) delete mode 100644 arch/powerpc/boot/dts/walnut.dts delete mode 100644 arch/powerpc/boot/treeboot-walnut.c delete mode 100644 arch/powerpc/platforms/40x/walnut.c
arch/powerpc/boot/Makefile +1 -3
@@ -75,7 +75,6 @@ $(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 -$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-akebono.o: BOOTCFLAGS += -mcpu=405
@@ -132,7 +131,7 @@ src-wlib-$(CONFIG_CPM) += cpm-serial.c src-plat-y := of.c epapr.c src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \ - treeboot-walnut.c cuboot-acadia.c \ + cuboot-acadia.c \ cuboot-kilauea.c simpleboot.c src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ cuboot-bamboo.c cuboot-sam440ep.c \
@@ -278,7 +277,6 @@ image-$(CONFIG_EPAPR_BOOT) += zImage.epapr # 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 image-$(CONFIG_OBS600) += uImage.obs600
arch/powerpc/boot/dts/walnut.dts deleted +0 -246
246 lines not on this page · raw message
arch/powerpc/boot/treeboot-walnut.c deleted +0 -81
81 lines not on this page · raw message
arch/powerpc/configs/40x/acadia_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ACADIA=y -# CONFIG_WALNUT is not set CONFIG_PCI=y CONFIG_NET=y CONFIG_PACKET=y
arch/powerpc/configs/40x/kilauea_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_KILAUEA=y -# CONFIG_WALNUT is not set CONFIG_PCI=y CONFIG_NET=y CONFIG_PACKET=y
arch/powerpc/configs/40x/klondike_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_WALNUT is not set CONFIG_APM8018X=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_MATH_EMULATION=y
arch/powerpc/configs/40x/makalu_defconfig +0 -1
@@ -9,7 +9,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_MAKALU=y -# CONFIG_WALNUT is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/powerpc/configs/40x/obs600_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -# CONFIG_WALNUT is not set CONFIG_OBS600=y CONFIG_MATH_EMULATION=y CONFIG_NET=y
arch/powerpc/platforms/40x/Kconfig +0 -10
@@ -45,16 +45,6 @@ config MAKALU help This option enables support for the AMCC PPC405EX board. -config WALNUT - bool "Walnut" - depends on 40x - default y - select 405GP - select FORCE_PCI - select OF_RTC - help - This option enables support for the IBM PPC405GP evaluation board. - config OBS600 bool "OpenBlockS 600" depends on 40x
arch/powerpc/platforms/40x/Makefile +0 -1
@@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_WALNUT) += walnut.o obj-$(CONFIG_EP405) += ep405.o obj-$(CONFIG_PPC40x_SIMPLE) += ppc40x_simple.o
arch/powerpc/platforms/40x/walnut.c deleted +0 -65
65 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v5 7/13 powerpc/40x: Remove EP405
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
EP405 is an old type of board based on a 405GP which is obsolete.
Remove it.
---
v4: A few things from previous patch are now here as there are not related to walnut
--- arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/dts/ep405.dts | 230 ----------------------- arch/powerpc/boot/ep405.c | 71 ------- arch/powerpc/configs/40x/ep405_defconfig | 62 ------ arch/powerpc/configs/ppc40x_defconfig | 1 - arch/powerpc/platforms/40x/Kconfig | 8 - arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/ep405.c | 123 ------------ 8 files changed, 1 insertion(+), 498 deletions(-) delete mode 100644 arch/powerpc/boot/dts/ep405.dts delete mode 100644 arch/powerpc/boot/ep405.c delete mode 100644 arch/powerpc/configs/40x/ep405_defconfig delete mode 100644 arch/powerpc/platforms/40x/ep405.c
arch/powerpc/boot/Makefile +1 -2
@@ -130,7 +130,7 @@ src-wlib-$(CONFIG_EMBEDDED6xx) += ugecon.c fsl-soc.c src-wlib-$(CONFIG_CPM) += cpm-serial.c src-plat-y := of.c epapr.c -src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \ +src-plat-$(CONFIG_40x) += fixed-head.S cuboot-hotfoot.c \ cuboot-acadia.c \ cuboot-kilauea.c simpleboot.c src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \
@@ -275,7 +275,6 @@ image-$(CONFIG_EPAPR_BOOT) += zImage.epapr # # Board ports in arch/powerpc/platform/40x/Kconfig -image-$(CONFIG_EP405) += dtbImage.ep405 image-$(CONFIG_HOTFOOT) += cuImage.hotfoot image-$(CONFIG_ACADIA) += cuImage.acadia image-$(CONFIG_OBS600) += uImage.obs600
arch/powerpc/boot/dts/ep405.dts deleted +0 -230
230 lines not on this page · raw message
arch/powerpc/boot/ep405.c deleted +0 -71
71 lines not on this page · raw message
arch/powerpc/configs/40x/ep405_defconfig deleted +0 -62
62 lines not on this page · raw message
arch/powerpc/configs/ppc40x_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PPC4xx_GPIO=y CONFIG_ACADIA=y -CONFIG_EP405=y CONFIG_HOTFOOT=y CONFIG_KILAUEA=y CONFIG_MAKALU=y
arch/powerpc/platforms/40x/Kconfig +0 -8
@@ -7,14 +7,6 @@ config ACADIA help This option enables support for the AMCC 405EZ Acadia evaluation board. -config EP405 - bool "EP405/EP405PC" - depends on 40x - select 405GP - select FORCE_PCI - help - This option enables support for the EP405/EP405PC boards. - config HOTFOOT bool "Hotfoot" depends on 40x
arch/powerpc/platforms/40x/Makefile +0 -1
@@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_EP405) += ep405.o obj-$(CONFIG_PPC40x_SIMPLE) += ppc40x_simple.o
arch/powerpc/platforms/40x/ep405.c deleted +0 -123
123 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v5 8/13 powerpc/40x: Remove support for ISS Simulator
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
ISS4xx has support for 405GP which is obsolete.
Remote it.
--- arch/powerpc/platforms/44x/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/platforms/44x/Kconfig +1 -2
@@ -167,8 +167,7 @@ config YOSEMITE config ISS4xx bool "ISS 4xx Simulator" - depends on (44x || 40x) - select 405GP if 40x + depends on 44x select 440GP if 44x && !PPC_47x select PPC_FPU select OF_RTC
Signature · 1 line
2.25.0
PATCH v5 9/13 powerpc/40x: Remove support for IBM 405GP
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
All platforms selecting the obsolete processor are gone now.
Remove support for it.
--- arch/powerpc/kernel/cputable.c | 13 ------------- arch/powerpc/platforms/40x/Kconfig | 6 ------ 2 files changed, 19 deletions(-)
arch/powerpc/kernel/cputable.c +0 -13
@@ -1232,19 +1232,6 @@ static struct cpu_spec __initdata cpu_specs[] = { },#endif /* CONFIG_PPC_8xx */ #ifdef CONFIG_40x - {/* 405GP */ - .pvr_mask = 0xffff0000, - .pvr_value = 0x40110000, - .cpu_name = "405GP", - .cpu_features = CPU_FTRS_40X, - .cpu_user_features =PPC_FEATURE_32 | - PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, - .mmu_features = MMU_FTR_TYPE_40x, - .icache_bsize = 32, - .dcache_bsize = 32, - .machine_check = machine_check_4xx, - .platform = "ppc405", - }, {/* STB 04xxx */ .pvr_mask = 0xffff0000, .pvr_value = 0x41810000,
arch/powerpc/platforms/40x/Kconfig +0 -6
@@ -51,12 +51,6 @@ config PPC40x_SIMPLE help This option enables the simple PowerPC 40x platform support. -config 405GP - bool - select IBM405_ERR77 - select IBM405_ERR51 - select IBM_EMAC_ZMII if IBM_EMAC - config 405EX bool select IBM_EMAC_EMAC4 if IBM_EMAC
Signature · 1 line
2.25.0
PATCH v5 10/13 powerpc/40x: Remove IBM405 Erratum #51
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
This erratum was for IBM 403GCX, 405EP and STB03xxx which are now gone.
Remove this erratum.
--- arch/powerpc/kernel/head_40x.S | 6 ------ arch/powerpc/platforms/40x/Kconfig | 4 ---- 2 files changed, 10 deletions(-)
arch/powerpc/kernel/head_40x.S +0 -6
@@ -426,13 +426,7 @@ _ENTRY(saved_ksp_limit) EXCEPTION(0x1400, Trap_14, unknown_exception, EXC_XFER_STD) EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_STD) EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_STD) -#ifdef CONFIG_IBM405_ERR51 - /* 405GP errata 51 */ - START_EXCEPTION(0x1700, Trap_17) - b DTLBMiss -#else EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_STD) -#endif EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_STD) EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_STD) EXCEPTION(0x1A00, Trap_1A, unknown_exception, EXC_XFER_STD)
arch/powerpc/platforms/40x/Kconfig +0 -4
@@ -75,10 +75,6 @@ config PPC4xx_GPIO config IBM405_ERR77 bool -# All 40x-based cores, up until the 405GPR and 405EP have this errata. -config IBM405_ERR51 - bool - config APM8018X bool "APM8018X" depends on 40x
Signature · 1 line
2.25.0
PATCH v5 11/13 powerpc: Remove IBM405 Erratum #77
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
This erratum is dedicated to IBM 405GP and STB03xxx which are now gone.
Remove this erratum.
--- arch/powerpc/include/asm/asm-405.h | 19 ------------------- arch/powerpc/include/asm/atomic.h | 11 ----------- arch/powerpc/include/asm/bitops.h | 4 ---- arch/powerpc/include/asm/cmpxchg.h | 11 ----------- arch/powerpc/include/asm/futex.h | 3 --- arch/powerpc/include/asm/nohash/32/pgtable.h | 1 - arch/powerpc/include/asm/spinlock.h | 4 ---- arch/powerpc/kernel/entry_32.S | 11 ----------- arch/powerpc/kernel/head_40x.S | 3 --- arch/powerpc/platforms/40x/Kconfig | 6 ------ 10 files changed, 73 deletions(-) delete mode 100644 arch/powerpc/include/asm/asm-405.h
arch/powerpc/include/asm/asm-405.h deleted +0 -19
@@ -1,19 +0,0 @@ -#ifndef _ASM_POWERPC_ASM_405_H -#define _ASM_POWERPC_ASM_405_H - -#include <asm/asm-const.h> - -#ifdef __KERNEL__ -#ifdef CONFIG_IBM405_ERR77 -/* Erratum #77 on the 405 means we need a sync or dcbt before every -* stwcx. The old ATOMIC_SYNC_FIX covered some but not all of this. -*/ -#define PPC405_ERR77 (ra,rb) stringify_in_c(dcbt ra, rb;) -#define PPC405_ERR77_SYNC stringify_in_c(sync;) -#else -#define PPC405_ERR77 (ra,rb) -#define PPC405_ERR77_SYNC -#endif -#endif - -#endif /* _ASM_POWERPC_ASM_405_H */
arch/powerpc/include/asm/atomic.h +0 -11
@@ -10,7 +10,6 @@#include <linux/types.h> #include <asm/cmpxchg.h> #include <asm/barrier.h> -#include <asm/asm-405.h> #define ATOMIC_INIT (i) { (i) }
@@ -47,7 +46,6 @@ static __inline__ void atomic_##op(int a, atomic_t *v) \ __asm__ __volatile__( \ "1: lwarx %0,0,%3 # atomic_" #op "\n" \ #asm_op " %0,%2,%0\n" \ - PPC405_ERR77(0,%3) \ " stwcx. %0,0,%3 \n" \ " bne- 1b\n" \ : "=&r" (t), "+m" (v->counter) \
@@ -63,7 +61,6 @@ static inline int atomic_##op##_return_relaxed(int a, atomic_t *v) \ __asm__ __volatile__( \ "1: lwarx %0,0,%3 # atomic_" #op "_return_relaxed\n" \ #asm_op " %0,%2,%0\n" \ - PPC405_ERR77(0, %3) \ " stwcx. %0,0,%3\n" \ " bne- 1b\n" \ : "=&r" (t), "+m" (v->counter) \
@@ -81,7 +78,6 @@ static inline int atomic_fetch_##op##_relaxed(int a, atomic_t *v) \ __asm__ __volatile__( \ "1: lwarx %0,0,%4 # atomic_fetch_" #op "_relaxed\n" \ #asm_op " %1,%3,%0\n" \ - PPC405_ERR77(0, %4) \ " stwcx. %1,0,%4\n" \ " bne- 1b\n" \ : "=&r" (res), "=&r" (t), "+m" (v->counter) \
@@ -130,7 +126,6 @@ static __inline__ void atomic_inc(atomic_t *v) __asm__ __volatile__("1: lwarx %0,0,%2 # atomic_inc\n\ addic %0,%0,1\n" - PPC405_ERR77(0,%2)" stwcx. %0,0,%2 \n\ bne- 1b" : "=&r" (t), "+m" (v->counter)
@@ -146,7 +141,6 @@ static __inline__ int atomic_inc_return_relaxed(atomic_t *v) __asm__ __volatile__("1: lwarx %0,0,%2 # atomic_inc_return_relaxed\n" " addic %0,%0,1\n" - PPC405_ERR77(0, %2)" stwcx. %0,0,%2\n" " bne- 1b" : "=&r" (t), "+m" (v->counter)
@@ -163,7 +157,6 @@ static __inline__ void atomic_dec(atomic_t *v) __asm__ __volatile__("1: lwarx %0,0,%2 # atomic_dec\n\ addic %0,%0,-1\n" - PPC405_ERR77(0,%2)\" stwcx. %0,0,%2\n\ bne- 1b" : "=&r" (t), "+m" (v->counter)
@@ -179,7 +172,6 @@ static __inline__ int atomic_dec_return_relaxed(atomic_t *v) __asm__ __volatile__("1: lwarx %0,0,%2 # atomic_dec_return_relaxed\n" " addic %0,%0,-1\n" - PPC405_ERR77(0, %2)" stwcx. %0,0,%2\n" " bne- 1b" : "=&r" (t), "+m" (v->counter)
@@ -220,7 +212,6 @@ static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) cmpw 0,%0,%3 \n\ beq 2f \n\ add %0,%2,%0 \n" - PPC405_ERR77(0,%2)" stwcx. %0,0,%1 \n\ bne- 1b \n" PPC_ATOMIC_EXIT_BARRIER
@@ -251,7 +242,6 @@ static __inline__ int atomic_inc_not_zero(atomic_t *v) cmpwi 0,%0,0\n\ beq- 2f\n\ addic %1,%0,1\n" - PPC405_ERR77(0,%2) " stwcx. %1,0,%2\n\ bne- 1b\n"PPC_ATOMIC_EXIT_BARRIER
@@ -280,7 +270,6 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v) cmpwi %0,1\n\ addi %0,%0,-1\n\ blt- 2f\n" - PPC405_ERR77(0,%1)" stwcx. %0,0,%1\n\ bne- 1b" PPC_ATOMIC_EXIT_BARRIER
arch/powerpc/include/asm/bitops.h +0 -4
@@ -41,7 +41,6 @@#include <linux/compiler.h> #include <asm/asm-compat.h> #include <asm/synch.h> -#include <asm/asm-405.h> /* PPC bit number conversion */ #define PPC_BITLSHIFT (be) (BITS_PER_LONG - 1 - (be))
@@ -73,7 +72,6 @@ static inline void fn(unsigned long mask, \ prefix \ "1:" PPC_LLARX(%0,0,%3,0) "\n" \ stringify_in_c(op) "%0,%0,%2\n" \ - PPC405_ERR77(0,%3) \PPC_STLCX "%0,0,%3\n" \"bne- 1b\n" \ : "=&r" (old), "+m" (*p) \
@@ -119,7 +117,6 @@ static inline unsigned long fn( \ prefix \ "1:" PPC_LLARX(%0,0,%3,eh) "\n" \ stringify_in_c(op) "%1,%0,%2\n" \ - PPC405_ERR77(0,%3) \PPC_STLCX "%1,0,%3\n" \"bne- 1b\n" \ postfix \
@@ -175,7 +172,6 @@ clear_bit_unlock_return_word(int nr, volatile unsigned long *addr)PPC_RELEASE_BARRIER "1:" PPC_LLARX(%0,0,%3,0) "\n""andc %1,%0,%2\n" - PPC405_ERR77(0,%3)PPC_STLCX "%1,0,%3\n" "bne- 1b\n" : "=&r" (old), "=&r" (t)
arch/powerpc/include/asm/cmpxchg.h +0 -11
@@ -6,7 +6,6 @@#include <linux/compiler.h> #include <asm/synch.h> #include <linux/bug.h> -#include <asm/asm-405.h> #ifdef __BIG_ENDIAN#define BITOFF_CAL (size, off) ((sizeof(u32) - size - off) * BITS_PER_BYTE)
@@ -29,7 +28,6 @@ static inline u32 __xchg_##type##sfx(volatile void *p, u32 val) \"1: lwarx %0,0,%3\n" \" andc %1,%0,%5\n" \" or %1,%1,%4\n" \ - PPC405_ERR77(0,%3) \" stwcx. %1,0,%3\n" \" bne- 1b\n" \ : "=&r" (prev), "=&r" (tmp), "+m" (*(u32*)p) \
@@ -60,7 +58,6 @@ u32 __cmpxchg_##type##sfx(volatile void *p, u32 old, u32 new) \" bne- 2f\n" \" andc %1,%0,%6\n" \" or %1,%1,%5\n" \ - PPC405_ERR77(0,%3) \" stwcx. %1,0,%3\n" \" bne- 1b\n" \ br2 \
@@ -92,7 +89,6 @@ __xchg_u32_local(volatile void *p, unsigned long val) __asm__ __volatile__("1: lwarx %0,0,%2 \n" - PPC405_ERR77(0,%2)" stwcx. %3,0,%2 \n\ bne- 1b" : "=&r" (prev), "+m" (*(volatile unsigned int *)p)
@@ -109,7 +105,6 @@ __xchg_u32_relaxed(u32 *p, unsigned long val) __asm__ __volatile__("1: lwarx %0,0,%2\n" - PPC405_ERR77(0, %2)" stwcx. %3,0,%2\n" " bne- 1b" : "=&r" (prev), "+m" (*p)
@@ -127,7 +122,6 @@ __xchg_u64_local(volatile void *p, unsigned long val) __asm__ __volatile__("1: ldarx %0,0,%2 \n" - PPC405_ERR77(0,%2)" stdcx. %3,0,%2 \n\ bne- 1b" : "=&r" (prev), "+m" (*(volatile unsigned long *)p)
@@ -144,7 +138,6 @@ __xchg_u64_relaxed(u64 *p, unsigned long val) __asm__ __volatile__("1: ldarx %0,0,%2\n" - PPC405_ERR77(0, %2)" stdcx. %3,0,%2\n" " bne- 1b" : "=&r" (prev), "+m" (*p)
@@ -229,7 +222,6 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)"1: lwarx %0,0,%2 # __cmpxchg_u32\n\ cmpw 0,%0,%3\n\ bne- 2f\n" - PPC405_ERR77(0,%2)" stwcx. %4,0,%2\n\ bne- 1b" PPC_ATOMIC_EXIT_BARRIER
@@ -252,7 +244,6 @@ __cmpxchg_u32_local(volatile unsigned int *p, unsigned long old,"1: lwarx %0,0,%2 # __cmpxchg_u32\n\ cmpw 0,%0,%3\n\ bne- 2f\n" - PPC405_ERR77(0,%2)" stwcx. %4,0,%2\n\ bne- 1b" "\n\
@@ -273,7 +264,6 @@ __cmpxchg_u32_relaxed(u32 *p, unsigned long old, unsigned long new)"1: lwarx %0,0,%2 # __cmpxchg_u32_relaxed\n" " cmpw 0,%0,%3\n" " bne- 2f\n" - PPC405_ERR77(0, %2)" stwcx. %4,0,%2\n" " bne- 1b\n" "2:"
@@ -301,7 +291,6 @@ __cmpxchg_u32_acquire(u32 *p, unsigned long old, unsigned long new)"1: lwarx %0,0,%2 # __cmpxchg_u32_acquire\n" " cmpw 0,%0,%3\n" " bne- 2f\n" - PPC405_ERR77(0, %2)" stwcx. %4,0,%2\n" " bne- 1b\n" PPC_ACQUIRE_BARRIER
arch/powerpc/include/asm/futex.h +0 -3
@@ -8,14 +8,12 @@#include <linux/uaccess.h> #include <asm/errno.h> #include <asm/synch.h> -#include <asm/asm-405.h> #define __futex_atomic_op (insn, ret, oldval, uaddr, oparg) \ __asm__ __volatile ( \ PPC_ATOMIC_ENTRY_BARRIER \ "1: lwarx %0,0,%2\n" \ insn \ - PPC405_ERR77(0, %2) \ "2: stwcx. %1,0,%2\n" \ "bne- 1b\n" \ PPC_ATOMIC_EXIT_BARRIER \
@@ -82,7 +80,6 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,"1: lwarx %1,0,%3 # futex_atomic_cmpxchg_inatomic\n\ cmpw 0,%1,%4\n\ bne- 3f\n" - PPC405_ERR77(0,%3)"2: stwcx. %5,0,%3\n\ bne- 1b\n" PPC_ATOMIC_EXIT_BARRIER
arch/powerpc/include/asm/nohash/32/pgtable.h +0 -1
@@ -9,7 +9,6 @@#include <linux/sched.h> #include <linux/threads.h> #include <asm/mmu.h> /* For sub-arch specific PPC_PIN_SIZE */ -#include <asm/asm-405.h> #ifdef CONFIG_44xextern int icache_44x_need_flush;
arch/powerpc/include/asm/spinlock.h +0 -4
@@ -23,7 +23,6 @@#endif #include <asm/synch.h> #include <asm/ppc-opcode.h> -#include <asm/asm-405.h> #ifdef CONFIG_PPC64 /* use 0x800000yy when locked, where yy == CPU number */
@@ -210,7 +209,6 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw) __DO_SIGN_EXTEND" addic. %0,%0,1\n\ ble- 2f\n" - PPC405_ERR77(0,%1)" stwcx. %0,0,%1\n\ bne- 1b\n" PPC_ACQUIRE_BARRIER
@@ -234,7 +232,6 @@ static inline long __arch_write_trylock(arch_rwlock_t *rw) "1: " PPC_LWARX(%0,0,%2,1) "\n\cmpwi 0,%0,0\n\ bne- 2f\n" - PPC405_ERR77(0,%1)" stwcx. %1,0,%2\n\ bne- 1b\n" PPC_ACQUIRE_BARRIER
@@ -292,7 +289,6 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) PPC_RELEASE_BARRIER "1: lwarx %0,0,%1\n\ addic %0,%0,-1\n" - PPC405_ERR77(0,%1) " stwcx. %0,0,%1\n\ bne- 1b" : "=&r"(tmp)
arch/powerpc/kernel/entry_32.S +0 -11
@@ -28,7 +28,6 @@ #include <asm/unistd.h> #include <asm/ptrace.h> #include <asm/export.h> -#include <asm/asm-405.h> #include <asm/feature-fixups.h> #include <asm/barrier.h> #include <asm/kup.h>
@@ -541,9 +540,6 @@ syscall_exit_work: addi r12,r2,TI_FLAGS 3: lwarx r8,0,r12 andc r8,r8,r11 -#ifdef CONFIG_IBM405_ERR77 - dcbt 0,r12 -#endif stwcx. r8,0,r12 bne- 3b
@@ -918,9 +914,6 @@ resume_kernel: addi r5,r2,TI_FLAGS 0: lwarx r8,0,r5 andc r8,r8,r11 -#ifdef CONFIG_IBM405_ERR77 - dcbt 0,r5 -#endif stwcx. r8,0,r5 bne- 0b 1:
@@ -997,7 +990,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_47x) mtspr SPRN_XER,r10 mtctr r11 - PPC405_ERR77(0,r1) BEGIN_FTR_SECTION lwarx r11,0,r1 END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
@@ -1066,7 +1058,6 @@ exc_exit_start: lwz r1,GPR1(r1) .globl exc_exit_restart_end exc_exit_restart_end: - PPC405_ERR77_SYNC rfi b . /* prevent prefetch past rfi */
@@ -1109,7 +1100,6 @@ exc_exit_restart_end: lwz r11,_CTR(r1); \ mtspr SPRN_XER,r10; \ mtctr r11; \ - PPC405_ERR77(0,r1); \ stwcx. r0,0,r1; /* to clear the reservation */ \ lwz r11,_LINK(r1); \ mtlr r11; \
@@ -1129,7 +1119,6 @@ exc_exit_restart_end: lwz r10,GPR10(r1); \ lwz r11,GPR11(r1); \ lwz r1,GPR1(r1); \ - PPC405_ERR77_SYNC; \ exc_lvl_rfi; \ b .; /* prevent prefetch past exc_lvl_rfi */
arch/powerpc/kernel/head_40x.S +0 -3
@@ -36,7 +36,6 @@ #include <asm/asm-offsets.h> #include <asm/ptrace.h> #include <asm/export.h> -#include <asm/asm-405.h> #include "head_32.h"
@@ -487,7 +486,6 @@ _ENTRY(saved_ksp_limit) lwz r12,GPR12(r11) lwz r10,crit_r10@l(0) lwz r11,crit_r11@l(0) - PPC405_ERR77_SYNC rfci b .
@@ -569,7 +567,6 @@ finish_tlb_load: mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1 mfspr r10, SPRN_SPRG_SCRATCH0 - PPC405_ERR77_SYNC rfi /* Should sync shadow TLBs */ b . /* prevent prefetch past rfi */
arch/powerpc/platforms/40x/Kconfig +0 -6
@@ -69,12 +69,6 @@ config PPC4xx_GPIO help Enable gpiolib support for ppc40x based boards -# 40x errata/workaround config symbols, selected by the CPU models above - -# All 405-based cores up until the 405GPR and 405EP have this errata. -config IBM405_ERR77 - bool - config APM8018X bool "APM8018X" depends on 40x
Signature · 1 line
2.25.0
PATCH v5 12/13 powerpc/40x: Avoid using r12 in TLB miss handlers
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
Let's reduce the number of registers used in TLB miss handlers.
We have both r9 and r12 available for any temporary use.
r9 is enough, avoid using r12.
--- arch/powerpc/kernel/head_40x.S | 70 ++++++++++++++++------------------ 1 file changed, 33 insertions(+), 37 deletions(-)
arch/powerpc/kernel/head_40x.S +33 -37
@@ -255,9 +255,9 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 mfcr r11 - mfspr r12, SPRN_PID + mfspr r9, SPRN_PID mtspr SPRN_SPRG_SCRATCH6, r11 - mtspr SPRN_SPRG_SCRATCH5, r12 + mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_DEAR /* Get faulting address */ /* If we are faulting a kernel address, we have to use the
@@ -280,12 +280,12 @@ _ENTRY(saved_ksp_limit) 4: tophys(r11, r11) rlwimi r11, r10, 12, 20, 29 /* Create L1 (pgdir/pmd) address */ - lwz r12, 0(r11) /* Get L1 entry */ - andi. r9, r12, _PMD_PRESENT /* Check if it points to a PTE page */ + lwz r11, 0(r11) /* Get L1 entry */ + andi. r9, r11, _PMD_PRESENT /* Check if it points to a PTE page */ beq 2f /* Bail if no table */ - rlwimi r12, r10, 22, 20, 29 /* Compute PTE address */ - lwz r11, 0(r12) /* Get Linux PTE */ + rlwimi r11, r10, 22, 20, 29 /* Compute PTE address */ + lwz r11, 0(r11) /* Get Linux PTE */ #ifdef CONFIG_SWAP li r9, _PAGE_PRESENT | _PAGE_ACCESSED #else
@@ -301,13 +301,13 @@ _ENTRY(saved_ksp_limit) /* Create TLB tag. This is the faulting address plus a static * set of bits. These are size, valid, E, U0. */ - li r12, 0x00c0 - rlwimi r10, r12, 0, 20, 31 + li r9, 0x00c0 + rlwimi r10, r9, 0, 20, 31 b finish_tlb_load 2: /* Check for possible large-page pmd entry */ - rlwinm. r9, r12, 2, 22, 24 + rlwinm. r9, r11, 2, 22, 24 beq 5f /* Create TLB tag. This is the faulting address, plus a static
@@ -315,7 +315,6 @@ _ENTRY(saved_ksp_limit) */ ori r9, r9, 0x40 rlwimi r10, r9, 0, 20, 31 - mr r11, r12 b finish_tlb_load
@@ -323,9 +322,9 @@ _ENTRY(saved_ksp_limit) /* The bailout. Restore registers to pre-exception conditions * and call the heavyweights to help us out. */ - mfspr r12, SPRN_SPRG_SCRATCH5 + mfspr r9, SPRN_SPRG_SCRATCH5 mfspr r11, SPRN_SPRG_SCRATCH6 - mtspr SPRN_PID, r12 + mtspr SPRN_PID, r9 mtcr r11 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3
@@ -343,9 +342,9 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 mfcr r11 - mfspr r12, SPRN_PID + mfspr r9, SPRN_PID mtspr SPRN_SPRG_SCRATCH6, r11 - mtspr SPRN_SPRG_SCRATCH5, r12 + mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_SRR0 /* Get faulting address */ /* If we are faulting a kernel address, we have to use the
@@ -368,12 +367,12 @@ _ENTRY(saved_ksp_limit) 4: tophys(r11, r11) rlwimi r11, r10, 12, 20, 29 /* Create L1 (pgdir/pmd) address */ - lwz r12, 0(r11) /* Get L1 entry */ - andi. r9, r12, _PMD_PRESENT /* Check if it points to a PTE page */ + lwz r11, 0(r11) /* Get L1 entry */ + andi. r9, r11, _PMD_PRESENT /* Check if it points to a PTE page */ beq 2f /* Bail if no table */ - rlwimi r12, r10, 22, 20, 29 /* Compute PTE address */ - lwz r11, 0(r12) /* Get Linux PTE */ + rlwimi r11, r10, 22, 20, 29 /* Compute PTE address */ + lwz r11, 0(r11) /* Get Linux PTE */ #ifdef CONFIG_SWAP li r9, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC #else
@@ -389,13 +388,13 @@ _ENTRY(saved_ksp_limit) /* Create TLB tag. This is the faulting address plus a static * set of bits. These are size, valid, E, U0. */ - li r12, 0x00c0 - rlwimi r10, r12, 0, 20, 31 + li r9, 0x00c0 + rlwimi r10, r9, 0, 20, 31 b finish_tlb_load 2: /* Check for possible large-page pmd entry */ - rlwinm. r9, r12, 2, 22, 24 + rlwinm. r9, r11, 2, 22, 24 beq 5f /* Create TLB tag. This is the faulting address, plus a static
@@ -403,7 +402,6 @@ _ENTRY(saved_ksp_limit) */ ori r9, r9, 0x40 rlwimi r10, r9, 0, 20, 31 - mr r11, r12 b finish_tlb_load
@@ -411,9 +409,9 @@ _ENTRY(saved_ksp_limit) /* The bailout. Restore registers to pre-exception conditions * and call the heavyweights to help us out. */ - mfspr r12, SPRN_SPRG_SCRATCH5 + mfspr r9, SPRN_SPRG_SCRATCH5 mfspr r11, SPRN_SPRG_SCRATCH6 - mtspr SPRN_PID, r12 + mtspr SPRN_PID, r9 mtcr r11 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3
@@ -529,7 +527,7 @@ WDTException: * miss get to this point to load the TLB. * r10 - TLB_TAG value * r11 - Linux PTE - * r12, r9 - available to use + * r9 - available to use * PID - loaded with proper value when we get here * Upon exit, we reload everything and RFI. * Actually, it will fit now, but oh well.....a common place
@@ -538,30 +536,28 @@ WDTException: tlb_4xx_index: .long 0 finish_tlb_load: - /* load the next available TLB index. - */ - lwz r9, tlb_4xx_index@l(0) - addi r9, r9, 1 - andi. r9, r9, (PPC40X_TLB_SIZE-1) - stw r9, tlb_4xx_index@l(0) - -6: /* * Clear out the software-only bits in the PTE to generate the * TLB_DATA value. These are the bottom 2 bits of the RPM, the * top 3 bits of the zone field, and M. */ - li r12, 0x0ce2 - andc r11, r11, r12 + li r9, 0x0ce2 + andc r11, r11, r9 + + /* load the next available TLB index. */ + lwz r9, tlb_4xx_index@l(0) + addi r9, r9, 1 + andi. r9, r9, PPC40X_TLB_SIZE - 1 + stw r9, tlb_4xx_index@l(0) tlbwe r11, r9, TLB_DATA /* Load TLB LO */ tlbwe r10, r9, TLB_TAG /* Load TLB HI */ /* Done...restore registers and get out of here. */ - mfspr r12, SPRN_SPRG_SCRATCH5 + mfspr r9, SPRN_SPRG_SCRATCH5 mfspr r11, SPRN_SPRG_SCRATCH6 - mtspr SPRN_PID, r12 + mtspr SPRN_PID, r9 mtcr r11 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3
Signature · 1 line
2.25.0
PATCH v5 13/13 powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6
In reply to Christophe LeroyFrom: Christophe Leroy <[email protected]>
We have r12 available, use it to keep CR around and don't save it in SPRN_SPRG_SCRATCH6.
--- arch/powerpc/kernel/head_40x.S | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/powerpc/kernel/head_40x.S +5 -10
@@ -254,9 +254,8 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH1, r11 mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 - mfcr r11 + mfcr r12 mfspr r9, SPRN_PID - mtspr SPRN_SPRG_SCRATCH6, r11 mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_DEAR /* Get faulting address */
@@ -323,9 +322,8 @@ _ENTRY(saved_ksp_limit) * and call the heavyweights to help us out. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1
@@ -341,9 +339,8 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH1, r11 mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 - mfcr r11 + mfcr r12 mfspr r9, SPRN_PID - mtspr SPRN_SPRG_SCRATCH6, r11 mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_SRR0 /* Get faulting address */
@@ -410,9 +407,8 @@ _ENTRY(saved_ksp_limit) * and call the heavyweights to help us out. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1
@@ -556,9 +552,8 @@ finish_tlb_load: /* Done...restore registers and get out of here. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1
Signature · 1 line
2.25.0
Michael Ellerman
AppliedQuoted 11 lines · Christophe Leroy
v1 and v2 of this series were aiming at removing 40x entirely, but it led to protests.
v3 is trying to start modernising powerpc 40x:
- Rework TLB miss handlers to not usePTE_ATOMIC_UPDATESand_PAGE_HWWRITE
- Remove old versions of 40x processors, namely 403 and 405GP and associated errata.
- Last two patches are trivial changes in TLB miss handlers to reduce number of scratch registers.[...]
Applied to powerpc/next.
[01/13] powerpc: Remove Xilinx PPC405/PPC440 support
https://git.kernel.org/powerpc/c/7ade8495dcfd788a76e6877c9ea86f5207369ea4 [02/13] powerpc/40x: Rework 40x PTE access and TLB miss https://git.kernel.org/powerpc/c/2c74e2586bb96012ffc05f1c819b05d9cad86d6e [03/13] powerpc/pgtable: Drop PTE_ATOMIC_UPDATES https://git.kernel.org/powerpc/c/4e1df545e2fae53e07c93b835c3dcc9d4917c849 [04/13] powerpc/40x: Remove support for IBM 403GCX https://git.kernel.org/powerpc/c/1b5c0967ab8aa9424cdd5108de4e055d8aeaa9d0 [05/13] powerpc/40x: Remove STB03xxx https://git.kernel.org/powerpc/c/7583b63c343c1076c89b2012fd8758473f046f5f [06/13] powerpc/40x: Remove WALNUT https://git.kernel.org/powerpc/c/5786074b96e38691a0cb3d3644ca2aa5d6d8830d [07/13] powerpc/40x: Remove EP405 https://git.kernel.org/powerpc/c/548f5244f1064c9facb19c5e97c21e1e80102ea0 [08/13] powerpc/40x: Remove support for ISS Simulator https://git.kernel.org/powerpc/c/2874ec75708eed59a47a9a986c02add747ae6e9b [09/13] powerpc/40x: Remove support for IBM 405GP https://git.kernel.org/powerpc/c/7d372d4ccdd55d5ead4d4ecbc336af4dd7d04344 [10/13] powerpc/40x: Remove IBM405 Erratum #51 https://git.kernel.org/powerpc/c/59fb463b48e904dfdfff64c7dd4d67f20ae27170 [11/13] powerpc: Remove IBM405 Erratum #77 https://git.kernel.org/powerpc/c/455531e9d88048c025ff9099796413df748d92b9 [12/13] powerpc/40x: Avoid using r12 in TLB miss handlers https://git.kernel.org/powerpc/c/797f4016f6da4a90ac83e32b213b68ff7be3812b [13/13] powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6 https://git.kernel.org/powerpc/c/3aacaa719b7bf135551cabde2480e8f7bfdf7c7d
cheers