From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753845AbbL3Sj5 (ORCPT ); Wed, 30 Dec 2015 13:39:57 -0500 Received: from mail-am1on0101.outbound.protection.outlook.com ([157.56.112.101]:27460 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751143AbbL3Sjz (ORCPT ); Wed, 30 Dec 2015 13:39:55 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=daniel@numascale.com; From: Daniel J Blueman To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" CC: Daniel J Blueman , , , Daniel Lezcano , Steffen Persvold , Linus Torvalds Subject: [PATCH] x86/urgent: Fix NumaConnect2 MMCFG PCI access Date: Thu, 31 Dec 2015 02:06:47 +0800 Message-ID: <1451498807-15920-1-git-send-email-daniel@numascale.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [175.156.137.47] X-ClientProxiedBy: DB3PR08CA0034.eurprd08.prod.outlook.com (25.161.51.172) To HE1PR07MB1436.eurprd07.prod.outlook.com (25.169.122.22) X-Microsoft-Exchange-Diagnostics: 1;HE1PR07MB1436;2:KQxbEQiqHAbdMma9azluiqDMMMmgZuXOcaYGInX66w39x2HvAGwCkXqIe9gUaMjDZ+Wtz6ffD4zQ2LKK7z1YrCJWZR/P25L+5+e7r8bCmT6fpPdPZL5tOeDk6jI2gmayRdjxmL51LWU0sMR+va88kA==;3:D2OZ2NWj6Q9QXt/PqWGS7xtzhfzM34t+5mC43aSVfgtPS7ElnRhJJftWMUdYXM/BCu2W4lLQW0271bCOc2sHCdrBx22KeI5jqPExGGSBCUBxppEzX9kX2K+MzPY7OMiC;25:KANAlM6f9Cde7AZRExchrqqxxYCZ23koMYhDiujwPKqUdO8+4UPlLF80dq0uDSqqXksT4bWX3HDHZwO7XtWsMO1MNhoiZ2zF+bGLdNkc3UNHkhVpgSVO2dgFkS5yQSSKgbWGXGJJcwBxC1CdWLBx3CU36x9ABxITx61xz1plhjLj/+GfxYC8JYaQT6uvIE3sRbP8JOwYdFShVSnhaVmLTe+bVrgo6dMTciwUewc6XolFds1s1VTOiDx+6NOZ1r28wGsRKt0XomC6kkRu0H0Q3A==;4:H5ZFy9ScaSAzVTFOO0RGwkvdySE10aWU2/VgLQN3ZTCda43FWrhIgwRy701+SbDIsdzngiHmh03MlhIYNmJ5TdPHj4cQ5OZJreGgwDZjZkRkp/Ludu92zWWJlmHxf/oReJ1fGBXqdqGPA5pVdFogIMFrl9iXCbc064j8o8Swr/DXsWfLnlq8l9V0D4moEwdz6onKYSCnXe50SebGVwNAbVX8HAzIyqvcOxwsZSsBgRoEwzfxIWAdBRelE5ze6p4o8ZhmHtsowuaSk6F+PBFmnNheondOgaOjCk5Pkwb+rB5OHSidzR/X+F813hpuEmg0uGo/nSvELv6qpAkojgbAHTgFUrSok/jfGOgoI5+iNi5u74tXr4vNQaCAyxef9VEb X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR07MB1436; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001);SRVR:HE1PR07MB1436;BCL:0;PCL:0;RULEID:;SRVR:HE1PR07MB1436; X-Forefront-PRVS: 08062C429B X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(189002)(199003)(101416001)(5001960100002)(5001770100001)(106356001)(77096005)(47776003)(92566002)(42186005)(66066001)(50466002)(19580405001)(4326007)(86362001)(81156007)(1096002)(586003)(189998001)(48376002)(6116002)(3846002)(97736004)(5008740100001)(5004730100002)(50986999)(122386002)(36756003)(19580395003)(229853001)(87976001)(33646002)(5003940100001)(218543002)(105586002)(40100003)(50226001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR07MB1436;H:exige.int.numascale.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR07MB1436;23:yL+0KuQDX76uAz7+PZDfwvrp/5Z2NHSG/KL2Obk6q?= =?us-ascii?Q?bwZDQeXFjwLO5d7mPb+UEYM7hWhPQTdCr7iPz9z8O6acigNMBoNkl+FBDqm8?= =?us-ascii?Q?/UxNUrteAhpGlqoCgzv7tePx0T/Qx2svnmfTrnFv5wXuu/DbViYXrHU1ciGO?= =?us-ascii?Q?lChJXpR2APNSDQAsM4Ee4nv/wdGhMs+n761ow7Wo1XeZz0TJztrrdbD+Hii4?= =?us-ascii?Q?5uykgbU650k4E/c8e4/pCTKapneQqJz1n5YHtIFWT0LScJ8bbK5Abbxcmuon?= =?us-ascii?Q?XjUrdxiAGxE0wHS7RJwNaKdVF1GL8fthqjzOa5ZdO57veMDg0LXJz82ANH5f?= =?us-ascii?Q?kySkFTVPfXv7MBRtTFecgmY30G8hTuR65dzBu01lC7CxFAT0qaA6dqn60Y/3?= =?us-ascii?Q?lpcBtw3Wdi6XukHxK6RWWQrgINOJqo4D8QLHRx796W/TmoAXlIfOdCKUfNrG?= =?us-ascii?Q?bz43QdO3hhudGQK8L0W/geBkQ7shVflngqJGq1qA/Go0VXdHzIQDbBvpqnEh?= =?us-ascii?Q?2qmJ04RVyaLHSoGa+84c7BzCIJqJ8TvAhUG/lQ+oCphkPp5CI3ePZA7lHNQt?= =?us-ascii?Q?58sYWInjRfhXw4Uc5Rvuog3cWQxZixEPVaFOKrRvdrikwiNah1Vbacb55fo1?= =?us-ascii?Q?KgrIv5TU/qNNYppVSyKcynI8zk1xruM2/wBSja6pC7jGHNAeD1ieLhKDv9gY?= =?us-ascii?Q?JQEaLpxXEJdJWb8V23tYH2LK4XnfelPBGAt20dqtDq5wxqBy3H9zwhUC+Ov1?= =?us-ascii?Q?ITYXgg67lU06LVtAWUhD73BwaboY1xkNNHMJ9oa9EuR9J3orD/YejBMObqzh?= =?us-ascii?Q?eAMi6UNn+BMVM9wersWHfK3z73gvNVyaj/6FCRibi964YAwXerBUXBf7173x?= =?us-ascii?Q?KWOID9RpmPyTwNk3vRFCi8FbkcVmALZP5LwP4rlRVcl98sQ2gJfjcZYSpwga?= =?us-ascii?Q?5vGvfa6lQWXdo4rRKOY8HWZKFjTC6NtJomP2BnMGmmT2ZGEiopA1N9G6fCGX?= =?us-ascii?Q?S3VCO7byupNmZK3Hx/FCopxgger7N7H2B0jvUWs0Q5Qso1GmfEZR84pmvb1d?= =?us-ascii?Q?6C43H4=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR07MB1436;5:93bkbq9lD/hHrAn/DFoA9+cbKLAVk1BZOpoFoNlCBHZgoZfolUFP+56EsnID4B0uxDszfiOA2xdqr2IgzHmOyGuxp5u8FGfOat9oAn2d/Wc1WVwxthJte4ljCWQgnngrdb7/U8Y7WnTpVAvelLZ72g==;24:fhoajRXcjK0YgWubvD+WVR7yFsu8EiPAUuannaRBrYhwx2P35CNAjFkzOrEU9eBT8P/vmkzzHyyXZkiktTOgOIztnY6c8UUO9wDO+3H4qcc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: numascale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2015 18:07:24.7910 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB1436 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The MMCFG PCI accessors weren't being setup for NumacConnect2 correctly due to over-early assignment; this would create the potential for the wrong PCI domain to be accessed. Fix this by using the correct arch-specific PCI init function. Signed-off-by: Daniel J Blueman Acked-by: Steffen Persvold --- arch/x86/kernel/apic/apic_numachip.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index 38dd5ef..2bd2292 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -193,20 +193,17 @@ static int __init numachip_system_init(void) case 1: init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE); numachip_apic_icr_write = numachip1_apic_icr_write; - x86_init.pci.arch_init = pci_numachip_init; break; case 2: init_extra_mapping_uc(NUMACHIP2_LCSR_BASE, NUMACHIP2_LCSR_SIZE); numachip_apic_icr_write = numachip2_apic_icr_write; - - /* Use MCFG config cycles rather than locked CF8 cycles */ - raw_pci_ops = &pci_mmcfg; break; default: return 0; } x86_cpuinit.fixup_cpu_id = fixup_cpu_id; + x86_init.pci.arch_init = pci_numachip_init; return 0; } -- 2.5.0