Re: [PATCH v2 1/3] kconfig: add dependencies of POWER_RESET for mips malta

[Philippe Mathieu-Daudé]

On 4/9/23 11:24, Yuan Tan wrote:
> Hi,
>
> On 9/4/2023 3:40 PM, Philippe Mathieu-Daudé wrote:
> > Hi,
> >
> > On 1/9/23 04:42, Yuan Tan wrote:
> > > MIPS Malta's power off depends on PCI, PCI_QUIRKS, and
> > > POWER_RESET_PIIX4_POWEROFF to work. Enable them when POWER_RESET is set
> > > for convenience.
> > >
> > > Suggested-by: Zhangjin Wu <falcon@xxxxxxxxxxx>
> > > Signed-off-by: Yuan Tan <tanyuan@xxxxxxxxxxx>
> > > ---
> > >   arch/mips/Kconfig | 3 +++
> > >   1 file changed, 3 insertions(+)
> > >
> > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> > > index bc8421859006..13bacbd05125 100644
> > > --- a/arch/mips/Kconfig
> > > +++ b/arch/mips/Kconfig
> > > @@ -547,6 +547,9 @@ config MIPS_MALTA
> > >       select MIPS_L1_CACHE_SHIFT_6
> > >       select MIPS_MSC
> > >       select PCI_GT64XXX_PCI0
> > > +    select PCI if POWER_RESET
> > > +    select PCI_QUIRKS if POWER_RESET
> > > +    select POWER_RESET_PIIX4_POWEROFF if POWER_RESET
> > >       select SMP_UP if SMP
> > >       select SWAP_IO_SPACE
> > >       select SYS_HAS_CPU_MIPS32_R1
> >
> > Shouldn't we also update the _defconfig files?
> Sorry, in my last email, I forgot to reply to all. So I am now resending 
> this email.
>
> In malta_defconfig, PCI and POWER_RESET_PIIX4_POWEROFF have already been 
> set and PCI_QUIRKS is also selected by FSL_PCI [=n].
>
> So shutdown and reboot with malta_defconfig is working and there is no 
> need to update the malta_defconfig 🙂

Since the dependency is now enforced by Kconfig, the defconfig can
be simplified:

--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -306,3 +306,2 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_PIIX4_POWEROFF=y
 CONFIG_POWER_RESET_SYSCON=y

But maybe we don't care, I don't know.