From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 7 Nov 2018 12:42:53 -0800 From: "tip-bot for Woods, Brian" Message-ID: Cc: bp@suse.de, puwen@hygon.cn, linux@roeck-us.net, bhelgaas@google.com, clemens@ladisch.de, x86@kernel.org, linux-hwmon@vger.kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, qianyue.zj@alibaba-inc.com, jdelvare@suse.com, linux-pci@vger.kernel.org, brian.woods@amd.com, tglx@linutronix.de, hpa@zytor.com, Brian.Woods@amd.com, mingo@redhat.com Reply-To: linux@roeck-us.net, bhelgaas@google.com, bp@suse.de, puwen@hygon.cn, clemens@ladisch.de, mingo@kernel.org, linux-hwmon@vger.kernel.org, x86@kernel.org, qianyue.zj@alibaba-inc.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, brian.woods@amd.com, linux-pci@vger.kernel.org, jdelvare@suse.com, hpa@zytor.com, mingo@redhat.com, Brian.Woods@amd.com In-Reply-To: <20181106200754.60722-2-brian.woods@amd.com> References: <20181106200754.60722-2-brian.woods@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/amd-nb] hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: List-ID: Commit-ID: dedf7dce4cec5c0abe69f4fa6938d5100398220b Gitweb: https://git.kernel.org/tip/dedf7dce4cec5c0abe69f4fa6938d5100398220b Author: Woods, Brian AuthorDate: Tue, 6 Nov 2018 20:08:14 +0000 Committer: Borislav Petkov 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. Signed-off-by: Brian Woods Signed-off-by: Borislav Petkov Acked-by: Guenter Roeck CC: Bjorn Helgaas CC: Clemens Ladisch CC: "H. Peter Anvin" CC: Ingo Molnar CC: Jean Delvare CC: Jia Zhang CC: CC: CC: Pu Wen CC: Thomas Gleixner CC: x86-ml Link: http://lkml.kernel.org/r/20181106200754.60722-2-brian.woods@amd.com --- 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(-) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index a6eca647bc76..19d489ee2b1e 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -11,13 +11,12 @@ #include #include #include +#include #include #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. */ diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 2cef0c37ff6f..bc6871c8dd4e 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -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 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 69f0abe1ba1a..78d5cd29778a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -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