[PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c

[PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c

[Tony Luck]

New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 drivers/pci/pci-mid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c
index fbfd78127123..bed9f0755271 100644
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
  * arch/x86/platform/intel-mid/pwr.c.
  */
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL),
-	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL),
+	X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL),
+	X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL),
 	{}
 };
 
-- 
2.44.0

Re: [PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c

[Bjorn Helgaas]

[+cc Andy]

On Tue, Apr 16, 2024 at 02:22:19PM -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

Possibly consider updating subject line with a hint about what
"update" refers to, since every commit is an update.  I guess "vfm" is
some kind of a hint, but I don't know what it means.  I suppose it is
for "vendor, family, model".

> ---
>  drivers/pci/pci-mid.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c
> index fbfd78127123..bed9f0755271 100644
> --- a/drivers/pci/pci-mid.c
> +++ b/drivers/pci/pci-mid.c
> @@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
>   * arch/x86/platform/intel-mid/pwr.c.
>   */
>  static const struct x86_cpu_id lpss_cpu_ids[] = {
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL),
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL),
> +	X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL),
> +	X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL),
>  	{}
>  };
>  
> -- 
> 2.44.0
> 

RE: [PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c

[Luck, Tony]

> > New CPU #defines encode vendor and family as well as model.
> >
> > Signed-off-by: Tony Luck <tony.luck@intel.com>
>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>

Thanks. You win the medal for the fastest turnaround!

> Possibly consider updating subject line with a hint about what
> "update" refers to, since every commit is an update.  I guess "vfm" is
> some kind of a hint, but I don't know what it means.  I suppose it is
> for "vendor, family, model".

Yes. vfm is indeed vendor-family-model.  Agreed the commit comment
is lacking details without the context of the cover letter and the other
patches in this series.

-Tony

Re: [PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c

[Andy Shevchenko]

On Tue, Apr 16, 2024 at 09:51:43PM +0000, Luck, Tony wrote:

...

> > I guess "vfm" is
> > some kind of a hint, but I don't know what it means.  I suppose it is
> > for "vendor, family, model".
> 
> Yes. vfm is indeed vendor-family-model.  Agreed the commit comment
> is lacking details without the context of the cover letter and the other
> patches in this series.

You see, TLAs are cryptic, that's why I internally proposed different naming.

-- 
With Best Regards,
Andy Shevchenko