From patchwork Thu May 9 19:23:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Naru, Kim" X-Patchwork-Id: 1099837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="CqD5gsmO"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 453dcC5zV1z9sMr; Wed, 15 May 2019 12:22:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hQjYY-0002EF-3F; Wed, 15 May 2019 02:22:10 +0000 Received: from mail-eopbgr810053.outbound.protection.outlook.com ([40.107.81.53] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hOoe9-00028W-3Z for kernel-team@lists.ubuntu.com; Thu, 09 May 2019 19:24:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YEE8TrvgWX+7NyvytdU1gI/eilSlu387Oj77KuAiACg=; b=CqD5gsmOfw4aChQRQ7TVmsDOMLmN352rH/PuAWjPe7yjHpcPx15Zg8HQcGNHxUA2/2TMFMi7hosjUPV0J0SSrUlkKlJ1BzRM2IuqhSbMy+y4Gr+0DDi4OrJvYLGNtF3Wm5um7YvQzUAesh6pb2TOVih5j70eVXO7DINbwgmssf4= Received: from BYAPR12MB2662.namprd12.prod.outlook.com (20.176.255.215) by BYAPR12MB2951.namprd12.prod.outlook.com (20.179.91.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1878.22; Thu, 9 May 2019 19:23:55 +0000 Received: from BYAPR12MB2662.namprd12.prod.outlook.com ([fe80::903a:7fa4:3729:3b67]) by BYAPR12MB2662.namprd12.prod.outlook.com ([fe80::903a:7fa4:3729:3b67%3]) with mapi id 15.20.1878.019; Thu, 9 May 2019 19:23:55 +0000 From: "Naru, Kim" To: "kernel-team@lists.ubuntu.com" Subject: [Bionic][PATCH 1/5] hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs Thread-Topic: [Bionic][PATCH 1/5] hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs Thread-Index: AQHVBpy9Q/7F+4JJKU6T2hYtoTOWvg== Date: Thu, 9 May 2019 19:23:54 +0000 Message-ID: <20190509192345.5321-2-kim.naru@amd.com> References: <20190509192345.5321-1-kim.naru@amd.com> In-Reply-To: <20190509192345.5321-1-kim.naru@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [165.204.53.122] x-clientproxiedby: BYAPR05CA0097.namprd05.prod.outlook.com (2603:10b6:a03:e0::38) To BYAPR12MB2662.namprd12.prod.outlook.com (2603:10b6:a03:69::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Kim.Naru@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.21.0 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 46c8412c-c1ab-4e66-f705-08d6d4b3e034 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR12MB2951; x-ms-traffictypediagnostic: BYAPR12MB2951: x-ms-exchange-purlcount: 2 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:277; x-forefront-prvs: 003245E729 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(39860400002)(136003)(346002)(199004)(189003)(1076003)(86362001)(186003)(26005)(66446008)(66946007)(36756003)(66476007)(66556008)(966005)(66066001)(64756008)(478600001)(6486002)(4743002)(5660300002)(6916009)(6436002)(316002)(73956011)(6512007)(72206003)(14454004)(5640700003)(6306002)(7736002)(81166006)(25786009)(81156014)(8936002)(68736007)(50226002)(2501003)(256004)(53936002)(305945005)(14444005)(71190400001)(71200400001)(8676002)(102836004)(2906002)(52116002)(476003)(2616005)(446003)(486006)(11346002)(6116002)(3846002)(99286004)(76176011)(6506007)(386003)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2951; H:BYAPR12MB2662.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 1BJgdTvOxj1uA9x8BNPArqbnHaNtkjgIeQE3ulBG+sI7p9Dz+iO04oRP1CGSnmTxhw8EbhQIMPtPZC7ntq3tzHXDdNJ0Ad/IJKl2Lz/tIpuN8oRHrPkWqkHYfB90jmbyt9DMAygNiYSCxrNA6+ftZoe6X+733UJ+yUTCuaInVhwPqYVEMDiTjWTiHH3Yoh2tQjFglOB1XA5IbFJNNyuxPsPy301qIWm89UTDxTwKvyA3KWvwWriVC3zGeEJnY48w6WpxYia5P7jBQMohcTyg2fjtwkwdA2jDOE43LmWX9RMKO/be2sCYgcO9fyVo7Hw1SYMv18l+83RWc5hB8YhU93+d2TaJWcNZxkRbfIu/ZD6LsRTjrfifeYJ/ZgOtdbVntmqHnoxJnng5NIY1wIWQ8k1C0/alnAlSbqjoA5EP5Hs= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46c8412c-c1ab-4e66-f705-08d6d4b3e034 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2019 19:23:54.8074 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2951 X-Mailman-Approved-At: Wed, 15 May 2019 02:22:08 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1819485 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 (backported from commit dedf7dce4cec5c0abe69f4fa6938d5100398220b) 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 b481b95bd8f6..bf440af5ff9c 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 e97105ae4158..a2bf873a0a23 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 2e1bb0fc77df..e04577bbe414 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -538,6 +538,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