Rev last modify to support acpi
Signed-off-by: Wang Honghui <[email protected]>
---
drivers/firmware/arm_scpi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index e2e90dcc38bd..aca0a9780c12 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -908,7 +908,9 @@ static const struct of_device_id shmem_of_match[] __maybe_unused = {
{ }
};
+#ifdef CONFIG_PHYTIUM_MBOX
extern struct mbox_chan *phytium_mbox_request_channel(struct mbox_client *cl);
+#endif
static int scpi_probe(struct platform_device *pdev)
{
@@ -1047,6 +1049,7 @@ static int scpi_probe(struct platform_device *pdev)
ret = scpi_alloc_xfer_list(dev, pchan);
+#ifdef phytium_mbox_request_channel
if (!ret) {
pchan->chan = phytium_mbox_request_channel(cl);
@@ -1058,6 +1061,7 @@ static int scpi_probe(struct platform_device *pdev)
dev_err(dev, "failed to get channel%d err %d\n",
idx, ret);
}
+#endif
return ret;
}
--
2.34.1
On Thu, Nov 24, 2022 at 05:59:47PM +0800, Wang Honghui wrote:
> Rev last modify to support acpi
>
> Signed-off-by: Wang Honghui <[email protected]>
> ---
> drivers/firmware/arm_scpi.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
> index e2e90dcc38bd..aca0a9780c12 100644
> --- a/drivers/firmware/arm_scpi.c
> +++ b/drivers/firmware/arm_scpi.c
> @@ -908,7 +908,9 @@ static const struct of_device_id shmem_of_match[] __maybe_unused = {
> { }
> };
>
> +#ifdef CONFIG_PHYTIUM_MBOX
> extern struct mbox_chan *phytium_mbox_request_channel(struct mbox_client *cl);
> +#endif
I have already NACK the approach you have taken for SCPI + ACPI. Just forgot
to mention SCPI is old and deprecated protocol and SCMI replaced it. You
much be using that if possible.
Anyways, this kind of #ifdeffery is not allowed in any generic code even if
I agreed with the approach. So please don't change the code in such a way.
--
Regards,
Sudeep
Ok!
Thanks,
Best Regards!
Wang Honghui
------------------ Original ------------------From: "Sudeep Holla"<[email protected]>;Date: Thu, Nov 24, 2022 07:15 PMTo: "Wang Honghui"<[email protected]>; Cc: "Cristian Maruss"<[email protected]>; "linux-arm-kernel"<[email protected]>; "linux-kernel"<[email protected]>; Subject: Re: [PATCH V2 3/3] arm_scpi: Rev last modify to support acpi On Thu, Nov 24, 2022 at 05:59:47PM +0800, Wang Honghui wrote:> Rev last modify to support acpi> > Signed-off-by: Wang Honghui <[email protected]>> ---> drivers/firmware/arm_scpi.c | 4 ++++> 1 file changed, 4 insertions(+)> > diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c> index e2e90dcc38bd..aca0a9780c12 100644> --- a/drivers/firmware/arm_scpi.c> +++ b/drivers/firmware/arm_scpi.c> @@ -908,7 +908,9 @@ static const struct of_device_id shmem_of_match[] __maybe_unused = {> { }> };> > +#ifdef CONFIG_PHYTIUM_MBOX> extern struct mbox_chan *phytium_mbox_request_channel(struct mbox_client *cl);> +#endifI have already NACK the approach you have taken for SCPI + ACPI. Just forgotto mention SCPI is old and deprecated protocol and SCMI replaced it. Youmuch be using that if possible.Anyways, this kind of #ifdeffery is not allowed in any generic code even ifI agreed with the approach. So please don't change the code in such a way.-- Regards,Sudeep