From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753657AbbL3SV6 (ORCPT ); Wed, 30 Dec 2015 13:21:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45940 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750814AbbL3SVz (ORCPT ); Wed, 30 Dec 2015 13:21:55 -0500 Date: Wed, 30 Dec 2015 10:21:40 -0800 From: tip-bot for Daniel J Blueman Message-ID: Cc: sp@numascale.com, linux-kernel@vger.kernel.org, mingo@kernel.org, daniel.lezcano@linaro.org, daniel@numascale.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org Reply-To: hpa@zytor.com, daniel@numascale.com, daniel.lezcano@linaro.org, linux-kernel@vger.kernel.org, sp@numascale.com, mingo@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1451498807-15920-1-git-send-email-daniel@numascale.com> References: <1451498807-15920-1-git-send-email-daniel@numascale.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/numachip: Fix NumaConnect2 MMCFG PCI access Git-Commit-ID: dd7a5ab495019d424c2b0747892eb2e38a052ba5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd7a5ab495019d424c2b0747892eb2e38a052ba5 Gitweb: http://git.kernel.org/tip/dd7a5ab495019d424c2b0747892eb2e38a052ba5 Author: Daniel J Blueman AuthorDate: Thu, 31 Dec 2015 02:06:47 +0800 Committer: Thomas Gleixner CommitDate: Wed, 30 Dec 2015 19:19:03 +0100 x86/numachip: Fix NumaConnect2 MMCFG PCI access 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 Cc: Daniel Lezcano Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1451498807-15920-1-git-send-email-daniel@numascale.com Signed-off-by: Thomas Gleixner --- 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; }