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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B59C4C77B73 for ; Tue, 6 Jun 2023 12:03:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:To:Subject:MIME-Version: Date:Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K0E+iJVdGoklCtaDc5Wzmrefu3sHXNCODjATZ6AVm/I=; b=noA8QyVdwAqmwMG703uBmh1bt/ Y3dT9fiDEQ2QH+6CSEJDW5oZG4PVTep/89p8axFHbG2sO4VXHQeY4ncFcOKSLxtICxuG8w+nhQ9/3 +O43mNmUiUDRpRHAdRo9ur/YfeXm149qbU+U1aJltLeWzJRpna2V/0oQSba62ObHbmKJL2ubcJhX1 qtilBrD2IsPqNoVbHALxed2RoMKIYwi2uiYZ9jnnCPJeVuRZhcuCTdL39+yK7pZl+J79lqVTQ3XOu qtqYzmluMRnad706t/eR988dQ6zbf/VFCInjIkpSiIr/057ZvVi4HTFQa0D8CYlpZZEyWO76xaBtz VVUt7Qhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6VOW-001XJz-2I; Tue, 06 Jun 2023 12:02:36 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6VOT-001XJJ-2F for linux-arm-kernel@lists.infradead.org; Tue, 06 Jun 2023 12:02:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686052951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/LlVGSMU8xy8zoX3LHb4hFyzoRssTlgWgYqnU+CC5I=; b=KP2E4FeYfevM3mdMPtesZsYS1xcSzspsZ/LgJr2uv+EZ+Vg1LSyJFfWMWE372wFqRjbhcU 1eg4uGBEArHsdZlbXVqczPjV/1PxLknFfuVZXeg/2nYr/I9VRsBS3fhEoKlb4xrat6qLaT Rncn5GqpISShO8BcUCkcOYGtYGfHz2o= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-DcXsNuqtM3qfU11v2W0smw-1; Tue, 06 Jun 2023 08:02:30 -0400 X-MC-Unique: DcXsNuqtM3qfU11v2W0smw-1 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-25666e9a8c3so633993a91.1 for ; Tue, 06 Jun 2023 05:02:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686052949; x=1688644949; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s/LlVGSMU8xy8zoX3LHb4hFyzoRssTlgWgYqnU+CC5I=; b=OfyWxJJP45D6L27GD+RxFPA5kEHYia90eDSxBzhBLqBWtYDGkSg25h8SGcTHE4f81N 87ZwLQcl0f254U71Fz3MDGgATSai8KAabR1YhC5+dN5CZFSaQ6Quc2OD6ctC6i5lic6l 8C/pTSrb/8T6qBFkYLmrT3E1pM/uOff2yQpxCq8x6b1E3JTpEC2Df6MPYeIk14jixSej 7mR+q6zoeUxX9D8jKTbmVlFoXFk1UsxC7n4InFsP/yeVG6McJ+2wqP51i19MwdA3eTzb +2hakY6OQpFcjEAXaMsE3leIgip3Vg/7MTY2S0oZxWhIU8ASIvPloKvVHydnep5Hg7SX 6bHA== X-Gm-Message-State: AC+VfDwIqzL6CNjYc7PQBKGOWw5U9MWMoj1/EMoLOs+Op2OfQuMU/0R9 8uffdJTtMHinPpPXEZKKL8BprS7h2lDNZxDG3qP+9itITOvfAoRGAHUYc1aNrH9avnadib8OJME 2UE3t40xFZbaLGmQfJoIAFuCrVFV3cr650/km9yd1wiIzzPaJwxowbPcDw5Sj3qt6GkKa8Mcjw8 KDDnUh9G3SbcTe5g8QS5ohTA== X-Received: by 2002:a17:903:2449:b0:1a6:cf4b:4d7d with SMTP id l9-20020a170903244900b001a6cf4b4d7dmr2209915pls.2.1686052948475; Tue, 06 Jun 2023 05:02:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4DVVJnme5UX3JGackWNfNm7953bvMJv0f8kS/cnHzi7pnS49cTjtO2MMP/JdLR/889j7ahGA== X-Received: by 2002:a17:903:2449:b0:1a6:cf4b:4d7d with SMTP id l9-20020a170903244900b001a6cf4b4d7dmr2209883pls.2.1686052947923; Tue, 06 Jun 2023 05:02:27 -0700 (PDT) Received: from [10.66.61.39] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id u17-20020a17090341d100b001ae268978cfsm8354703ple.259.2023.06.06.05.02.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jun 2023 05:02:27 -0700 (PDT) Message-ID: Date: Tue, 6 Jun 2023 20:02:24 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v2] ACPI: bus: Consolidate all arm specific initialisation into acpi_arm_init() To: linux-arm-kernel@lists.infradead.org References: <20230606093531.2746732-1-sudeep.holla@arm.com> From: Shaoqin Huang In-Reply-To: <20230606093531.2746732-1-sudeep.holla@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_050233_835750_039A63CB X-CRM114-Status: GOOD ( 25.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Looks good. On 6/6/23 17:35, Sudeep Holla wrote: > Move all of the ARM-specific initialization into one function namely > acpi_arm_init(), so it is not necessary to modify/update bus.c every > time a new piece of it is added. > > Cc: Lorenzo Pieralisi > Cc: Rafael J. Wysocki > Suggested-by: Rafael J. Wysocki > Reviewed-by: Robin Murphy > Reviewed-by: Hanjun Guo > Link: https://lore.kernel.org/r/CAJZ5v0iBZRZmV_oU+VurqxnVMbFN_ttqrL=cLh0sUH+=u0PYsw@mail.gmail.com > Signed-off-by: Sudeep Holla Reviewed-by: Shaoqin Huang > --- > drivers/acpi/arm64/Makefile | 2 +- > drivers/acpi/arm64/agdi.c | 2 +- > drivers/acpi/arm64/apmt.c | 2 +- > drivers/acpi/arm64/init.c | 13 +++++++++++++ > drivers/acpi/arm64/init.h | 6 ++++++ > drivers/acpi/arm64/iort.c | 1 + > drivers/acpi/bus.c | 7 +------ > include/linux/acpi.h | 6 ++++++ > include/linux/acpi_agdi.h | 13 ------------- > include/linux/acpi_apmt.h | 19 ------------------- > include/linux/acpi_iort.h | 2 -- > 11 files changed, 30 insertions(+), 43 deletions(-) > create mode 100644 drivers/acpi/arm64/init.c > create mode 100644 drivers/acpi/arm64/init.h > delete mode 100644 include/linux/acpi_agdi.h > delete mode 100644 include/linux/acpi_apmt.h > > v1[1]->v2: > - Used IS_ENABLED and made the init functions' declarations > unconditional > - Added review tags > > [1] https://lore.kernel.org/all/20230605103550.2427459-1-sudeep.holla@arm.com > > diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile > index e21a9e84e394..f81fe24894b2 100644 > --- a/drivers/acpi/arm64/Makefile > +++ b/drivers/acpi/arm64/Makefile > @@ -3,4 +3,4 @@ obj-$(CONFIG_ACPI_AGDI) += agdi.o > obj-$(CONFIG_ACPI_IORT) += iort.o > obj-$(CONFIG_ACPI_GTDT) += gtdt.o > obj-$(CONFIG_ACPI_APMT) += apmt.o > -obj-y += dma.o > +obj-y += dma.o init.o > diff --git a/drivers/acpi/arm64/agdi.c b/drivers/acpi/arm64/agdi.c > index f605302395c3..8b3c7d42b41b 100644 > --- a/drivers/acpi/arm64/agdi.c > +++ b/drivers/acpi/arm64/agdi.c > @@ -9,11 +9,11 @@ > #define pr_fmt(fmt) "ACPI: AGDI: " fmt > > #include > -#include > #include > #include > #include > #include > +#include "init.h" > > struct agdi_data { > int sdei_event; > diff --git a/drivers/acpi/arm64/apmt.c b/drivers/acpi/arm64/apmt.c > index 8cab69fa5d59..e5c3bc99fc79 100644 > --- a/drivers/acpi/arm64/apmt.c > +++ b/drivers/acpi/arm64/apmt.c > @@ -10,10 +10,10 @@ > #define pr_fmt(fmt) "ACPI: APMT: " fmt > > #include > -#include > #include > #include > #include > +#include "init.h" > > #define DEV_NAME "arm-cs-arch-pmu" > > diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c > new file mode 100644 > index 000000000000..d3ce53dda122 > --- /dev/null > +++ b/drivers/acpi/arm64/init.c > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +#include > +#include "init.h" > + > +void __init acpi_arm_init(void) > +{ > + if (IS_ENABLED(CONFIG_ACPI_AGDI)) > + acpi_agdi_init(); > + if (IS_ENABLED(CONFIG_ACPI_APMT)) > + acpi_apmt_init(); > + if (IS_ENABLED(CONFIG_ACPI_IORT)) > + acpi_iort_init(); > +} > diff --git a/drivers/acpi/arm64/init.h b/drivers/acpi/arm64/init.h > new file mode 100644 > index 000000000000..a1715a2a34e9 > --- /dev/null > +++ b/drivers/acpi/arm64/init.h > @@ -0,0 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +#include > + > +void __init acpi_agdi_init(void); > +void __init acpi_apmt_init(void); > +void __init acpi_iort_init(void); > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 38fb84974f35..3631230a61c8 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include "init.h" > > #define IORT_TYPE_MASK(type) (1 << (type)) > #define IORT_MSI_TYPE (1 << ACPI_IORT_NODE_ITS_GROUP) > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index d161ff707de4..7a1eaf8c7bde 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -26,9 +26,6 @@ > #include > #include > #endif > -#include > -#include > -#include > #include > #include > #include > @@ -1408,7 +1405,7 @@ static int __init acpi_init(void) > acpi_init_ffh(); > > pci_mmcfg_late_init(); > - acpi_iort_init(); > + acpi_arm_init(); > acpi_viot_early_init(); > acpi_hest_init(); > acpi_ghes_init(); > @@ -1420,8 +1417,6 @@ static int __init acpi_init(void) > acpi_debugger_init(); > acpi_setup_sb_notify_handler(); > acpi_viot_init(); > - acpi_agdi_init(); > - acpi_apmt_init(); > return 0; > } > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 7b71dd74baeb..5ef126a0a50f 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1507,6 +1507,12 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu) > } > #endif > > +#ifdef CONFIG_ARM64 > +void acpi_arm_init(void); > +#else > +static inline void acpi_arm_init(void) { } > +#endif > + > #ifdef CONFIG_ACPI_PCC > void acpi_init_pcc(void); > #else > diff --git a/include/linux/acpi_agdi.h b/include/linux/acpi_agdi.h > deleted file mode 100644 > index f477f0b452fa..000000000000 > --- a/include/linux/acpi_agdi.h > +++ /dev/null > @@ -1,13 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > - > -#ifndef __ACPI_AGDI_H__ > -#define __ACPI_AGDI_H__ > - > -#include > - > -#ifdef CONFIG_ACPI_AGDI > -void __init acpi_agdi_init(void); > -#else > -static inline void acpi_agdi_init(void) {} > -#endif > -#endif /* __ACPI_AGDI_H__ */ > diff --git a/include/linux/acpi_apmt.h b/include/linux/acpi_apmt.h > deleted file mode 100644 > index 40bd634d082f..000000000000 > --- a/include/linux/acpi_apmt.h > +++ /dev/null > @@ -1,19 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 > - * > - * ARM CoreSight PMU driver. > - * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. > - * > - */ > - > -#ifndef __ACPI_APMT_H__ > -#define __ACPI_APMT_H__ > - > -#include > - > -#ifdef CONFIG_ACPI_APMT > -void acpi_apmt_init(void); > -#else > -static inline void acpi_apmt_init(void) { } > -#endif /* CONFIG_ACPI_APMT */ > - > -#endif /* __ACPI_APMT_H__ */ > diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h > index b43be0987b19..e4e7bb6fa720 100644 > --- a/include/linux/acpi_iort.h > +++ b/include/linux/acpi_iort.h > @@ -27,7 +27,6 @@ int iort_register_domain_token(int trans_id, phys_addr_t base, > void iort_deregister_domain_token(int trans_id); > struct fwnode_handle *iort_find_domain_token(int trans_id); > #ifdef CONFIG_ACPI_IORT > -void acpi_iort_init(void); > u32 iort_msi_map_id(struct device *dev, u32 id); > struct irq_domain *iort_get_device_domain(struct device *dev, u32 id, > enum irq_domain_bus_token bus_token); > @@ -43,7 +42,6 @@ int iort_iommu_configure_id(struct device *dev, const u32 *id_in); > void iort_iommu_get_resv_regions(struct device *dev, struct list_head *head); > phys_addr_t acpi_iort_dma_get_max_cpu_address(void); > #else > -static inline void acpi_iort_init(void) { } > static inline u32 iort_msi_map_id(struct device *dev, u32 id) > { return id; } > static inline struct irq_domain *iort_get_device_domain( > -- > 2.40.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Shaoqin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel