2024-06-11 17:35:41

by Luck, Tony

Subject: [PATCH v6 12/49 RESEND] PCI: PM: Switch to new Intel CPU model defines

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

Signed-off-by: Tony Luck <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
---

Bjorn: You acked this. Are you planning to apply it this cycle? It
hasn't shown up in linux-next yet.

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.45.0

2024-06-11 19:13:14

by Bjorn Helgaas

Subject: Re: [PATCH v6 12/49 RESEND] PCI: PM: Switch to new Intel CPU model defines

On Tue, Jun 11, 2024 at 10:28:16AM -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <[email protected]>
> Acked-by: Bjorn Helgaas <[email protected]>
> ---
>
> Bjorn: You acked this. Are you planning to apply it this cycle? It
> hasn't shown up in linux-next yet.

I acked it because I assumed you were going to merge the whole series
together, sorry for the miscommunication.

I put it on pci/misc for v6.11.

> 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.45.0
>