Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On 08/10/2017 10:00 AM, Guenter Roeck wrote: On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: From: "Edward A. James"Add the driver to monitor power supplies with hwmon over pmbus. Signed-off-by: Edward A. James --- drivers/hwmon/pmbus/Kconfig | 10 +++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ibmps.c | 164 +++ 3 files changed, 175 insertions(+) create mode 100644 drivers/hwmon/pmbus/ibmps.c diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 68d717a..4eba657 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig @@ -37,6 +37,16 @@ config SENSORS_ADM1275 This driver can also be built as a module. If so, the module will be called adm1275. +config SENSORS_IBMPS + tristate "IBM Power Supply" + default n + help + If you say yes here you get hardware monitoring support for IBM + power supply. + + This driver can also be built as a module. If so, the module will + be called ibmps. + config SENSORS_IR35221 tristate "Infineon IR35221" default n diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile index 75bb7ca..e37b715 100644 --- a/drivers/hwmon/pmbus/Makefile +++ b/drivers/hwmon/pmbus/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_PMBUS) += pmbus_core.o obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o +obj-$(CONFIG_SENSORS_IBMPS)+= ibmps.o obj-$(CONFIG_SENSORS_IR35221) += ir35221.o obj-$(CONFIG_SENSORS_LM25066) += lm25066.o obj-$(CONFIG_SENSORS_LTC2978) += ltc2978.o diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c new file mode 100644 index 000..1928dd9 --- /dev/null +++ b/drivers/hwmon/pmbus/ibmps.c @@ -0,0 +1,164 @@ +/* + * Copyright 2017 IBM Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include + +#include "pmbus.h" + +#define IBMPS_MFR_FAN_FAULTBIT(0) +#define IBMPS_MFR_THERMAL_FAULTBIT(1) +#define IBMPS_MFR_OV_FAULT BIT(2) +#define IBMPS_MFR_UV_FAULT BIT(3) +#define IBMPS_MFR_PS_KILL BIT(4) +#define IBMPS_MFR_OC_FAULT BIT(5) +#define IBMPS_MFR_VAUX_FAULT BIT(6) +#define IBMPS_MFR_CURRENT_SHARE_WARNINGBIT(7) + +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg); + +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) +{ + int rc, mfr; + + switch (reg) { + case PMBUS_STATUS_BYTE: + case PMBUS_STATUS_WORD: + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); + break; + case PMBUS_STATUS_VOUT: + case PMBUS_STATUS_IOUT: + case PMBUS_STATUS_TEMPERATURE: + case PMBUS_STATUS_FAN_12: + rc = pmbus_read_byte_data(client, page, reg); + if (rc < 0) + return rc; + + mfr = pmbus_read_byte_data(client, page, + PMBUS_STATUS_MFR_SPECIFIC); + if (mfr < 0) + return rc; + + if (reg == PMBUS_STATUS_FAN_12) { + if (mfr & IBMPS_MFR_FAN_FAULT) + rc |= PB_FAN_FAN1_FAULT; + } else if (reg == PMBUS_STATUS_TEMPERATURE) { + if (mfr & IBMPS_MFR_THERMAL_FAULT) + rc |= PB_TEMP_OT_FAULT; + } else if (reg == PMBUS_STATUS_VOUT) { + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) + rc |= PB_VOLTAGE_OV_FAULT; + if (mfr & IBMPS_MFR_UV_FAULT) + rc |= PB_VOLTAGE_UV_FAULT; + } else if (reg == PMBUS_STATUS_IOUT) { + if (mfr & IBMPS_MFR_OC_FAULT) + rc |= PB_IOUT_OC_FAULT; + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) + rc |= PB_CURRENT_SHARE_FAULT; + } + break; + default: + if (reg >= PMBUS_VIRT_BASE) + return -ENXIO; + + rc = pmbus_read_byte_data(client, page, reg); + break; + } + + return rc; +} + +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg) +{ + int rc, mfr; + + switch (reg) { + case PMBUS_STATUS_BYTE: + case PMBUS_STATUS_WORD: + rc =
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On 08/10/2017 10:00 AM, Guenter Roeck wrote: On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: From: "Edward A. James" Add the driver to monitor power supplies with hwmon over pmbus. Signed-off-by: Edward A. James --- drivers/hwmon/pmbus/Kconfig | 10 +++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ibmps.c | 164 +++ 3 files changed, 175 insertions(+) create mode 100644 drivers/hwmon/pmbus/ibmps.c diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 68d717a..4eba657 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig @@ -37,6 +37,16 @@ config SENSORS_ADM1275 This driver can also be built as a module. If so, the module will be called adm1275. +config SENSORS_IBMPS + tristate "IBM Power Supply" + default n + help + If you say yes here you get hardware monitoring support for IBM + power supply. + + This driver can also be built as a module. If so, the module will + be called ibmps. + config SENSORS_IR35221 tristate "Infineon IR35221" default n diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile index 75bb7ca..e37b715 100644 --- a/drivers/hwmon/pmbus/Makefile +++ b/drivers/hwmon/pmbus/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_PMBUS) += pmbus_core.o obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o +obj-$(CONFIG_SENSORS_IBMPS)+= ibmps.o obj-$(CONFIG_SENSORS_IR35221) += ir35221.o obj-$(CONFIG_SENSORS_LM25066) += lm25066.o obj-$(CONFIG_SENSORS_LTC2978) += ltc2978.o diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c new file mode 100644 index 000..1928dd9 --- /dev/null +++ b/drivers/hwmon/pmbus/ibmps.c @@ -0,0 +1,164 @@ +/* + * Copyright 2017 IBM Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include + +#include "pmbus.h" + +#define IBMPS_MFR_FAN_FAULTBIT(0) +#define IBMPS_MFR_THERMAL_FAULTBIT(1) +#define IBMPS_MFR_OV_FAULT BIT(2) +#define IBMPS_MFR_UV_FAULT BIT(3) +#define IBMPS_MFR_PS_KILL BIT(4) +#define IBMPS_MFR_OC_FAULT BIT(5) +#define IBMPS_MFR_VAUX_FAULT BIT(6) +#define IBMPS_MFR_CURRENT_SHARE_WARNINGBIT(7) + +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg); + +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) +{ + int rc, mfr; + + switch (reg) { + case PMBUS_STATUS_BYTE: + case PMBUS_STATUS_WORD: + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); + break; + case PMBUS_STATUS_VOUT: + case PMBUS_STATUS_IOUT: + case PMBUS_STATUS_TEMPERATURE: + case PMBUS_STATUS_FAN_12: + rc = pmbus_read_byte_data(client, page, reg); + if (rc < 0) + return rc; + + mfr = pmbus_read_byte_data(client, page, + PMBUS_STATUS_MFR_SPECIFIC); + if (mfr < 0) + return rc; + + if (reg == PMBUS_STATUS_FAN_12) { + if (mfr & IBMPS_MFR_FAN_FAULT) + rc |= PB_FAN_FAN1_FAULT; + } else if (reg == PMBUS_STATUS_TEMPERATURE) { + if (mfr & IBMPS_MFR_THERMAL_FAULT) + rc |= PB_TEMP_OT_FAULT; + } else if (reg == PMBUS_STATUS_VOUT) { + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) + rc |= PB_VOLTAGE_OV_FAULT; + if (mfr & IBMPS_MFR_UV_FAULT) + rc |= PB_VOLTAGE_UV_FAULT; + } else if (reg == PMBUS_STATUS_IOUT) { + if (mfr & IBMPS_MFR_OC_FAULT) + rc |= PB_IOUT_OC_FAULT; + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) + rc |= PB_CURRENT_SHARE_FAULT; + } + break; + default: + if (reg >= PMBUS_VIRT_BASE) + return -ENXIO; + + rc = pmbus_read_byte_data(client, page, reg); + break; + } + + return rc; +} + +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg) +{ + int rc, mfr; + + switch (reg) { + case PMBUS_STATUS_BYTE: + case PMBUS_STATUS_WORD: + rc = pmbus_read_word_data(client, page, PMBUS_STATUS_WORD); +
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: > From: "Edward A. James"> > Add the driver to monitor power supplies with hwmon over pmbus. > > Signed-off-by: Edward A. James > --- > drivers/hwmon/pmbus/Kconfig | 10 +++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/ibmps.c | 164 > +++ > 3 files changed, 175 insertions(+) > create mode 100644 drivers/hwmon/pmbus/ibmps.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 68d717a..4eba657 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -37,6 +37,16 @@ config SENSORS_ADM1275 > This driver can also be built as a module. If so, the module will > be called adm1275. > > +config SENSORS_IBMPS > + tristate "IBM Power Supply" > + default n > + help > + If you say yes here you get hardware monitoring support for IBM > + power supply. > + > + This driver can also be built as a module. If so, the module will > + be called ibmps. > + > config SENSORS_IR35221 > tristate "Infineon IR35221" > default n > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 75bb7ca..e37b715 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -5,6 +5,7 @@ > obj-$(CONFIG_PMBUS) += pmbus_core.o > obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > obj-$(CONFIG_SENSORS_ADM1275)+= adm1275.o > +obj-$(CONFIG_SENSORS_IBMPS) += ibmps.o > obj-$(CONFIG_SENSORS_IR35221)+= ir35221.o > obj-$(CONFIG_SENSORS_LM25066)+= lm25066.o > obj-$(CONFIG_SENSORS_LTC2978)+= ltc2978.o > diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c > new file mode 100644 > index 000..1928dd9 > --- /dev/null > +++ b/drivers/hwmon/pmbus/ibmps.c > @@ -0,0 +1,164 @@ > +/* > + * Copyright 2017 IBM Corp. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#include > +#include > +#include > +#include > + > +#include "pmbus.h" > + > +#define IBMPS_MFR_FAN_FAULT BIT(0) > +#define IBMPS_MFR_THERMAL_FAULT BIT(1) > +#define IBMPS_MFR_OV_FAULT BIT(2) > +#define IBMPS_MFR_UV_FAULT BIT(3) > +#define IBMPS_MFR_PS_KILLBIT(4) > +#define IBMPS_MFR_OC_FAULT BIT(5) > +#define IBMPS_MFR_VAUX_FAULT BIT(6) > +#define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int > reg); > + > +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_BYTE: > + case PMBUS_STATUS_WORD: > + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); > + break; > + case PMBUS_STATUS_VOUT: > + case PMBUS_STATUS_IOUT: > + case PMBUS_STATUS_TEMPERATURE: > + case PMBUS_STATUS_FAN_12: > + rc = pmbus_read_byte_data(client, page, reg); > + if (rc < 0) > + return rc; > + > + mfr = pmbus_read_byte_data(client, page, > +PMBUS_STATUS_MFR_SPECIFIC); > + if (mfr < 0) > + return rc; > + > + if (reg == PMBUS_STATUS_FAN_12) { > + if (mfr & IBMPS_MFR_FAN_FAULT) > + rc |= PB_FAN_FAN1_FAULT; > + } else if (reg == PMBUS_STATUS_TEMPERATURE) { > + if (mfr & IBMPS_MFR_THERMAL_FAULT) > + rc |= PB_TEMP_OT_FAULT; > + } else if (reg == PMBUS_STATUS_VOUT) { > + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) > + rc |= PB_VOLTAGE_OV_FAULT; > + if (mfr & IBMPS_MFR_UV_FAULT) > + rc |= PB_VOLTAGE_UV_FAULT; > + } else if (reg == PMBUS_STATUS_IOUT) { > + if (mfr & IBMPS_MFR_OC_FAULT) > + rc |= PB_IOUT_OC_FAULT; > + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) > + rc |= PB_CURRENT_SHARE_FAULT; > + } > + break; > + default: > + if (reg >= PMBUS_VIRT_BASE) > + return -ENXIO; > + > + rc = pmbus_read_byte_data(client, page, reg); > + break; > + } > + > + return rc; > +} > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) {
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: > From: "Edward A. James" > > Add the driver to monitor power supplies with hwmon over pmbus. > > Signed-off-by: Edward A. James > --- > drivers/hwmon/pmbus/Kconfig | 10 +++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/ibmps.c | 164 > +++ > 3 files changed, 175 insertions(+) > create mode 100644 drivers/hwmon/pmbus/ibmps.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 68d717a..4eba657 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -37,6 +37,16 @@ config SENSORS_ADM1275 > This driver can also be built as a module. If so, the module will > be called adm1275. > > +config SENSORS_IBMPS > + tristate "IBM Power Supply" > + default n > + help > + If you say yes here you get hardware monitoring support for IBM > + power supply. > + > + This driver can also be built as a module. If so, the module will > + be called ibmps. > + > config SENSORS_IR35221 > tristate "Infineon IR35221" > default n > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 75bb7ca..e37b715 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -5,6 +5,7 @@ > obj-$(CONFIG_PMBUS) += pmbus_core.o > obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > obj-$(CONFIG_SENSORS_ADM1275)+= adm1275.o > +obj-$(CONFIG_SENSORS_IBMPS) += ibmps.o > obj-$(CONFIG_SENSORS_IR35221)+= ir35221.o > obj-$(CONFIG_SENSORS_LM25066)+= lm25066.o > obj-$(CONFIG_SENSORS_LTC2978)+= ltc2978.o > diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c > new file mode 100644 > index 000..1928dd9 > --- /dev/null > +++ b/drivers/hwmon/pmbus/ibmps.c > @@ -0,0 +1,164 @@ > +/* > + * Copyright 2017 IBM Corp. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#include > +#include > +#include > +#include > + > +#include "pmbus.h" > + > +#define IBMPS_MFR_FAN_FAULT BIT(0) > +#define IBMPS_MFR_THERMAL_FAULT BIT(1) > +#define IBMPS_MFR_OV_FAULT BIT(2) > +#define IBMPS_MFR_UV_FAULT BIT(3) > +#define IBMPS_MFR_PS_KILLBIT(4) > +#define IBMPS_MFR_OC_FAULT BIT(5) > +#define IBMPS_MFR_VAUX_FAULT BIT(6) > +#define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int > reg); > + > +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_BYTE: > + case PMBUS_STATUS_WORD: > + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); > + break; > + case PMBUS_STATUS_VOUT: > + case PMBUS_STATUS_IOUT: > + case PMBUS_STATUS_TEMPERATURE: > + case PMBUS_STATUS_FAN_12: > + rc = pmbus_read_byte_data(client, page, reg); > + if (rc < 0) > + return rc; > + > + mfr = pmbus_read_byte_data(client, page, > +PMBUS_STATUS_MFR_SPECIFIC); > + if (mfr < 0) > + return rc; > + > + if (reg == PMBUS_STATUS_FAN_12) { > + if (mfr & IBMPS_MFR_FAN_FAULT) > + rc |= PB_FAN_FAN1_FAULT; > + } else if (reg == PMBUS_STATUS_TEMPERATURE) { > + if (mfr & IBMPS_MFR_THERMAL_FAULT) > + rc |= PB_TEMP_OT_FAULT; > + } else if (reg == PMBUS_STATUS_VOUT) { > + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) > + rc |= PB_VOLTAGE_OV_FAULT; > + if (mfr & IBMPS_MFR_UV_FAULT) > + rc |= PB_VOLTAGE_UV_FAULT; > + } else if (reg == PMBUS_STATUS_IOUT) { > + if (mfr & IBMPS_MFR_OC_FAULT) > + rc |= PB_IOUT_OC_FAULT; > + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) > + rc |= PB_CURRENT_SHARE_FAULT; > + } > + break; > + default: > + if (reg >= PMBUS_VIRT_BASE) > + return -ENXIO; > + > + rc = pmbus_read_byte_data(client, page, reg); > + break; > + } > + > + return rc; > +} > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_BYTE: > +
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: > From: "Edward A. James"> > Add the driver to monitor power supplies with hwmon over pmbus. > > Signed-off-by: Edward A. James > --- > drivers/hwmon/pmbus/Kconfig | 10 +++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/ibmps.c | 164 > +++ > 3 files changed, 175 insertions(+) > create mode 100644 drivers/hwmon/pmbus/ibmps.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 68d717a..4eba657 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -37,6 +37,16 @@ config SENSORS_ADM1275 > This driver can also be built as a module. If so, the module will > be called adm1275. > > +config SENSORS_IBMPS > + tristate "IBM Power Supply" What if IBM ever produces another power supply ? I think this should be more specific. Similar, ibmps/IBMPS is way too generic. > + default n > + help > + If you say yes here you get hardware monitoring support for IBM > + power supply. > + > + This driver can also be built as a module. If so, the module will > + be called ibmps. > + > config SENSORS_IR35221 > tristate "Infineon IR35221" > default n > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 75bb7ca..e37b715 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -5,6 +5,7 @@ > obj-$(CONFIG_PMBUS) += pmbus_core.o > obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > obj-$(CONFIG_SENSORS_ADM1275)+= adm1275.o > +obj-$(CONFIG_SENSORS_IBMPS) += ibmps.o > obj-$(CONFIG_SENSORS_IR35221)+= ir35221.o > obj-$(CONFIG_SENSORS_LM25066)+= lm25066.o > obj-$(CONFIG_SENSORS_LTC2978)+= ltc2978.o > diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c > new file mode 100644 > index 000..1928dd9 > --- /dev/null > +++ b/drivers/hwmon/pmbus/ibmps.c > @@ -0,0 +1,164 @@ > +/* > + * Copyright 2017 IBM Corp. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#include > +#include > +#include > +#include > + > +#include "pmbus.h" > + > +#define IBMPS_MFR_FAN_FAULT BIT(0) > +#define IBMPS_MFR_THERMAL_FAULT BIT(1) > +#define IBMPS_MFR_OV_FAULT BIT(2) > +#define IBMPS_MFR_UV_FAULT BIT(3) > +#define IBMPS_MFR_PS_KILLBIT(4) > +#define IBMPS_MFR_OC_FAULT BIT(5) > +#define IBMPS_MFR_VAUX_FAULT BIT(6) > +#define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int > reg); > + I don't see why this would require a forward declaration. Why not just move the function ? > +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_BYTE: Is the byte part still needed with the upcoming core changes ? > + case PMBUS_STATUS_WORD: > + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); > + break; > + case PMBUS_STATUS_VOUT: > + case PMBUS_STATUS_IOUT: > + case PMBUS_STATUS_TEMPERATURE: > + case PMBUS_STATUS_FAN_12: > + rc = pmbus_read_byte_data(client, page, reg); > + if (rc < 0) > + return rc; > + > + mfr = pmbus_read_byte_data(client, page, > +PMBUS_STATUS_MFR_SPECIFIC); > + if (mfr < 0) > + return rc; > + > + if (reg == PMBUS_STATUS_FAN_12) { > + if (mfr & IBMPS_MFR_FAN_FAULT) > + rc |= PB_FAN_FAN1_FAULT; > + } else if (reg == PMBUS_STATUS_TEMPERATURE) { > + if (mfr & IBMPS_MFR_THERMAL_FAULT) > + rc |= PB_TEMP_OT_FAULT; > + } else if (reg == PMBUS_STATUS_VOUT) { > + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) > + rc |= PB_VOLTAGE_OV_FAULT; > + if (mfr & IBMPS_MFR_UV_FAULT) > + rc |= PB_VOLTAGE_UV_FAULT; > + } else if (reg == PMBUS_STATUS_IOUT) { > + if (mfr & IBMPS_MFR_OC_FAULT) > + rc |= PB_IOUT_OC_FAULT; > + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) > + rc |= PB_CURRENT_SHARE_FAULT; Is changing a warning to a fault a good idea ? > + } > + break; > + default: > +
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
On Wed, Aug 02, 2017 at 04:17:10PM -0500, Eddie James wrote: > From: "Edward A. James" > > Add the driver to monitor power supplies with hwmon over pmbus. > > Signed-off-by: Edward A. James > --- > drivers/hwmon/pmbus/Kconfig | 10 +++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/ibmps.c | 164 > +++ > 3 files changed, 175 insertions(+) > create mode 100644 drivers/hwmon/pmbus/ibmps.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 68d717a..4eba657 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -37,6 +37,16 @@ config SENSORS_ADM1275 > This driver can also be built as a module. If so, the module will > be called adm1275. > > +config SENSORS_IBMPS > + tristate "IBM Power Supply" What if IBM ever produces another power supply ? I think this should be more specific. Similar, ibmps/IBMPS is way too generic. > + default n > + help > + If you say yes here you get hardware monitoring support for IBM > + power supply. > + > + This driver can also be built as a module. If so, the module will > + be called ibmps. > + > config SENSORS_IR35221 > tristate "Infineon IR35221" > default n > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 75bb7ca..e37b715 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -5,6 +5,7 @@ > obj-$(CONFIG_PMBUS) += pmbus_core.o > obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > obj-$(CONFIG_SENSORS_ADM1275)+= adm1275.o > +obj-$(CONFIG_SENSORS_IBMPS) += ibmps.o > obj-$(CONFIG_SENSORS_IR35221)+= ir35221.o > obj-$(CONFIG_SENSORS_LM25066)+= lm25066.o > obj-$(CONFIG_SENSORS_LTC2978)+= ltc2978.o > diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c > new file mode 100644 > index 000..1928dd9 > --- /dev/null > +++ b/drivers/hwmon/pmbus/ibmps.c > @@ -0,0 +1,164 @@ > +/* > + * Copyright 2017 IBM Corp. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#include > +#include > +#include > +#include > + > +#include "pmbus.h" > + > +#define IBMPS_MFR_FAN_FAULT BIT(0) > +#define IBMPS_MFR_THERMAL_FAULT BIT(1) > +#define IBMPS_MFR_OV_FAULT BIT(2) > +#define IBMPS_MFR_UV_FAULT BIT(3) > +#define IBMPS_MFR_PS_KILLBIT(4) > +#define IBMPS_MFR_OC_FAULT BIT(5) > +#define IBMPS_MFR_VAUX_FAULT BIT(6) > +#define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) > + > +static int ibmps_read_word_data(struct i2c_client *client, int page, int > reg); > + I don't see why this would require a forward declaration. Why not just move the function ? > +static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_BYTE: Is the byte part still needed with the upcoming core changes ? > + case PMBUS_STATUS_WORD: > + rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); > + break; > + case PMBUS_STATUS_VOUT: > + case PMBUS_STATUS_IOUT: > + case PMBUS_STATUS_TEMPERATURE: > + case PMBUS_STATUS_FAN_12: > + rc = pmbus_read_byte_data(client, page, reg); > + if (rc < 0) > + return rc; > + > + mfr = pmbus_read_byte_data(client, page, > +PMBUS_STATUS_MFR_SPECIFIC); > + if (mfr < 0) > + return rc; > + > + if (reg == PMBUS_STATUS_FAN_12) { > + if (mfr & IBMPS_MFR_FAN_FAULT) > + rc |= PB_FAN_FAN1_FAULT; > + } else if (reg == PMBUS_STATUS_TEMPERATURE) { > + if (mfr & IBMPS_MFR_THERMAL_FAULT) > + rc |= PB_TEMP_OT_FAULT; > + } else if (reg == PMBUS_STATUS_VOUT) { > + if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) > + rc |= PB_VOLTAGE_OV_FAULT; > + if (mfr & IBMPS_MFR_UV_FAULT) > + rc |= PB_VOLTAGE_UV_FAULT; > + } else if (reg == PMBUS_STATUS_IOUT) { > + if (mfr & IBMPS_MFR_OC_FAULT) > + rc |= PB_IOUT_OC_FAULT; > + if (mfr & IBMPS_MFR_CURRENT_SHARE_WARNING) > + rc |= PB_CURRENT_SHARE_FAULT; Is changing a warning to a fault a good idea ? > + } > + break; > + default: > + if (reg >= PMBUS_VIRT_BASE) > +
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
Hi Edward, [auto build test ERROR on hwmon/hwmon-next] [also build test ERROR on v4.13-rc3 next-20170803] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Eddie-James/drivers-hwmon-pmbus-Add-IBM-power-supply-hwmon-driver/20170803-122545 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next config: x86_64-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): In file included from drivers/hwmon/pmbus/ibmps.c:13:0: >> drivers/hwmon/pmbus/ibmps.c:148:25: error: 'p8_i2c_occ_of_match' undeclared >> here (not in a function) MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^ include/linux/module.h:212:21: note: in definition of macro 'MODULE_DEVICE_TABLE' extern const typeof(name) __mod_##type##__##name##_device_table \ ^~~~ >> include/linux/module.h:212:27: error: >> '__mod_of__p8_i2c_occ_of_match_device_table' aliased to undefined symbol >> 'p8_i2c_occ_of_match' extern const typeof(name) __mod_##type##__##name##_device_table \ ^ >> drivers/hwmon/pmbus/ibmps.c:148:1: note: in expansion of macro >> 'MODULE_DEVICE_TABLE' MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^~~ -- In file included from drivers/hwmon//pmbus/ibmps.c:13:0: drivers/hwmon//pmbus/ibmps.c:148:25: error: 'p8_i2c_occ_of_match' undeclared here (not in a function) MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^ include/linux/module.h:212:21: note: in definition of macro 'MODULE_DEVICE_TABLE' extern const typeof(name) __mod_##type##__##name##_device_table \ ^~~~ >> include/linux/module.h:212:27: error: >> '__mod_of__p8_i2c_occ_of_match_device_table' aliased to undefined symbol >> 'p8_i2c_occ_of_match' extern const typeof(name) __mod_##type##__##name##_device_table \ ^ drivers/hwmon//pmbus/ibmps.c:148:1: note: in expansion of macro 'MODULE_DEVICE_TABLE' MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^~~ vim +/p8_i2c_occ_of_match +148 drivers/hwmon/pmbus/ibmps.c > 13 #include 14 15 #include "pmbus.h" 16 17 #define IBMPS_MFR_FAN_FAULT BIT(0) 18 #define IBMPS_MFR_THERMAL_FAULT BIT(1) 19 #define IBMPS_MFR_OV_FAULT BIT(2) 20 #define IBMPS_MFR_UV_FAULT BIT(3) 21 #define IBMPS_MFR_PS_KILL BIT(4) 22 #define IBMPS_MFR_OC_FAULT BIT(5) 23 #define IBMPS_MFR_VAUX_FAULTBIT(6) 24 #define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) 25 26 static int ibmps_read_word_data(struct i2c_client *client, int page, int reg); 27 28 static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) 29 { 30 int rc, mfr; 31 32 switch (reg) { 33 case PMBUS_STATUS_BYTE: 34 case PMBUS_STATUS_WORD: 35 rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); 36 break; 37 case PMBUS_STATUS_VOUT: 38 case PMBUS_STATUS_IOUT: 39 case PMBUS_STATUS_TEMPERATURE: 40 case PMBUS_STATUS_FAN_12: 41 rc = pmbus_read_byte_data(client, page, reg); 42 if (rc < 0) 43 return rc; 44 45 mfr = pmbus_read_byte_data(client, page, 46 PMBUS_STATUS_MFR_SPECIFIC); 47 if (mfr < 0) 48 return rc; 49 50 if (reg == PMBUS_STATUS_FAN_12) { 51 if (mfr & IBMPS_MFR_FAN_FAULT) 52 rc |= PB_FAN_FAN1_FAULT; 53 } else if (reg == PMBUS_STATUS_TEMPERATURE) { 54 if (mfr & IBMPS_MFR_THERMAL_FAULT) 55 rc |= PB_TEMP_OT_FAULT; 56 } else if (reg == PMBUS_STATUS_VOUT) { 57 if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) 58 rc |= PB_VOLTAGE_OV_FAULT; 59 if (mfr & IBMPS_MFR_UV_FAULT) 60 rc |= PB_VOLTAGE_UV_FAULT; 61 } else if (reg == PMBUS_STATUS_IOUT) { 62 if (mfr & IBMPS_MFR_OC_FAULT) 63 rc |= PB_IOUT_OC_FAULT; 64 if (mfr &
Re: [PATCH 1/4] drivers/hwmon/pmbus: Add IBM power supply hwmon driver
Hi Edward, [auto build test ERROR on hwmon/hwmon-next] [also build test ERROR on v4.13-rc3 next-20170803] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Eddie-James/drivers-hwmon-pmbus-Add-IBM-power-supply-hwmon-driver/20170803-122545 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next config: x86_64-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): In file included from drivers/hwmon/pmbus/ibmps.c:13:0: >> drivers/hwmon/pmbus/ibmps.c:148:25: error: 'p8_i2c_occ_of_match' undeclared >> here (not in a function) MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^ include/linux/module.h:212:21: note: in definition of macro 'MODULE_DEVICE_TABLE' extern const typeof(name) __mod_##type##__##name##_device_table \ ^~~~ >> include/linux/module.h:212:27: error: >> '__mod_of__p8_i2c_occ_of_match_device_table' aliased to undefined symbol >> 'p8_i2c_occ_of_match' extern const typeof(name) __mod_##type##__##name##_device_table \ ^ >> drivers/hwmon/pmbus/ibmps.c:148:1: note: in expansion of macro >> 'MODULE_DEVICE_TABLE' MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^~~ -- In file included from drivers/hwmon//pmbus/ibmps.c:13:0: drivers/hwmon//pmbus/ibmps.c:148:25: error: 'p8_i2c_occ_of_match' undeclared here (not in a function) MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^ include/linux/module.h:212:21: note: in definition of macro 'MODULE_DEVICE_TABLE' extern const typeof(name) __mod_##type##__##name##_device_table \ ^~~~ >> include/linux/module.h:212:27: error: >> '__mod_of__p8_i2c_occ_of_match_device_table' aliased to undefined symbol >> 'p8_i2c_occ_of_match' extern const typeof(name) __mod_##type##__##name##_device_table \ ^ drivers/hwmon//pmbus/ibmps.c:148:1: note: in expansion of macro 'MODULE_DEVICE_TABLE' MODULE_DEVICE_TABLE(of, p8_i2c_occ_of_match); ^~~ vim +/p8_i2c_occ_of_match +148 drivers/hwmon/pmbus/ibmps.c > 13 #include 14 15 #include "pmbus.h" 16 17 #define IBMPS_MFR_FAN_FAULT BIT(0) 18 #define IBMPS_MFR_THERMAL_FAULT BIT(1) 19 #define IBMPS_MFR_OV_FAULT BIT(2) 20 #define IBMPS_MFR_UV_FAULT BIT(3) 21 #define IBMPS_MFR_PS_KILL BIT(4) 22 #define IBMPS_MFR_OC_FAULT BIT(5) 23 #define IBMPS_MFR_VAUX_FAULTBIT(6) 24 #define IBMPS_MFR_CURRENT_SHARE_WARNING BIT(7) 25 26 static int ibmps_read_word_data(struct i2c_client *client, int page, int reg); 27 28 static int ibmps_read_byte_data(struct i2c_client *client, int page, int reg) 29 { 30 int rc, mfr; 31 32 switch (reg) { 33 case PMBUS_STATUS_BYTE: 34 case PMBUS_STATUS_WORD: 35 rc = ibmps_read_word_data(client, page, PMBUS_STATUS_WORD); 36 break; 37 case PMBUS_STATUS_VOUT: 38 case PMBUS_STATUS_IOUT: 39 case PMBUS_STATUS_TEMPERATURE: 40 case PMBUS_STATUS_FAN_12: 41 rc = pmbus_read_byte_data(client, page, reg); 42 if (rc < 0) 43 return rc; 44 45 mfr = pmbus_read_byte_data(client, page, 46 PMBUS_STATUS_MFR_SPECIFIC); 47 if (mfr < 0) 48 return rc; 49 50 if (reg == PMBUS_STATUS_FAN_12) { 51 if (mfr & IBMPS_MFR_FAN_FAULT) 52 rc |= PB_FAN_FAN1_FAULT; 53 } else if (reg == PMBUS_STATUS_TEMPERATURE) { 54 if (mfr & IBMPS_MFR_THERMAL_FAULT) 55 rc |= PB_TEMP_OT_FAULT; 56 } else if (reg == PMBUS_STATUS_VOUT) { 57 if (mfr & (IBMPS_MFR_OV_FAULT | IBMPS_MFR_VAUX_FAULT)) 58 rc |= PB_VOLTAGE_OV_FAULT; 59 if (mfr & IBMPS_MFR_UV_FAULT) 60 rc |= PB_VOLTAGE_UV_FAULT; 61 } else if (reg == PMBUS_STATUS_IOUT) { 62 if (mfr & IBMPS_MFR_OC_FAULT) 63 rc |= PB_IOUT_OC_FAULT; 64 if (mfr &