From nobody Fri Jan 2 11:57:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52B59CDB46E for ; Thu, 12 Oct 2023 03:27:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376825AbjJLD1T (ORCPT ); Wed, 11 Oct 2023 23:27:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234050AbjJLD1S (ORCPT ); Wed, 11 Oct 2023 23:27:18 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCA46A4 for ; Wed, 11 Oct 2023 20:27:15 -0700 (PDT) X-UUID: 8082050961664414ac8c087896282905-20231012 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.32,REQID:10d5f7a9-3d12-473a-8444-bd7c2cb1cc91,IP:5,U RL:25,TC:0,Content:-25,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,A CTION:release,TS:15 X-CID-INFO: VERSION:1.1.32,REQID:10d5f7a9-3d12-473a-8444-bd7c2cb1cc91,IP:5,URL :25,TC:0,Content:-25,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:15 X-CID-META: VersionHash:5f78ec9,CLOUDID:f5b6b1f0-9a6e-4c39-b73e-f2bc08ca3dc5,B ulkID:2310121127047JV2J5CC,BulkQuantity:0,Recheck:0,SF:24|17|19|44|66|38|1 02,TC:nil,Content:0,EDM:5,IP:-2,URL:11|1,File:nil,Bulk:nil,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_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_ULN, TF_CID_SPAM_SNR X-UUID: 8082050961664414ac8c087896282905-20231012 X-User: yaolu@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1332845596; Thu, 12 Oct 2023 11:27:02 +0800 From: Lu Yao To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, rdunlap@infradead.org, lkp@intel.com, Lu Yao Subject: [PATCH v3] x86/msi: Fix compile error caused by GENERIC_MSI_IRQ and X86_LOCAL_APIC Date: Thu, 12 Oct 2023 11:26:59 +0800 Message-Id: <20231012032659.323251-1-yaolu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231011055749.98840-1-yaolu@kylinos.cn> References: <20231011055749.98840-1-yaolu@kylinos.cn> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: =E2=80=98x86_vector_domain=E2=80=99= undeclared arch/x86/kernel/hpet.c:600:9: error: implicit declaration of function =E2=80=98init_irq_alloc_info=E2=80=99 This is because 'x86_vector_domain' is defined in 'kernel/apic/vector.c' which is compiled only when 'X86_LOCAL_APIC' is enabled. Besides, function 'msi_domain_set_affinity' is defined in 'include/linux/msi.h' which depends on 'GENERIC_MSI_IRQ'. So use 'X86_LOCAL_APIC' and 'GENERIC_MSI_IRQ' to expose these code. Tested-by: Randy Dunlap Signed-off-by: Lu Yao Reported-by: kernel test robot --- Change from v2: * Fix arch/x86/kernel/hpet.c compiled error when enable 'X86_LOCAL_APIC' 'HPET_TIMER' but disable 'GENERIC_MSI_IRQ'. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202310120849.zrfrI44Z-lkp@int= el.com/ v2: https://patchew.org/linux/20231011055749.98840-1-yaolu@kylinos.cn/ Change from v1: * Fix arch/x86/kernel/hpet.c compiled error when enable 'X86_LOCAL_APIC' 'GENERIC_MSI_IRQ' 'HPET_TIMER' 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 =20 -#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 =20 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 */ =20 /* Statistics */ extern atomic_t irq_err_count; diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 1648aa0204d9..41eecf180b7f 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; =20 -#ifdef CONFIG_GENERIC_MSI_IRQ +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_GENERIC_MSI_IRQ) 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(stru= ct hpet_channel *hc) /* * HPET MSI Support */ -#ifdef CONFIG_GENERIC_MSI_IRQ +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_GENERIC_MSI_IRQ) static void hpet_msi_unmask(struct irq_data *data) { struct hpet_channel *hc =3D irq_data_get_irq_handler_data(data); --=20 2.25.1