bring in some x86 PCI ids
This commit is contained in:
Laura Abbott
parent
b07dd9aa6f
commit
138f36aa16
|
|
@ -0,0 +1,92 @@
|
|||
From af4e1c5eca95bed1192d8dc45c8ed63aea2209e8 Mon Sep 17 00:00:00 2001
|
||||
From: Marcel Bocu <marcel.p.bocu@gmail.com>
|
||||
Date: Mon, 22 Jul 2019 20:45:10 +0300
|
||||
Subject: [PATCH] x86/amd_nb: Add PCI device IDs for family 17h, model 70h
|
||||
|
||||
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
|
||||
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Ingo Molnar <mingo@redhat.com>
|
||||
Cc: Borislav Petkov <bp@alien8.de>
|
||||
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
||||
Cc: x86@kernel.org
|
||||
Cc: "Woods, Brian" <Brian.Woods@amd.com>
|
||||
Cc: Clemens Ladisch <clemens@ladisch.de>
|
||||
Cc: Jean Delvare <jdelvare@suse.com>
|
||||
Cc: Guenter Roeck <linux@roeck-us.net>
|
||||
Cc: linux-hwmon@vger.kernel.org
|
||||
Link: https://lore.kernel.org/r/20190722174510.2179-1-marcel.p.bocu@gmail.com
|
||||
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
||||
---
|
||||
arch/x86/kernel/amd_nb.c | 3 +++
|
||||
include/linux/pci_ids.h | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
|
||||
index d63e63b7d1d9..251c795b4eb3 100644
|
||||
--- a/arch/x86/kernel/amd_nb.c
|
||||
+++ b/arch/x86/kernel/amd_nb.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464
|
||||
#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
|
||||
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
|
||||
+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
|
||||
|
||||
/* Protect the PCI config register pairs used for SMN and DF indirect access. */
|
||||
static DEFINE_MUTEX(smn_mutex);
|
||||
@@ -50,6 +51,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
|
||||
{}
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(amd_nb_misc_ids);
|
||||
@@ -63,6 +65,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
|
||||
{}
|
||||
};
|
||||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
|
||||
index c842735a4f45..4b97f427cc92 100644
|
||||
--- a/include/linux/pci_ids.h
|
||||
+++ b/include/linux/pci_ids.h
|
||||
@@ -548,6 +548,7 @@
|
||||
#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
|
||||
#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
|
||||
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
|
||||
+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
|
||||
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
|
||||
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
|
||||
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -584,6 +584,9 @@ Patch504: dwc3-fix.patch
|
|||
# https://patchwork.kernel.org/patch/11158395/
|
||||
Patch505: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch
|
||||
|
||||
# new ids
|
||||
Patch506: 0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue