Merge tag 'powerpc-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

3c3ff7be · Linus Torvalds <[email protected]> · 2024-07-19 21:00:33 -07:00

Pull powerpc updates from Michael Ellerman:

 - Remove support for 40x CPUs & platforms

 - Add support to the 64-bit BPF JIT for cpu v4 instructions

 - Fix PCI hotplug driver crash on powernv

 - Fix doorbell emulation for KVM on PAPR guests (nestedv2)

 - Fix KVM nested guest handling of some less used SPRs

 - Online NUMA nodes with no CPU/memory if they have a PCI device
   attached

 - Reduce memory overhead of enabling kfence on 64-bit Radix MMU kernels

 - Reimplement the iommu table_group_ops for pseries for VFIO SPAPR TCE

Thanks to: Anjali K, Artem Savkov, Athira Rajeev, Breno Leitao, Brian
King, Celeste Liu, Christophe Leroy, Esben Haabendal, Gaurav Batra,
Gautam Menghani, Haren Myneni, Hari Bathini, Jeff Johnson, Krishna
Kumar, Krzysztof Kozlowski, Nathan Lynch, Nicholas Piggin, Nick Bowler,
Nilay Shroff, Rob Herring (Arm), Shawn Anastasio, Shivaprasad G Bhat,
Sourabh Jain, Srikar Dronamraju, Timothy Pearson, Uwe Kleine-König, and
Vaibhav Jain.

* tag 'powerpc-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (57 commits)
  Documentation/powerpc: Mention 40x is removed
  powerpc: Remove 40x leftovers
  macintosh/therm_windtunnel: fix module unload.
  powerpc: Check only single values are passed to CPU/MMU feature checks
  powerpc/xmon: Fix disassembly CPU feature checks
  powerpc: Drop clang workaround for builtin constant checks
  powerpc64/bpf: jit support for signed division and modulo
  powerpc64/bpf: jit support for sign extended mov
  powerpc64/bpf: jit support for sign extended load
  powerpc64/bpf: jit support for unconditional byte swap
  powerpc64/bpf: jit support for 32bit offset jmp instruction
  powerpc/pci: Hotplug driver bridge support
  pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv
  powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
  powerpc: add missing MODULE_DESCRIPTION() macros
  macintosh/mac_hid: add MODULE_DESCRIPTION()
  KVM: PPC: add missing MODULE_DESCRIPTION() macros
  powerpc/kexec: Use of_property_read_reg()
  powerpc/64s/radix/kfence: map __kfence_pool at page granularity
  powerpc/pseries/iommu: Define spapr_tce_table_group_ops only with CONFIG_IOMMU_API
  ...

Commit: 3c3ff7be9729959699eb6cbc7fd7303566d74069
Parents: 3f386cb8 · 9ff0251b

Merge commit. Changes below are compared with the first parent: 3f386cb8.

Changes

158 files changed · +1464 −5776

