Skip to contentSkip to conversation

hwmon/occ: OCC sensors aren't arch-specific

PATCH Applied Jeremy Kerr 3 participants 5 messages Oct 24, 2022 – Oct 26, 2022 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwmon/occ: OCC sensors aren't arch-specific

Commit c112d75840fb ("hwmon: OCC drivers are ARM-only") made the OCC sensor drivers not selectable on powerpc64:

These drivers are for a BMC inside PowerPC servers. The BMC runs on ARM hardware, so only propose the drivers on this architecture, unless build-testing.

... but we now have a powerpc64 BMC (still for a powerpc64 host), so drop the depends on that excludes building for this platform.

---
 drivers/hwmon/occ/Kconfig | 2 --
 1 file changed, 2 deletions(-)
drivers/hwmon/occ/Kconfig +0 -2
index 35a7070db827..348c21100a37 100644
@@ -6,7 +6,6 @@
 config SENSORS_OCC_P8_I2C
 	tristate "POWER8 OCC through I2C"
 	depends on I2C
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the
@@ -21,7 +20,6 @@ config SENSORS_OCC_P8_I2C
 config SENSORS_OCC_P9_SBE
 	tristate "POWER9 OCC through SBE"
 	depends on FSI_OCC
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 11 lines · Jeremy Kerr

Commit c112d75840fb ("hwmon: OCC drivers are ARM-only") made the OCC sensor drivers not selectable on powerpc64:

These drivers are for a BMC inside PowerPC servers. The BMC runs on ARM hardware, so only propose the drivers on this architecture, unless build-testing.

... but we now have a powerpc64 BMC (still for a powerpc64 host), so drop the depends on that excludes building for this platform.

Should the original patch be reverted instead, and should the revert be backported ? In other words, is this a bug fix which needs to be applied to v6.1, or is it needed for v6.2+ only ?

Thanks,
Guenter

Quoted 24 lines
---
 drivers/hwmon/occ/Kconfig | 2 --
 1 file changed, 2 deletions(-)
drivers/hwmon/occ/Kconfig +0 -2
index 35a7070db827..348c21100a37 100644
@@ -6,7 +6,6 @@
 config SENSORS_OCC_P8_I2C
 	tristate "POWER8 OCC through I2C"
 	depends on I2C
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the
@@ -21,7 +20,6 @@ config SENSORS_OCC_P8_I2C
 config SENSORS_OCC_P9_SBE
 	tristate "POWER9 OCC through SBE"
 	depends on FSI_OCC
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the
#2 lore raw

Hi Guenter,

Quoted 3 lines

Should the original patch be reverted instead, and should the revert be backported ? In other words, is this a bug fix which needs to be applied to v6.1, or is it needed for v6.2+ only ?

This isn't a regression, we're just enabling this driver on a new hardware implementation. No need to backport either.

I don't think that warrants a revert, as having a separate change means we keep the rationale for both changes in the git history.

Cheers,

Jeremy

Acked-by
#3 lore raw
Quoted 7 lines · Jeremy Kerr

Hi Guenter,

Quoted 3 lines

Should the original patch be reverted instead, and should the revert be backported ? In other words, is this a bug fix which needs to be applied to v6.1, or is it needed for v6.2+ only ?

Quoted 5 lines

This isn't a regression, we're just enabling this driver on a new hardware implementation. No need to backport either.

I don't think that warrants a revert, as having a separate change means we keep the rationale for both changes in the git history.

That makes sense to me.

Cheers,

Joel

maintainer Applied
#4 lore raw
In reply to Jeremy Kerr
Quoted 7 lines · Jeremy Kerr

Commit c112d75840fb ("hwmon: OCC drivers are ARM-only") made the OCC sensor drivers not selectable on powerpc64:

These drivers are for a BMC inside PowerPC servers. The BMC runs on ARM hardware, so only propose the drivers on this architecture, unless build-testing.

Quoted 5 lines

... but we now have a powerpc64 BMC (still for a powerpc64 host), so drop the depends on that excludes building for this platform.

Applied to hwmon-next.

Thanks,
Guenter

Quoted 24 lines
---
 drivers/hwmon/occ/Kconfig | 2 --
 1 file changed, 2 deletions(-)
drivers/hwmon/occ/Kconfig +0 -2
index 35a7070db827..348c21100a37 100644
@@ -6,7 +6,6 @@
 config SENSORS_OCC_P8_I2C
 	tristate "POWER8 OCC through I2C"
 	depends on I2C
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the
@@ -21,7 +20,6 @@ config SENSORS_OCC_P8_I2C
 config SENSORS_OCC_P9_SBE
 	tristate "POWER9 OCC through SBE"
 	depends on FSI_OCC
-	depends on ARM || ARM64 || COMPILE_TEST
 	select SENSORS_OCC
 	help
 	 This option enables support for monitoring sensors provided by the