diff mbox series

[v2] regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error

Message ID 20201123222359.103822-1-john.stultz@linaro.org
State Accepted
Commit 34c5aa2666db54c4bd330fb2759f6e4d4544ad7a
Headers show
Series [v2] regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error | expand

Commit Message

John Stultz Nov. 23, 2020, 10:23 p.m. UTC 
The kernel test robot reported the following build error:

All errors (new ones prefixed by >>):

   xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
   qcom-rpmh-regulator.c:(.text+0x270): undefined reference to `rpmh_write'
   xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
   qcom-rpmh-regulator.c:(.text+0x2f2): undefined reference to `rpmh_write'
   xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
>> qcom-rpmh-regulator.c:(.text+0x274): undefined reference to `rpmh_write_async'
   xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
   qcom-rpmh-regulator.c:(.text+0x2fc): undefined reference to `rpmh_write_async'

Which is due to REGULATOR_QCOM_RPMH depending on
QCOM_RPMH || COMPILE_TEST. The problem is that QOM_RPMH can now
be a module, which in that case requires REGULATOR_QCOM_RPMH=m
to build.

However, if COMPILE_TEST is enabled, REGULATOR_QCOM_RPMH can be
set to =y while QCOM_RPMH=m which will cause build failures.

The fix here is to add (QCOM_RPMH=n && COMPILE_TEST) to the
dependency.

Feedback would be appreciated!

Cc: Todd Kjos <tkjos@google.com>
Cc: Saravana Kannan <saravanak@google.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Rajendra Nayak <rnayak@codeaurora.org>
Cc: Maulik Shah <mkshah@codeaurora.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-msm@vger.kernel.org
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v2: Switch dependency logic as suggested by MarkB
---
 drivers/regulator/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bjorn Andersson Nov. 24, 2020, 4:51 a.m. UTC | #1 
On Mon 23 Nov 16:23 CST 2020, John Stultz wrote:

> The kernel test robot reported the following build error:
> 
> All errors (new ones prefixed by >>):
> 
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
>    qcom-rpmh-regulator.c:(.text+0x270): undefined reference to `rpmh_write'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
>    qcom-rpmh-regulator.c:(.text+0x2f2): undefined reference to `rpmh_write'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
> >> qcom-rpmh-regulator.c:(.text+0x274): undefined reference to `rpmh_write_async'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
>    qcom-rpmh-regulator.c:(.text+0x2fc): undefined reference to `rpmh_write_async'
> 
> Which is due to REGULATOR_QCOM_RPMH depending on
> QCOM_RPMH || COMPILE_TEST. The problem is that QOM_RPMH can now
> be a module, which in that case requires REGULATOR_QCOM_RPMH=m
> to build.
> 
> However, if COMPILE_TEST is enabled, REGULATOR_QCOM_RPMH can be
> set to =y while QCOM_RPMH=m which will cause build failures.
> 
> The fix here is to add (QCOM_RPMH=n && COMPILE_TEST) to the
> dependency.
> 
> Feedback would be appreciated!

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

Regards,
Bjorn

> 
> Cc: Todd Kjos <tkjos@google.com>
> Cc: Saravana Kannan <saravanak@google.com>
> Cc: Andy Gross <agross@kernel.org>
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: Rajendra Nayak <rnayak@codeaurora.org>
> Cc: Maulik Shah <mkshah@codeaurora.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Liam Girdwood <lgirdwood@gmail.com>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: linux-arm-msm@vger.kernel.org
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> v2: Switch dependency logic as suggested by MarkB
> ---
>  drivers/regulator/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
> index 020a00d6696b..481c7b10133b 100644
> --- a/drivers/regulator/Kconfig
> +++ b/drivers/regulator/Kconfig
> @@ -843,7 +843,7 @@ config REGULATOR_QCOM_RPM
>  
>  config REGULATOR_QCOM_RPMH
>  	tristate "Qualcomm Technologies, Inc. RPMh regulator driver"
> -	depends on QCOM_RPMH || COMPILE_TEST
> +	depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST)
>  	help
>  	  This driver supports control of PMIC regulators via the RPMh hardware
>  	  block found on Qualcomm Technologies Inc. SoCs.  RPMh regulator
> -- 
> 2.17.1
>
Mark Brown Nov. 24, 2020, 3:37 p.m. UTC | #2 
On Mon, 23 Nov 2020 22:23:59 +0000, John Stultz wrote:
> The kernel test robot reported the following build error:
> 
> All errors (new ones prefixed by >>):
> 
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
>    qcom-rpmh-regulator.c:(.text+0x270): undefined reference to `rpmh_write'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
>    qcom-rpmh-regulator.c:(.text+0x2f2): undefined reference to `rpmh_write'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':
> >> qcom-rpmh-regulator.c:(.text+0x274): undefined reference to `rpmh_write_async'
>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':
>    qcom-rpmh-regulator.c:(.text+0x2fc): undefined reference to `rpmh_write_async'
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error
      commit: 34c5aa2666db54c4bd330fb2759f6e4d4544ad7a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
patchwork-bot+linux-arm-msm@kernel.org Dec. 29, 2020, 8:15 p.m. UTC | #3 
Hello:

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

On Mon, 23 Nov 2020 22:23:59 +0000 you wrote:
> The kernel test robot reported the following build error:

> 

> All errors (new ones prefixed by >>):

> 

>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':

>    qcom-rpmh-regulator.c:(.text+0x270): undefined reference to `rpmh_write'

>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':

>    qcom-rpmh-regulator.c:(.text+0x2f2): undefined reference to `rpmh_write'

>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_vrm_get_voltage_sel':

> >> qcom-rpmh-regulator.c:(.text+0x274): undefined reference to `rpmh_write_async'

>    xtensa-linux-ld: drivers/regulator/qcom-rpmh-regulator.o: in function `rpmh_regulator_send_request':

>    qcom-rpmh-regulator.c:(.text+0x2fc): undefined reference to `rpmh_write_async'

> 

> [...]


Here is the summary with links:
  - [v2] regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error
    https://git.kernel.org/qcom/c/34c5aa2666db

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/regulator/Kconfig b/drivers/regulator/Kconfig
index 020a00d6696b..481c7b10133b 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -843,7 +843,7 @@  config REGULATOR_QCOM_RPM
 
 config REGULATOR_QCOM_RPMH
 	tristate "Qualcomm Technologies, Inc. RPMh regulator driver"
-	depends on QCOM_RPMH || COMPILE_TEST
+	depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST)
 	help
 	  This driver supports control of PMIC regulators via the RPMh hardware
 	  block found on Qualcomm Technologies Inc. SoCs.  RPMh regulator