[PATCH] mei: fix vsc dependency

[PATCH] mei: fix vsc dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The Kconfig dependency in the new module is reversed from the dependency
on the exported symbols, so it fails to link with CONFIG_INTEL_MEI_VSC
disabled and CONFIG_INTEL_MEI_VSC_HW enabled:

ERROR: modpost: "vsc_tp_reset" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_init" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_xfer" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_need_read" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_intr_enable" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_intr_synchronize" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_intr_disable" [drivers/misc/mei/mei-vsc.ko] undefined!
ERROR: modpost: "vsc_tp_register_event_cb" [drivers/misc/mei/mei-vsc.ko] undefined!

Make the dependency reflect the module dependency.

Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/misc/mei/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index 858bd701d68c..eb69987f8325 100644
--- a/drivers/misc/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
@@ -64,6 +64,7 @@ config INTEL_MEI_VSC_HW
 	tristate "Intel visual sensing controller device transport driver"
 	depends on ACPI && SPI
 	depends on GPIOLIB || COMPILE_TEST
+	depends on INTEL_MEI_VSC
 	help
 	  Intel SPI transport driver between host and Intel visual sensing
 	  controller (IVSC) device.
@@ -73,7 +74,6 @@ config INTEL_MEI_VSC_HW
 
 config INTEL_MEI_VSC
 	tristate "Intel visual sensing controller device with ME interface"
-	depends on INTEL_MEI_VSC_HW
 	depends on INTEL_MEI
 	help
 	  Intel MEI over SPI driver for Intel visual sensing controller
-- 
2.39.2

Re: [PATCH] mei: fix vsc dependency

[Sakari Ailus]

Hi Arnd,

Thanks for the patch.

On Wed, Dec 13, 2023 at 01:43:05PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The Kconfig dependency in the new module is reversed from the dependency
> on the exported symbols, so it fails to link with CONFIG_INTEL_MEI_VSC
> disabled and CONFIG_INTEL_MEI_VSC_HW enabled:
> 
> ERROR: modpost: "vsc_tp_reset" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_init" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_xfer" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_need_read" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_intr_enable" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_intr_synchronize" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_intr_disable" [drivers/misc/mei/mei-vsc.ko] undefined!
> ERROR: modpost: "vsc_tp_register_event_cb" [drivers/misc/mei/mei-vsc.ko] undefined!
> 
> Make the dependency reflect the module dependency.
> 
> Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/misc/mei/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
> index 858bd701d68c..eb69987f8325 100644
> --- a/drivers/misc/mei/Kconfig
> +++ b/drivers/misc/mei/Kconfig
> @@ -64,6 +64,7 @@ config INTEL_MEI_VSC_HW
>  	tristate "Intel visual sensing controller device transport driver"
>  	depends on ACPI && SPI
>  	depends on GPIOLIB || COMPILE_TEST
> +	depends on INTEL_MEI_VSC

Oops. The dependency indeed seems to have been reversed.

Could you also reorder the entries so the one that depends on the other
would be below?

>  	help
>  	  Intel SPI transport driver between host and Intel visual sensing
>  	  controller (IVSC) device.
> @@ -73,7 +74,6 @@ config INTEL_MEI_VSC_HW
>  
>  config INTEL_MEI_VSC
>  	tristate "Intel visual sensing controller device with ME interface"
> -	depends on INTEL_MEI_VSC_HW
>  	depends on INTEL_MEI
>  	help
>  	  Intel MEI over SPI driver for Intel visual sensing controller

-- 
Kind regards,

Sakari Ailus

Re: [PATCH] mei: fix vsc dependency

[Arnd Bergmann]

On Wed, Dec 13, 2023, at 14:12, Sakari Ailus wrote:
> On Wed, Dec 13, 2023 at 01:43:05PM +0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>> 
>> The Kconfig dependency in the new module is reversed from the dependency
>> on the exported symbols, so it fails to link with CONFIG_INTEL_MEI_VSC
>> disabled and CONFIG_INTEL_MEI_VSC_HW enabled:
>> @@ -64,6 +64,7 @@ config INTEL_MEI_VSC_HW
>>  	tristate "Intel visual sensing controller device transport driver"
>>  	depends on ACPI && SPI
>>  	depends on GPIOLIB || COMPILE_TEST
>> +	depends on INTEL_MEI_VSC
>
> Oops. The dependency indeed seems to have been reversed.
>
> Could you also reorder the entries so the one that depends on the other
> would be below?

Update: I actually misread the code and the original dependency
appears to have been correct. Instead there is a different bug,
so I'll send a new patch after I have done enough testing on
the new version.

      Armd