From 384c5578e3a0260d1b76fbaf29515da9730841eb Mon Sep 17 00:00:00 2001 From: Wojciech Dubowik Date: Mon, 23 May 2022 10:20:43 +0200 Subject: [PATCH] mpc85xx: Add testing linux v5.15 support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Build system: x86_64 Build-tested: generic Run-tested: generic/TL-WDR4900 v1 board from TP-Link Signed-off-by: Wojciech Dubowik Signed-off-by: Petr Štetiar [un-dmarc,2-commit bump] --- target/linux/mpc85xx/Makefile | 1 + target/linux/mpc85xx/config-5.15 | 4 +- ...0-powerpc-85xx-tl-wdr4900-v1-support.patch | 14 +++---- .../102-powerpc-add-cmdline-override.patch | 4 +- ...-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch | 37 ------------------- ...ootwrapper-disable-uImage-generation.patch | 4 +- 6 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 target/linux/mpc85xx/patches-5.15/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 398e578882..f5f5a9c5c1 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -12,6 +12,7 @@ FEATURES:=squashfs ramdisk nand SUBTARGETS:=p1010 p1020 p2020 KERNEL_PATCHVER:=5.10 +KERNEL_TESTING_PATCHVER:=5.15 KERNELNAME:=zImage diff --git a/target/linux/mpc85xx/config-5.15 b/target/linux/mpc85xx/config-5.15 index 532d176c15..ab7bc235ea 100644 --- a/target/linux/mpc85xx/config-5.15 +++ b/target/linux/mpc85xx/config-5.15 @@ -39,9 +39,7 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 # CONFIG_CRYPTO_MD5_PPC is not set CONFIG_CRYPTO_NULL=y @@ -98,6 +96,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GEN_RTC=y # CONFIG_GE_IMP3A is not set CONFIG_GIANFAR=y +CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MPC8XXX=y CONFIG_HAS_DMA=y @@ -193,6 +192,7 @@ CONFIG_PHYSICAL_START=0x00000000 # CONFIG_PPA8548 is not set CONFIG_PPC=y CONFIG_PPC32=y +# CONFIG_PPC_BOOK3S_32 is not set # CONFIG_PPC64 is not set CONFIG_PPC_85xx=y # CONFIG_PPC_8xx is not set diff --git a/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch index 9bf9154e91..18a0478381 100644 --- a/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -19,17 +19,17 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -157,6 +157,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -162,6 +162,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c +src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S - src-wlib := $(sort $(src-wlib-y)) - src-plat := $(sort $(src-plat-y)) -@@ -336,7 +337,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm + src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c + +@@ -342,7 +343,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm + image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 - image-$(CONFIG_SBC8548) += cuImage.sbc8548 image-$(CONFIG_KSI8560) += cuImage.ksi8560 - +image-$(CONFIG_TL_WDR4900_V1) += simpleImage.tl-wdr4900-v1 @@ -38,7 +38,7 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -324,6 +324,11 @@ adder875-redboot) +@@ -326,6 +326,11 @@ adder875-redboot) platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; @@ -78,6 +78,6 @@ Signed-off-by: Pawel Dembicki obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o +obj-$(CONFIG_TL_WDR4900_V1) += tl_wdr4900_v1.o - obj-$(CONFIG_SBC8548) += sbc8548.o obj-$(CONFIG_PPA8548) += ppa8548.o obj-$(CONFIG_SOCRATES) += socrates.o socrates_fpga_pic.o + obj-$(CONFIG_KSI8560) += ksi8560.o diff --git a/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch index 9242fce4e2..2ba5f7e98b 100644 --- a/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -931,6 +931,14 @@ config CMDLINE_FORCE +@@ -913,6 +913,14 @@ config CMDLINE_FORCE endchoice @@ -17,7 +17,7 @@ help --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns +@@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns if (p != NULL && l > 0) strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); diff --git a/target/linux/mpc85xx/patches-5.15/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch b/target/linux/mpc85xx/patches-5.15/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch deleted file mode 100644 index 38ae4e08e6..0000000000 --- a/target/linux/mpc85xx/patches-5.15/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 29af30435022442ec4eccf3166956b8e0b8a2134 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Mon, 5 Sep 2022 23:13:47 +0200 -Subject: [PATCH] gpio: mpc8xxx: Fix support for IRQ_TYPE_LEVEL_LOW flow_type - in mpc85xx -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e39d5ef67804 ("powerpc/5xxx: extend mpc8xxx_gpio driver to support -mpc512x gpios") implemented support for IRQ_TYPE_LEVEL_LOW flow type in -mpc512x via falling edge type. Do same for mpc85xx which support was added -in commit 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio"). - -Fixes probing of lm90 hwmon driver on mpc85xx based board which use level -interrupt. Without it kernel prints error and refuse lm90 to work: - - [ 15.258370] genirq: Setting trigger mode 8 for irq 49 failed (mpc8xxx_irq_set_type+0x0/0xf8) - [ 15.267168] lm90 0-004c: cannot request IRQ 49 - [ 15.272708] lm90: probe of 0-004c failed with error -22 - -Fixes: 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio") -Signed-off-by: Pali Rohár ---- - drivers/gpio/gpio-mpc8xxx.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/gpio/gpio-mpc8xxx.c -+++ b/drivers/gpio/gpio-mpc8xxx.c -@@ -169,6 +169,7 @@ static int mpc8xxx_irq_set_type(struct i - - switch (flow_type) { - case IRQ_TYPE_EDGE_FALLING: -+ case IRQ_TYPE_LEVEL_LOW: - raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags); - gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR, - gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR) diff --git a/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch index 2ba3f83326..c81ab7fcc2 100644 --- a/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch +++ b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -264,7 +264,6 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp +@@ -271,7 +271,6 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_PPC_HOLLY) += dtbImage.holly @@ -24,7 +24,7 @@ Signed-off-by: David Bauer image-$(CONFIG_EPAPR_BOOT) += zImage.epapr # -@@ -395,15 +394,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits +@@ -403,15 +402,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits $(obj)/vmlinux.strip: vmlinux $(STRIP) -s -R .comment $< -o $@ -- 2.30.2