diff mbox series

[PATCH/RFC] riscv: defconfig: Disable RZ/Five peripheral support

Message ID 89ad70c7d6e8078208fecfd41dc03f6028531729.1722353710.git.geert+renesas@glider.be (mailing list archive)
State Handled Elsewhere
Headers show
Series [PATCH/RFC] riscv: defconfig: Disable RZ/Five peripheral support | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR success PR summary
conchuod/vmtest-fixes-PR success PR summary
conchuod/patch-1-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh
conchuod/patch-1-test-2 success .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh
conchuod/patch-1-test-3 success .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh
conchuod/patch-1-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh
conchuod/patch-1-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh
conchuod/patch-1-test-6 success .github/scripts/patches/tests/checkpatch.sh
conchuod/patch-1-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh
conchuod/patch-1-test-8 success .github/scripts/patches/tests/header_inline.sh
conchuod/patch-1-test-9 success .github/scripts/patches/tests/kdoc.sh
conchuod/patch-1-test-10 success .github/scripts/patches/tests/module_param.sh
conchuod/patch-1-test-11 success .github/scripts/patches/tests/verify_fixes.sh
conchuod/patch-1-test-12 success .github/scripts/patches/tests/verify_signedoff.sh

Commit Message

Geert Uytterhoeven July 30, 2024, 3:37 p.m. UTC
There is not much point in keeping support for RZ/Five peripherals
enabled, as the RZ/Five platform option (ARCH_R9A07G043) is gated behind
NONPORTABLE.  Hence drop all config options that enable built-in or
modular support for peripherals found on RZ/Five SoCs.

Disable USB_XHCI_RCAR explicitly, as its value defaults to the value of
ARCH_RENESAS, which is still enabled.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Questions:
  1. Perhaps the intention is to keep all RZ/Five peripheral support
     enabled, so RZ/Five users can start from the defconfig, and
     "just"[1] enable NONPORTABLE and ARCH_R9A07G043?

     [1] Nope, need to disable RISCV_ISA_ZICBOM and ERRATA_THEAD_CMO
	 (and whatever else in the future?), too.

  2. Perhaps CONFIG_ARCH_RENESAS=y should be dropped, too?
     In addition to USB_XHCI_RCAR, that would get rid of SOC_BUS,
     PINCTRL_RENESAS, CLK_RENESAS, and SOC_RENESAS.
---
 arch/riscv/configs/defconfig | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Comments

Lad, Prabhakar Aug. 1, 2024, 7:32 a.m. UTC | #1
Hi Geert,

On Tue, Jul 30, 2024 at 4:37 PM Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
>
> There is not much point in keeping support for RZ/Five peripherals
> enabled, as the RZ/Five platform option (ARCH_R9A07G043) is gated behind
> NONPORTABLE.  Hence drop all config options that enable built-in or
> modular support for peripherals found on RZ/Five SoCs.
>
> Disable USB_XHCI_RCAR explicitly, as its value defaults to the value of
> ARCH_RENESAS, which is still enabled.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Questions:
>   1. Perhaps the intention is to keep all RZ/Five peripheral support
>      enabled, so RZ/Five users can start from the defconfig, and
>      "just"[1] enable NONPORTABLE and ARCH_R9A07G043?
>
>      [1] Nope, need to disable RISCV_ISA_ZICBOM and ERRATA_THEAD_CMO
>          (and whatever else in the future?), too.
>
>   2. Perhaps CONFIG_ARCH_RENESAS=y should be dropped, too?
>      In addition to USB_XHCI_RCAR, that would get rid of SOC_BUS,
>      PINCTRL_RENESAS, CLK_RENESAS, and SOC_RENESAS.
>
I think it does make sense if we drop the above configs too as anyway
users will have to select the configs manually to get a bootable image
for RZ/Five.

> ---
>  arch/riscv/configs/defconfig | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Cheers,
Prabhakar

> diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
> index 0d678325444fccdc..b51ef6cd1e3986ed 100644
> --- a/arch/riscv/configs/defconfig
> +++ b/arch/riscv/configs/defconfig
> @@ -137,12 +137,10 @@ CONFIG_VIRTIO_NET=y
>  CONFIG_MACB=y
>  CONFIG_E1000E=y
>  CONFIG_R8169=y
> -CONFIG_RAVB=y
>  CONFIG_STMMAC_ETH=m
>  CONFIG_MICREL_PHY=y
>  CONFIG_MICROSEMI_PHY=y
>  CONFIG_MOTORCOMM_PHY=y
> -CONFIG_CAN_RCAR_CANFD=m
>  CONFIG_INPUT_MOUSEDEV=y
>  CONFIG_KEYBOARD_SUN4I_LRADC=m
>  CONFIG_SERIAL_8250=y
> @@ -150,7 +148,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
>  CONFIG_SERIAL_8250_DW=y
>  CONFIG_SERIAL_OF_PLATFORM=y
>  CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
> -CONFIG_SERIAL_SH_SCI=y
>  CONFIG_VIRTIO_CONSOLE=y
>  CONFIG_HW_RANDOM=y
>  CONFIG_HW_RANDOM_VIRTIO=y
> @@ -159,11 +156,9 @@ CONFIG_I2C=y
>  CONFIG_I2C_CHARDEV=m
>  CONFIG_I2C_DESIGNWARE_PLATFORM=y
>  CONFIG_I2C_MV64XXX=m
> -CONFIG_I2C_RIIC=y
>  CONFIG_SPI=y
>  CONFIG_SPI_CADENCE_QUADSPI=m
>  CONFIG_SPI_PL022=m
> -CONFIG_SPI_RSPI=m
>  CONFIG_SPI_SIFIVE=y
>  CONFIG_SPI_SUN6I=y
>  # CONFIG_PTP_1588_CLOCK is not set
> @@ -172,7 +167,6 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
>  CONFIG_SENSORS_SFCTEMP=m
>  CONFIG_CPU_THERMAL=y
>  CONFIG_DEVFREQ_THERMAL=y
> -CONFIG_RZG2L_THERMAL=y
>  CONFIG_WATCHDOG=y
>  CONFIG_SUNXI_WATCHDOG=y
>  CONFIG_MFD_AXP20X_I2C=y
> @@ -201,11 +195,11 @@ CONFIG_USB=y
>  CONFIG_USB_OTG=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_PLATFORM=y
> +# CONFIG_USB_XHCI_RCAR is not set
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_HCD_PLATFORM=y
>  CONFIG_USB_OHCI_HCD=y
>  CONFIG_USB_OHCI_HCD_PLATFORM=y
> -CONFIG_USB_RENESAS_USBHS=m
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_UAS=y
>  CONFIG_USB_CDNS_SUPPORT=m
> @@ -217,7 +211,6 @@ CONFIG_USB_MUSB_HDRC=m
>  CONFIG_USB_MUSB_SUNXI=m
>  CONFIG_NOP_USB_XCEIV=m
>  CONFIG_USB_GADGET=y
> -CONFIG_USB_RENESAS_USBHS_UDC=m
>  CONFIG_USB_CONFIGFS=m
>  CONFIG_USB_CONFIGFS_SERIAL=y
>  CONFIG_USB_CONFIGFS_ACM=y
> @@ -235,7 +228,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
>  CONFIG_MMC_SDHCI_OF_DWCMSHC=y
>  CONFIG_MMC_SDHCI_CADENCE=y
>  CONFIG_MMC_SPI=y
> -CONFIG_MMC_SDHI=y
>  CONFIG_MMC_DW=y
>  CONFIG_MMC_DW_STARFIVE=y
>  CONFIG_MMC_SUNXI=y
> @@ -250,7 +242,6 @@ CONFIG_VIRTIO_INPUT=y
>  CONFIG_VIRTIO_MMIO=y
>  CONFIG_CLK_SOPHGO_CV1800=y
>  CONFIG_SUN8I_DE2_CCU=m
> -CONFIG_RENESAS_OSTM=y
>  CONFIG_SUN50I_IOMMU=y
>  CONFIG_RPMSG_CHAR=y
>  CONFIG_RPMSG_CTRL=y
> @@ -258,7 +249,6 @@ CONFIG_RPMSG_VIRTIO=y
>  CONFIG_PM_DEVFREQ=y
>  CONFIG_IIO=y
>  CONFIG_PHY_SUN4I_USB=m
> -CONFIG_PHY_RCAR_GEN3_USB2=y
>  CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
>  CONFIG_PHY_STARFIVE_JH7110_PCIE=m
>  CONFIG_PHY_STARFIVE_JH7110_USB=m
> --
> 2.34.1
>
>
Palmer Dabbelt Sept. 17, 2024, 1:20 p.m. UTC | #2
On Thu, 01 Aug 2024 00:32:43 PDT (-0700), prabhakar.csengg@gmail.com wrote:
> Hi Geert,
>
> On Tue, Jul 30, 2024 at 4:37 PM Geert Uytterhoeven
> <geert+renesas@glider.be> wrote:
>>
>> There is not much point in keeping support for RZ/Five peripherals
>> enabled, as the RZ/Five platform option (ARCH_R9A07G043) is gated behind
>> NONPORTABLE.  Hence drop all config options that enable built-in or
>> modular support for peripherals found on RZ/Five SoCs.
>>
>> Disable USB_XHCI_RCAR explicitly, as its value defaults to the value of
>> ARCH_RENESAS, which is still enabled.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> ---
>> Questions:
>>   1. Perhaps the intention is to keep all RZ/Five peripheral support
>>      enabled, so RZ/Five users can start from the defconfig, and
>>      "just"[1] enable NONPORTABLE and ARCH_R9A07G043?
>>
>>      [1] Nope, need to disable RISCV_ISA_ZICBOM and ERRATA_THEAD_CMO
>>          (and whatever else in the future?), too.
>>
>>   2. Perhaps CONFIG_ARCH_RENESAS=y should be dropped, too?
>>      In addition to USB_XHCI_RCAR, that would get rid of SOC_BUS,
>>      PINCTRL_RENESAS, CLK_RENESAS, and SOC_RENESAS.
>>
> I think it does make sense if we drop the above configs too as anyway
> users will have to select the configs manually to get a bootable image
> for RZ/Five.

Ya, I agree.  If we end up with another RZ/Five or somone gets rid of 
that DMA pool stuff that's forcing the NONPORTABLE then we can always 
re-add it.

I picked this one up and send the ARCH_RENESAS removal.

>
>> ---
>>  arch/riscv/configs/defconfig | 12 +-----------
>>  1 file changed, 1 insertion(+), 11 deletions(-)
>>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Cheers,
> Prabhakar
>
>> diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
>> index 0d678325444fccdc..b51ef6cd1e3986ed 100644
>> --- a/arch/riscv/configs/defconfig
>> +++ b/arch/riscv/configs/defconfig
>> @@ -137,12 +137,10 @@ CONFIG_VIRTIO_NET=y
>>  CONFIG_MACB=y
>>  CONFIG_E1000E=y
>>  CONFIG_R8169=y
>> -CONFIG_RAVB=y
>>  CONFIG_STMMAC_ETH=m
>>  CONFIG_MICREL_PHY=y
>>  CONFIG_MICROSEMI_PHY=y
>>  CONFIG_MOTORCOMM_PHY=y
>> -CONFIG_CAN_RCAR_CANFD=m
>>  CONFIG_INPUT_MOUSEDEV=y
>>  CONFIG_KEYBOARD_SUN4I_LRADC=m
>>  CONFIG_SERIAL_8250=y
>> @@ -150,7 +148,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
>>  CONFIG_SERIAL_8250_DW=y
>>  CONFIG_SERIAL_OF_PLATFORM=y
>>  CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
>> -CONFIG_SERIAL_SH_SCI=y
>>  CONFIG_VIRTIO_CONSOLE=y
>>  CONFIG_HW_RANDOM=y
>>  CONFIG_HW_RANDOM_VIRTIO=y
>> @@ -159,11 +156,9 @@ CONFIG_I2C=y
>>  CONFIG_I2C_CHARDEV=m
>>  CONFIG_I2C_DESIGNWARE_PLATFORM=y
>>  CONFIG_I2C_MV64XXX=m
>> -CONFIG_I2C_RIIC=y
>>  CONFIG_SPI=y
>>  CONFIG_SPI_CADENCE_QUADSPI=m
>>  CONFIG_SPI_PL022=m
>> -CONFIG_SPI_RSPI=m
>>  CONFIG_SPI_SIFIVE=y
>>  CONFIG_SPI_SUN6I=y
>>  # CONFIG_PTP_1588_CLOCK is not set
>> @@ -172,7 +167,6 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
>>  CONFIG_SENSORS_SFCTEMP=m
>>  CONFIG_CPU_THERMAL=y
>>  CONFIG_DEVFREQ_THERMAL=y
>> -CONFIG_RZG2L_THERMAL=y
>>  CONFIG_WATCHDOG=y
>>  CONFIG_SUNXI_WATCHDOG=y
>>  CONFIG_MFD_AXP20X_I2C=y
>> @@ -201,11 +195,11 @@ CONFIG_USB=y
>>  CONFIG_USB_OTG=y
>>  CONFIG_USB_XHCI_HCD=y
>>  CONFIG_USB_XHCI_PLATFORM=y
>> +# CONFIG_USB_XHCI_RCAR is not set
>>  CONFIG_USB_EHCI_HCD=y
>>  CONFIG_USB_EHCI_HCD_PLATFORM=y
>>  CONFIG_USB_OHCI_HCD=y
>>  CONFIG_USB_OHCI_HCD_PLATFORM=y
>> -CONFIG_USB_RENESAS_USBHS=m
>>  CONFIG_USB_STORAGE=y
>>  CONFIG_USB_UAS=y
>>  CONFIG_USB_CDNS_SUPPORT=m
>> @@ -217,7 +211,6 @@ CONFIG_USB_MUSB_HDRC=m
>>  CONFIG_USB_MUSB_SUNXI=m
>>  CONFIG_NOP_USB_XCEIV=m
>>  CONFIG_USB_GADGET=y
>> -CONFIG_USB_RENESAS_USBHS_UDC=m
>>  CONFIG_USB_CONFIGFS=m
>>  CONFIG_USB_CONFIGFS_SERIAL=y
>>  CONFIG_USB_CONFIGFS_ACM=y
>> @@ -235,7 +228,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
>>  CONFIG_MMC_SDHCI_OF_DWCMSHC=y
>>  CONFIG_MMC_SDHCI_CADENCE=y
>>  CONFIG_MMC_SPI=y
>> -CONFIG_MMC_SDHI=y
>>  CONFIG_MMC_DW=y
>>  CONFIG_MMC_DW_STARFIVE=y
>>  CONFIG_MMC_SUNXI=y
>> @@ -250,7 +242,6 @@ CONFIG_VIRTIO_INPUT=y
>>  CONFIG_VIRTIO_MMIO=y
>>  CONFIG_CLK_SOPHGO_CV1800=y
>>  CONFIG_SUN8I_DE2_CCU=m
>> -CONFIG_RENESAS_OSTM=y
>>  CONFIG_SUN50I_IOMMU=y
>>  CONFIG_RPMSG_CHAR=y
>>  CONFIG_RPMSG_CTRL=y
>> @@ -258,7 +249,6 @@ CONFIG_RPMSG_VIRTIO=y
>>  CONFIG_PM_DEVFREQ=y
>>  CONFIG_IIO=y
>>  CONFIG_PHY_SUN4I_USB=m
>> -CONFIG_PHY_RCAR_GEN3_USB2=y
>>  CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
>>  CONFIG_PHY_STARFIVE_JH7110_PCIE=m
>>  CONFIG_PHY_STARFIVE_JH7110_USB=m
>> --
>> 2.34.1
>>
>>
diff mbox series

Patch

diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
index 0d678325444fccdc..b51ef6cd1e3986ed 100644
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@ -137,12 +137,10 @@  CONFIG_VIRTIO_NET=y
 CONFIG_MACB=y
 CONFIG_E1000E=y
 CONFIG_R8169=y
-CONFIG_RAVB=y
 CONFIG_STMMAC_ETH=m
 CONFIG_MICREL_PHY=y
 CONFIG_MICROSEMI_PHY=y
 CONFIG_MOTORCOMM_PHY=y
-CONFIG_CAN_RCAR_CANFD=m
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_SERIAL_8250=y
@@ -150,7 +148,6 @@  CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
-CONFIG_SERIAL_SH_SCI=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_VIRTIO=y
@@ -159,11 +156,9 @@  CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=m
-CONFIG_I2C_RIIC=y
 CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_PL022=m
-CONFIG_SPI_RSPI=m
 CONFIG_SPI_SIFIVE=y
 CONFIG_SPI_SUN6I=y
 # CONFIG_PTP_1588_CLOCK is not set
@@ -172,7 +167,6 @@  CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_SENSORS_SFCTEMP=m
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
-CONFIG_RZG2L_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MFD_AXP20X_I2C=y
@@ -201,11 +195,11 @@  CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PLATFORM=y
+# CONFIG_USB_XHCI_RCAR is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_RENESAS_USBHS=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_CDNS_SUPPORT=m
@@ -217,7 +211,6 @@  CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_SUNXI=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_USB_GADGET=y
-CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
@@ -235,7 +228,6 @@  CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_DWCMSHC=y
 CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SPI=y
-CONFIG_MMC_SDHI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_STARFIVE=y
 CONFIG_MMC_SUNXI=y
@@ -250,7 +242,6 @@  CONFIG_VIRTIO_INPUT=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_CLK_SOPHGO_CV1800=y
 CONFIG_SUN8I_DE2_CCU=m
-CONFIG_RENESAS_OSTM=y
 CONFIG_SUN50I_IOMMU=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_RPMSG_CTRL=y
@@ -258,7 +249,6 @@  CONFIG_RPMSG_VIRTIO=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_IIO=y
 CONFIG_PHY_SUN4I_USB=m
-CONFIG_PHY_RCAR_GEN3_USB2=y
 CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
 CONFIG_PHY_STARFIVE_JH7110_PCIE=m
 CONFIG_PHY_STARFIVE_JH7110_USB=m