Skip to contentSkip to conversation

PCI: PM: Switch to new Intel CPU model defines

PATCH RESEND Applied Tony Luck 2 participants 2 messages Jun 11, 2024 PCI

v6 of 8 Applied Latest is v8 →

lore
Share & tools
lore

Tony Luck

author
#0 lore raw

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

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

---

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(-)
drivers/pci/pci-mid.c +2 -2
index fbfd78127123..bed9f0755271 100644
@@ -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),
 	{}
 };
 
Signature · 1 line
2.45.0
#1 lore raw
Quoted 8 lines · Tony Luck

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

---

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.

Quoted 21 lines
 drivers/pci/pci-mid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-mid.c +2 -2
index fbfd78127123..bed9f0755271 100644
@@ -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),
 	{}
 };
 
Signature · 1 line
2.45.0