File	Status	Add	Del	Content
Documentation/arch/powerpc/cpu_families.rst	modified	+0	−18	View file
Documentation/arch/powerpc/elf_hwcaps.rst	modified	+1	−0	View file
Documentation/arch/powerpc/kvm-nested.rst	modified	+3	−1	View file
Documentation/virt/kvm/api.rst	modified	+3	−0	View file
MAINTAINERS	modified	+0	−1	View file
arch/powerpc/Kconfig	modified	+7	−10	View file
arch/powerpc/Kconfig.debug	modified	+0	−13	View file
arch/powerpc/Makefile	modified	+0	−5	View file
arch/powerpc/boot/4xx.c	modified	+0	−266	View file
arch/powerpc/boot/4xx.h	modified	+0	−4	View file
arch/powerpc/boot/Makefile	modified	+0	−11	View file
arch/powerpc/boot/cuboot-acadia.c	deleted	+0	−171	View before deletion
arch/powerpc/boot/cuboot-hotfoot.c	deleted	+0	−139	View before deletion
arch/powerpc/boot/cuboot-kilauea.c	deleted	+0	−46	View before deletion
arch/powerpc/boot/dcr.h	modified	+0	−11	View file
arch/powerpc/boot/dts/acadia.dts	deleted	+0	−224	View before deletion
arch/powerpc/boot/dts/haleakala.dts	deleted	+0	−281	View before deletion
arch/powerpc/boot/dts/hotfoot.dts	deleted	+0	−296	View before deletion
arch/powerpc/boot/dts/kilauea.dts	deleted	+0	−407	View before deletion
arch/powerpc/boot/dts/klondike.dts	deleted	+0	−212	View before deletion
arch/powerpc/boot/dts/makalu.dts	deleted	+0	−353	View before deletion
arch/powerpc/boot/dts/obs600.dts	deleted	+0	−314	View before deletion
arch/powerpc/boot/ppcboot-hotfoot.h	deleted	+0	−119	View before deletion
arch/powerpc/boot/ppcboot.h	modified	+1	−1	View file
arch/powerpc/boot/wrapper	modified	+1	−21	View file
arch/powerpc/configs/40x.config	deleted	+0	−2	View before deletion
arch/powerpc/configs/40x/acadia_defconfig	deleted	+0	−61	View before deletion
arch/powerpc/configs/40x/kilauea_defconfig	deleted	+0	−69	View before deletion
arch/powerpc/configs/40x/klondike_defconfig	deleted	+0	−43	View before deletion
arch/powerpc/configs/40x/makalu_defconfig	deleted	+0	−59	View before deletion
arch/powerpc/configs/40x/obs600_defconfig	deleted	+0	−69	View before deletion
arch/powerpc/configs/40x/walnut_defconfig	deleted	+0	−55	View before deletion
arch/powerpc/configs/85xx-hw.config	modified	+2	−0	View file
arch/powerpc/configs/ppc40x_defconfig	deleted	+0	−74	View before deletion
arch/powerpc/configs/ppc6xx_defconfig	modified	+0	−1	View file
arch/powerpc/include/asm/cacheflush.h	modified	+1	−1	View file
arch/powerpc/include/asm/cpu_has_feature.h	modified	+1	−2	View file
arch/powerpc/include/asm/cputable.h	modified	+0	−7	View file
arch/powerpc/include/asm/guest-state-buffer.h	modified	+2	−1	View file
arch/powerpc/include/asm/hw_irq.h	modified	+4	−4	View file
arch/powerpc/include/asm/iommu.h	modified	+13	−3	View file
arch/powerpc/include/asm/irq.h	modified	+1	−1	View file
arch/powerpc/include/asm/kexec.h	modified	+2	−4	View file
arch/powerpc/include/asm/kfence.h	modified	+10	−1	View file
arch/powerpc/include/asm/kup.h	modified	+1	−1	View file
arch/powerpc/include/asm/kvm_book3s.h	modified	+1	−0	View file
arch/powerpc/include/asm/kvm_book3s_64.h	modified	+5	−0	View file
arch/powerpc/include/asm/kvm_host.h	modified	+3	−0	View file
arch/powerpc/include/asm/lppaca.h	modified	+8	−3	View file
arch/powerpc/include/asm/mmu.h	modified	+1	−9	View file
arch/powerpc/include/asm/nohash/32/mmu-40x.h	deleted	+0	−68	View before deletion
arch/powerpc/include/asm/nohash/32/pgtable.h	modified	+1	−3	View file
arch/powerpc/include/asm/nohash/32/pte-40x.h	deleted	+0	−73	View before deletion
arch/powerpc/include/asm/nohash/mmu.h	modified	+1	−4	View file
arch/powerpc/include/asm/perf_event_server.h	modified	+2	−1	View file
arch/powerpc/include/asm/plpar_wrappers.h	modified	+0	−28	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+2	−0	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+1	−1	View file
arch/powerpc/include/asm/processor.h	modified	+1	−1	View file
arch/powerpc/include/asm/ptrace.h	modified	+1	−1	View file
arch/powerpc/include/asm/reg.h	modified	+2	−25	View file
arch/powerpc/include/asm/reg_booke.h	modified	+2	−111	View file
arch/powerpc/include/asm/time.h	modified	+1	−6	View file
arch/powerpc/include/asm/udbg.h	modified	+0	−1	View file
arch/powerpc/include/uapi/asm/kvm.h	modified	+3	−0	View file
arch/powerpc/kernel/Makefile	modified	+0	−1	View file
arch/powerpc/kernel/asm-offsets.c	modified	+1	−1	View file
arch/powerpc/kernel/cpu_specs.h	modified	+0	−4	View file
arch/powerpc/kernel/cpu_specs_40x.h	deleted	+0	−280	View before deletion
arch/powerpc/kernel/eeh.c	modified	+0	−16	View file
arch/powerpc/kernel/entry_32.S	modified	+3	−45	View file
arch/powerpc/kernel/epapr_hcalls.S	modified	+1	−1	View file
arch/powerpc/kernel/head_32.h	modified	+1	−11	View file
arch/powerpc/kernel/head_40x.S	deleted	+0	−721	View before deletion
arch/powerpc/kernel/head_booke.h	modified	+1	−2	View file
arch/powerpc/kernel/iommu.c	modified	+21	−149	View file
arch/powerpc/kernel/irq.c	modified	+1	−1	View file
arch/powerpc/kernel/kgdb.c	modified	+2	−2	View file
arch/powerpc/kernel/misc_32.S	modified	+0	−40	View file
arch/powerpc/kernel/pci-hotplug.c	modified	+32	−3	View file
arch/powerpc/kernel/process.c	modified	+2	−2	View file
arch/powerpc/kernel/prom.c	modified	+8	−4	View file
arch/powerpc/kernel/rtas.c	modified	+4	−0	View file
arch/powerpc/kernel/rtas_flash.c	modified	+1	−0	View file
arch/powerpc/kernel/setup.h	modified	+1	−1	View file
arch/powerpc/kernel/setup_32.c	modified	+1	−1	View file
arch/powerpc/kernel/time.c	modified	+1	−1	View file
arch/powerpc/kernel/traps.c	modified	+1	−1	View file
arch/powerpc/kernel/udbg.c	modified	+0	−3	View file
arch/powerpc/kernel/udbg_16550.c	modified	+0	−23	View file
arch/powerpc/kexec/core_64.c	modified	+37	−16	View file
arch/powerpc/kexec/elf_64.c	modified	+9	−3	View file
arch/powerpc/kexec/file_load_64.c	modified	+35	−55	View file
arch/powerpc/kvm/book3s_hv.c	modified	+101	−2	View file
arch/powerpc/kvm/book3s_hv.h	modified	+3	−0	View file
arch/powerpc/kvm/book3s_hv_nestedv2.c	modified	+25	−0	View file
arch/powerpc/kvm/book3s_pr.c	modified	+1	−0	View file
arch/powerpc/kvm/test-guest-state-buffer.c	modified	+2	−1	View file
arch/powerpc/kvm/trace_hv.h	modified	+29	−0	View file
arch/powerpc/mm/book3s64/radix_pgtable.c	modified	+80	−4	View file
arch/powerpc/mm/drmem.c	modified	+1	−3	View file
arch/powerpc/mm/fault.c	modified	+2	−2	View file
arch/powerpc/mm/init-common.c	modified	+3	−0	View file
arch/powerpc/mm/mmu_context.c	modified	+1	−1	View file
arch/powerpc/mm/mmu_decl.h	modified	+4	−4	View file
arch/powerpc/mm/nohash/40x.c	deleted	+0	−161	View before deletion
arch/powerpc/mm/nohash/Makefile	modified	+0	−1	View file
arch/powerpc/mm/nohash/kup.c	modified	+0	−2	View file
arch/powerpc/mm/nohash/mmu_context.c	modified	+1	−4	View file
arch/powerpc/mm/nohash/tlb_low.S	modified	+1	−26	View file
arch/powerpc/mm/numa.c	modified	+13	−1	View file
arch/powerpc/mm/ptdump/Makefile	modified	+1	−1	View file
arch/powerpc/net/bpf_jit_comp64.c	modified	+88	−30	View file
arch/powerpc/perf/core-book3s.c	modified	+19	−26	View file
arch/powerpc/perf/power10-pmu.c	modified	+2	−1	View file
arch/powerpc/platforms/40x/Kconfig	deleted	+0	−78	View before deletion
arch/powerpc/platforms/40x/Makefile	deleted	+0	−2	View before deletion
arch/powerpc/platforms/40x/ppc40x_simple.c	deleted	+0	−74	View before deletion
arch/powerpc/platforms/44x/Makefile	modified	+5	−1	View file
arch/powerpc/platforms/4xx/cpm.c → arch/powerpc/platforms/44x/cpm.c	renamed	+0	−0	View file
arch/powerpc/platforms/4xx/gpio.c → arch/powerpc/platforms/44x/gpio.c	renamed	+0	−0	View file
arch/powerpc/platforms/4xx/hsta_msi.c → arch/powerpc/platforms/44x/hsta_msi.c	renamed	+0	−0	View file
arch/powerpc/platforms/44x/machine_check.c	modified	+15	−0	View file
arch/powerpc/platforms/4xx/pci.c → arch/powerpc/platforms/44x/pci.c	renamed	+0	−100	View file
arch/powerpc/platforms/4xx/pci.h → arch/powerpc/platforms/44x/pci.h	renamed	+0	−0	View file
arch/powerpc/platforms/4xx/soc.c → arch/powerpc/platforms/44x/soc.c	renamed	+0	−0	View file
arch/powerpc/platforms/4xx/uic.c → arch/powerpc/platforms/44x/uic.c	renamed	+0	−0	View file
arch/powerpc/platforms/4xx/Makefile	deleted	+0	−7	View before deletion
arch/powerpc/platforms/4xx/machine_check.c	deleted	+0	−23	View before deletion
arch/powerpc/platforms/85xx/t1042rdb_diu.c	modified	+1	−0	View file
arch/powerpc/platforms/Kconfig	modified	+0	−1	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+4	−24	View file
arch/powerpc/platforms/Makefile	modified	+0	−2	View file
arch/powerpc/platforms/cell/cbe_powerbutton.c	modified	+1	−0	View file
arch/powerpc/platforms/cell/cbe_thermal.c	modified	+1	−0	View file
arch/powerpc/platforms/cell/cpufreq_spudemand.c	modified	+1	−0	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+1	−0	View file
arch/powerpc/platforms/chrp/nvram.c	modified	+1	−0	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+4	−2	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+733	−48	View file
arch/powerpc/platforms/pseries/papr_scm.c	modified	+1	−0	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+14	−0	View file
arch/powerpc/platforms/pseries/vas.c	modified	+21	−1	View file
arch/powerpc/sysdev/Kconfig	modified	+2	−2	View file
arch/powerpc/sysdev/rtc_cmos_setup.c	modified	+1	−0	View file
arch/powerpc/xmon/ppc-dis.c	modified	+11	−22	View file
drivers/macintosh/ams/ams-i2c.c	modified	+1	−1	View file
drivers/macintosh/mac_hid.c	modified	+1	−0	View file
drivers/macintosh/therm_windtunnel.c	modified	+1	−1	View file
drivers/macintosh/windfarm_ad7417_sensor.c	modified	+1	−1	View file
drivers/macintosh/windfarm_fcu_controls.c	modified	+1	−1	View file
drivers/macintosh/windfarm_lm87_sensor.c	modified	+1	−1	View file
drivers/macintosh/windfarm_max6690_sensor.c	modified	+1	−1	View file
drivers/macintosh/windfarm_smu_sat.c	modified	+1	−1	View file
drivers/pci/hotplug/pnv_php.c	modified	+1	−2	View file
drivers/vfio/vfio_iommu_spapr_tce.c	modified	+9	−4	View file
scripts/head-object-list.txt	modified	+0	−1	View file
tools/testing/selftests/sigaltstack/current_stack_pointer.h	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arch/powerpc/cpu_families.rst

View file

diff --git a/Documentation/arch/powerpc/cpu_families.rst b/Documentation/arch/powerpc/cpu_families.rst
index eb7e606..f55433c 100644
--- a/Documentation/arch/powerpc/cpu_families.rst
+++ b/Documentation/arch/powerpc/cpu_families.rst
@@ -128,24 +128,6 @@ IBM BookE
 - All 32 bit::
 
    +--------------+
-   |     401      |
-   +--------------+
-          |
-          |
-          v
-   +--------------+
-   |     403      |
-   +--------------+
-          |
-          |
-          v
-   +--------------+
-   |     405      |
-   +--------------+
-          |
-          |
-          v
-   +--------------+
    |     440      |
    +--------------+
           |

Documentation/arch/powerpc/elf_hwcaps.rst

View file

diff --git a/Documentation/arch/powerpc/elf_hwcaps.rst b/Documentation/arch/powerpc/elf_hwcaps.rst
index 4c896cf..fce7489 100644
--- a/Documentation/arch/powerpc/elf_hwcaps.rst
+++ b/Documentation/arch/powerpc/elf_hwcaps.rst
@@ -91,6 +91,7 @@ PPC_FEATURE_HAS_MMU
 
 PPC_FEATURE_HAS_4xxMAC
     The processor is 40x or 44x family.
+    Unused in the kernel since 732b32daef80 ("powerpc: Remove core support for 40x")
 
 PPC_FEATURE_UNIFIED_CACHE
     The processor has a unified L1 cache for instructions and data, as

Documentation/arch/powerpc/kvm-nested.rst

View file

diff --git a/Documentation/arch/powerpc/kvm-nested.rst b/Documentation/arch/powerpc/kvm-nested.rst
index 630602a..5defd13 100644
--- a/Documentation/arch/powerpc/kvm-nested.rst
+++ b/Documentation/arch/powerpc/kvm-nested.rst
@@ -546,7 +546,9 @@ table information.
 +--------+-------+----+--------+----------------------------------+
 | 0x1052 | 0x08  | RW |   T    | CTRL                             |
 +--------+-------+----+--------+----------------------------------+
-| 0x1053-|       |    |        | Reserved                         |
+| 0x1053 | 0x08  | RW |   T    | DPDES                            |
++--------+-------+----+--------+----------------------------------+
+| 0x1054-|       |    |        | Reserved                         |
 | 0x1FFF |       |    |        |                                  |
 +--------+-------+----+--------+----------------------------------+
 | 0x2000 | 0x04  | RW |   T    | CR                               |

Documentation/virt/kvm/api.rst

View file

diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index a71d919..899480d 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -2439,8 +2439,11 @@ registers, find a list below:
   PPC     KVM_REG_PPC_PSSCR               64
   PPC     KVM_REG_PPC_DEC_EXPIRY          64
   PPC     KVM_REG_PPC_PTCR                64
+  PPC     KVM_REG_PPC_HASHKEYR            64
+  PPC     KVM_REG_PPC_HASHPKEYR           64
   PPC     KVM_REG_PPC_DAWR1               64
   PPC     KVM_REG_PPC_DAWRX1              64
+  PPC     KVM_REG_PPC_DEXCR               64
   PPC     KVM_REG_PPC_TM_GPR0             64
   ...
   PPC     KVM_REG_PPC_TM_GPR31            64

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index ab6da9c..e1b9bac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12924,7 +12924,6 @@ F:	arch/powerpc/platforms/52xx/
 LINUX FOR POWERPC EMBEDDED PPC4XX
 L:	[email protected]
 S:	Orphan
-F:	arch/powerpc/platforms/40x/
 F:	arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED PPC85XX

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c88c6d4..f8891fb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -149,7 +149,7 @@ config PPC
 	select ARCH_HAS_PTE_SPECIAL
 	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64
 	select ARCH_HAS_SET_MEMORY
-	select ARCH_HAS_STRICT_KERNEL_RWX	if (PPC_BOOK3S || PPC_8xx || 40x) && !HIBERNATION
+	select ARCH_HAS_STRICT_KERNEL_RWX	if (PPC_BOOK3S || PPC_8xx) && !HIBERNATION
 	select ARCH_HAS_STRICT_KERNEL_RWX	if PPC_85xx && !HIBERNATION && !RANDOMIZE_BASE
 	select ARCH_HAS_STRICT_MODULE_RWX	if ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_HAS_SYSCALL_WRAPPER		if !SPU_BASE && !COMPAT
@@ -167,7 +167,7 @@ config PPC
 	select ARCH_SPLIT_ARG64			if PPC32
 	select ARCH_STACKWALK
 	select ARCH_SUPPORTS_ATOMIC_RMW
-	select ARCH_SUPPORTS_DEBUG_PAGEALLOC	if PPC_BOOK3S || PPC_8xx || 40x
+	select ARCH_SUPPORTS_DEBUG_PAGEALLOC	if PPC_BOOK3S || PPC_8xx
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_CMPXCHG_LOCKREF		if PPC64
 	select ARCH_USE_MEMTEST
@@ -389,7 +389,7 @@ config ARCH_SUSPEND_POSSIBLE
 	def_bool y
 	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
 		   (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \
-		   || 44x || 40x
+		   || 44x
 
 config ARCH_SUSPEND_NONZERO_CPU
 	def_bool y
@@ -443,7 +443,7 @@ config ARCH_SUPPORTS_UPROBES
 
 config PPC_ADV_DEBUG_REGS
 	bool
-	depends on 40x || BOOKE
+	depends on BOOKE
 	default y
 
 config PPC_ADV_DEBUG_IACS
@@ -490,7 +490,7 @@ source "kernel/Kconfig.hz"
 
 config MATH_EMULATION
 	bool "Math emulation"
-	depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE || PPC_MICROWATT
+	depends on 44x || PPC_8xx || PPC_MPC832x || BOOKE || PPC_MICROWATT
 	select PPC_FPU_REGS
 	help
 	  Some PowerPC chips designed for embedded applications do not have
@@ -1077,7 +1077,7 @@ config GENERIC_ISA_DMA
 config PPC_INDIRECT_PCI
 	bool
 	depends on PCI
-	default y if 40x || 44x
+	default y if 44x
 
 config SBUS
 	bool
@@ -1102,15 +1102,12 @@ config FSL_PMC
 config PPC4xx_CPM
 	bool
 	default y
-	depends on SUSPEND && (44x || 40x)
+	depends on SUSPEND && 44x
 	help
 	  PPC4xx Clock Power Management (CPM) support (suspend/resume).
 	  It also enables support for two different idle states (idle-wait
 	  and idle-doze).
 
-config 4xx_SOC
-	bool
-
 config FSL_LBC
 	bool "Freescale Local Bus support"
 	help

arch/powerpc/Kconfig.debug

View file

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 8c80b15..3799cec 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -244,14 +244,6 @@ config PPC_EARLY_DEBUG_44x
 	  inbuilt serial port.  If you enable this, ensure you set
 	  PPC_EARLY_DEBUG_44x_PHYSLOW below to suit your target board.
 
-config PPC_EARLY_DEBUG_40x
-	bool "Early serial debugging for IBM/AMCC 40x CPUs"
-	depends on 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.
-
 config PPC_EARLY_DEBUG_CPM
 	bool "Early serial debugging for Freescale CPM-based serial ports"
 	depends on SERIAL_CPM=y
@@ -356,11 +348,6 @@ config PPC_EARLY_DEBUG_44x_PHYSHIGH
 	depends on PPC_EARLY_DEBUG_44x
 	default "0x1"
 
-config PPC_EARLY_DEBUG_40x_PHYSADDR
-	hex "Early debug UART physical address"
-	depends on PPC_EARLY_DEBUG_40x
-	default "0xef600300"
-
 config PPC_EARLY_DEBUG_CPM_ADDR
 	hex "CPM UART early debug transmit descriptor address"
 	depends on PPC_EARLY_DEBUG_CPM

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index a8479c8..bbfe4a1 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -301,11 +301,6 @@ ppc32_allmodconfig:
 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/book3s_32.config \
 		-f $(srctree)/Makefile allmodconfig
 
-generated_configs += ppc40x_allmodconfig
-ppc40x_allmodconfig:
-	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/40x.config \
-		-f $(srctree)/Makefile allmodconfig
-
 generated_configs += ppc44x_allmodconfig
 ppc44x_allmodconfig:
 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/44x.config \

arch/powerpc/boot/4xx.c

View file

diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
index 00c4d84..682ca38 100644
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
@@ -253,7 +253,6 @@ void ibm4xx_denali_fixup_memsize(void)
 	dt_fixup_memory(0, memsize);
 }
 
-#define SPRN_DBCR0_40X 0x3F2
 #define SPRN_DBCR0_44X 0x134
 #define DBCR0_RST_SYSTEM 0x30000000
 
@@ -270,18 +269,6 @@ void ibm44x_dbcr_reset(void)
 
 }
 
-void ibm40x_dbcr_reset(void)
-{
-	unsigned long tmp;
-
-	asm volatile (
-		"mfspr	%0,%1\n"
-		"oris	%0,%0,%2@h\n"
-		"mtspr	%1,%0"
-		: "=&r"(tmp) : "i"(SPRN_DBCR0_40X), "i"(DBCR0_RST_SYSTEM)
-		);
-}
-
 #define EMAC_RESET 0x20000000
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
 {
@@ -544,256 +531,3 @@ void ibm440spe_fixup_clocks(unsigned int sys_clk,
 	eplike_fixup_uart_clk(1, "/plb/opb/serial@f0000300", ser_clk, plb_clk);
 	eplike_fixup_uart_clk(2, "/plb/opb/serial@f0000600", ser_clk, plb_clk);
 }
-
-void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk)
-{
-	u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
-	u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
-	u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
-	u32 psr = mfdcr(DCRN_405_CPC0_PSR);
-	u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
-	u32 fwdv, fwdvb, fbdv, cbdv, opdv, epdv, ppdv, udiv;
-
-	fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
-	fbdv = (pllmr & 0x1e000000) >> 25;
-	if (fbdv == 0)
-		fbdv = 16;
-	cbdv = ((pllmr & 0x00060000) >> 17) + 1; /* CPU:PLB */
-	opdv = ((pllmr & 0x00018000) >> 15) + 1; /* PLB:OPB */
-	ppdv = ((pllmr & 0x00006000) >> 13) + 1; /* PLB:PCI */
-	epdv = ((pllmr & 0x00001800) >> 11) + 2; /* PLB:EBC */
-	udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
-
-	/* check for 405GPr */
-	if ((mfpvr() & 0xfffffff0) == (0x50910951 & 0xfffffff0)) {
-		fwdvb = 8 - (pllmr & 0x00000007);
-		if (!(psr & 0x00001000)) /* PCI async mode enable == 0 */
-			if (psr & 0x00000020) /* New mode enable */
-				m = fwdvb * 2 * ppdv;
-			else
-				m = fwdvb * cbdv * ppdv;
-		else if (psr & 0x00000020) /* New mode enable */
-			if (psr & 0x00000800) /* PerClk synch mode */
-				m = fwdvb * 2 * epdv;
-			else
-				m = fbdv * fwdv;
-		else if (epdv == fbdv)
-			m = fbdv * cbdv * epdv;
-		else
-			m = fbdv * fwdvb * cbdv;
-
-		cpu = sys_clk * m / fwdv;
-		plb = sys_clk * m / (fwdvb * cbdv);
-	} else {
-		m = fwdv * fbdv * cbdv;
-		cpu = sys_clk * m / fwdv;
-		plb = cpu / cbdv;
-	}
-	opb = plb / opdv;
-	ebc = plb / epdv;
-
-	if (cpc0_cr0 & 0x80)
-		/* uart0 uses the external clock */
-		uart0 = ser_clk;
-	else
-		uart0 = cpu / udiv;
-
-	if (cpc0_cr0 & 0x40)
-		/* uart1 uses the external clock */
-		uart1 = ser_clk;
-	else
-		uart1 = cpu / udiv;
-
-	/* setup the timebase clock to tick at the cpu frequency */
-	cpc0_cr1 = cpc0_cr1 & ~0x00800000;
-	mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
-	tb = cpu;
-
-	dt_fixup_cpu_clocks(cpu, tb, 0);
-	dt_fixup_clock("/plb", plb);
-	dt_fixup_clock("/plb/opb", opb);
-	dt_fixup_clock("/plb/ebc", ebc);
-	dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
-	dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
-}
-
-
-void ibm405ep_fixup_clocks(unsigned int sys_clk)
-{
-	u32 pllmr0 = mfdcr(DCRN_CPC0_PLLMR0);
-	u32 pllmr1 = mfdcr(DCRN_CPC0_PLLMR1);
-	u32 cpc0_ucr = mfdcr(DCRN_CPC0_UCR);
-	u32 cpu, plb, opb, ebc, uart0, uart1;
-	u32 fwdva, fwdvb, fbdv, cbdv, opdv, epdv;
-	u32 pllmr0_ccdv, tb, m;
-
-	fwdva = 8 - ((pllmr1 & 0x00070000) >> 16);
-	fwdvb = 8 - ((pllmr1 & 0x00007000) >> 12);
-	fbdv = (pllmr1 & 0x00f00000) >> 20;
-	if (fbdv == 0)
-		fbdv = 16;
-
-	cbdv = ((pllmr0 & 0x00030000) >> 16) + 1; /* CPU:PLB */
-	epdv = ((pllmr0 & 0x00000300) >> 8) + 2;  /* PLB:EBC */
-	opdv = ((pllmr0 & 0x00003000) >> 12) + 1; /* PLB:OPB */
-
-	m = fbdv * fwdvb;
-
-	pllmr0_ccdv = ((pllmr0 & 0x00300000) >> 20) + 1;
-	if (pllmr1 & 0x80000000)
-		cpu = sys_clk * m / (fwdva * pllmr0_ccdv);
-	else
-		cpu = sys_clk / pllmr0_ccdv;
-
-	plb = cpu / cbdv;
-	opb = plb / opdv;
-	ebc = plb / epdv;
-	tb = cpu;
-	uart0 = cpu / (cpc0_ucr & 0x0000007f);
-	uart1 = cpu / ((cpc0_ucr & 0x00007f00) >> 8);
-
-	dt_fixup_cpu_clocks(cpu, tb, 0);
-	dt_fixup_clock("/plb", plb);
-	dt_fixup_clock("/plb/opb", opb);
-	dt_fixup_clock("/plb/ebc", ebc);
-	dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
-	dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
-}
-
-static u8 ibm405ex_fwdv_multi_bits[] = {
-	/* values for:  1 - 16 */
-	0x01, 0x02, 0x0e, 0x09, 0x04, 0x0b, 0x10, 0x0d, 0x0c, 0x05,
-	0x06, 0x0f, 0x0a, 0x07, 0x08, 0x03
-};
-
-u32 ibm405ex_get_fwdva(unsigned long cpr_fwdv)
-{
-	u32 index;
-
-	for (index = 0; index < ARRAY_SIZE(ibm405ex_fwdv_multi_bits); index++)
-		if (cpr_fwdv == (u32)ibm405ex_fwdv_multi_bits[index])
-			return index + 1;
-
-	return 0;
-}
-
-static u8 ibm405ex_fbdv_multi_bits[] = {
-	/* values for:  1 - 100 */
-	0x00, 0xff, 0x7e, 0xfd, 0x7a, 0xf5, 0x6a, 0xd5, 0x2a, 0xd4,
-	0x29, 0xd3, 0x26, 0xcc, 0x19, 0xb3, 0x67, 0xce, 0x1d, 0xbb,
-	0x77, 0xee, 0x5d, 0xba, 0x74, 0xe9, 0x52, 0xa5, 0x4b, 0x96,
-	0x2c, 0xd8, 0x31, 0xe3, 0x46, 0x8d, 0x1b, 0xb7, 0x6f, 0xde,
-	0x3d, 0xfb, 0x76, 0xed, 0x5a, 0xb5, 0x6b, 0xd6, 0x2d, 0xdb,
-	0x36, 0xec, 0x59, 0xb2, 0x64, 0xc9, 0x12, 0xa4, 0x48, 0x91,
-	0x23, 0xc7, 0x0e, 0x9c, 0x38, 0xf0, 0x61, 0xc2, 0x05, 0x8b,
-	0x17, 0xaf, 0x5f, 0xbe, 0x7c, 0xf9, 0x72, 0xe5, 0x4a, 0x95,
-	0x2b, 0xd7, 0x2e, 0xdc, 0x39, 0xf3, 0x66, 0xcd, 0x1a, 0xb4,
-	0x68, 0xd1, 0x22, 0xc4, 0x09, 0x93, 0x27, 0xcf, 0x1e, 0xbc,
-	/* values for:  101 - 200 */
-	0x78, 0xf1, 0x62, 0xc5, 0x0a, 0x94, 0x28, 0xd0, 0x21, 0xc3,
-	0x06, 0x8c, 0x18, 0xb0, 0x60, 0xc1, 0x02, 0x84, 0x08, 0x90,
-	0x20, 0xc0, 0x01, 0x83, 0x07, 0x8f, 0x1f, 0xbf, 0x7f, 0xfe,
-	0x7d, 0xfa, 0x75, 0xea, 0x55, 0xaa, 0x54, 0xa9, 0x53, 0xa6,
-	0x4c, 0x99, 0x33, 0xe7, 0x4e, 0x9d, 0x3b, 0xf7, 0x6e, 0xdd,
-	0x3a, 0xf4, 0x69, 0xd2, 0x25, 0xcb, 0x16, 0xac, 0x58, 0xb1,
-	0x63, 0xc6, 0x0d, 0x9b, 0x37, 0xef, 0x5e, 0xbd, 0x7b, 0xf6,
-	0x6d, 0xda, 0x35, 0xeb, 0x56, 0xad, 0x5b, 0xb6, 0x6c, 0xd9,
-	0x32, 0xe4, 0x49, 0x92, 0x24, 0xc8, 0x11, 0xa3, 0x47, 0x8e,
-	0x1c, 0xb8, 0x70, 0xe1, 0x42, 0x85, 0x0b, 0x97, 0x2f, 0xdf,
-	/* values for:  201 - 255 */
-	0x3e, 0xfc, 0x79, 0xf2, 0x65, 0xca, 0x15, 0xab, 0x57, 0xae,
-	0x5c, 0xb9, 0x73, 0xe6, 0x4d, 0x9a, 0x34, 0xe8, 0x51, 0xa2,
-	0x44, 0x89, 0x13, 0xa7, 0x4f, 0x9e, 0x3c, 0xf8, 0x71, 0xe2,
-	0x45, 0x8a, 0x14, 0xa8, 0x50, 0xa1, 0x43, 0x86, 0x0c, 0x98,
-	0x30, 0xe0, 0x41, 0x82, 0x04, 0x88, 0x10, 0xa0, 0x40, 0x81,
-	0x03, 0x87, 0x0f, 0x9f, 0x3f  /* END */
-};
-
-u32 ibm405ex_get_fbdv(unsigned long cpr_fbdv)
-{
-	u32 index;
-
-	for (index = 0; index < ARRAY_SIZE(ibm405ex_fbdv_multi_bits); index++)
-		if (cpr_fbdv == (u32)ibm405ex_fbdv_multi_bits[index])
-			return index + 1;
-
-	return 0;
-}
-
-void ibm405ex_fixup_clocks(unsigned int sys_clk, unsigned int uart_clk)
-{
-	/* PLL config */
-	u32 pllc  = CPR0_READ(DCRN_CPR0_PLLC);
-	u32 plld  = CPR0_READ(DCRN_CPR0_PLLD);
-	u32 cpud  = CPR0_READ(DCRN_CPR0_PRIMAD);
-	u32 plbd  = CPR0_READ(DCRN_CPR0_PRIMBD);
-	u32 opbd  = CPR0_READ(DCRN_CPR0_OPBD);
-	u32 perd  = CPR0_READ(DCRN_CPR0_PERD);
-
-	/* Dividers */
-	u32 fbdv   = ibm405ex_get_fbdv(__fix_zero((plld >> 24) & 0xff, 1));
-
-	u32 fwdva  = ibm405ex_get_fwdva(__fix_zero((plld >> 16) & 0x0f, 1));
-
-	u32 cpudv0 = __fix_zero((cpud >> 24) & 7, 8);
-
-	/* PLBDV0 is hardwared to 010. */
-	u32 plbdv0 = 2;
-	u32 plb2xdv0 = __fix_zero((plbd >> 16) & 7, 8);
-
-	u32 opbdv0 = __fix_zero((opbd >> 24) & 3, 4);
-
-	u32 perdv0 = __fix_zero((perd >> 24) & 3, 4);
-
-	/* Resulting clocks */
-	u32 cpu, plb, opb, ebc, vco, tb, uart0, uart1;
-
-	/* PLL's VCO is the source for primary forward ? */
-	if (pllc & 0x40000000) {
-		u32 m;
-
-		/* Feedback path */
-		switch ((pllc >> 24) & 7) {
-		case 0:
-			/* PLLOUTx */
-			m = fbdv;
-			break;
-		case 1:
-			/* CPU */
-			m = fbdv * fwdva * cpudv0;
-			break;
-		case 5:
-			/* PERClk */
-			m = fbdv * fwdva * plb2xdv0 * plbdv0 * opbdv0 * perdv0;
-			break;
-		default:
-			printf("WARNING ! Invalid PLL feedback source !\n");
-			goto bypass;
-		}
-
-		vco = (unsigned int)(sys_clk * m);
-	} else {
-bypass:
-		/* Bypass system PLL */
-		vco = 0;
-	}
-
-	/* CPU = VCO / ( FWDVA x CPUDV0) */
-	cpu = vco / (fwdva * cpudv0);
-	/* PLB = VCO / ( FWDVA x PLB2XDV0 x PLBDV0) */
-	plb = vco / (fwdva * plb2xdv0 * plbdv0);
-	/* OPB = PLB / OPBDV0 */
-	opb = plb / opbdv0;
-	/* EBC = OPB / PERDV0 */
-	ebc = opb / perdv0;
-
-	tb = cpu;
-	uart0 = uart1 = uart_clk;
-
-	dt_fixup_cpu_clocks(cpu, tb, 0);
-	dt_fixup_clock("/plb", plb);
-	dt_fixup_clock("/plb/opb", opb);
-	dt_fixup_clock("/plb/opb/ebc", ebc);
-	dt_fixup_clock("/plb/opb/serial@ef600200", uart0);
-	dt_fixup_clock("/plb/opb/serial@ef600300", uart1);
-}

