From patchwork Fri Dec 7 22:29:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 10718969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D7DE18B8 for ; Fri, 7 Dec 2018 22:29:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CB202F2E1 for ; Fri, 7 Dec 2018 22:29:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3124E2F2E3; Fri, 7 Dec 2018 22:29:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA6C72F2CF for ; Fri, 7 Dec 2018 22:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726101AbeLGW3h (ORCPT ); Fri, 7 Dec 2018 17:29:37 -0500 Received: from mail-eopbgr680065.outbound.protection.outlook.com ([40.107.68.65]:61568 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726065AbeLGW3h (ORCPT ); Fri, 7 Dec 2018 17:29:37 -0500 Received: from MWHPR19CA0074.namprd19.prod.outlook.com (2603:10b6:320:1f::12) by BN6PR19MB0929.namprd19.prod.outlook.com (2603:10b6:404:75::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.18; Fri, 7 Dec 2018 22:29:14 +0000 Received: from BN1AFFO11FD005.protection.gbl (2a01:111:f400:7c10::182) by MWHPR19CA0074.outlook.office365.com (2603:10b6:320:1f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.18 via Frontend Transport; Fri, 7 Dec 2018 22:29:14 +0000 Authentication-Results: spf=pass (sender IP is 208.19.99.221) smtp.mailfrom=microsemi.com; linux.vnet.ibm.com; dkim=none (message not signed) header.d=none;linux.vnet.ibm.com; dmarc=bestguesspass action=none header.from=microsemi.com; Received-SPF: Pass (protection.outlook.com: domain of microsemi.com designates 208.19.99.221 as permitted sender) receiver=protection.outlook.com; client-ip=208.19.99.221; helo=AUSMBX1.microsemi.net; Received: from AUSMBX1.microsemi.net (208.19.99.221) by BN1AFFO11FD005.mail.protection.outlook.com (10.58.52.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1404.13 via Frontend Transport; Fri, 7 Dec 2018 22:29:13 +0000 Received: from AUSMBX2.microsemi.net (10.201.34.32) by AUSMBX1.microsemi.net (10.201.34.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Fri, 7 Dec 2018 16:29:12 -0600 Received: from [127.0.1.1] (10.238.32.34) by ausmbx2.microsemi.net (10.201.34.32) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Fri, 7 Dec 2018 16:29:12 -0600 Subject: [PATCH 11/20] smartpqi: enhance numa node detection From: Don Brace To: , , , , , , , , , , , CC: Date: Fri, 7 Dec 2018 16:29:12 -0600 Message-ID: <154422175200.1218.8971234676113295433.stgit@brunhilda> In-Reply-To: <154422079293.1218.12539829857034151457.stgit@brunhilda> References: <154422079293.1218.12539829857034151457.stgit@brunhilda> User-Agent: StGit/0.19-dirty MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:208.19.99.221;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(7916004)(396003)(346002)(376002)(136003)(39860400002)(2980300002)(189003)(199004)(69596002)(76176011)(2486003)(305945005)(33896004)(186003)(23676004)(2201001)(2906002)(478600001)(47776003)(86362001)(575784001)(8936002)(8676002)(81156014)(103116003)(77096007)(26005)(97736004)(106466001)(5660300001)(81166006)(58126008)(230700001)(4326008)(33716001)(110136005)(106002)(50466002)(316002)(446003)(16576012)(44832011)(336012)(9686003)(68736007)(356004)(486006)(126002)(53936002)(11346002)(476003)(921003)(83996005)(2101003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR19MB0929;H:AUSMBX1.microsemi.net;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD005;1:eyhA5tIrBOExWStE54nz9Dy/d2iSxmi7sY+fwGmpKOKoMjJLi1HPAD4IkxlWmAdptvo3ph2fq81VzudCOK8z+h3ISCr12WLjuagmhwY4tD2pimeGzpdxvfIRBwaMQWgj X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bcc4aeee-60dd-42f8-7d21-08d65c936a98 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN6PR19MB0929; X-Microsoft-Exchange-Diagnostics: 1;BN6PR19MB0929;3:x15FTiKORJaMqKAkGnjQ2VI0abrNEEU4j0cPn5O8S7+Dd4Goi8dB6Hs54wrrei4xs1lqgqMY09/YvNQGXAw7FxZSgahc5rQwXesiFKfVIhFlc8h4pwfFrUjtYOiwy+ZUuCF9KoF+KUCbMyLjQOLkg4pbD9afDmhP4C14OltQgUNe7l9bBn7JKns9yGeib4z6YOU5vM67AhiW0n03/XS1xZ+5S57Ed1OZRa4Bv524CGTdVy3lQoLEPB7pROqqKIZ480ACOgoJ150GZCibPMK4D7VZvUKqtPY5bghAKGylg2YOGiaKXOIU5pQ1pb6k4yCjuUdFwSXJis5EJyJz+jkZr/ZYXy00c6yoRG0LZe6aobk=;25:VswoH4vjKmq5xNBxryJJ0g/p4wYom/+STDY5FkmRRrNT0jEgoXxroFy0NiKwkr7i+C2Vza+pA3kmHHrnK3lPSHVZhrMueeCuCEaybIcYVtpUwzSdBofnsIEx78lpV5EaeLBslg8355Mcx0XsyvfTEGO8Qcsifw4CSWP4AlvNVivIgvqzZBLvWNRKQsQlenDZ1Ckc1pkd7LgyL/JjiZ82XjRxYeGt/x8C9i9x96g90BAO9dAUrxhjrGR9twaGSr1+P/6jOrBdNK8JIRpXj5WSJlLBksolpMjXcUHdY7ZvlM+GmEuuLzlkfs/EC7Z8II6IGnxBTkq4/lsHAFnDXMm2Vw== X-MS-TrafficTypeDiagnostic: BN6PR19MB0929: X-Microsoft-Exchange-Diagnostics: 1;BN6PR19MB0929;31:zwpE/V7B3LInAIwy1539AYQEnoCTiRSmU54xz6n4NxIZKemPLIq8G+ULmm+YEdVyXkwZpi32Ui/LPYWUl1Kt5hV+hMZ7wvRayj6bpHFkkrShyckaKwVb87MkfWsmS+nO+zSd9sOSM7nxvp6W6J23OTxMudb11AKjRMuGgRoW8xyiybDQ6V3ZLV/SKteBpZcRjZ2wEKiUuCTdA/WqvhF/nzItbU5Tv5Xo9Gfgawsr9Vs=;20:b6X9MQD/agUdt+HSE07egL9hmUAwvlfMGMkRVg/wQRg/o/0JnMUrbzth/6AZPdXM338aduJXNSRFMKBwX3Fi2XLSU9nM3eJADhcXwn1BAoit5T2rTrjx2nZyr1OJRsuyaiEUtQCt6Hieva4EBXXhspxXnWBThc/p8qzcwNKU37JNL7ZPWCRtbyAkKAuN0SMy51loj4nibrLK15EvuqaVAxStN9Uu+ZvInRHBBd03IgT/94jbowzLirlOZCvRZZlu1/aWczjCKiAmW7xTTbyNxfSKpNPAhhDqebCdfdSFUHfuppkuDY5mPIo9gS01y8bkV3XpqbWEnZ4PoOm2oYb5U2LRUsOla0DK8iv9Eamt5/cxaSfiv32k9medJqHwDGUyhqQW5Nsr54jdkiqgOIw6G6+jCsCijPSmoxjH/o6rLpue01CKg1pMBF1bX+JUMp+ju4R5hRKxNwDP6lPfQdUcfqJXuKjsFvbWIMbO0an7rMfBYX/dracidANvvdZWROWU X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93004095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:BN6PR19MB0929;BCL:0;PCL:0;RULEID:;SRVR:BN6PR19MB0929; X-Microsoft-Exchange-Diagnostics: 1;BN6PR19MB0929;4:R3y1zDrtca3RP3XHolSLM/ZB4pj47qV7Frt3hior/KliAxJ/9SGjenjvDHnIISxDosCsG+370Yc62PbWBHIG32CRP7OwN7mSeaaHJiARtADvvgTw0hKCF6cgYdsQ1TPHJ33oHIFIBDLJZNMjs6HajnsLHlDp+Le3BjOozVe0Iqm/FHomo2cTMHkAGc0d38yB2D9xqxjRVukc4fm8/AidBdUp9eQRSo35hNP4kYffM9Bg2wNqjzT6W7wN0oN5GY2xUz5cV1bD/jSFQEedS7FbNA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN6PR19MB0929=3B23=3A0KRX1KO?= =?utf-8?q?3cvOs+hH/ByDEtvX6VISfI+Nh5uarFHKL5R6e9XUNSIeQ9fcqeFLx7CeaKU89OhhE?= =?utf-8?q?7K3N2YqmXJ6FubCWEqXYVtkk8+2uxbZzUGunPvzv1M/2cS6KQmVXR/2ZnQxVj3Hpl?= =?utf-8?q?l4h88EXIoMUk+8LfyKqEuzWPTBPXDvz0+tHT8fHBYe3sLirlu56+ZcLhe9zXbwin4?= =?utf-8?q?WTE+Ygox5+l25hZR72I7W9Ni24WPhCu4i2dp9VKTzUQ3+JuRIU5Hm6PiTyjqRFJJe?= =?utf-8?q?fYkjJe2O5x8WT4u02EkwDixiJPEiMrdEGzkkU9V71g35xpJERdDusM11fkUc0HFCy?= =?utf-8?q?x/UvusQirdUlPGNg4AoeCMTnP6wifivWS5bhl7iLddyjfocMkKRCEiENO3f/zwjJ7?= =?utf-8?q?ckd7A0clWq9AYi1iqn/64fzzZu2pBpYha0x6ykRjIL3gu2lvPwb+1qDBLwwT0sT9g?= =?utf-8?q?z4/DxZbSPBfqv9iLADkZWoYiET0jXIo+we+grV+YxJ95HTWszDvhVem6M1jZdaYwD?= =?utf-8?q?EIj0yWZxqZI2AVjPfNjSk3oWvvEqj3QJ5wJf//3qAsn1MCHdXl7b3N8C8a5kTEejK?= =?utf-8?q?/Ts6hnX9UwAxma87Zkj7bSiJuG2j+Nb7QcTpGmpHstewAYVgUgR2RG1SK3No/+BtX?= =?utf-8?q?zyyoRKk0utR5ozLAEgrijOTlDF1cJPuSgm5L9h9lIfanCmahLx4suva0LlziKKtvR?= =?utf-8?q?JF6N7dNarGI7YFlk+Rt3mORy9QsiGbZGk3HIDhn8U8eDyHUMWPBHJ0iP/GXZRoIut?= =?utf-8?q?rw7FIfCuF5rm8eKwkakiLV5vJ7lSqlxuXRYiOycjEzg6XbEMGtHBf9jFYvRXoAg6n?= =?utf-8?q?YG0LE9Vb7bpCXNKL7649ggv7IeIak/Ya9RmjZMGCtGl/zQiHFFd+E7phuRFeEdX2D?= =?utf-8?q?NBIo9hcCoPziCtdjPMvIKUaZ+9Et1taTNtW+ZTVkQaZafJX19EfeKLrjBa1PW3WTP?= =?utf-8?q?eu6G1RvNVeJls6Ds4hNpKNzuCGAtbMnoktd3R5Dfg2wRyFu26mRUQFyXsLUpmSnnN?= =?utf-8?q?p303UTrI+I116XCGFqyxXAAp7KHFz2dCbO9eYxBF9pBcXZx9IPtJqqBwAjVHu8MS3?= =?utf-8?q?KAPGP7TRrMUiq19ZuzLzgPCwilc3+j+9R9zKF0hOJ0le6croKc7BDmA8+p8aTdz1j?= =?utf-8?q?dzCiS+zWhcUOwlycgFa1j1Qfq0GBNOpxmTB+gYBMuH/ux1QPEp2wCQYa8Rupw=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: AjmI+jb4W6+SLHpafZK0QydPiz6VRbLxrntn6bjiIElOGo4U9NGz41VBvJd8TgO9l80jpbKJ+cfG0Cg3pgu1Hd49hznx9k0akKqKZTpRrtHwFBixyVMUyQ6PaVFwN0aDObIKchxOJ53VO3tPyo9bwOxELAO2efhfAQEUe+NTGcGmRd1UF3aeQBFFq21JxNCLGClYWZ/shUkNt6/xNO65SWR8EchzPzxVIHhEnF2msmrnLIB78Kbh2igx3XrJGtuKxKeoWMEsZPDXtFbBZeIMpndJWcGep8m+VIYcOaEXe4Em8qCPVecSgCXj4epr9WOmB033hLnuWzmLvs9IX5kKjn91wtngiuy8TXy3m/3mDMI= X-Microsoft-Exchange-Diagnostics: 1;BN6PR19MB0929;6:PdsIt4qjkuOc+CjzStUwgti/hMA18/uYF0W7bW6tYRZn55D4kHCHh4Tmih2FoVMn1Dt5hZM5iF5KkA95xgLyh2kgVewDkYKzIxRKVHuUmOa6s7lYaAEEhXbyeSUfrHo/KBNOfhqBfJzsPnHDpjhuAYtohKRlkl22rwFpSPhr4H1BupuGU71kcLjqpKvPfI+CQRRKUaC9To8zYgPd1ScM57OT1DKbaJA1eBsrCUZPCXU+KJl6PqjuqtzIzuXfNT0gfz7p2+EbzxgFnee4VSZqHiTyD5l0sbdbnr5Cn6RFKvqjoMOvvHFNTr1ZsiRAL26a6zaY0TOBOeXg/ol8vi/7WMOsddagPgdfSbmYBU5trHwrkHYSKAKbTaZRb/FcmYQKxsm9LO9iEsg4MYzfUNxhCjTlhZiqvcR+Ibp3CfIb1pCnhY5FJwI3yrt0V3WTNviG7YZJ7Lq5zUFmfjfZyGg3QA==;5:UuUfZvEAi+AMAJxTUetnAK0xi9slnECAILdeeA/+8WdZZzFRMt85GxGLwIW7XpOR0ZpFkwoeXVrEUHObYna1OugPUvsQa9Ax+0LSvNUjJkNlSm877O3T4OF/AVkOOIrrxurKB9H/O2GKcLY6uMkcLjoX8qh2OdpB479LEDXOO3s=;7:UgmbE1wprryibP6PDXBgLH51kmT3udUUr48IjnNaxDUFmvRoeMXSHYJBPYen91RXkIFploQDX3T2UaRLvMCua1s7PMDYgBa78rDIga6s1sbfS2+oPpmNJCLBWT3iczXDhoyKETomNO6vlZIMczyxBQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 22:29:13.6579 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bcc4aeee-60dd-42f8-7d21-08d65c936a98 X-MS-Exchange-CrossTenant-Id: f267a5c8-86d8-4cc9-af71-1fd2c67c8fad X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f267a5c8-86d8-4cc9-af71-1fd2c67c8fad;Ip=[208.19.99.221];Helo=[AUSMBX1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR19MB0929 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sagar Biradar - set pci_dev->dev to 0 only if the node is NO_NUMA_NODE. If not, do not reset the value but retain it. Reviewed-by: Murthy Bhat Reviewed-by: Mahesh Rajashekhara Reviewed-by: Dave Carroll Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Sagar Biradar Signed-off-by: Don Brace --- drivers/scsi/smartpqi/smartpqi_init.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index acde0abbbf43..a98b3de40c74 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -7131,7 +7131,7 @@ static int pqi_pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) { int rc; - int node; + int node, cp_node; struct pqi_ctrl_info *ctrl_info; pqi_print_ctrl_info(pci_dev, id); @@ -7149,8 +7149,12 @@ static int pqi_pci_probe(struct pci_dev *pci_dev, "controller device ID matched using wildcards\n"); node = dev_to_node(&pci_dev->dev); - if (node == NUMA_NO_NODE) - set_dev_node(&pci_dev->dev, 0); + if (node == NUMA_NO_NODE) { + cp_node = cpu_to_node(0); + if (cp_node == NUMA_NO_NODE) + cp_node = 0; + set_dev_node(&pci_dev->dev, cp_node); + } ctrl_info = pqi_alloc_ctrl_info(node); if (!ctrl_info) {