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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham 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 8EBA1C433E2 for ; Mon, 7 Sep 2020 18:06:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 141E82137B for ; Mon, 7 Sep 2020 18:06:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dhPD9rkY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 141E82137B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HB5RXUx6n8O3w9Pc2Iqyl0jDH7MqtVl8ZEw6riT4I1U=; b=dhPD9rkY7pj/nwQoifPWSMADa VvqxpAg2CqwseRauXGzW/0yHv0VcxeS1cxW6xYn5Z5KNteEfkraC9Ov4SBogENFYOM3eWG0Sitlpg WuBZtyY3NQc4P5cmohQItPYcIuKcg7Ewa5itoLc1URFIlnw3KSVZ/FbCu0K5Jz4h4x4npJ4ef8AfM 4xm0na5t9zHNWbVPkAR9wdmVbCpWgbpPiHLQoR3f1ap5qyoiPObFc6/Jh+7Wv/zVm0ie1mgt2XYMc 2pTzcYs+61uKnp0psvxQsDBO0P3abkHjdWkskL65MAhyUuoo9y0EXal+01vXMBr68SZeYBTpG763b fTw6Vyz+w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFLVw-0007dZ-9t; Mon, 07 Sep 2020 18:05:12 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFLVs-0007c0-MU for linux-arm-kernel@lists.infradead.org; Mon, 07 Sep 2020 18:05:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 087D831B; Mon, 7 Sep 2020 11:05:07 -0700 (PDT) Received: from e119603-lin.cambridge.arm.com (unknown [10.57.49.144]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0A25A3F66E; Mon, 7 Sep 2020 11:05:05 -0700 (PDT) Date: Mon, 7 Sep 2020 19:06:01 +0100 From: Cristian Marussi To: Sudeep Holla Subject: Re: [PATCH 2/3] firmware: arm_scmi: Move scmi protocols initialisation into the driver Message-ID: <20200907180601.GA32664@e119603-lin.cambridge.arm.com> References: <20200907112920.34275-1-sudeep.holla@arm.com> <20200907112920.34275-3-sudeep.holla@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200907112920.34275-3-sudeep.holla@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200907_140508_848726_DA3DC60C X-CRM114-Status: GOOD ( 24.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mikhail Golubev , Peter Hilber , Igor Skalkin , linux-arm-kernel@lists.infradead.org, Anton Yakovlev Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Sep 07, 2020 at 12:29:19PM +0100, Sudeep Holla wrote: > In preparation to enable building SCMI as a single module, let us move > the SCMI protocol initialisation call into the driver. This enables us > to also add de-initialisation of the SCMI protocols. > > The main reason for this is to keep it simple instead of maintaining > it as separate modules and dealing with all possible initcall races > and deferred probe handling. We can move it as separate modules if > needed in future. > > Signed-off-by: Sudeep Holla > --- > drivers/firmware/arm_scmi/clock.c | 7 +------ > drivers/firmware/arm_scmi/common.h | 21 +++++++++++++++++++++ > drivers/firmware/arm_scmi/driver.c | 10 ++++++++++ > drivers/firmware/arm_scmi/perf.c | 7 +------ > drivers/firmware/arm_scmi/power.c | 7 +------ > drivers/firmware/arm_scmi/reset.c | 7 +------ > drivers/firmware/arm_scmi/sensors.c | 7 +------ > 7 files changed, 36 insertions(+), 30 deletions(-) > > diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c > index 75e39882746e..606396f748f0 100644 > --- a/drivers/firmware/arm_scmi/clock.c > +++ b/drivers/firmware/arm_scmi/clock.c > @@ -364,9 +364,4 @@ static int scmi_clock_protocol_init(struct scmi_handle *handle) > return 0; > } > > -static int __init scmi_clock_init(void) > -{ > - return scmi_protocol_register(SCMI_PROTOCOL_CLOCK, > - &scmi_clock_protocol_init); > -} > -subsys_initcall(scmi_clock_init); > +DEFINE_SCMI_PROTOCOL_INIT_EXIT(SCMI_PROTOCOL_CLOCK, clock) > diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h > index 5fa42eba6de7..6d98a6c47005 100644 > --- a/drivers/firmware/arm_scmi/common.h > +++ b/drivers/firmware/arm_scmi/common.h > @@ -159,6 +159,27 @@ int scmi_base_protocol_init(struct scmi_handle *h); > int __init scmi_bus_init(void); > void __exit scmi_bus_exit(void); > > +#define DECLARE_SCMI_INIT_EXIT(func) \ > + int __init scmi_##func##_init(void); \ > + void __exit scmi_##func##_exit(void) > +DECLARE_SCMI_INIT_EXIT(clock); > +DECLARE_SCMI_INIT_EXIT(perf); > +DECLARE_SCMI_INIT_EXIT(power); > +DECLARE_SCMI_INIT_EXIT(reset); > +DECLARE_SCMI_INIT_EXIT(sensors); > +DECLARE_SCMI_INIT_EXIT(bus); > + Can we call these protocols' functions (and related macros) something like: scmi_##PROTO##_load/_unload or _register/_unregister given that in SCMI stack we usually intend something else with protocol initialization and in fact each protocol has its own dedicated protocol_init function which is called at a different time. > +#define DEFINE_SCMI_PROTOCOL_INIT_EXIT(id, name) \ > +int __init scmi_##name##_init(void) \ > +{ \ > + return scmi_protocol_register((id), &scmi_##name##_protocol_init); \ > +} \ > +\ > +void __exit scmi_##name##_exit(void) \ > +{ \ > + scmi_protocol_unregister((id)); \ > +} > + > /* SCMI Transport */ > /** > * struct scmi_chan_info - Structure representing a SCMI channel information > diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c > index f4d9601c053f..2a1396b74fa5 100644 > --- a/drivers/firmware/arm_scmi/driver.c > +++ b/drivers/firmware/arm_scmi/driver.c > @@ -931,6 +931,11 @@ static struct platform_driver scmi_driver = { > static int __init scmi_driver_init(void) > { > scmi_bus_init(); > + scmi_clock_init(); > + scmi_perf_init(); > + scmi_power_init(); > + scmi_reset_init(); > + scmi_sensors_init(); > > return platform_driver_register(&scmi_driver); > } > @@ -939,6 +944,11 @@ module_init(scmi_driver_init); > static void __exit scmi_driver_exit(void) > { > scmi_bus_exit(); Shouldn't this bus_exit() be issued in reverse oerder at the end after protocols have being _exited() ? Cheers, Cristian > + scmi_clock_exit(); > + scmi_perf_exit(); > + scmi_power_exit(); > + scmi_reset_exit(); > + scmi_sensors_exit(); > > return platform_driver_unregister(&scmi_driver); > } > diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c > index 3e1e87012c95..e0ec1a78d2ad 100644 > --- a/drivers/firmware/arm_scmi/perf.c > +++ b/drivers/firmware/arm_scmi/perf.c > @@ -890,9 +890,4 @@ static int scmi_perf_protocol_init(struct scmi_handle *handle) > return 0; > } > > -static int __init scmi_perf_init(void) > -{ > - return scmi_protocol_register(SCMI_PROTOCOL_PERF, > - &scmi_perf_protocol_init); > -} > -subsys_initcall(scmi_perf_init); > +DEFINE_SCMI_PROTOCOL_INIT_EXIT(SCMI_PROTOCOL_PERF, perf) > diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c > index 46f213644c49..54926d1f381c 100644 > --- a/drivers/firmware/arm_scmi/power.c > +++ b/drivers/firmware/arm_scmi/power.c > @@ -301,9 +301,4 @@ static int scmi_power_protocol_init(struct scmi_handle *handle) > return 0; > } > > -static int __init scmi_power_init(void) > -{ > - return scmi_protocol_register(SCMI_PROTOCOL_POWER, > - &scmi_power_protocol_init); > -} > -subsys_initcall(scmi_power_init); > +DEFINE_SCMI_PROTOCOL_INIT_EXIT(SCMI_PROTOCOL_POWER, power) > diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c > index 3691bafca057..4b91d39cfe21 100644 > --- a/drivers/firmware/arm_scmi/reset.c > +++ b/drivers/firmware/arm_scmi/reset.c > @@ -313,9 +313,4 @@ static int scmi_reset_protocol_init(struct scmi_handle *handle) > return 0; > } > > -static int __init scmi_reset_init(void) > -{ > - return scmi_protocol_register(SCMI_PROTOCOL_RESET, > - &scmi_reset_protocol_init); > -} > -subsys_initcall(scmi_reset_init); > +DEFINE_SCMI_PROTOCOL_INIT_EXIT(SCMI_PROTOCOL_RESET, reset) > diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c > index 1af0ad362e82..37dc187cafea 100644 > --- a/drivers/firmware/arm_scmi/sensors.c > +++ b/drivers/firmware/arm_scmi/sensors.c > @@ -365,9 +365,4 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle) > return 0; > } > > -static int __init scmi_sensors_init(void) > -{ > - return scmi_protocol_register(SCMI_PROTOCOL_SENSOR, > - &scmi_sensors_protocol_init); > -} > -subsys_initcall(scmi_sensors_init); > +DEFINE_SCMI_PROTOCOL_INIT_EXIT(SCMI_PROTOCOL_SENSOR, sensors) > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel