From patchwork Wed Oct 11 05:57:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lu Yao X-Patchwork-Id: 151119 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp327591vqb; Tue, 10 Oct 2023 22:58:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfutRNWf3kcTJROBpaf7zDFgIgGKFaPQfT1+NBsSL37wCWBoV+fFqYFHJLDLD/tiFQ6iN7 X-Received: by 2002:a17:90a:2dc5:b0:27c:e2d5:abb6 with SMTP id q5-20020a17090a2dc500b0027ce2d5abb6mr4079029pjm.0.1697003913074; Tue, 10 Oct 2023 22:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697003913; cv=none; d=google.com; s=arc-20160816; b=YTE6Qo3sXBcZfQirGr9DWfRPhiihv/p3muNgzTRPQ9P5a3Hz2ZUGR+LV5RgTFpI+qt AakBkaTsn/dPewtPBVFTO9RDT1JZgsYgST4QJur+9G1xCXkAxy2KydQNy0bUa2LwhFFb 5ePIST7FCpt2hWZ8OIwHWGnpK8Qzqz60crNv1FiAQYYUvNaX1BXYQpFaXri2bG9LV05Q 0KrcgIV8RsGJL05D+4qfvkJ9VrwL+0maOf44CJQQlQ0zTmUidjSQo9zzsv8mPkEtVhhc l37dunJ9Hnsbh+MAN6VCFnPOSPifp9CABkjzRAAx8TcZjFGh17PXIIL7aAXmXc6fzHWF DgVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Yncb0X9AkLla4ex0ak7OinBBty6f3BXM/UMDu/YOP8M=; fh=Uli0oazh7oPSqtnKpDtEw09S0FipZl7wf9ittDApOrY=; b=sKDtrRPT2Cpu3NL+AXYI7vX42KVAMMKvOG1w0IpPsNeWt+qyURGzU+Vlv9RnOVUktG 7mPxbseRSJ/QaSN+PI6rRP4s2/fYIkRUtqewf+sMVD//RZKmU1GPQ0FhwLLMIG+WVHwr U56q+IhMdkCLhgE8L782/LQqZTAH+++ryd6jzvbLlP1ANGTpIbtq1foKBdODjUhr3DEg XjndL9ZMeZv596UaKUWpbmjMOgcQehRX85kTfYmeTlKBjsHAhaJpsAa4/AKEzuHqTBZD IbdSMTJ9gwXvFGOZDVOf6Fbb68CU4hdauTpWwi8uHFTfLfH9gf3IlrABxYdlcCFntRZs n4DQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id nv8-20020a17090b1b4800b0026c198d8182si16737771pjb.105.2023.10.10.22.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 22:58:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 787FE8079B23; Tue, 10 Oct 2023 22:58:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344240AbjJKF6Q (ORCPT + 19 others); Wed, 11 Oct 2023 01:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229968AbjJKF6P (ORCPT ); Wed, 11 Oct 2023 01:58:15 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 725568E for ; Tue, 10 Oct 2023 22:58:09 -0700 (PDT) X-UUID: f9ac824e9f20462685694ea3c5f6a613-20231011 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.32,REQID:d99964bf-05f0-4c51-9c6d-3ec5b34a12e5,IP:5,U RL:0,TC:0,Content:-25,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,AC TION:release,TS:-10 X-CID-INFO: VERSION:1.1.32,REQID:d99964bf-05f0-4c51-9c6d-3ec5b34a12e5,IP:5,URL :0,TC:0,Content:-25,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-10 X-CID-META: VersionHash:5f78ec9,CLOUDID:0252e514-4929-4845-9571-38c601e9c3c9,B ulkID:231011104149YJMBUFJ5,BulkQuantity:2,Recheck:0,SF:66|38|24|17|19|44|1 02,TC:nil,Content:0,EDM:5,IP:-2,URL:1,File:nil,Bulk:40,QS:nil,BEC:nil,COL: 0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_ULS,TF_CID_SPAM_SNR, TF_CID_SPAM_FAS X-UUID: f9ac824e9f20462685694ea3c5f6a613-20231011 X-User: yaolu@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1008634985; Wed, 11 Oct 2023 13:57:51 +0800 From: Lu Yao To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, rdunlap@infradead.org Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, Lu Yao Subject: [PATCH v2] x86/msi: Fix compile error caused by GENERIC_MSI_IRQ and X86_LOCAL_APIC Date: Wed, 11 Oct 2023 13:57:49 +0800 Message-Id: <20231011055749.98840-1-yaolu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231008082827.279154-1-yaolu@kylinos.cn> References: <20231008082827.279154-1-yaolu@kylinos.cn> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 10 Oct 2023 22:58:29 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779437575006491060 X-GMAIL-MSGID: 1779437575006491060 When compiling the x86 kernel, if X86_LOCAL_APIC is not enabled but GENERIC_MSI_IRQ is selected in '.config', the following compilation error will occur: include/linux/gpio/driver.h:38:19: error: field 'msiinfo' has incomplete type kernel/irq/msi.c:752:5: error: invalid use of incomplete typedef 'msi_alloc_info_t' {aka 'struct irq_alloc_info'} kernel/irq/msi.c:740:1: error: control reaches end of non-void function This is because file such as 'kernel/irq/msi.c' only depends on 'GENERIC_MSI_IRQ', and uses 'struct msi_alloc_info_t'. However, this struct depends on 'X86_LOCAL_APIC'. When enable 'GENERIC_MSI_IRQ' or 'X86_LOCAL_APIC' will select 'IRQ_DOMAIN_HIERARCHY', so exposing this struct using 'IRQ_DOMAIN_HIERARCHY' rather than 'X86_LOCAL_APIC'. Under the above conditions, if 'HPET_TIMER' is selected, the following compilation error will occur: arch/x86/kernel/hpet.c:550:13: error: ‘x86_vector_domain’ undeclared arch/x86/kernel/hpet.c:600:9: error: implicit declaration of function ‘init_irq_alloc_info’ This is because 'x86_vector_domain' is defined in 'kernel/apic/vector.c' which is compiled only when 'X86_LOCAL_APIC' is enabled. So use 'X86_LOCAL_APIC' to expose these code rather than 'GENERIC_MSI_IRQ'. Signed-off-by: Lu Yao Acked-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested --- Change from v1: * Fix arch/x86/kernel/hpet.c compiled error Thanks to Randy for the feedback. v1: https://lore.kernel.org/lkml/20231008082827.279154-1-yaolu@kylinos.cn/ --- arch/x86/include/asm/hw_irq.h | 6 +++--- arch/x86/kernel/hpet.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 551829884734..b02c3cd3c0f6 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -28,7 +28,7 @@ #include #include -#ifdef CONFIG_X86_LOCAL_APIC +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY struct irq_data; struct pci_dev; struct msi_desc; @@ -105,10 +105,10 @@ static inline void irq_complete_move(struct irq_cfg *c) { } #endif extern void apic_ack_edge(struct irq_data *data); -#else /* CONFIG_X86_LOCAL_APIC */ +#else /* CONFIG_IRQ_DOMAIN_HIERARCHY */ static inline void lock_vector_lock(void) {} static inline void unlock_vector_lock(void) {} -#endif /* CONFIG_X86_LOCAL_APIC */ +#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */ /* Statistics */ extern atomic_t irq_err_count; diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 1648aa0204d9..9904c0d46eba 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -52,7 +52,7 @@ unsigned long hpet_address; u8 hpet_blockid; /* OS timer block num */ bool hpet_msi_disable; -#ifdef CONFIG_GENERIC_MSI_IRQ +#ifdef CONFIG_X86_LOCAL_APIC static DEFINE_PER_CPU(struct hpet_channel *, cpu_hpet_channel); static struct irq_domain *hpet_domain; #endif @@ -469,7 +469,7 @@ static void __init hpet_legacy_clockevent_register(struct hpet_channel *hc) /* * HPET MSI Support */ -#ifdef CONFIG_GENERIC_MSI_IRQ +#ifdef CONFIG_X86_LOCAL_APIC static void hpet_msi_unmask(struct irq_data *data) { struct hpet_channel *hc = irq_data_get_irq_handler_data(data);