diff mbox series

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

Message ID 20221024081527.3842565-1-jk@codeconstruct.com.au (mailing list archive)
State Accepted
Headers show
Series hwmon/occ: OCC sensors aren't arch-specific | expand

Commit Message

Jeremy Kerr Oct. 24, 2022, 8:15 a.m. UTC
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.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
 drivers/hwmon/occ/Kconfig | 2 --
 1 file changed, 2 deletions(-)

Comments

Guenter Roeck Oct. 24, 2022, 11:32 a.m. UTC | #1
On Mon, Oct 24, 2022 at 04:15:27PM +0800, Jeremy Kerr wrote:
> 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.
> 
> Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

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

> ---
>  drivers/hwmon/occ/Kconfig | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/hwmon/occ/Kconfig b/drivers/hwmon/occ/Kconfig
> index 35a7070db827..348c21100a37 100644
> --- a/drivers/hwmon/occ/Kconfig
> +++ b/drivers/hwmon/occ/Kconfig
> @@ -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
Jeremy Kerr Oct. 24, 2022, 12:51 p.m. UTC | #2
Hi Guenter,

> 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
Joel Stanley Oct. 25, 2022, 3:07 a.m. UTC | #3
On Mon, 24 Oct 2022 at 12:51, Jeremy Kerr <jk@codeconstruct.com.au> wrote:
>
> Hi Guenter,
>
> > 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.

That makes sense to me.

Acked-by: Joel Stanley <joel@jms.id.au>

Cheers,

Joel
Guenter Roeck Oct. 26, 2022, 3:01 p.m. UTC | #4
On Mon, Oct 24, 2022 at 04:15:27PM +0800, Jeremy Kerr wrote:
> 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.
> 
> Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
> Acked-by: Joel Stanley <joel@jms.id.au>

Applied to hwmon-next.

Thanks,
Guenter

> ---
>  drivers/hwmon/occ/Kconfig | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/hwmon/occ/Kconfig b/drivers/hwmon/occ/Kconfig
> index 35a7070db827..348c21100a37 100644
> --- a/drivers/hwmon/occ/Kconfig
> +++ b/drivers/hwmon/occ/Kconfig
> @@ -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
diff mbox series

Patch

diff --git a/drivers/hwmon/occ/Kconfig b/drivers/hwmon/occ/Kconfig
index 35a7070db827..348c21100a37 100644
--- a/drivers/hwmon/occ/Kconfig
+++ b/drivers/hwmon/occ/Kconfig
@@ -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