From patchwork Tue Aug 1 10:47:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2651400vqg; Tue, 1 Aug 2023 06:03:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlGWd2k9AD3IAzyVpjEHz1/0RBaZPKivUARW3/ThOWCd9DQdY2MqPa8+Otbc9m3aJcLyGMvA X-Received: by 2002:a05:6a20:7353:b0:137:bc72:9c08 with SMTP id v19-20020a056a20735300b00137bc729c08mr12833880pzc.16.1690894986535; Tue, 01 Aug 2023 06:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690894986; cv=none; d=google.com; s=arc-20160816; b=NXn0Us7iw7qqVnexBuo6owXytBiBdKdCyGENNtgdm7skpKKG8HuIpJLTh8jUlj3zKA T67YQ2Cpfc3rjd2/UXJzph8pENNJCu3Xt8/ji0m5IALcjDiow3iH97sL3SLbhTvDs0Sp zUaHpIegiYhY+GqZbha7D3XoiAJytgzHho9fraOHrzmjeOTIt0ojVF0wjXk9IFC7j1QP o84FltWe8LeMh2czQ1Tv6cLix01E+V3jjtNYulkLV4wr8FRyJtOvvBMq3sq3NWqoeiU8 Pg32ojH2T7XLkNZ472GOvdLW/z6Rbi1SD6GBLWKsEYTcZKbQFwEIhrqN5wHrLqlj+qJx r+cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=Q8bPz8OSR7Dw0div3KJHyiz5smjtpl0ETsImY01rMac=; fh=wMSvDXu8aIctG0BkLX/h/O+j330BBHOD6MPYFjhkfeU=; b=cgON1Jf+8V1DNmXrZzBCz2XUARigd74Vtt0HSBNk40hpB7+GfTWyqLf7vfU5j2QzEX VYpRNikh8xOHDyT4f3vSSACDdb6OmX3Q2PzLgnkDQ5TtM4gCxIDGYV+U60VFDxDdnW1X DcTn3Kwo8V5Aqkoh6O1IwRRTPQnJQFjLBsCEEMgHZQ4+XWggQDSUBAnfQ/Zqx/ntyIvp cjZENLDez0/Sc97byv5oAh5Ej+EpnZuH3vYb1Vars873t+kvgsPfzxC64HnYKe97kx0b /ZNWrXAoXDrDeq1OdjwX3hHbzuqf74TXvUsl3OhrXu/YDphMXhR1pegZxz4Kjwo03iz0 7V1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YxBqGI1i; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=38ETvICZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id by14-20020a056a00400e00b006862f5ac976si2044332pfb.379.2023.08.01.06.02.52; Tue, 01 Aug 2023 06:03:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YxBqGI1i; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=38ETvICZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234165AbjHAKvd (ORCPT + 99 others); Tue, 1 Aug 2023 06:51:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234227AbjHAKvD (ORCPT ); Tue, 1 Aug 2023 06:51:03 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A91A249D3 for ; Tue, 1 Aug 2023 03:48:43 -0700 (PDT) Message-ID: <20230801103817.996980460@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=Q8bPz8OSR7Dw0div3KJHyiz5smjtpl0ETsImY01rMac=; b=YxBqGI1i1OUJtBhM2j5Ghxb2h7CmNslx+ErwQHf2TTWhmdHDc6EVk0tQ04BVFAc2fa8D+m M8Ot1DFQFNOL3OBXPpJpSQOetpgLK0xbAQFl3GgqQTJ24bRKJzs4ct0zqM4xQiLIQUCNe+ QgCmPOZuGFCcxKlOx/h0QoGpfXng24GKNlnkVM9l/P3kEhdzOPpDZ2I5pV3HtnsL0YWNkK CInABts2J+ViQ8Lbv55wfUxMTKhX7OGovUNnNQdsacyJTpVhc7+FtiD9Kt54xqDXqy/hLm dKcBtP14BfmI3ax9a7K9EOoZken0vr/MAHWqpaUy3PLxavg9eHuXHNSQQmq0lQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=Q8bPz8OSR7Dw0div3KJHyiz5smjtpl0ETsImY01rMac=; b=38ETvICZ3PHedt8pZ667v+ToVqjm87wEQsWaFrWu9bPLMAN/c6ipdtNBwEJNEI2YsXviZ8 Y1qxF2E+UrrKqFCg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross , Michael Kelley , Peter Keresztes Schmidt Subject: [patch V3 52/60] x86/xen/apic: Use standard apic driver mechanism for Xen PV References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:47:45 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773031901573181578 X-GMAIL-MSGID: 1773031901573181578 Instead of setting the Xen PV apic driver very early during boot, just use the standard apic driver probing by setting an appropriate x86_init.irqs.intr_mode_init callback. At the same time eliminate xen_apic_check() which has never been used. The #ifdef CONFIG_X86_LOCAL_APIC around the call of xen_init_apic() can be removed, too, as CONFIG_XEN depends on CONFIG_X86_LOCAL_APIC. Signed-off-by: Juergen Gross Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/lkml/aa086365-fd02-210f-67c6-5c9175c0dfee@suse.com --- V3: New patch to address the XenPV fallout --- arch/x86/xen/apic.c | 11 ----------- arch/x86/xen/enlighten_pv.c | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -158,19 +158,8 @@ static struct apic xen_pv_apic = { .icr_write = xen_apic_icr_write, }; -static void __init xen_apic_check(void) -{ - apic_install_driver(&xen_pv_apic); -} - void __init xen_init_apic(void) { x86_apic_ops.io_apic_read = xen_io_apic_read; - /* On PV guests the APIC CPUID bit is disabled so none of the - * routines end up executing. */ - if (!xen_initial_domain()) - apic_install_driver(&xen_pv_apic); - - x86_platform.apic_post_init = xen_apic_check; } apic_driver(xen_pv_apic); --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1326,7 +1326,7 @@ asmlinkage __visible void __init xen_sta x86_init.resources.memory_setup = xen_memory_setup; x86_init.irqs.intr_mode_select = x86_init_noop; - x86_init.irqs.intr_mode_init = x86_init_noop; + x86_init.irqs.intr_mode_init = x86_64_probe_apic; x86_init.oem.arch_setup = xen_arch_setup; x86_init.oem.banner = xen_banner; x86_init.hyper.init_platform = xen_pv_init_platform; @@ -1366,12 +1366,10 @@ asmlinkage __visible void __init xen_sta xen_init_capabilities(); -#ifdef CONFIG_X86_LOCAL_APIC /* * set up the basic apic ops. */ xen_init_apic(); -#endif machine_ops = xen_machine_ops;