Skip to contentSkip to conversation

misc: habanalabs: avoid HWMON dependency

PATCH In review Arnd Bergmann 2 participants 3 messages Mar 4, 2019 Char and misc drivers

lore
Share & tools
lore

Arnd Bergmann

author maintainer
#0 lore raw

PATCH 1/1 misc: habanalabs: avoid HWMON dependency

When CONFIG_HWMON is disabled, we currently get a link error for this driver:

ERROR: "hwmon_device_unregister" [drivers/misc/habanalabs/habanalabs.ko] undefined!
ERROR: "hwmon_device_register_with_info" [drivers/misc/habanalabs/habanalabs.ko] undefined!

As the hardware monitoring is not a required part of the functionality, make it possible to compile without HWMON by ignoring all that functionality depending on the configuration.

---
 drivers/misc/habanalabs/hwmon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/hwmon.c +2 -2
index 77facd25c4a2..933746639831 100644
@@ -423,7 +423,7 @@ int hl_hwmon_init(struct hl_device *hdev)
 	struct device *dev = hdev->pdev ? &hdev->pdev->dev : hdev->dev;
 	int rc;
 
-	if ((hdev->hwmon_initialized) || !(hdev->fw_loading))
+	if (!IS_ENABLED(CONFIG_HWMON) || (hdev->hwmon_initialized) || !(hdev->fw_loading))
 		return 0;
 
 	if (hdev->hl_chip_info->info) {
@@ -451,7 +451,7 @@ int hl_hwmon_init(struct hl_device *hdev)
 
 void hl_hwmon_fini(struct hl_device *hdev)
 {
-	if (!hdev->hwmon_initialized)
+	if (!IS_ENABLED(CONFIG_HWMON) || !hdev->hwmon_initialized)
 		return;
 
 	hwmon_device_unregister(hdev->hwmon_dev);
Signature · 1 line
2.20.0
#1 lore raw
Quoted 38 lines · Arnd Bergmann

When CONFIG_HWMON is disabled, we currently get a link error for this driver:

ERROR: "hwmon_device_unregister" [drivers/misc/habanalabs/habanalabs.ko] undefined!
ERROR: "hwmon_device_register_with_info" [drivers/misc/habanalabs/habanalabs.ko] undefined!

As the hardware monitoring is not a required part of the functionality, make it possible to compile without HWMON by ignoring all that functionality depending on the configuration.

---
 drivers/misc/habanalabs/hwmon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/hwmon.c +2 -3
index 77facd25c4a2..933746639831 100644
@@ -423,7 +423,7 @@ int hl_hwmon_init(struct hl_device *hdev)
        struct device *dev = hdev->pdev ? &hdev->pdev->dev : hdev->dev;
        int rc;
 
-       if ((hdev->hwmon_initialized) || !(hdev->fw_loading))
+       if (!IS_ENABLED(CONFIG_HWMON) || (hdev->hwmon_initialized) || !(hdev->fw_loading))
                return 0;
 
        if (hdev->hl_chip_info->info) {
@@ -451,7 +451,7 @@ int hl_hwmon_init(struct hl_device *hdev)
 
 void hl_hwmon_fini(struct hl_device *hdev)
 {
-       if (!hdev->hwmon_initialized)
+       if (!IS_ENABLED(CONFIG_HWMON) || !hdev->hwmon_initialized)
                return;
 
        hwmon_device_unregister(hdev->hwmon_dev);
--
Quoted 2 lines

2.20.0

Hi Arnd,
I sent a patch to gkh to fix this last week (and he merged that into his tree), but I took a different approach of selecting HWMON in kconfig (with an added depends on of HAS_IOMEM to prevent dependency breakage).
I don't really want the driver to load without HWMON support. I took the example from AMD's amdgpu driver which does the same thing.

Thanks,
Oded

author maintainer
#2 lore raw
Quoted 12 lines · Oded Gabbay
Quoted 9 lines · Arnd Bergmann

When CONFIG_HWMON is disabled, we currently get a link error for this driver:

ERROR: "hwmon_device_unregister" [drivers/misc/habanalabs/habanalabs.ko] undefined!
ERROR: "hwmon_device_register_with_info" [drivers/misc/habanalabs/habanalabs.ko] undefined!

As the hardware monitoring is not a required part of the functionality, make it possible to compile without HWMON by ignoring all that functionality depending on the configuration.

Quoted 7 lines

Hi Arnd,
I sent a patch to gkh to fix this last week (and he merged that into his tree), but I took a different approach of selecting HWMON in kconfig (with an added depends on of HAS_IOMEM to prevent dependency breakage).
I don't really want the driver to load without HWMON support. I took the example from AMD's amdgpu driver which does the same thing.

Ok, that's fine, I see your fix now.

I tried to avoid doing this in Kconfig, as we already have a mix of 'depends on HWMON' and 'select HWMON', which sooner or later is likely to cause circular dependencies. Since you don't have any 'depends on' statements so far, it's not a problem for you though.

Arnd