The AMD Ryzen gen 3 processors came with a different PCI IDs for the function 3 & 4 which are used to access the SMN interface. The root PCI address however remained at the same address as the model 30h. Adding the F3/F4 PCI IDs respectively to the misc and link ids appear to be sufficient for k10temp, so let's add them and follow up on the patch if other functions need more tweaking. Vicki Pfau sent an identical patch after I checked that no-one had written this patch. I would have been happy about dropping my patch but unlike for his patch series, I had already Cc:ed the x86 people and they already reviewed the changes. Since Vicki has not answered to any email after his initial series, let's assume she is on vacation and let's avoid duplication of reviews from the maintainers and merge my series. To acknowledge Vicki's anteriority, I added her S-o-b to the patch. v2, suggested by Guenter Roeck and Brian Woods: - rename from 71h to 70h Signed-off-by: Vicki Pfau <vi@endrift.com> Signed-off-by: Marcel Bocu <marcel.p.bocu@gmail.com> Tested-by: Marcel Bocu <marcel.p.bocu@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Brian Woods <brian.woods@amd.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h
Unified · Split
| @@ -21,6 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 |
| 22 | 22 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec |
| 23 | 23 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 |
| 24 | +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 | |
| 24 | 25 | |
| 25 | 26 | /* Protect the PCI config register pairs used for SMN and DF indirect access. */ |
| 26 | 27 | static DEFINE_MUTEX(smn_mutex); |
| @@ -50,6 +51,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { · 23 unmodified lines | ||
| 50 | 51 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, |
| 51 | 52 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, |
| 52 | 53 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, |
| 54 | + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, | |
| 53 | 55 | {} |
| 54 | 56 | }; |
| 55 | 57 | EXPORT_SYMBOL_GPL(amd_nb_misc_ids); |
| @@ -63,6 +65,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { · 7 unmodified lines | ||
| 63 | 65 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, |
| 64 | 66 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, |
| 65 | 67 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, |
| 68 | + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, | |
| 66 | 69 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, |
| 67 | 70 | {} |
| 68 | 71 | }; |
| @@ -548,6 +548,7 @@ · 547 unmodified lines | ||
| 548 | 548 | #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 |
| 549 | 549 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb |
| 550 | 550 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 |
| 551 | +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 | |
| 551 | 552 | #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 |
| 552 | 553 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 |
| 553 | 554 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 |