From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 464ECC10F14 for ; Thu, 3 Oct 2019 16:02:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11DA522459 for ; Thu, 3 Oct 2019 16:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118548; bh=/ysRQqNMeKecQLyftEsr3RWSE3M08IG9c29G8hT03sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qhthGdwo5oLq2Cp1Qs8pg3RpN/Gc4RE8Do0RHmJybsxNaAm90nU0w4Zpv+E4sd8Hk p3FyuywZvQmi18jX8m2PB855VfRQJyzXJvBfqcmrl7Lq4mMbJGxb3ZxMGtNFrAES4d Vd8LNvuocnFID8XOppX8Ia6G1u8FrSIH743LugEw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731989AbfJCQC1 (ORCPT ); Thu, 3 Oct 2019 12:02:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:47300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729597AbfJCQCZ (ORCPT ); Thu, 3 Oct 2019 12:02:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89570215EA; Thu, 3 Oct 2019 16:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118545; bh=/ysRQqNMeKecQLyftEsr3RWSE3M08IG9c29G8hT03sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=feBXWflt4AodduC0C7Ue43wkOG3+ziq36DGaNwhgDzWQNkNxJXxcqhqu5IgxdDrfg ctjXc8ZEswGGwSatvRDePx/xwy8+CYiHq247V+Nvrp1dvnAv9Al6EbiiX9QkcmaVra pRk+uHeCyW1NMHzqugL7bgzegef5CRbH8LTW5TBg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 4.9 050/129] x86/apic: Soft disable APIC before initializing it Date: Thu, 3 Oct 2019 17:52:53 +0200 Message-Id: <20191003154339.591386690@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Gleixner [ Upstream commit 2640da4cccf5cc613bf26f0998b9e340f4b5f69c ] If the APIC was already enabled on entry of setup_local_APIC() then disabling it soft via the SPIV register makes a lot of sense. That masks all LVT entries and brings it into a well defined state. Otherwise previously enabled LVTs which are not touched in the setup function stay unmasked and might surprise the just booting kernel. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20190722105219.068290579@linutronix.de Signed-off-by: Sasha Levin --- arch/x86/kernel/apic/apic.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 928ffdc21873c..232350519062b 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1303,6 +1303,14 @@ void setup_local_APIC(void) return; } + /* + * If this comes from kexec/kcrash the APIC might be enabled in + * SPIV. Soft disable it before doing further initialization. + */ + value = apic_read(APIC_SPIV); + value &= ~APIC_SPIV_APIC_ENABLED; + apic_write(APIC_SPIV, value); + #ifdef CONFIG_X86_32 /* Pound the ESR really hard over the head with a big hammer - mbligh */ if (lapic_is_integrated() && apic->disable_esr) { -- 2.20.1