diff mbox series

[v2] soc: qcom: geni: shield geni_icc_get() for ACPI boot

Message ID 20210114112928.11368-1-shawn.guo@linaro.org (mailing list archive)
State Accepted
Commit ee23057b4d6f1eb502da4c19507e43cff0be34ee
Headers show
Series [v2] soc: qcom: geni: shield geni_icc_get() for ACPI boot | expand

Commit Message

Shawn Guo Jan. 14, 2021, 11:29 a.m. UTC
Currently, GENI devices like i2c-qcom-geni fails to probe in ACPI boot,
if interconnect support is enabled.  That's because interconnect driver
only supports DT right now.  As interconnect is not necessarily required
for basic function of GENI devices, let's shield geni_icc_get() call,
and then all other ICC calls become nop due to NULL icc_path, so that
GENI devices keep working for ACPI boot.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
Changes for v2:
- Only shield geni_icc_get(), as all other ICC calls will become nop
  anyway due to NULL icc_path.

 drivers/soc/qcom/qcom-geni-se.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Bjorn Andersson Jan. 14, 2021, 4:30 p.m. UTC | #1
On Thu 14 Jan 05:29 CST 2021, Shawn Guo wrote:

> Currently, GENI devices like i2c-qcom-geni fails to probe in ACPI boot,
> if interconnect support is enabled.  That's because interconnect driver
> only supports DT right now.  As interconnect is not necessarily required
> for basic function of GENI devices, let's shield geni_icc_get() call,
> and then all other ICC calls become nop due to NULL icc_path, so that
> GENI devices keep working for ACPI boot.
> 

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Regards,
Bjorn

> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> Changes for v2:
> - Only shield geni_icc_get(), as all other ICC calls will become nop
>   anyway due to NULL icc_path.
> 
>  drivers/soc/qcom/qcom-geni-se.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
> index f42954e2c98e..c7c03ccfe888 100644
> --- a/drivers/soc/qcom/qcom-geni-se.c
> +++ b/drivers/soc/qcom/qcom-geni-se.c
> @@ -760,6 +760,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr)
>  	int i, err;
>  	const char *icc_names[] = {"qup-core", "qup-config", icc_ddr};
>  
> +	if (has_acpi_companion(se->dev))
> +		return 0;
> +
>  	for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) {
>  		if (!icc_names[i])
>  			continue;
> -- 
> 2.17.1
>
patchwork-bot+linux-arm-msm@kernel.org March 1, 2021, 7:59 p.m. UTC | #2
Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

On Thu, 14 Jan 2021 19:29:28 +0800 you wrote:
> Currently, GENI devices like i2c-qcom-geni fails to probe in ACPI boot,
> if interconnect support is enabled.  That's because interconnect driver
> only supports DT right now.  As interconnect is not necessarily required
> for basic function of GENI devices, let's shield geni_icc_get() call,
> and then all other ICC calls become nop due to NULL icc_path, so that
> GENI devices keep working for ACPI boot.
> 
> [...]

Here is the summary with links:
  - [v2] soc: qcom: geni: shield geni_icc_get() for ACPI boot
    https://git.kernel.org/qcom/c/ee23057b4d6f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
index f42954e2c98e..c7c03ccfe888 100644
--- a/drivers/soc/qcom/qcom-geni-se.c
+++ b/drivers/soc/qcom/qcom-geni-se.c
@@ -760,6 +760,9 @@  int geni_icc_get(struct geni_se *se, const char *icc_ddr)
 	int i, err;
 	const char *icc_names[] = {"qup-core", "qup-config", icc_ddr};
 
+	if (has_acpi_companion(se->dev))
+		return 0;
+
 	for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) {
 		if (!icc_names[i])
 			continue;