Update DF/SMN access and k10temp for AMD F17h M30h
Subsystems (4)
v2 cover Update DF/SMN access and k10temp for AMD F17h M30h
Updates the data fabric/system management network code needed to get k10temp working for M30h. Since there are now processors which have multiple roots per DF/SMN interface, there needs to some logic which skips N-1 root complexes per DF/SMN interface. This is because the root complexes per interface are redundant (as far as DF/SMN goes). These changes shouldn't effect past processors and, for F17h M0Xh, the mappings stay the same.
v1 -> v2:
* patch 3 & 4: add M30_DF_F3 straight to pci_ids.h to reduce churn
* patch 2:
- update commit msg and comment to explain root selection further
- move return if !misc_count under where misc_count is calculated
Brian Woods (4):
k10temp: x86/amd_nb: consolidate shared device IDs x86/amd_nb: add support for newer PCI topologies x86/amd_nb: add PCI device IDs for F17h M30h
hwmon: k10temp: add support for AMD F17h M30h CPUs
arch/x86/kernel/amd_nb.c | 53 ++++++++++++++++++++++++++++++++++++++++-------- drivers/hwmon/k10temp.c | 10 ++------- include/linux/pci_ids.h | 3 +++ 3 files changed, 50 insertions(+), 16 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/4 k10temp: x86/amd_nb: consolidate shared device IDs
Consolidate shared PCI_DEVICE_IDs that were scattered through k10temp and amd_nb, and move them into pci_ids.
--- arch/x86/kernel/amd_nb.c | 3 +-- drivers/hwmon/k10temp.c | 9 +-------- include/linux/pci_ids.h | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-)
arch/x86/kernel/amd_nb.c +1 -2
@@ -11,13 +11,12 @@#include <linux/errno.h> #include <linux/export.h> #include <linux/spinlock.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec/* Protect the PCI config register pairs used for SMN and DF indirect access. */
drivers/hwmon/k10temp.c +1 -8
@@ -23,6 +23,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #include <asm/processor.h>
@@ -41,14 +42,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3#endif -#ifndef PCI_DEVICE_ID_AMD_17H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 -#endif - -#ifndef PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb -#endif -/* CPUID function 0x80000001, ebx */ #define CPUID_PKGTYPE_MASK 0xf0000000#define CPUID_PKGTYPE_F 0x00000000
include/linux/pci_ids.h +2 -0
@@ -545,6 +545,8 @@#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584 +#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
Signature · 1 line
2.11.0
Re: [PATCH v2 1/4] k10temp: x86/amd_nb: consolidate shared device IDs
Quoted 4 lines · Brian
Consolidate shared
PCI_DEVICE_IDsthat were scattered through k10temp andamd_nb, and move them intopci_ids.Signed-off-by Brian Woods <[email protected]>
For hwmon:
Quoted 68 lines
--- arch/x86/kernel/amd_nb.c | 3 +-- drivers/hwmon/k10temp.c | 9 +-------- include/linux/pci_ids.h | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-)arch/x86/kernel/amd_nb.c +1
-2@@ -11,13 +11,12 @@#include <linux/errno.h> #include <linux/export.h> #include <linux/spinlock.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec/* Protect the PCI config register pairs used for SMN and DF indirect access. */ drivers/hwmon/k10temp.c +1
-8@@ -23,6 +23,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #include <asm/processor.h> @@ -41,14 +42,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3#endif -#ifndef PCI_DEVICE_ID_AMD_17H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 -#endif - -#ifndef PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb -#endif -/* CPUID function 0x80000001, ebx */ #define CPUID_PKGTYPE_MASK 0xf0000000#define CPUID_PKGTYPE_F 0x00000000include/linux/pci_ids.h +2
-0@@ -545,6 +545,8 @@#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584 +#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001Signature · 1 line
2.11.0
tip-bot for Woods, Brian
merge bot[tip:x86/amd-nb] hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs
In reply to Woods, Brianhwmon/k10temp, x86/amd_nb: Consolidate shared device IDs
Commit-ID: dedf7dce4cec5c0abe69f4fa6938d5100398220b Gitweb: https://git.kernel.org/tip/dedf7dce4cec5c0abe69f4fa6938d5100398220b Author: Woods, Brian <[email protected]> AuthorDate: Tue, 6 Nov 2018 20:08:14 +0000 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 7 Nov 2018 21:28:04 +0100
hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs
Consolidate shared PCI_DEVICE_IDs that were scattered through k10temp and amd_nb, and move them into pci_ids.
--- arch/x86/kernel/amd_nb.c | 3 +-- drivers/hwmon/k10temp.c | 9 +-------- include/linux/pci_ids.h | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-)
arch/x86/kernel/amd_nb.c +1 -2
@@ -11,13 +11,12 @@#include <linux/errno.h> #include <linux/export.h> #include <linux/spinlock.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec/* Protect the PCI config register pairs used for SMN and DF indirect access. */
drivers/hwmon/k10temp.c +1 -8
@@ -23,6 +23,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/pci_ids.h> #include <asm/amd_nb.h> #include <asm/processor.h>
@@ -41,14 +42,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3#endif -#ifndef PCI_DEVICE_ID_AMD_17H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 -#endif - -#ifndef PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb -#endif -/* CPUID function 0x80000001, ebx */ #define CPUID_PKGTYPE_MASK 0xf0000000#define CPUID_PKGTYPE_F 0x00000000
include/linux/pci_ids.h +2 -0
@@ -545,6 +545,8 @@#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584 +#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
PATCH v2 2/4 x86/amd_nb: add support for newer PCI topologies
In reply to Woods, BrianAdd support for new processors which have multiple PCI root complexes per data fabric/system management network interface. If there are (N) multiple PCI roots per DF/SMN interface, then the PCI roots are redundant (as far as SMN/DF access goes). For each DF/SMN interface:
map to the first available PCI root and skip the next N-1 PCI roots so the following DF/SMN interface get mapped to a correct PCI root.
Ex:
DF/SMN 0 -> 60
40 20 00 DF/SMN 1 -> e0 c0 a0 80
--- arch/x86/kernel/amd_nb.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-)
arch/x86/kernel/amd_nb.c +38 -6
@@ -213,7 +213,10 @@ int amd_cache_northbridges(void)const struct pci_device_id *root_ids = amd_root_ids;struct pci_dev *root, *misc, *link;struct amd_northbridge *nb; -u16 i =0 ; +u16 roots_per_misc =0 ; +u16 misc_count =0 ; +u16 root_count =0 ; +u16 i, j;if (amd_northbridges.num)return 0 ;
@@ -226,26 +229,55 @@ int amd_cache_northbridges(void) misc =NULL ;while ((misc =next_northbridge (misc, misc_ids)) !=NULL ) - i++; + misc_count++; -if (!i) +if (!misc_count)return -ENODEV ; - nb =kcalloc (i,sizeof (struct amd_northbridge ),GFP_KERNEL ); + root =NULL ; +while ((root =next_northbridge (root, root_ids)) !=NULL ) + root_count++; + +if (root_count) { + roots_per_misc = root_count / misc_count; + +/* +* There should be _exactly_ N roots for each DF/SMN +* interface. +*/ +if (!roots_per_misc || (root_count % roots_per_misc)) { +pr_info ("Unsupported AMD DF/PCI configuration found\n" ); +return -ENODEV ; + } + } + + nb =kcalloc (misc_count,sizeof (struct amd_northbridge ),GFP_KERNEL );if (!nb)return -ENOMEM ; amd_northbridges.nb = nb; - amd_northbridges.num = i; + amd_northbridges.num = misc_count; link = misc = root =NULL ; -for (i =0 ; i != amd_northbridges.num; i++) { +for (i =0 ; i < amd_northbridges.num; i++) {node_to_amd_nb (i)->root = root =next_northbridge (root, root_ids);node_to_amd_nb (i)->misc = misc =next_northbridge (misc, misc_ids);node_to_amd_nb (i)->link = link =next_northbridge (link, link_ids); + +/* +* If there are more PCI root devices than data fabric/ +* system management network interfaces, then the (N) +* PCI roots per DF/SMN interface are functionally the +* same (for DF/SMN access) and N-1 are redundant. N-1 +* PCI roots should be skipped per DF/SMN interface so +* the following DF/SMN interfaces get mapped to +* correct PCI roots. +*/ +for (j =1 ; j < roots_per_misc; j++) + root =next_northbridge (root, root_ids); }if (amd_gart_present ())
Signature · 1 line
2.11.0
tip-bot for Woods, Brian
merge bot[tip:x86/amd-nb] x86/amd_nb: Add support for newer PCI topologies
x86/amd_nb: Add support for newer PCI topologies
Commit-ID: 556e4c62baffa71e2045a298379db7e57dd47f3d Gitweb: https://git.kernel.org/tip/556e4c62baffa71e2045a298379db7e57dd47f3d Author: Woods, Brian <[email protected]> AuthorDate: Tue, 6 Nov 2018 20:08:16 +0000 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 7 Nov 2018 21:28:29 +0100
x86/amd_nb: Add support for newer PCI topologies
Add support for new processors which have multiple PCI root complexes per data fabric/system management network interface. If there are (N) multiple PCI roots per DF/SMN interface, then the PCI roots are redundant (as far as SMN/DF access goes). For each DF/SMN interface:
map to the first available PCI root and skip the next N-1 PCI roots so the following DF/SMN interface get mapped to a correct PCI root.
Ex:
DF/SMN 0 -> 60
40 20 00 DF/SMN 1 -> e0 c0 a0 80
--- arch/x86/kernel/amd_nb.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-)
arch/x86/kernel/amd_nb.c +38 -6
@@ -213,7 +213,10 @@ int amd_cache_northbridges(void)const struct pci_device_id *root_ids = amd_root_ids;struct pci_dev *root, *misc, *link;struct amd_northbridge *nb; -u16 i =0 ; +u16 roots_per_misc =0 ; +u16 misc_count =0 ; +u16 root_count =0 ; +u16 i, j;if (amd_northbridges.num)return 0 ;
@@ -226,26 +229,55 @@ int amd_cache_northbridges(void) misc =NULL ;while ((misc =next_northbridge (misc, misc_ids)) !=NULL ) - i++; + misc_count++; -if (!i) +if (!misc_count)return -ENODEV ; - nb =kcalloc (i,sizeof (struct amd_northbridge ),GFP_KERNEL ); + root =NULL ; +while ((root =next_northbridge (root, root_ids)) !=NULL ) + root_count++; + +if (root_count) { + roots_per_misc = root_count / misc_count; + +/* +* There should be _exactly_ N roots for each DF/SMN +* interface. +*/ +if (!roots_per_misc || (root_count % roots_per_misc)) { +pr_info ("Unsupported AMD DF/PCI configuration found\n" ); +return -ENODEV ; + } + } + + nb =kcalloc (misc_count,sizeof (struct amd_northbridge ),GFP_KERNEL );if (!nb)return -ENOMEM ; amd_northbridges.nb = nb; - amd_northbridges.num = i; + amd_northbridges.num = misc_count; link = misc = root =NULL ; -for (i =0 ; i != amd_northbridges.num; i++) { +for (i =0 ; i < amd_northbridges.num; i++) {node_to_amd_nb (i)->root = root =next_northbridge (root, root_ids);node_to_amd_nb (i)->misc = misc =next_northbridge (misc, misc_ids);node_to_amd_nb (i)->link = link =next_northbridge (link, link_ids); + +/* +* If there are more PCI root devices than data fabric/ +* system management network interfaces, then the (N) +* PCI roots per DF/SMN interface are functionally the +* same (for DF/SMN access) and N-1 are redundant. N-1 +* PCI roots should be skipped per DF/SMN interface so +* the following DF/SMN interfaces get mapped to +* correct PCI roots. +*/ +for (j =1 ; j < roots_per_misc; j++) + root =next_northbridge (root, root_ids); }if (amd_gart_present ())
PATCH v2 3/4 x86/amd_nb: add PCI device IDs for F17h M30h
In reply to Woods, BrianAdd the PCI device IDs for family 17h model 30h, since they are needed for accessing various registers via the data fabric/SMN interface.
--- arch/x86/kernel/amd_nb.c | 6 ++++++ include/linux/pci_ids.h | 1 + 2 files changed, 7 insertions(+)
arch/x86/kernel/amd_nb.c +6 -0
@@ -16,8 +16,10 @@#define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 +#define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480#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/* Protect the PCI config register pairs used for SMN and DF indirect access. */ static DEFINE_MUTEX (smn_mutex);
@@ -27,9 +29,11 @@ static u32 *flush_words;static const struct pci_device_id amd_root_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_ROOT ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_M10H_ROOT ) }, + {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_M30H_ROOT ) }, {} }; +#define PCI_DEVICE_ID_AMD_CNB17H_F4 0x1704const struct pci_device_id amd_nb_misc_ids[] = {
@@ -43,6 +47,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { 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) }, {} };
@@ -56,6 +61,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) }, { 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_CNB17H_F4) }, {} };
include/linux/pci_ids.h +1 -0
@@ -547,6 +547,7 @@#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584#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_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
Signature · 1 line
2.11.0
tip-bot for Woods, Brian
merge bot[tip:x86/amd-nb] x86/amd_nb: Add PCI device IDs for family 17h, model 30h
x86/amd_nb: Add PCI device IDs for family 17h, model 30h
Commit-ID: be3518a16ef270e3b030a6ae96055f83f51bd3dd Gitweb: https://git.kernel.org/tip/be3518a16ef270e3b030a6ae96055f83f51bd3dd Author: Woods, Brian <[email protected]> AuthorDate: Tue, 6 Nov 2018 20:08:18 +0000 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 7 Nov 2018 21:36:09 +0100
x86/amd_nb: Add PCI device IDs for family 17h, model 30h
Add the PCI device IDs for family 17h model 30h, since they are needed for accessing various registers via the data fabric/SMN interface.
--- arch/x86/kernel/amd_nb.c | 6 ++++++ include/linux/pci_ids.h | 1 + 2 files changed, 7 insertions(+)
arch/x86/kernel/amd_nb.c +6 -0
@@ -16,8 +16,10 @@#define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 +#define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480#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/* Protect the PCI config register pairs used for SMN and DF indirect access. */ static DEFINE_MUTEX (smn_mutex);
@@ -27,9 +29,11 @@ static u32 *flush_words;static const struct pci_device_id amd_root_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_ROOT ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_M10H_ROOT ) }, + {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_17H_M30H_ROOT ) }, {} }; +#define PCI_DEVICE_ID_AMD_CNB17H_F4 0x1704const struct pci_device_id amd_nb_misc_ids[] = {
@@ -43,6 +47,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { 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) }, {} };
@@ -56,6 +61,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) }, { 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_CNB17H_F4) }, {} };
include/linux/pci_ids.h +1 -0
@@ -547,6 +547,7 @@#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584#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_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
PATCH v2 4/4 hwmon: k10temp: add support for AMD F17h M30h CPUs
In reply to Woods, BrianAdd support for AMD family 17h model 30h processors for k10temp. Model 30h is functionally the same as model 01h processors (as far as k10temp is concerned), just the PCI device IDs need to be updated.
--- drivers/hwmon/k10temp.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/k10temp.c +1 -0
@@ -360,6 +360,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, {} };MODULE_DEVICE_TABLE (pci, k10temp_id_table);
Signature · 1 line
2.11.0
Re: [PATCH v2 4/4] hwmon: k10temp: add support for AMD F17h M30h CPUs
Quoted 5 lines · Brian
Add support for AMD family 17h model 30h processors for k10temp. Model 30h is functionally the same as model 01h processors (as far as k10temp is concerned), just the PCI device IDs need to be updated.
Signed-off-by Brian Woods <[email protected]>
Quoted 19 lines
--- drivers/hwmon/k10temp.c | 1 + 1 file changed, 1 insertion(+)drivers/hwmon/k10temp.c +1
-0@@ -360,6 +360,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, {} };MODULE_DEVICE_TABLE (pci, k10temp_id_table);Signature · 1 line
2.11.0
tip-bot for Woods, Brian
merge bot[tip:x86/amd-nb] hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs
In reply to Woods, Brianhwmon/k10temp: Add support for AMD family 17h, model 30h CPUs
Commit-ID: 210ba1201ff950b3d05bfd8fa5d47540cea393c0 Gitweb: https://git.kernel.org/tip/210ba1201ff950b3d05bfd8fa5d47540cea393c0 Author: Woods, Brian <[email protected]> AuthorDate: Tue, 6 Nov 2018 20:08:21 +0000 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 7 Nov 2018 21:39:13 +0100
hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs
Add support for AMD family 17h model 30h processors for k10temp. Model 30h is functionally the same as model 01h processors (as far as k10temp is concerned), just the PCI device IDs need to be updated.
--- drivers/hwmon/k10temp.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/k10temp.c +1 -0
@@ -360,6 +360,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, {} };MODULE_DEVICE_TABLE (pci, k10temp_id_table);