arch/powerpc/boot/4xx.h

View file

diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h
index 77f15d1..62df496 100644
--- a/arch/powerpc/boot/4xx.h
+++ b/arch/powerpc/boot/4xx.h
@@ -12,13 +12,9 @@ void ibm4xx_sdram_fixup_memsize(void);
 void ibm440spe_fixup_memsize(void);
 void ibm4xx_denali_fixup_memsize(void);
 void ibm44x_dbcr_reset(void);
-void ibm40x_dbcr_reset(void);
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);
 void ibm4xx_fixup_ebc_ranges(const char *ebc);
 
-void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);
-void ibm405ep_fixup_clocks(unsigned int sys_clk);
-void ibm405ex_fixup_clocks(unsigned int sys_clk, unsigned int uart_clk);
 void ibm440gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);
 void ibm440ep_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk,
 			   unsigned int tmr_clk);

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 35f6b15..fa85180 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -54,10 +54,8 @@ endif
 
 $(obj)/4xx.o: BOOTTARGETFLAGS += -mcpu=405
 $(obj)/ebony.o: BOOTTARGETFLAGS += -mcpu=440
-$(obj)/cuboot-hotfoot.o: BOOTTARGETFLAGS += -mcpu=405
 $(obj)/cuboot-taishan.o: BOOTTARGETFLAGS += -mcpu=440
 $(obj)/cuboot-katmai.o: BOOTTARGETFLAGS += -mcpu=440
-$(obj)/cuboot-acadia.o: BOOTTARGETFLAGS += -mcpu=405
 $(obj)/treeboot-iss4xx.o: BOOTTARGETFLAGS += -mcpu=405
 $(obj)/treeboot-currituck.o: BOOTTARGETFLAGS += -mcpu=405
 $(obj)/treeboot-akebono.o: BOOTTARGETFLAGS += -mcpu=405
@@ -146,7 +144,6 @@ src-wlib-$(CONFIG_PPC_POWERNV) += opal-calls.S opal.c
 ifndef CONFIG_PPC64_BOOT_WRAPPER
 src-wlib-y += crtsavres.S
 endif
-src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c
 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
@@ -154,9 +151,6 @@ 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 cuboot-hotfoot.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 \
 				cuboot-sequoia.c cuboot-rainier.c \
@@ -300,11 +294,6 @@ image-$(CONFIG_EPAPR_BOOT)		+= zImage.epapr
 # Boards with newish u-boot firmware can use the uImage target above
 #
 
-# Board ports in arch/powerpc/platform/40x/Kconfig
-image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot
-image-$(CONFIG_ACADIA)			+= cuImage.acadia
-image-$(CONFIG_OBS600)			+= uImage.obs600
-
 # Board ports in arch/powerpc/platform/44x/Kconfig
 image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
 image-$(CONFIG_BAMBOO)			+= treeImage.bamboo cuImage.bamboo

arch/powerpc/boot/cuboot-acadia.c

View before deletion

diff --git a/arch/powerpc/boot/cuboot-acadia.c b/arch/powerpc/boot/cuboot-acadia.c
deleted file mode 100644
index 46e9675..0000000
--- a/arch/powerpc/boot/cuboot-acadia.c
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Old U-boot compatibility for Acadia
- *
- * Author: Josh Boyer <[email protected]>
- *
- * Copyright 2008 IBM Corporation
- */
-
-#include "ops.h"
-#include "io.h"
-#include "dcr.h"
-#include "stdio.h"
-#include "4xx.h"
-#include "44x.h"
-#include "cuboot.h"
-
-#define TARGET_4xx
-#include "ppcboot.h"
-
-static bd_t bd;
-
-#define CPR_PERD0_SPIDV_MASK   0x000F0000     /* SPI Clock Divider */
-
-#define PLLC_SRC_MASK	       0x20000000     /* PLL feedback source */
-
-#define PLLD_FBDV_MASK	       0x1F000000     /* PLL feedback divider value */
-#define PLLD_FWDVA_MASK        0x000F0000     /* PLL forward divider A value */
-#define PLLD_FWDVB_MASK        0x00000700     /* PLL forward divider B value */
-
-#define PRIMAD_CPUDV_MASK      0x0F000000     /* CPU Clock Divisor Mask */
-#define PRIMAD_PLBDV_MASK      0x000F0000     /* PLB Clock Divisor Mask */
-#define PRIMAD_OPBDV_MASK      0x00000F00     /* OPB Clock Divisor Mask */
-#define PRIMAD_EBCDV_MASK      0x0000000F     /* EBC Clock Divisor Mask */
-
-#define PERD0_PWMDV_MASK       0xFF000000     /* PWM Divider Mask */
-#define PERD0_SPIDV_MASK       0x000F0000     /* SPI Divider Mask */