| Message ID | 20230221194637.28436-5-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
| Series | Remove some e500/MPC85xx evaluation platforms | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | fail | kernel (corenet32_smp_defconfig, ubuntu-22.04) failed at step Build. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
On Tuesday 21 February 2023 14:46:37 Paul Gortmaker wrote: > None of these have a reference anymore anywhere, such as like this: > > arch/powerpc/Makefile: $(call merge_into_defconfig,mpc85xx_base.config,\ > > As such, we probably should just clean up and remove them. > > Cc: Scott Wood <oss@buserror.net> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > arch/powerpc/configs/85xx-32bit.config | 5 - > arch/powerpc/configs/85xx-hw.config | 139 ------------------------- > arch/powerpc/configs/85xx-smp.config | 2 - > 3 files changed, 146 deletions(-) > delete mode 100644 arch/powerpc/configs/85xx-32bit.config > delete mode 100644 arch/powerpc/configs/85xx-hw.config > delete mode 100644 arch/powerpc/configs/85xx-smp.config This change is likely going to break mpc85xx platform because defconfig files includes all these files which you are going to remove. For example in arch/powerpc/Makefile is: PHONY += mpc85xx_smp_defconfig mpc85xx_smp_defconfig: $(call merge_into_defconfig,mpc85xx_base.config,\ 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw) And for P2020 boards I'm using mpc85xx_smp_defconfig configuration as this one compiles SMP kernel, ideal for P2020 which is dual-core SoC.
[Re: [PATCH 4/4] powerpc: remove orphaned MPC85xx kernel config fragments.] On 21/02/2023 (Tue 21:03) Pali Roh??r wrote: > On Tuesday 21 February 2023 14:46:37 Paul Gortmaker wrote: > > None of these have a reference anymore anywhere, such as like this: > > > > arch/powerpc/Makefile: $(call merge_into_defconfig,mpc85xx_base.config,\ > > > > As such, we probably should just clean up and remove them. > > > > Cc: Scott Wood <oss@buserror.net> > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Cc: Paul Mackerras <paulus@samba.org> > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > --- > > arch/powerpc/configs/85xx-32bit.config | 5 - > > arch/powerpc/configs/85xx-hw.config | 139 ------------------------- > > arch/powerpc/configs/85xx-smp.config | 2 - > > 3 files changed, 146 deletions(-) > > delete mode 100644 arch/powerpc/configs/85xx-32bit.config > > delete mode 100644 arch/powerpc/configs/85xx-hw.config > > delete mode 100644 arch/powerpc/configs/85xx-smp.config > > This change is likely going to break mpc85xx platform because defconfig > files includes all these files which you are going to remove. For > example in arch/powerpc/Makefile is: > > PHONY += mpc85xx_smp_defconfig > mpc85xx_smp_defconfig: > $(call merge_into_defconfig,mpc85xx_base.config,\ > 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw) OK, it seems you've answered a question for me. That being "why didn't grep find a reference to these fragments?" It seems the ".config" extension is optional? This seems inconsistent at best, to reference some files with the .config extension and others without it. Not blaming you for that, but it is probably something that needs looking into. I am fine with dropping this config frag patch as we figure that out. Paul. -- > > And for P2020 boards I'm using mpc85xx_smp_defconfig configuration as > this one compiles SMP kernel, ideal for P2020 which is dual-core SoC.
On Tuesday 21 February 2023 16:29:32 Paul Gortmaker wrote: > [Re: [PATCH 4/4] powerpc: remove orphaned MPC85xx kernel config fragments.] On 21/02/2023 (Tue 21:03) Pali Roh??r wrote: > > > On Tuesday 21 February 2023 14:46:37 Paul Gortmaker wrote: > > > None of these have a reference anymore anywhere, such as like this: > > > > > > arch/powerpc/Makefile: $(call merge_into_defconfig,mpc85xx_base.config,\ > > > > > > As such, we probably should just clean up and remove them. > > > > > > Cc: Scott Wood <oss@buserror.net> > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > Cc: Paul Mackerras <paulus@samba.org> > > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > > --- > > > arch/powerpc/configs/85xx-32bit.config | 5 - > > > arch/powerpc/configs/85xx-hw.config | 139 ------------------------- > > > arch/powerpc/configs/85xx-smp.config | 2 - > > > 3 files changed, 146 deletions(-) > > > delete mode 100644 arch/powerpc/configs/85xx-32bit.config > > > delete mode 100644 arch/powerpc/configs/85xx-hw.config > > > delete mode 100644 arch/powerpc/configs/85xx-smp.config > > > > This change is likely going to break mpc85xx platform because defconfig > > files includes all these files which you are going to remove. For > > example in arch/powerpc/Makefile is: > > > > PHONY += mpc85xx_smp_defconfig > > mpc85xx_smp_defconfig: > > $(call merge_into_defconfig,mpc85xx_base.config,\ > > 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw) > > OK, it seems you've answered a question for me. That being "why didn't > grep find a reference to these fragments?" > > It seems the ".config" extension is optional? I really do not know. (And I'm not sure if I want to know answer :D) > This seems inconsistent at best, to reference some files with the > .config extension and others without it. Not blaming you for that, > but it is probably something that needs looking into. I agree it is inconsistent. But it was there before I looked or touched any powerpc code. So it looks like something which nobody wanted to cleanup because "it works" and had no motivation. > I am fine with dropping this config frag patch as we figure that out. > > Paul. > -- > > > > > And for P2020 boards I'm using mpc85xx_smp_defconfig configuration as > > this one compiles SMP kernel, ideal for P2020 which is dual-core SoC.
On Tue, 2023-02-21 at 22:49 +0100, Pali Rohár wrote: > On Tuesday 21 February 2023 16:29:32 Paul Gortmaker wrote: > > [Re: [PATCH 4/4] powerpc: remove orphaned MPC85xx kernel config > > fragments.] On 21/02/2023 (Tue 21:03) Pali Roh??r wrote: > > > > > On Tuesday 21 February 2023 14:46:37 Paul Gortmaker wrote: > > > > None of these have a reference anymore anywhere, such as like this: > > > > > > > > arch/powerpc/Makefile: $(call > > > > merge_into_defconfig,mpc85xx_base.config,\ > > > > > > > > As such, we probably should just clean up and remove them. > > > > > > > > Cc: Scott Wood <oss@buserror.net> > > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > Cc: Paul Mackerras <paulus@samba.org> > > > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > > > --- > > > > arch/powerpc/configs/85xx-32bit.config | 5 - > > > > arch/powerpc/configs/85xx-hw.config | 139 ------------------------ > > > > - > > > > arch/powerpc/configs/85xx-smp.config | 2 - > > > > 3 files changed, 146 deletions(-) > > > > delete mode 100644 arch/powerpc/configs/85xx-32bit.config > > > > delete mode 100644 arch/powerpc/configs/85xx-hw.config > > > > delete mode 100644 arch/powerpc/configs/85xx-smp.config > > > > > > This change is likely going to break mpc85xx platform because defconfig > > > files includes all these files which you are going to remove. For > > > example in arch/powerpc/Makefile is: > > > > > > PHONY += mpc85xx_smp_defconfig > > > mpc85xx_smp_defconfig: > > > $(call merge_into_defconfig,mpc85xx_base.config,\ > > > 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw) > > > > OK, it seems you've answered a question for me. That being "why didn't > > grep find a reference to these fragments?" > > > > It seems the ".config" extension is optional? > > I really do not know. (And I'm not sure if I want to know answer :D) It's not optional; you have to leave it off: # Used to create 'merged defconfigs' # To use it $(call) it with the first argument as the base defconfig # and the second argument as a space separated list of .config files to merge, # without the .config suffix. define merge_into_defconfig ... > > This seems inconsistent at best, to reference some files with the > > .config extension and others without it. Not blaming you for that, > > but it is probably something that needs looking into. > > I agree it is inconsistent. But it was there before I looked or touched > any powerpc code. So it looks like something which nobody wanted to > cleanup because "it works" and had no motivation. No, it's intentional to reduce verbosity. If by "inconsistent" you're referring to mpc85xx_base.config, that argument sometimes refers to _defconfig files (i.e. the pseries targets which were the initial user of merge_into_config) so that argument can't autoappend .config. -Crystal
[Re: [PATCH 4/4] powerpc: remove orphaned MPC85xx kernel config fragments.] On 02/03/2023 (Thu 17:30) Crystal Wood wrote: > On Tue, 2023-02-21 at 22:49 +0100, Pali Roh??r wrote: > > On Tuesday 21 February 2023 16:29:32 Paul Gortmaker wrote: > > > [Re: [PATCH 4/4] powerpc: remove orphaned MPC85xx kernel config > > > fragments.] On 21/02/2023 (Tue 21:03) Pali Roh??r wrote: > > > > > > > On Tuesday 21 February 2023 14:46:37 Paul Gortmaker wrote: > > > > > None of these have a reference anymore anywhere, such as like this: > > > > > > > > > > ?? arch/powerpc/Makefile:?? $(call > > > > > merge_into_defconfig,mpc85xx_base.config,\ > > > > > > > > > > As such, we probably should just clean up and remove them. > > > > > > > > > > Cc: Scott Wood <oss@buserror.net> > > > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > > Cc: Paul Mackerras <paulus@samba.org> > > > > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > > > > --- > > > > > ??arch/powerpc/configs/85xx-32bit.config |???? 5 - > > > > > ??arch/powerpc/configs/85xx-hw.config?????? | 139 ------------------------ > > > > > - > > > > > ??arch/powerpc/configs/85xx-smp.config???? |???? 2 - > > > > > ??3 files changed, 146 deletions(-) > > > > > ??delete mode 100644 arch/powerpc/configs/85xx-32bit.config > > > > > ??delete mode 100644 arch/powerpc/configs/85xx-hw.config > > > > > ??delete mode 100644 arch/powerpc/configs/85xx-smp.config > > > > > > > > This change is likely going to break mpc85xx platform because defconfig > > > > files includes all these files which you are going to remove. For > > > > example in arch/powerpc/Makefile is: > > > > > > > > PHONY += mpc85xx_smp_defconfig > > > > mpc85xx_smp_defconfig: > > > > ????????????????$(call merge_into_defconfig,mpc85xx_base.config,\ > > > > ????????????????????????????????85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw) > > > > > > OK, it seems you've answered a question for me.?? That being "why didn't > > > grep find a reference to these fragments?" > > > > > > It seems the ".config" extension is optional? > > > > I really do not know. (And I'm not sure if I want to know answer :D) > > It's not optional; you have to leave it off: > > # Used to create 'merged defconfigs' > # To use it $(call) it with the first argument as the base defconfig > # and the second argument as a space separated list of .config files to merge, > # without the .config suffix. > define merge_into_defconfig > ... > > > > This seems inconsistent at best, to reference some files with the > > > .config extension and others without it.?? Not blaming you for that, > > > but it is probably something that needs looking into. > > > > I agree it is inconsistent. But it was there before I looked or touched > > any powerpc code. So it looks like something which nobody wanted to > > cleanup because "it works" and had no motivation. > > No, it's intentional to reduce verbosity. If by "inconsistent" you're > referring to mpc85xx_base.config, that argument sometimes refers to _defconfig > files (i.e. the pseries targets which were the initial user of > merge_into_config) so that argument can't autoappend .config. Thanks for the detailed explanation. As I believe I said elsewhere, I wouldn't be submitting this change once I understood the use case. Plus it wasn't significant in reducing our overall maintain/build/boot kernel overhead in v6.4+ in linux-next etc. --- as that was the real goal here. I deleted our various BSPs years ago because I didn't think it was fair or reasonable to expect other people to update/carry them on our behalf. I would hope that is a statement that everyone could get behind. Thanks, Paul. -- > > -Crystal >
diff --git a/arch/powerpc/configs/85xx-32bit.config b/arch/powerpc/configs/85xx-32bit.config deleted file mode 100644 index 6b8894d727a2..000000000000 --- a/arch/powerpc/configs/85xx-32bit.config +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_HIGHMEM=y -CONFIG_KEXEC=y -CONFIG_PPC_85xx=y -CONFIG_PROC_KCORE=y -CONFIG_PHYS_64BIT=y diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config deleted file mode 100644 index 524db76f47b7..000000000000 --- a/arch/powerpc/configs/85xx-hw.config +++ /dev/null @@ -1,139 +0,0 @@ -CONFIG_AQUANTIA_PHY=y -CONFIG_AT803X_PHY=y -CONFIG_ATA=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -CONFIG_BROADCOM_PHY=y -CONFIG_C293_PCIE=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_ST=y -CONFIG_CICADA_PHY=y -CONFIG_CLK_QORIQ=y -CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_CRYPTO_DEV_TALITOS=y -CONFIG_DAVICOM_PHY=y -CONFIG_DMADEVICES=y -CONFIG_E1000E=y -CONFIG_E1000=y -CONFIG_EDAC=y -CONFIG_EDAC_MPC85XX=y -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_LEGACY=y -CONFIG_FB_FSL_DIU=y -CONFIG_FS_ENET=y -CONFIG_FSL_CORENET_CF=y -CONFIG_FSL_DMA=y -CONFIG_FSL_HV_MANAGER=y -CONFIG_FSL_PQ_MDIO=y -CONFIG_FSL_RIO=y -CONFIG_FSL_XGMAC_MDIO=y -CONFIG_GIANFAR=y -CONFIG_GPIO_MPC8XXX=y -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SUNPLUS=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_CPM=m -CONFIG_I2C_MPC=y -CONFIG_I2C_MUX_PCA954x=y -CONFIG_I2C_MUX=y -CONFIG_I2C=y -CONFIG_IGB=y -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_MARVELL_PHY=y -CONFIG_MDIO_BUS_MUX_GPIO=y -CONFIG_MDIO_BUS_MUX_MMIOREG=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_MTD_RAW_NAND=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PLATRAM=y -CONFIG_MTD_SPI_NOR=y -CONFIG_NETDEVICES=y -CONFIG_NVRAM=y -CONFIG_PATA_ALI=y -CONFIG_PATA_SIL680=y -CONFIG_PATA_VIA=y -# CONFIG_PCIEASPM is not set -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_MSI=y -CONFIG_PCI=y -CONFIG_PPC_EPAPR_HV_BYTECHAN=y -# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set -CONFIG_QE_GPIO=y -CONFIG_QUICC_ENGINE=y -CONFIG_RAPIDIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_DS1374=y -CONFIG_RTC_DRV_DS3232=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIL=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SENSORS_INA2XX=y -CONFIG_SENSORS_LM90=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_NR_UARTS=6 -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_RUNTIME_UARTS=6 -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_QE=m -CONFIG_SERIO_LIBPS2=y -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_INTEL8X0=y -CONFIG_SND_POWERPC_SOC=y -# CONFIG_SND_PPC is not set -CONFIG_SND_SOC=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_USB is not set -CONFIG_SND=y -CONFIG_SOUND=y -CONFIG_SPI_FSL_ESPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_GPIO=y -CONFIG_SPI=y -CONFIG_TERANETICS_PHY=y -CONFIG_UCC_GETH=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_HID=m -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_OHCI_HCD_PPC_OF_LE=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_VIRT_DRIVERS=y -CONFIG_VITESSE_PHY=y diff --git a/arch/powerpc/configs/85xx-smp.config b/arch/powerpc/configs/85xx-smp.config deleted file mode 100644 index 3b4d1e54636d..000000000000 --- a/arch/powerpc/configs/85xx-smp.config +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NR_CPUS=24 -CONFIG_SMP=y
None of these have a reference anymore anywhere, such as like this: arch/powerpc/Makefile: $(call merge_into_defconfig,mpc85xx_base.config,\ As such, we probably should just clean up and remove them. Cc: Scott Wood <oss@buserror.net> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/powerpc/configs/85xx-32bit.config | 5 - arch/powerpc/configs/85xx-hw.config | 139 ------------------------- arch/powerpc/configs/85xx-smp.config | 2 - 3 files changed, 146 deletions(-) delete mode 100644 arch/powerpc/configs/85xx-32bit.config delete mode 100644 arch/powerpc/configs/85xx-hw.config delete mode 100644 arch/powerpc/configs/85xx-smp.config