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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33E44EB64DD for ; Mon, 7 Aug 2023 10:03:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 425FF86937; Mon, 7 Aug 2023 12:03:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="kkgWiH23"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 848FE8693C; Mon, 7 Aug 2023 12:03:43 +0200 (CEST) Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4370886928 for ; Mon, 7 Aug 2023 12:03:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1bc76cdf0cbso468635ad.1 for ; Mon, 07 Aug 2023 03:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691402618; x=1692007418; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=inY5bGY7dbklZ0Ljx5qj0KSGzkan7uaWqYaGZYR/M+g=; b=kkgWiH23lhRF4ysePPF5UIvrfGB7WDWk3Epbrzw8nGdjciWVMIFX15Tqcg1JHruACs z/+dGP4TghNdugoaDAVr2vaPr5UbxpyZYJgQ7jb3piqTLtLGZoBiVLszlPShw/dr21FV xKnFwedoezL/Q0smlVmalH1D+DBYMZMzlR4M2pANH1K7RXFlWwv+SWysjiNeKd5Al5a/ gHmBxCkcRzjX/tomF+Ni+uJ4e/th4P3zxfU6uB6mxdg/0SyqQv7qjxUnMHPlR2LlzsRr B4njUCFwWnyE3VC7xf2NFI46ko22mBm3La1XdgKq2hsvuNBE4nng7GmF8S69wCePuC44 w98A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691402618; x=1692007418; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=inY5bGY7dbklZ0Ljx5qj0KSGzkan7uaWqYaGZYR/M+g=; b=Ql4qz9Qfgwgi4gHL4m2J9l78D64xgHj2W9wmPa5UoTXdWztLJ6kePACpnZdnU4AwXb tpDNv0SqfhsiWgsAce8v4N2vM9HvFZsRqT3zqM2b5Pr8wzVPU47r+XzOaan/tK2w8w8s PHRqAWA1y3HPNRssGGHrmhHRweBYPvCndKTc/rxK1oeJ34PT5TMTQTXVWF/tg8d8p5ef Ix+wz1dPQtqgo2v+zYKy5z0wtZsbvoIGI3bOwCie4qlL+7q5He0zLf0gSJcLK4TDf6c7 qqAprVpbFHvXGsO5LIdoXrfp31ubMEt6f3oQE4qMSbc4lwshVQphrteNSsXrCtcdUGsp Kxvg== X-Gm-Message-State: ABy/qLbUvf4x/RQgfjAiSdKKyXxomRQebBl2jm8XJXW/hCymOi1Ppbbd 0+U1oa8sQcYGWBVD6oUxiCahDQ== X-Google-Smtp-Source: APBJJlG0lJ1bG/vcloISzQYWSUlDjLcf3pnLulrFyn5/wGzJqXWd5xbNpK39FJBaD1bLw5yzxwW7ZQ== X-Received: by 2002:a17:903:1c7:b0:1b8:b55d:4cff with SMTP id e7-20020a17090301c700b001b8b55d4cffmr32751041plh.2.1691402618250; Mon, 07 Aug 2023 03:03:38 -0700 (PDT) Received: from octopus ([2400:4050:c3e1:100:49db:7607:36aa:a3fa]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001bb9b87ac95sm6493884plg.103.2023.08.07.03.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 03:03:37 -0700 (PDT) Date: Mon, 7 Aug 2023 19:03:35 +0900 From: AKASHI Takahiro To: Etienne CARRIERE Cc: "trini@konsulko.com" , "sjg@chromium.org" , "u-boot@lists.denx.de" Subject: Re: [PATCH v2 01/12] scmi: refactor the code to hide a channel from devices Message-ID: Mail-Followup-To: AKASHI Takahiro , Etienne CARRIERE , "trini@konsulko.com" , "sjg@chromium.org" , "u-boot@lists.denx.de" References: <20230726083808.140780-1-takahiro.akashi@linaro.org> <20230726083808.140780-2-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Hi Etienne, On Thu, Aug 03, 2023 at 09:24:51AM +0000, Etienne CARRIERE wrote: > Hello Takahiro-san, > > Sorry again for this late feedback. > Testing the series against stm32mp135f-dk board which is using SCMI resources, I see the board fails to boot. > > > From: AKASHI Takahiro > > To: trini@konsulko.com, sjg@chromium.org > > Cc: etienne.carriere@st.com, u-boot@lists.denx.de, > > AKASHI Takahiro > > Subject: [PATCH v2 01/12] scmi: refactor the code to hide a channel from devices > > Date: Wed, 26 Jul 2023 17:37:57 +0900 [thread overview] > > Message-ID: <20230726083808.140780-2-takahiro.akashi@linaro.org> (raw) > > In-Reply-To: <20230726083808.140780-1-takahiro.akashi@linaro.org> > > > > The commit 85dc58289238 ("firmware: scmi: prepare uclass to pass channel > > reference") added an explicit parameter, channel, but it seems to make > > the code complex. > > > > Hiding this parameter will allow for adding a generic (protocol-agnostic) > > helper function, i.e. for PROTOCOL_VERSION, in a later patch. > > > > Signed-off-by: AKASHI Takahiro > > > > --- > > v2 > > * new patch > > --- > > drivers/clk/clk_scmi.c | 27 ++------- > > drivers/firmware/scmi/scmi_agent-uclass.c | 74 ++++++++++++++++++----- > > drivers/power/regulator/scmi_regulator.c | 27 +++------ > > drivers/reset/reset-scmi.c | 19 +----- > > include/scmi_agent.h | 15 +++-- > > 5 files changed, 86 insertions(+), 76 deletions(-) > > > > diff --git a/drivers/clk/clk_scmi.c b/drivers/clk/clk_scmi.c > > index d172fed24c9d..34a49363a51a 100644 > > --- a/drivers/clk/clk_scmi.c > > +++ b/drivers/clk/clk_scmi.c > > @@ -13,17 +13,8 @@ > > #include > > #include > > > > -/** > > - * struct scmi_clk_priv - Private data for SCMI clocks > > - * @channel: Reference to the SCMI channel to use > > - */ > > -struct scmi_clk_priv { > > - struct scmi_channel *channel; > > -}; > > - > > static int scmi_clk_get_num_clock(struct udevice *dev, size_t *num_clocks) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(dev); > > struct scmi_clk_protocol_attr_out out; > > struct scmi_msg msg = { > > .protocol_id = SCMI_PROTOCOL_ID_CLOCK, > > @@ -33,7 +24,7 @@ static int scmi_clk_get_num_clock(struct udevice *dev, size_t *num_clocks) > > }; > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret) > > return ret; > > > > @@ -44,7 +35,6 @@ static int scmi_clk_get_num_clock(struct udevice *dev, size_t *num_clocks) > > > > static int scmi_clk_get_attibute(struct udevice *dev, int clkid, char **name) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(dev); > > struct scmi_clk_attribute_in in = { > > .clock_id = clkid, > > }; > > @@ -59,7 +49,7 @@ static int scmi_clk_get_attibute(struct udevice *dev, int clkid, char **name) > > }; > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret) > > return ret; > > > > @@ -70,7 +60,6 @@ static int scmi_clk_get_attibute(struct udevice *dev, int clkid, char **name) > > > > static int scmi_clk_gate(struct clk *clk, int enable) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(clk->dev); > > struct scmi_clk_state_in in = { > > .clock_id = clk->id, > > .attributes = enable, > > @@ -81,7 +70,7 @@ static int scmi_clk_gate(struct clk *clk, int enable) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(clk->dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(clk->dev, &msg); > > if (ret) > > return ret; > > > > @@ -100,7 +89,6 @@ static int scmi_clk_disable(struct clk *clk) > > > > static ulong scmi_clk_get_rate(struct clk *clk) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(clk->dev); > > struct scmi_clk_rate_get_in in = { > > .clock_id = clk->id, > > }; > > @@ -110,7 +98,7 @@ static ulong scmi_clk_get_rate(struct clk *clk) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(clk->dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(clk->dev, &msg); > > if (ret < 0) > > return ret; > > > > @@ -123,7 +111,6 @@ static ulong scmi_clk_get_rate(struct clk *clk) > > > > static ulong scmi_clk_set_rate(struct clk *clk, ulong rate) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(clk->dev); > > struct scmi_clk_rate_set_in in = { > > .clock_id = clk->id, > > .flags = SCMI_CLK_RATE_ROUND_CLOSEST, > > @@ -136,7 +123,7 @@ static ulong scmi_clk_set_rate(struct clk *clk, ulong rate) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(clk->dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(clk->dev, &msg); > > if (ret < 0) > > return ret; > > > > @@ -149,12 +136,11 @@ static ulong scmi_clk_set_rate(struct clk *clk, ulong rate) > > > > static int scmi_clk_probe(struct udevice *dev) > > { > > - struct scmi_clk_priv *priv = dev_get_priv(dev); > > struct clk *clk; > > size_t num_clocks, i; > > int ret; > > > > - ret = devm_scmi_of_get_channel(dev, &priv->channel); > > + ret = devm_scmi_of_get_channel(dev); > > if (ret) > > return ret; > > > > @@ -205,5 +191,4 @@ U_BOOT_DRIVER(scmi_clock) = { > > .id = UCLASS_CLK, > > .ops = &scmi_clk_ops, > > .probe = scmi_clk_probe, > > - .priv_auto = sizeof(struct scmi_clk_priv *), > > }; > > diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c > > index 02de692d66f3..39cf15c88f75 100644 > > --- a/drivers/firmware/scmi/scmi_agent-uclass.c > > +++ b/drivers/firmware/scmi/scmi_agent-uclass.c > > @@ -8,6 +8,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -129,43 +130,88 @@ static const struct scmi_agent_ops *transport_dev_ops(struct udevice *dev) > > return (const struct scmi_agent_ops *)dev->driver->ops; > > } > > > > -int devm_scmi_of_get_channel(struct udevice *dev, struct scmi_channel **channel) > > +/** > > + * scmi_of_get_channel() - Get SCMI channel handle > > + * > > + * @dev: SCMI agent device > > + * @channel: Output reference to the SCMI channel upon success > > + * > > + * On return, @channel will be set. > > + * Return 0 on success and a negative errno on failure > > + */ > > +static int scmi_of_get_channel(struct udevice *dev, struct scmi_channel **channel) > > +{ > > + const struct scmi_agent_ops *ops; > > + > > + ops = transport_dev_ops(dev); > > + if (ops->of_get_channel) > > + return ops->of_get_channel(dev, channel); > > + else > > + return -EPROTONOSUPPORT; > > +} > > + > > +int devm_scmi_of_get_channel(struct udevice *dev) > > { > > struct udevice *parent; > > + struct scmi_agent_proto_priv *priv = dev_get_parent_priv(dev); > > This parent lookup does not match when CONFIG_CLK_CCF is enabled. When so, > the scmi clock device is on the clock itself but a child udevice of some > udevice held by the common clock framework (CCF). > Platforms from the stm32mp13 family do enable SCMI clock and CCF. I tested my patch on sandbox, where CCF is also enabled, and "ut dm scmi_clocks" is passed without any error. So I'm not sure if the point you mentioned above is a root cause. -Takahiro Akashi > It can propose a way to go, using find_scmi_transport_device() to provide > the agent's 1st child private data as an output argument: > //patch-start > -static struct udevice *find_scmi_transport_device(struct udevice *dev) > +static struct udevice * > +find_scmi_transport_device(struct udevice *dev, > + struct scmi_agent_proto_priv **priv) > { > struct udevice *parent = dev; > + struct scmi_agent_proto_priv *parent_priv; > > do { > + parent_priv = dev_get_parent_priv(parent); > parent = dev_get_parent(parent); > } while (parent && device_get_uclass_id(parent) != UCLASS_SCMI_AGENT); > > if (!parent) > dev_err(dev, "Invalid SCMI device, agent not found\n"); > + else if (priv) > + *priv = parent_priv; > > return parent; > } > //end patch > > Tested OK on stm32mp13 with the remaining patch series applied (minor conflics). > > BR, > etienne > > > > + int ret; > > > > parent = find_scmi_transport_device(dev); > > if (!parent) > > return -ENODEV; > > > > - if (transport_dev_ops(parent)->of_get_channel) > > - return transport_dev_ops(parent)->of_get_channel(parent, channel); > > + ret = scmi_of_get_channel(parent, &priv->channel); > > + if (ret == -EPROTONOSUPPORT) { > > + /* Drivers without a get_channel operator don't need a channel ref */ > > + priv->channel = NULL; > > > > - /* Drivers without a get_channel operator don't need a channel ref */ > > - *channel = NULL; > > + return 0; > > + } > > > > - return 0; > > + return ret; > > } > > > > -int devm_scmi_process_msg(struct udevice *dev, struct scmi_channel *channel, > > - struct scmi_msg *msg) > > +/** > > + * scmi_process_msg() - Send and process an SCMI message > > + * > > + * Send a message to an SCMI server. > > + * Caller sets scmi_msg::out_msg_sz to the output message buffer size. > > + * > > + * @dev: SCMI agent device > > + * @channel: Communication channel for the device > > + * @msg: Message structure reference > > + * > > + * On return, scmi_msg::out_msg_sz stores the response payload size. > > + * Return: 0 on success and a negative errno on failure > > + */ > > +static int scmi_process_msg(struct udevice *dev, struct scmi_channel *channel, > > + struct scmi_msg *msg) > > { > > const struct scmi_agent_ops *ops; > > + > > + ops = transport_dev_ops(dev); > > + if (ops->process_msg) > > + return ops->process_msg(dev, channel, msg); > > + else > > + return -EPROTONOSUPPORT; > > +} > > + > > +int devm_scmi_process_msg(struct udevice *dev, struct scmi_msg *msg) > > +{ > > struct udevice *parent; > > + struct scmi_agent_proto_priv *priv = dev_get_parent_priv(dev); > > > > parent = find_scmi_transport_device(dev); > > if (!parent) > > return -ENODEV; > > > > - ops = transport_dev_ops(parent); > > - > > - if (ops->process_msg) > > - return ops->process_msg(parent, channel, msg); > > - > > - return -EPROTONOSUPPORT; > > + return scmi_process_msg(parent, priv->channel, msg); > > } > > > > UCLASS_DRIVER(scmi_agent) = { > > .id = UCLASS_SCMI_AGENT, > > .name = "scmi_agent", > > .post_bind = scmi_bind_protocols, > > + .per_device_plat_auto = sizeof(struct scmi_agent_priv), > > Typo: this added line belong to patch 04/12. > > Regards, > Etienne > > > + .per_child_auto = sizeof(struct scmi_agent_proto_priv *), > > }; > > diff --git a/drivers/power/regulator/scmi_regulator.c b/drivers/power/regulator/scmi_regulator.c > > index 801148036ff6..08918b20872c 100644 > > --- a/drivers/power/regulator/scmi_regulator.c > > +++ b/drivers/power/regulator/scmi_regulator.c > > @@ -25,18 +25,9 @@ struct scmi_regulator_platdata { > > u32 domain_id; > > }; > > > > -/** > > - * struct scmi_regulator_priv - Private data for SCMI voltage regulator > > - * @channel: Reference to the SCMI channel to use > > - */ > > -struct scmi_regulator_priv { > > - struct scmi_channel *channel; > > -}; > > - > > static int scmi_voltd_set_enable(struct udevice *dev, bool enable) > > { > > struct scmi_regulator_platdata *pdata = dev_get_plat(dev); > > - struct scmi_regulator_priv *priv = dev_get_priv(dev); > > struct scmi_voltd_config_set_in in = { > > .domain_id = pdata->domain_id, > > .config = enable ? SCMI_VOLTD_CONFIG_ON : SCMI_VOLTD_CONFIG_OFF, > > @@ -47,7 +38,7 @@ static int scmi_voltd_set_enable(struct udevice *dev, bool enable) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret) > > return ret; > > > > @@ -57,7 +48,6 @@ static int scmi_voltd_set_enable(struct udevice *dev, bool enable) > > static int scmi_voltd_get_enable(struct udevice *dev) > > { > > struct scmi_regulator_platdata *pdata = dev_get_plat(dev); > > - struct scmi_regulator_priv *priv = dev_get_priv(dev); > > struct scmi_voltd_config_get_in in = { > > .domain_id = pdata->domain_id, > > }; > > @@ -67,7 +57,7 @@ static int scmi_voltd_get_enable(struct udevice *dev) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret < 0) > > return ret; > > > > @@ -80,7 +70,6 @@ static int scmi_voltd_get_enable(struct udevice *dev) > > > > static int scmi_voltd_set_voltage_level(struct udevice *dev, int uV) > > { > > - struct scmi_regulator_priv *priv = dev_get_priv(dev); > > struct scmi_regulator_platdata *pdata = dev_get_plat(dev); > > struct scmi_voltd_level_set_in in = { > > .domain_id = pdata->domain_id, > > @@ -92,7 +81,7 @@ static int scmi_voltd_set_voltage_level(struct udevice *dev, int uV) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret < 0) > > return ret; > > > > @@ -101,7 +90,6 @@ static int scmi_voltd_set_voltage_level(struct udevice *dev, int uV) > > > > static int scmi_voltd_get_voltage_level(struct udevice *dev) > > { > > - struct scmi_regulator_priv *priv = dev_get_priv(dev); > > struct scmi_regulator_platdata *pdata = dev_get_plat(dev); > > struct scmi_voltd_level_get_in in = { > > .domain_id = pdata->domain_id, > > @@ -112,7 +100,7 @@ static int scmi_voltd_get_voltage_level(struct udevice *dev) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(dev, &msg); > > if (ret < 0) > > return ret; > > > > @@ -140,7 +128,6 @@ static int scmi_regulator_of_to_plat(struct udevice *dev) > > static int scmi_regulator_probe(struct udevice *dev) > > { > > struct scmi_regulator_platdata *pdata = dev_get_plat(dev); > > - struct scmi_regulator_priv *priv = dev_get_priv(dev); > > struct scmi_voltd_attr_in in = { 0 }; > > struct scmi_voltd_attr_out out = { 0 }; > > struct scmi_msg scmi_msg = { > > @@ -153,14 +140,14 @@ static int scmi_regulator_probe(struct udevice *dev) > > }; > > int ret; > > > > - ret = devm_scmi_of_get_channel(dev->parent, &priv->channel); > > + ret = devm_scmi_of_get_channel(dev); > > if (ret) > > return ret; > > > > /* Check voltage domain is known from SCMI server */ > > in.domain_id = pdata->domain_id; > > > > - ret = devm_scmi_process_msg(dev, priv->channel, &scmi_msg); > > + ret = devm_scmi_process_msg(dev, &scmi_msg); > > if (ret) { > > dev_err(dev, "Failed to query voltage domain %u: %d\n", > > pdata->domain_id, ret); > > @@ -184,7 +171,6 @@ U_BOOT_DRIVER(scmi_regulator) = { > > .probe = scmi_regulator_probe, > > .of_to_plat = scmi_regulator_of_to_plat, > > .plat_auto = sizeof(struct scmi_regulator_platdata), > > - .priv_auto = sizeof(struct scmi_regulator_priv *), > > }; > > > > static int scmi_regulator_bind(struct udevice *dev) > > @@ -209,4 +195,5 @@ U_BOOT_DRIVER(scmi_voltage_domain) = { > > .name = "scmi_voltage_domain", > > .id = UCLASS_NOP, > > .bind = scmi_regulator_bind, > > + .per_child_auto = sizeof(struct scmi_agent_proto_priv *), > > }; > > diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c > > index 122556162ec3..b76711f0a8fb 100644 > > --- a/drivers/reset/reset-scmi.c > > +++ b/drivers/reset/reset-scmi.c > > @@ -13,17 +13,8 @@ > > #include > > #include > > > > -/** > > - * struct scmi_reset_priv - Private data for SCMI reset controller > > - * @channel: Reference to the SCMI channel to use > > - */ > > -struct scmi_reset_priv { > > - struct scmi_channel *channel; > > -}; > > - > > static int scmi_reset_set_level(struct reset_ctl *rst, bool assert_not_deassert) > > { > > - struct scmi_reset_priv *priv = dev_get_priv(rst->dev); > > struct scmi_rd_reset_in in = { > > .domain_id = rst->id, > > .flags = assert_not_deassert ? SCMI_RD_RESET_FLAG_ASSERT : 0, > > @@ -35,7 +26,7 @@ static int scmi_reset_set_level(struct reset_ctl *rst, bool assert_not_deassert) > > in, out); > > int ret; > > > > - ret = devm_scmi_process_msg(rst->dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(rst->dev, &msg); > > if (ret) > > return ret; > > > > @@ -54,7 +45,6 @@ static int scmi_reset_deassert(struct reset_ctl *rst) > > > > static int scmi_reset_request(struct reset_ctl *rst) > > { > > - struct scmi_reset_priv *priv = dev_get_priv(rst->dev); > > struct scmi_rd_attr_in in = { > > .domain_id = rst->id, > > }; > > @@ -68,7 +58,7 @@ static int scmi_reset_request(struct reset_ctl *rst) > > * We don't really care about the attribute, just check > > * the reset domain exists. > > */ > > - ret = devm_scmi_process_msg(rst->dev, priv->channel, &msg); > > + ret = devm_scmi_process_msg(rst->dev, &msg); > > if (ret) > > return ret; > > > > @@ -83,9 +73,7 @@ static const struct reset_ops scmi_reset_domain_ops = { > > > > static int scmi_reset_probe(struct udevice *dev) > > { > > - struct scmi_reset_priv *priv = dev_get_priv(dev); > > - > > - return devm_scmi_of_get_channel(dev, &priv->channel); > > + return devm_scmi_of_get_channel(dev); > > } > > > > U_BOOT_DRIVER(scmi_reset_domain) = { > > @@ -93,5 +81,4 @@ U_BOOT_DRIVER(scmi_reset_domain) = { > > .id = UCLASS_RESET, > > .ops = &scmi_reset_domain_ops, > > .probe = scmi_reset_probe, > > - .priv_auto = sizeof(struct scmi_reset_priv *), > > }; > > diff --git a/include/scmi_agent.h b/include/scmi_agent.h > > index ee6286366df7..577892029ff8 100644 > > --- a/include/scmi_agent.h > > +++ b/include/scmi_agent.h > > @@ -15,6 +15,14 @@ > > struct udevice; > > struct scmi_channel; > > > > +/** > > + * struct scmi_agent_proto_priv - Private data in device for SCMI agent > > + * @channel: Reference to the SCMI channel to use > > + */ > > +struct scmi_agent_proto_priv { > > + struct scmi_channel *channel; > > +}; > > + > > /* > > * struct scmi_msg - Context of a SCMI message sent and the response received > > * > > @@ -49,10 +57,9 @@ struct scmi_msg { > > * devm_scmi_of_get_channel() - Get SCMI channel handle from SCMI agent DT node > > * > > * @dev: Device requesting a channel > > - * @channel: Output reference to the SCMI channel upon success > > * @return 0 on success and a negative errno on failure > > */ > > -int devm_scmi_of_get_channel(struct udevice *dev, struct scmi_channel **channel); > > +int devm_scmi_of_get_channel(struct udevice *dev); > > > > /** > > * devm_scmi_process_msg() - Send and process an SCMI message > > @@ -62,12 +69,10 @@ int devm_scmi_of_get_channel(struct udevice *dev, struct scmi_channel **channel) > > * On return, scmi_msg::out_msg_sz stores the response payload size. > > * > > * @dev: SCMI device > > - * @channel: Communication channel for the device > > * @msg: Message structure reference > > * Return: 0 on success and a negative errno on failure > > */ > > -int devm_scmi_process_msg(struct udevice *dev, struct scmi_channel *channel, > > - struct scmi_msg *msg); > > +int devm_scmi_process_msg(struct udevice *dev, struct scmi_msg *msg); > > > > /** > > * scmi_to_linux_errno() - Convert an SCMI error code into a Linux errno code > > -- > > 2.41.0