RE: [PATCH v2 2/2] ata: ahci: Rename CONFIG_SATA_LPM_POLICY configuration item back

[Limonciello, Mario]

[Public]



> -----Original Message-----
> From: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> Sent: Tuesday, April 5, 2022 21:11
> To: Limonciello, Mario <Mario.Limonciello@xxxxxxx>
> Cc: open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers) <linux-
> ide@xxxxxxxxxxxxxxx>; open list <linux-kernel@xxxxxxxxxxxxxxx>;
> hdegoede@xxxxxxxxxx; Christoph Hellwig <hch@xxxxxxxxxxxxx>
> Subject: Re: [PATCH v2 2/2] ata: ahci: Rename CONFIG_SATA_LPM_POLICY
> configuration item back
> 
> On 4/5/22 05:02, Mario Limonciello wrote:
> > CONFIG_SATA_LPM_MOBILE_POLICY was renamed to
> CONFIG_SATA_LPM_POLICY in
> > commit 4dd4d3deb502 ("ata: ahci: Rename
> CONFIG_SATA_LPM_MOBILE_POLICY
> > configuration item").
> >
> > This caused some pain as users would invisibly lose configuration policy
> > defaults when they built the new kernel.  To help alleviate that, switch
> > back to the old name (even if it's wrong).
> >
> > Suggested-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
> > Suggested-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> > Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
> 
> I applied this manually as the "default 3" is from the first patch,
> which is for 5.19. This one is queued in for-5.18-fixes now. Thanks.

Ah I didn't realize you were not going to put default 3 in 5.18, otherwise I would
have re-ordered them.  Sorry.

Which branch did you push what you've applied so far to?
I checked libata/for-next and libata/for-5.19 and didn't see anything yet.

As most of my patches recently touch the same code want to me make sure
any more follow ups work from the right base.
 
> 
> > ---
> > v1->v2:
> >   * New patch
> >   drivers/ata/Kconfig | 6 ++++--
> >   drivers/ata/ahci.c  | 2 +-
> >   drivers/ata/ahci.h  | 2 +-
> >   3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> > index 3ffe14057ed2..c3194b80c655 100644
> > --- a/drivers/ata/Kconfig
> > +++ b/drivers/ata/Kconfig
> > @@ -115,14 +115,16 @@ config SATA_AHCI
> >
> >   	  If unsure, say N.
> >
> > -config SATA_LPM_POLICY
> > +config SATA_MOBILE_LPM_POLICY
> >   	int "Default SATA Link Power Management policy for low power
> chipsets"
> >   	range 0 4
> >   	default 3
> >   	depends on SATA_AHCI
> >   	help
> >   	  Select the Default SATA Link Power Management (LPM) policy to
> use
> > -	  for chipsets / "South Bridges" designated as supporting low power.
> > +	  for chipsets / "South Bridges" supporting low-power modes. Such
> > +	  chipsets are typically found on most laptops but desktops and
> > +	  servers now also widely use chipsets with low power modes
> support.
> >
> >   	  The value set has the following meanings:
> >   		0 => Keep firmware settings
> > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> > index 84456c05e845..397dfd27c90d 100644
> > --- a/drivers/ata/ahci.c
> > +++ b/drivers/ata/ahci.c
> > @@ -1595,7 +1595,7 @@ static int ahci_init_msi(struct pci_dev *pdev,
> unsigned int n_ports,
> >   static void ahci_update_initial_lpm_policy(struct ata_port *ap,
> >   					   struct ahci_host_priv *hpriv)
> >   {
> > -	int policy = CONFIG_SATA_LPM_POLICY;
> > +	int policy = CONFIG_SATA_MOBILE_LPM_POLICY;
> >
> >
> >   	/* Ignore processing for chipsets that don't use policy */
> > diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
> > index 6ead58c1b6e5..ad11a4c52fbe 100644
> > --- a/drivers/ata/ahci.h
> > +++ b/drivers/ata/ahci.h
> > @@ -236,7 +236,7 @@ enum {
> >   	AHCI_HFLAG_NO_WRITE_TO_RO	= (1 << 24), /* don't write to
> read
> >   							only registers */
> >   	AHCI_HFLAG_USE_LPM_POLICY	= (1 << 25), /* chipset that
> should use
> > -							SATA_LPM_POLICY
> > +
> 	SATA_MOBILE_LPM_POLICY
> >   							as default lpm_policy
> */
> >   	AHCI_HFLAG_SUSPEND_PHYS		= (1 << 26), /* handle PHYs
> during
> >   							suspend/resume */
> 
> 
> --
> Damien Le Moal
> Western Digital Research