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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 3E42BC3A5A2 for ; Sun, 22 Sep 2019 19:38:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C2A02186A for ; Sun, 22 Sep 2019 19:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569181128; bh=unuKwpicSk29FKeSUfdYaEpXIULrQ/T9E4PrM81Rjt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1foOsGQNxZjaBqwotu3YCVqI6+Y8JDW8xKLgVF33CUPRthPPaBB6eDiZw0HCMLfgG I4y2uTko3ax0NQWxkm59tgW4qEj+qCvTuT46buCVmLTsfZVwb6zqvLoonkLx1CPDou lnjFeFUcmGhsBf0OQvDO8b52OcQf6s5U+aDh2ahI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389143AbfIVSpU (ORCPT ); Sun, 22 Sep 2019 14:45:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:40956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389127AbfIVSpT (ORCPT ); Sun, 22 Sep 2019 14:45:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 432FC21928; Sun, 22 Sep 2019 18:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177918; bh=unuKwpicSk29FKeSUfdYaEpXIULrQ/T9E4PrM81Rjt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJujqEl6i6ZyMs839k/CVh3MJoppZQWFJGksMBhcNrCZtWidRmcBc5ovG06MPhj/C EOOXPDNI2+kAuNdgm9eSP/gziIvak52SMeiAtEsAfqWrno4cGLAJ0S/iTQygbWiEJY BRlZYmUWGm1+c78bL3pkAbdATh0yR1/fqg/5PL2Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.3 031/203] x86/apic: Soft disable APIC before initializing it Date: Sun, 22 Sep 2019 14:40:57 -0400 Message-Id: <20190922184350.30563-31-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 436d462dde715..ad0d5ced82b30 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1583,6 +1583,14 @@ static 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