From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752984AbbJMSQU (ORCPT ); Tue, 13 Oct 2015 14:16:20 -0400 Received: from mail-bn1on0085.outbound.protection.outlook.com ([157.56.110.85]:52230 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752159AbbJMSQR (ORCPT ); Tue, 13 Oct 2015 14:16:17 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NW682X-07-4CD-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , , CC: , , Subject: [PATCH] x86/amd_nb: Rename amd_get_node_id Date: Tue, 13 Oct 2015 08:19:54 -0500 Message-ID: <1444742394-3974-1-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(5007970100001)(189998001)(47776003)(229853001)(48376002)(50466002)(101416001)(5001770100001)(97736004)(5008740100001)(5003600100002)(64706001)(92566002)(5003940100001)(87936001)(86362001)(19580405001)(50986999)(105586002)(77096005)(50226001)(11100500001)(106466001)(53416004)(46102003)(2201001)(19580395003)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR12MB0710;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;2:YyoY9wOlwpjLuCGfBoDtXzx9NiW7Tqag7W/mK2+3EJzSrOjtW5cbCBiZGYx3FrlUi4+OZnEJYeRtFKnZbIjhg4uk6z9mxmStSqUEkxjMvRBe6QWuRAZiXb394HN+ZVTHkHG4sZRNp31EQdpt2mp22C96WQdEOFs+Qgdbb/fpGwA=;3:+jloHC7UFc5dL4m2wEVOr9M6a6sNqDyDAE3CmMgaTiJb+LgMoReQi5ZDagAoes47JGnjtW7Vhkc9iMz626sKOYgUg05nfmmzTTJR1Ze028lz+LFNHN8CxswHKslpLfdGW2IAWnb9XYPmX1agbfxpjrIhk/gkh0ACIBT1HFz9EYzwgx7zzVyf7ret1X7V1O936odbbutRX9/p0ZDv0DM1aXS4oMqNJrEFlyXXPjrptSWH96BECFEwPEcmYAw5yqRy;25:lPhDzQxv/7GPvu5fn70Xl1LN/PLpV8PWdespOj5w34lNWT7jHmUiJYkb4UNKB7hLf8OhNjemt3xVgXhI9XgxAaUCq9/QG1w4neCzRaEjhR676ysscm691QMpxLAeHpzyF1mSFMji++WUPxowXJvMRTbZzja7W183hkln5/7Rghul81iKTES5WRB0PVBA9QgM/wlNNtoWvsCY6nwz9mi8XvZQHRvU9a4QPXoXhU+PSwWNxrDGKeMPY0k95MErHmZu9ihXR6ulhOycpGlD7/BLDA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0710; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;20:hvqbp+QDsXeUxdFXFsrhW0HQ3e24KJdYorHJlS3h9uVEcKcpLBhBdokhO0/qLkfR6IhDcv6JTEyzvm+pq18wmsErYke+RYU5Y7ov+zeMq4Nts732Wr2vy8Pp7TesPZwFSBS2rVsEZ6RT7DE2PeChVw26apkSRjgmZn5UEw8tO+ZgFF76immX7JXwItElgQi8dWM8yjojYtKiYGbhdPemwvavfx/hMqjW/E0Shia/YNZTJWqKPqll/gs6XfZXeaTuFJwOv3UwapacF7GB/YqAVOtfzKD8pVTylQDr8xJhKGC3olrKO0UgGvU/nb1QfkIlrENeUN3BBImF+/pPwBvcQRVvzFKqEpgKn6CtgwUxmG+AJPghmP62aR7svvgFp/H9fbmLo0a3I7GQazsx1Klc/3eIIoIUfQVRW389YoP2hT+VNw3eul0UtOeOpGIhnhi/g3rCUa5hevQsxIksbEi6J0z4VfWukmS3Z14kgrbqgMdbJhb0NRlU76FGFO2R24vB;4:umaCviBv7/jar+KlXNkeIH8ysmltTy2tV8IJGI9ScKV/LVCXPDzx8qTH+kjWnfeKgxJPebg9ylns46Ym2yLaacpdkVt/XSt0caT8CBQ6aGr0uVU9GPag+aSaDY03f52LaFLmCYcN2ij+TwXF6S0v8VJN57ahZHe24UJYLLNDFIyO1Rxhm3Ow7SQnaf39WSpjeJjQ2zyiQkMUwxM6oNIA1gwHwXxsFCM8Hsn42Z5ua4Sjt8dI/lsWY2cp+wJCpJoBo3KVOaUcOhER+tjcJkDph7OrT2bRZvihALw3a28I/tLtSek/ADscXgKZV06zxYbleL8aK9vwgylmm+0UIQPlv/Sp9w/uJuF2YKfVV4p7htE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001);SRVR:BY2PR12MB0710;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0710; X-Forefront-PRVS: 07283408BE X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;23:9rOM7dB9odW8nLF3lO1D/avtxPS8cht9lTCa2D700gKqC4Cx1XzdKi53FB5vILlFGzDjAgoSvj9utkE94PSCT/oYrba1YDiSW732Q9ud4PKvNFYmaXCj1ITP7bHR6FNuXMYdCBeFixzVZ2CQRiulMC6LZFfhLPnILktKD0PMs5z5vpSxw4t4EOLXl0gJydIbE7gPDiQ6b9O2soOIQ2aZ08x9mt24Yna95gWSlTJhSZSPlGEJsyjnKxuCoDF+hEStJ8Sq4E6/eEpSX+TV9xPbD+UkGyKw9i6+UGA2nDjG03ouNTYfm+bI7WKUwQBZ6o3ICZbu18lCMYAmM2wTMjKGOsS/cKQikY9VW99DCmwciWoTIXpJEhO3DedyIUyGERtYc+ZVI+nK5jkewW27J4KCi2LsZ45PajgcGdGRAssDesjiZ9y5AAYLYqU0yCki6F5sAZrdzVRE++oHz7c+yTfpLHTigvoF6sg3AA4YoSSPG3f+CEMY7cRYJNfxdv6/6bZJLutmo+hcRu7I3j3tyz4873KQGc6vZXTE7Nz9NiqozaojNZtgEUh9uTM888K5JV7jkwEVYyvR0tEuYPjG77kZUlxVYIbCHmy7Xvjg/B5dHYpwXP2OAAEa2sKjfbsFFM2OV/d4QkyLlT6seX206PEfRbqZNtFI2XXdVNIcj0ula2ONH+na5pBuN7w9YeeiwMXRqXpVq5wYsFFTzMfWjMnV5b5FdByfVyJo/D716rKRHAgI+bRomGnYo98HFJV9gikBDmRRuBrqYd0JcIt7Ox5LahzUQ7dDtty6tW2JJ/c/rh8uIjjqJc1/nV9mip6ZDqdsdJFEOLRMVRM/JElqOP+UPjWeT5qIIrkw1PCIkDqqjtLD4RnqINO8bn6vKKdelQ6Lp/+EFU9N1Rnusw1aCU845xZeEevefrd3D6eQhYFutok= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;5:nnsmeyAVwaa/QCSla45Q/5ENouX7MOOLJwIIvdhpl3Q7N40In7gW7QjEoDSPPkIi2dUq4utSNwMuAWeZDuMImQk5DntkVv1cBhsjGvelKGB/i1vIBo6frMdpX0ZXGPwzKHco67jHGGEHSVvq/mTKzQ==;24:Tefu3EL1IQAdXd310SXTrz0Z/sWK3TdgRBl4TQ2eiqpc58Q6u4AX8zj8f52qddjnapX9inTiP2ChdtNAa2rjId3TFsmiOQQIxq4I1F9/EJM=;20:tKA/fOJSIxMm4yEQXhj9gle/VbGGKRuvKWfSiGkAb8eCaPPZJs+Y+x+dnLx+3V/nsjmQn76zE1Nyg7DzmV+VWvsAnQUvEnU7aG0KsEI3UJCsd4bOwXf/k5bMNldh9ab85S/BnqDRtUwS/tZCoNxCCDUSmxfBVJAAxTrTGcDeggfMsTU77cmlKsWjze/sUdt3zbbUnAjOQcOSW9vW+WbBqKomNUvsLd8/uEakbuCs0Aw9qgu2mfAvO9CGSmXAUNQO SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2015 18:16:11.3935 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0710 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function doesn't give us the "Node ID" as the function name suggests. Rather- it receives a PCI device as argument, checks the available F3 PCI device IDs in the system and returns the index of the matching Bus/Device IDs Renaming it accordingly in this patch. No functional change is introduced. Signed-off-by: Aravind Gopalakrishnan --- arch/x86/include/asm/amd_nb.h | 2 +- drivers/edac/amd64_edac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h index 1a5da2e..319843d 100644 --- a/arch/x86/include/asm/amd_nb.h +++ b/arch/x86/include/asm/amd_nb.h @@ -81,7 +81,7 @@ static inline struct amd_northbridge *node_to_amd_nb(int node) return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL; } -static inline u16 amd_get_node_id(struct pci_dev *pdev) +static inline u16 amd_get_node_id_from_pci_dev(struct pci_dev *pdev) { struct pci_dev *misc; int i; diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 73aea40..896cf1f 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2770,7 +2770,7 @@ static int init_one_instance(struct pci_dev *F2) struct mem_ctl_info *mci = NULL; struct edac_mc_layer layers[2]; int err = 0, ret; - u16 nid = amd_get_node_id(F2); + u16 nid = amd_get_node_id_from_pci_dev(F2); ret = -ENOMEM; pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL); @@ -2860,7 +2860,7 @@ err_ret: static int probe_one_instance(struct pci_dev *pdev, const struct pci_device_id *mc_type) { - u16 nid = amd_get_node_id(pdev); + u16 nid = amd_get_node_id_from_pci_dev(pdev); struct pci_dev *F3 = node_to_amd_nb(nid)->misc; struct ecc_settings *s; int ret = 0; @@ -2910,7 +2910,7 @@ static void remove_one_instance(struct pci_dev *pdev) { struct mem_ctl_info *mci; struct amd64_pvt *pvt; - u16 nid = amd_get_node_id(pdev); + u16 nid = amd_get_node_id_from_pci_dev(pdev); struct pci_dev *F3 = node_to_amd_nb(nid)->misc; struct ecc_settings *s = ecc_stngs[nid]; -- 2.5.0