[PATCH] riscv: defconfig: run savedefconfig to reorder it

[PATCH] riscv: defconfig: run savedefconfig to reorder it

[Yixun Lan]

Changes to defconfig should be always updated via 'make
savedefconfig', run this command to make it aligned again.

This will ease the effort of reviewing changes of defconfig
in the future.

Signed-off-by: Yixun Lan <dlan@gentoo.org>
---
Update PDMA config bring in unnecessary changes[1], let's fix
it by run savedefconfig first.

This patch is based on top of tag 6.16-rc1.

Link: https://lore.kernel.org/all/20250611134859-GYA125008@gentoo/ [1]
---
 arch/riscv/configs/defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
index fe8bd8afb4183ce871020fb2992a21a13bccbc87..37c98c0f98ffc0ee9d021e4d07aa37a27d342f7a 100644
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@ -134,6 +134,7 @@ CONFIG_MACB=y
 CONFIG_E1000E=y
 CONFIG_R8169=y
 CONFIG_STMMAC_ETH=m
+CONFIG_DWMAC_THEAD=m
 CONFIG_MICREL_PHY=y
 CONFIG_MICROSEMI_PHY=y
 CONFIG_MOTORCOMM_PHY=y
@@ -151,7 +152,6 @@ CONFIG_HW_RANDOM_JH7110=m
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=m
 CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=m
@@ -159,11 +159,11 @@ CONFIG_SPI_PL022=m
 CONFIG_SPI_SIFIVE=y
 CONFIG_SPI_SUN6I=y
 # CONFIG_PTP_1588_CLOCK is not set
+CONFIG_PINCTRL_TH1520=y
 CONFIG_PINCTRL_SOPHGO_CV1800B=y
 CONFIG_PINCTRL_SOPHGO_CV1812H=y
 CONFIG_PINCTRL_SOPHGO_SG2000=y
 CONFIG_PINCTRL_SOPHGO_SG2002=y
-CONFIG_PINCTRL_TH1520=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_SIFIVE=y
 CONFIG_GPIO_SPACEMIT_K1=y
@@ -240,7 +240,6 @@ CONFIG_RTC_DRV_SUN6I=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_SUN6I=m
 CONFIG_DW_AXI_DMAC=y
-CONFIG_DWMAC_THEAD=m
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_INPUT=y

---
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
change-id: 20250611-01-riscv-defconfig-7f90f73d283d

Best regards,
-- 
Yixun Lan

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Alexandre Ghiti]

Hi Yixun,

On 6/11/25 16:56, Yixun Lan wrote:
> Changes to defconfig should be always updated via 'make
> savedefconfig', run this command to make it aligned again.
>
> This will ease the effort of reviewing changes of defconfig
> in the future.
>
> Signed-off-by: Yixun Lan <dlan@gentoo.org>
> ---
> Update PDMA config bring in unnecessary changes[1], let's fix
> it by run savedefconfig first.


It would be easier if this patch was part of the PDMA series since the 
last patch will depend on it: @Guodong can you integrate this patch to 
your next revision of your patchset?

Thanks,

Alex


>
> This patch is based on top of tag 6.16-rc1.
>
> Link: https://lore.kernel.org/all/20250611134859-GYA125008@gentoo/ [1]
> ---
>   arch/riscv/configs/defconfig | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
> index fe8bd8afb4183ce871020fb2992a21a13bccbc87..37c98c0f98ffc0ee9d021e4d07aa37a27d342f7a 100644
> --- a/arch/riscv/configs/defconfig
> +++ b/arch/riscv/configs/defconfig
> @@ -134,6 +134,7 @@ CONFIG_MACB=y
>   CONFIG_E1000E=y
>   CONFIG_R8169=y
>   CONFIG_STMMAC_ETH=m
> +CONFIG_DWMAC_THEAD=m
>   CONFIG_MICREL_PHY=y
>   CONFIG_MICROSEMI_PHY=y
>   CONFIG_MOTORCOMM_PHY=y
> @@ -151,7 +152,6 @@ CONFIG_HW_RANDOM_JH7110=m
>   CONFIG_I2C=y
>   CONFIG_I2C_CHARDEV=m
>   CONFIG_I2C_DESIGNWARE_CORE=y
> -CONFIG_I2C_DESIGNWARE_PLATFORM=y
>   CONFIG_I2C_MV64XXX=m
>   CONFIG_SPI=y
>   CONFIG_SPI_CADENCE_QUADSPI=m
> @@ -159,11 +159,11 @@ CONFIG_SPI_PL022=m
>   CONFIG_SPI_SIFIVE=y
>   CONFIG_SPI_SUN6I=y
>   # CONFIG_PTP_1588_CLOCK is not set
> +CONFIG_PINCTRL_TH1520=y
>   CONFIG_PINCTRL_SOPHGO_CV1800B=y
>   CONFIG_PINCTRL_SOPHGO_CV1812H=y
>   CONFIG_PINCTRL_SOPHGO_SG2000=y
>   CONFIG_PINCTRL_SOPHGO_SG2002=y
> -CONFIG_PINCTRL_TH1520=y
>   CONFIG_GPIO_DWAPB=y
>   CONFIG_GPIO_SIFIVE=y
>   CONFIG_GPIO_SPACEMIT_K1=y
> @@ -240,7 +240,6 @@ CONFIG_RTC_DRV_SUN6I=y
>   CONFIG_DMADEVICES=y
>   CONFIG_DMA_SUN6I=m
>   CONFIG_DW_AXI_DMAC=y
> -CONFIG_DWMAC_THEAD=m
>   CONFIG_VIRTIO_PCI=y
>   CONFIG_VIRTIO_BALLOON=y
>   CONFIG_VIRTIO_INPUT=y
>
> ---
> base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
> change-id: 20250611-01-riscv-defconfig-7f90f73d283d
>
> Best regards,

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Yixun Lan]

Hi Alexandre,

On 10:37 Thu 12 Jun     , Alexandre Ghiti wrote:
> Hi Yixun,
> 
> On 6/11/25 16:56, Yixun Lan wrote:
> > Changes to defconfig should be always updated via 'make
> > savedefconfig', run this command to make it aligned again.
> >
> > This will ease the effort of reviewing changes of defconfig
> > in the future.
> >
> > Signed-off-by: Yixun Lan <dlan@gentoo.org>
> > ---
> > Update PDMA config bring in unnecessary changes[1], let's fix
> > it by run savedefconfig first.
> 
> 
> It would be easier if this patch was part of the PDMA series since the 
> last patch will depend on it: @Guodong can you integrate this patch to 
> your next revision of your patchset?
> 
I'd rather make this patch independent, as nothing strongly ralated with PDMA,
and it probably would take several rounds for PDMA patch to be settled down..

Besides, there is no problem for PDMA patch to depend on this patch if
needed (easy to use b4 to handle this..)

The idea here is to get this patch merged as early as possible, as it's
quite straightforward, and other people may have similar problem instead
of PDMA here

> Thanks,
> 
> Alex
> 

-- 
Yixun Lan (dlan)

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Alexandre Ghiti]

On 6/12/25 11:32, Yixun Lan wrote:
> Hi Alexandre,
>
> On 10:37 Thu 12 Jun     , Alexandre Ghiti wrote:
>> Hi Yixun,
>>
>> On 6/11/25 16:56, Yixun Lan wrote:
>>> Changes to defconfig should be always updated via 'make
>>> savedefconfig', run this command to make it aligned again.
>>>
>>> This will ease the effort of reviewing changes of defconfig
>>> in the future.
>>>
>>> Signed-off-by: Yixun Lan <dlan@gentoo.org>
>>> ---
>>> Update PDMA config bring in unnecessary changes[1], let's fix
>>> it by run savedefconfig first.
>>
>> It would be easier if this patch was part of the PDMA series since the
>> last patch will depend on it: @Guodong can you integrate this patch to
>> your next revision of your patchset?
>>
> I'd rather make this patch independent, as nothing strongly ralated with PDMA,
> and it probably would take several rounds for PDMA patch to be settled down..
>
> Besides, there is no problem for PDMA patch to depend on this patch if
> needed (easy to use b4 to handle this..)
>
> The idea here is to get this patch merged as early as possible, as it's
> quite straightforward, and other people may have similar problem instead
> of PDMA here


Ok makes sense, so let's Guodong deal with that then.

Thanks,

Alex


>
>> Thanks,
>>
>> Alex
>>

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Palmer Dabbelt]

On Thu, 12 Jun 2025 06:12:09 PDT (-0700), Alexandre Ghiti wrote:
> On 6/12/25 11:32, Yixun Lan wrote:
>> Hi Alexandre,
>>
>> On 10:37 Thu 12 Jun     , Alexandre Ghiti wrote:
>>> Hi Yixun,
>>>
>>> On 6/11/25 16:56, Yixun Lan wrote:
>>>> Changes to defconfig should be always updated via 'make
>>>> savedefconfig', run this command to make it aligned again.
>>>>
>>>> This will ease the effort of reviewing changes of defconfig
>>>> in the future.
>>>>
>>>> Signed-off-by: Yixun Lan <dlan@gentoo.org>
>>>> ---
>>>> Update PDMA config bring in unnecessary changes[1], let's fix
>>>> it by run savedefconfig first.
>>>
>>> It would be easier if this patch was part of the PDMA series since the
>>> last patch will depend on it: @Guodong can you integrate this patch to
>>> your next revision of your patchset?
>>>
>> I'd rather make this patch independent, as nothing strongly ralated with PDMA,
>> and it probably would take several rounds for PDMA patch to be settled down..

Ya, I agree.

>> Besides, there is no problem for PDMA patch to depend on this patch if
>> needed (easy to use b4 to handle this..)

Yep, something like "b4 shazam -lts --merge --merge-base 958097bdf88"
should do it on the merge side -- and maybe you don't even need the 
merge base, if all the b4 send side stuff picks it up right.

>> The idea here is to get this patch merged as early as possible, as it's
>> quite straightforward, and other people may have similar problem instead
>> of PDMA here
>
>
> Ok makes sense, so let's Guodong deal with that then.

(for some reason this isn't showing up in patchwork)

I'm going to merge it as a single patch into for-next.  It'll loop 
through the tester, but things look in good shape so it shouldn't take 
too long.  This way there's a stable hash people can base stuff off, 
rather than waiting for some other patch set.

>
> Thanks,
>
> Alex
>
>
>>
>>> Thanks,
>>>
>>> Alex
>>>

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Guodong Xu]

On Fri, Jun 13, 2025 at 2:57 AM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Thu, 12 Jun 2025 06:12:09 PDT (-0700), Alexandre Ghiti wrote:
> > On 6/12/25 11:32, Yixun Lan wrote:
> >> Hi Alexandre,
> >>
> >> On 10:37 Thu 12 Jun     , Alexandre Ghiti wrote:
> >>> Hi Yixun,
> >>>
> >>> On 6/11/25 16:56, Yixun Lan wrote:
> >>>> Changes to defconfig should be always updated via 'make
> >>>> savedefconfig', run this command to make it aligned again.
> >>>>
> >>>> This will ease the effort of reviewing changes of defconfig
> >>>> in the future.
> >>>>
> >>>> Signed-off-by: Yixun Lan <dlan@gentoo.org>
> >>>> ---
> >>>> Update PDMA config bring in unnecessary changes[1], let's fix
> >>>> it by run savedefconfig first.
> >>>
> >>> It would be easier if this patch was part of the PDMA series since the
> >>> last patch will depend on it: @Guodong can you integrate this patch to
> >>> your next revision of your patchset?
> >>>
> >> I'd rather make this patch independent, as nothing strongly ralated with PDMA,
> >> and it probably would take several rounds for PDMA patch to be settled down..
>
> Ya, I agree.
>
> >> Besides, there is no problem for PDMA patch to depend on this patch if
> >> needed (easy to use b4 to handle this..)
>
> Yep, something like "b4 shazam -lts --merge --merge-base 958097bdf88"
> should do it on the merge side -- and maybe you don't even need the
> merge base, if all the b4 send side stuff picks it up right.
>
> >> The idea here is to get this patch merged as early as possible, as it's
> >> quite straightforward, and other people may have similar problem instead
> >> of PDMA here
> >
> >
> > Ok makes sense, so let's Guodong deal with that then.
>
> (for some reason this isn't showing up in patchwork)
>
> I'm going to merge it as a single patch into for-next.  It'll loop

Sounds good. Thank you.
I will rebase, (or have it as a prerequisite in v2 of my PDMA
patchset).

Guodong

> through the tester, but things look in good shape so it shouldn't take
> too long.  This way there's a stable hash people can base stuff off,
> rather than waiting for some other patch set.
>
> >
> > Thanks,
> >
> > Alex
> >
> >
> >>
> >>> Thanks,
> >>>
> >>> Alex
> >>>

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[patchwork-bot+linux-riscv]

Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@dabbelt.com>:

On Wed, 11 Jun 2025 22:56:04 +0800 you wrote:
> Changes to defconfig should be always updated via 'make
> savedefconfig', run this command to make it aligned again.
> 
> This will ease the effort of reviewing changes of defconfig
> in the future.
> 
> Signed-off-by: Yixun Lan <dlan@gentoo.org>
> 
> [...]

Here is the summary with links:
  - riscv: defconfig: run savedefconfig to reorder it
    https://git.kernel.org/riscv/c/d958097bdf88

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH] riscv: defconfig: run savedefconfig to reorder it

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1698 bytes --]

Paul,

On Thu, Jun 12, 2025 at 09:40:28PM +0000, patchwork-bot+linux-riscv@kernel.org wrote:
> Hello:
> 
> This patch was applied to riscv/linux.git (for-next)
> by Palmer Dabbelt <palmer@dabbelt.com>:
> 
> On Wed, 11 Jun 2025 22:56:04 +0800 you wrote:
> > Changes to defconfig should be always updated via 'make
> > savedefconfig', run this command to make it aligned again.
> > 
> > This will ease the effort of reviewing changes of defconfig
> > in the future.
> > 
> > Signed-off-by: Yixun Lan <dlan@gentoo.org>
> > 
> > [...]
> 
> Here is the summary with links:
>   - riscv: defconfig: run savedefconfig to reorder it
>     https://git.kernel.org/riscv/c/d958097bdf88

This got lost in the 6.17 "incident". I applied it to my branch that I
collect defconfig stuff for SoCs on as it is a prereq for some spacemit
stuff that I was grabbing. It's up on my korg repo as a tag if you need
or want to pull it in:

The following changes since commit 8f5ae30d69d7543eee0d70083daf4de8fe15d585:

  Linux 6.17-rc1 (2025-08-10 19:41:16 +0300)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ tags/riscv-savedefconfig-6.18

for you to fetch changes up to 125c62df09a3fa4143298658340f093d2bd364a6:

  riscv: defconfig: run savedefconfig to reorder it (2025-09-14 16:34:42 +0100)

----------------------------------------------------------------
riscv-savedefconfig-6.18

----------------------------------------------------------------
Yixun Lan (1):
      riscv: defconfig: run savedefconfig to reorder it

 arch/riscv/configs/defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]