* [PATCH v5 0/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver @ 2017-08-21 19:46 Eddie James 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James ` (2 more replies) 0 siblings, 3 replies; 11+ messages in thread From: Eddie James @ 2017-08-21 19:46 UTC (permalink / raw) To: linux Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, eajames, Edward A. James From: "Edward A. James" <eajames@us.ibm.com> This series adds a hwmon pmbus driver for a POWER System power supply. The core monitoring functionality is provided by pmbus. Changes since v4: * Relocate dt bindings documentation under hwmon. Changes since v3: * Change "fault" to "alarm" in the documentation. Changes since v2: * Renamed the driver again... * Remove debugfs bool from pmbus_driver_info. * Add comment for returning rc when reading STATUS_MFR_SPECIFIC fails. Since v1: * Renamed the driver. * Removed non-hwmon attributes. * Simplified word and byte data reads. Edward A. James (3): dt-bindings: hwmon: Document the IBM CCF power supply version 1 hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Documentation: hwmon: Document the IBM CFF power supply .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++ Documentation/hwmon/ibm-cffps | 54 ++++++++ drivers/hwmon/pmbus/Kconfig | 10 ++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ibm-cffps.c | 151 +++++++++++++++++++++ 5 files changed, 237 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt create mode 100644 Documentation/hwmon/ibm-cffps create mode 100644 drivers/hwmon/pmbus/ibm-cffps.c -- 1.8.3.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 2017-08-21 19:46 [PATCH v5 0/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James @ 2017-08-21 19:46 ` Eddie James 2017-08-21 19:56 ` Eddie James ` (2 more replies) 2017-08-21 19:46 ` [PATCH v5 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James 2017-08-21 19:46 ` [PATCH v5 3/3] Documentation: hwmon: Document the IBM CFF power supply Eddie James 2 siblings, 3 replies; 11+ messages in thread From: Eddie James @ 2017-08-21 19:46 UTC (permalink / raw) To: linux Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, eajames, Edward A. James From: "Edward A. James" <eajames@us.ibm.com> Signed-off-by: Edward A. James <eajames@us.ibm.com> --- .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt new file mode 100644 index 0000000..f68a0a6 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt @@ -0,0 +1,21 @@ +Device-tree bindings for IBM Common Form Factor Power Supply Version 1 +---------------------------------------------------------------------- + +Required properties: + - compatible = "ibm,cffps1"; + - reg = < I2C bus address >; : Address of the power supply on the + I2C bus. + +Example: + + i2c-bus@100 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + < more properties > + + power-supply@68 { + compatible = "ibm,cffps1"; + reg = <0x68>; + }; + }; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James @ 2017-08-21 19:56 ` Eddie James 2017-08-25 18:10 ` Rob Herring 2017-08-30 1:04 ` [v5, " Guenter Roeck 2 siblings, 0 replies; 11+ messages in thread From: Eddie James @ 2017-08-21 19:56 UTC (permalink / raw) To: Rob Herring Cc: linux, jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet On 08/21/2017 02:46 PM, Eddie James wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Signed-off-by: Edward A. James <eajames@us.ibm.com> Forgot to add Rob Herring for the bindings. Eddie > --- > .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > > diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > new file mode 100644 > index 0000000..f68a0a6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > @@ -0,0 +1,21 @@ > +Device-tree bindings for IBM Common Form Factor Power Supply Version 1 > +---------------------------------------------------------------------- > + > +Required properties: > + - compatible = "ibm,cffps1"; > + - reg = < I2C bus address >; : Address of the power supply on the > + I2C bus. > + > +Example: > + > + i2c-bus@100 { > + #address-cells = <1>; > + #size-cells = <0>; > + #interrupt-cells = <1>; > + < more properties > > + > + power-supply@68 { > + compatible = "ibm,cffps1"; > + reg = <0x68>; > + }; > + }; ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 @ 2017-08-25 18:10 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2017-08-25 18:10 UTC (permalink / raw) To: Eddie James Cc: linux, jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, Edward A. James On Mon, Aug 21, 2017 at 02:46:11PM -0500, Eddie James wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Signed-off-by: Edward A. James <eajames@us.ibm.com> > --- > .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 @ 2017-08-25 18:10 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2017-08-25 18:10 UTC (permalink / raw) To: Eddie James Cc: linux-0h96xk9xTtrk1uMJSBkQmQ, jdelvare-IBi9RG/b67k, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-hwmon-u79uwXL29TY76Z2rM5mHXA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, corbet-T1hC0tSOHrs, Edward A. James On Mon, Aug 21, 2017 at 02:46:11PM -0500, Eddie James wrote: > From: "Edward A. James" <eajames-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > > Signed-off-by: Edward A. James <eajames-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > --- > .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [v5, 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James 2017-08-21 19:56 ` Eddie James 2017-08-25 18:10 ` Rob Herring @ 2017-08-30 1:04 ` Guenter Roeck 2 siblings, 0 replies; 11+ messages in thread From: Guenter Roeck @ 2017-08-30 1:04 UTC (permalink / raw) To: eajames Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, Edward A. James On Mon, Aug 21, 2017 at 02:46:11PM -0500, eajames@linux.vnet.ibm.com wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Signed-off-by: Edward A. James <eajames@us.ibm.com> > Acked-by: Rob Herring <robh@kernel.org> Applied to hwmon-next Thanks, Guenter > --- > .../devicetree/bindings/hwmon/ibm,cffps1.txt | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > > diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > new file mode 100644 > index 0000000..f68a0a6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt > @@ -0,0 +1,21 @@ > +Device-tree bindings for IBM Common Form Factor Power Supply Version 1 > +---------------------------------------------------------------------- > + > +Required properties: > + - compatible = "ibm,cffps1"; > + - reg = < I2C bus address >; : Address of the power supply on the > + I2C bus. > + > +Example: > + > + i2c-bus@100 { > + #address-cells = <1>; > + #size-cells = <0>; > + #interrupt-cells = <1>; > + < more properties > > + > + power-supply@68 { > + compatible = "ibm,cffps1"; > + reg = <0x68>; > + }; > + }; ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver 2017-08-21 19:46 [PATCH v5 0/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James @ 2017-08-21 19:46 ` Eddie James 2017-08-30 1:06 ` [v5, " Guenter Roeck 2017-08-21 19:46 ` [PATCH v5 3/3] Documentation: hwmon: Document the IBM CFF power supply Eddie James 2 siblings, 1 reply; 11+ messages in thread From: Eddie James @ 2017-08-21 19:46 UTC (permalink / raw) To: linux Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, eajames, Edward A. James From: "Edward A. James" <eajames@us.ibm.com> Add the driver to monitor IBM CFF power supplies with hwmon over pmbus. Signed-off-by: Edward A. James <eajames@us.ibm.com> --- drivers/hwmon/pmbus/Kconfig | 10 +++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ibm-cffps.c | 151 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 drivers/hwmon/pmbus/ibm-cffps.c diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 68d717a..f3de18a 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_IBM_CFFPS + tristate "IBM Common Form Factor Power Supply" + default n + help + If you say yes here you get hardware monitoring support for the IBM + Common Form Factor power supply. + + This driver can also be built as a module. If so, the module will + be called ibm-cffps. + config SENSORS_IR35221 tristate "Infineon IR35221" default n diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile index 75bb7ca..737fa4e 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_IBM_CFFPS) += ibm-cffps.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/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c new file mode 100644 index 0000000..1a6294c --- /dev/null +++ b/drivers/hwmon/pmbus/ibm-cffps.c @@ -0,0 +1,151 @@ +/* + * 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 <linux/device.h> +#include <linux/i2c.h> +#include <linux/jiffies.h> +#include <linux/module.h> + +#include "pmbus.h" + +/* STATUS_MFR_SPECIFIC bits */ +#define CFFPS_MFR_FAN_FAULT BIT(0) +#define CFFPS_MFR_THERMAL_FAULT BIT(1) +#define CFFPS_MFR_OV_FAULT BIT(2) +#define CFFPS_MFR_UV_FAULT BIT(3) +#define CFFPS_MFR_PS_KILL BIT(4) +#define CFFPS_MFR_OC_FAULT BIT(5) +#define CFFPS_MFR_VAUX_FAULT BIT(6) +#define CFFPS_MFR_CURRENT_SHARE_WARNING BIT(7) + +static int ibm_cffps_read_byte_data(struct i2c_client *client, int page, + int reg) +{ + int rc, mfr; + + switch (reg) { + 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 the status register instead of an error, + * since we successfully read status. + */ + return rc; + + /* Add MFR_SPECIFIC bits to the standard pmbus status regs. */ + if (reg == PMBUS_STATUS_FAN_12) { + if (mfr & CFFPS_MFR_FAN_FAULT) + rc |= PB_FAN_FAN1_FAULT; + } else if (reg == PMBUS_STATUS_TEMPERATURE) { + if (mfr & CFFPS_MFR_THERMAL_FAULT) + rc |= PB_TEMP_OT_FAULT; + } else if (reg == PMBUS_STATUS_VOUT) { + if (mfr & (CFFPS_MFR_OV_FAULT | CFFPS_MFR_VAUX_FAULT)) + rc |= PB_VOLTAGE_OV_FAULT; + if (mfr & CFFPS_MFR_UV_FAULT) + rc |= PB_VOLTAGE_UV_FAULT; + } else if (reg == PMBUS_STATUS_IOUT) { + if (mfr & CFFPS_MFR_OC_FAULT) + rc |= PB_IOUT_OC_FAULT; + if (mfr & CFFPS_MFR_CURRENT_SHARE_WARNING) + rc |= PB_CURRENT_SHARE_FAULT; + } + break; + default: + rc = -ENODATA; + break; + } + + return rc; +} + +static int ibm_cffps_read_word_data(struct i2c_client *client, int page, + int reg) +{ + int rc, mfr; + + switch (reg) { + case PMBUS_STATUS_WORD: + rc = pmbus_read_word_data(client, page, reg); + if (rc < 0) + return rc; + + mfr = pmbus_read_byte_data(client, page, + PMBUS_STATUS_MFR_SPECIFIC); + if (mfr < 0) + /* + * Return the status register instead of an error, + * since we successfully read status. + */ + return rc; + + if (mfr & CFFPS_MFR_PS_KILL) + rc |= PB_STATUS_OFF; + break; + default: + rc = -ENODATA; + break; + } + + return rc; +} + +static struct pmbus_driver_info ibm_cffps_info = { + .pages = 1, + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP | + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT | + PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT | + PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12, + .read_byte_data = ibm_cffps_read_byte_data, + .read_word_data = ibm_cffps_read_word_data, +}; + +static int ibm_cffps_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + return pmbus_do_probe(client, id, &ibm_cffps_info); +} + +static const struct i2c_device_id ibm_cffps_id[] = { + { "ibm_cffps1", 1 }, + {} +}; +MODULE_DEVICE_TABLE(i2c, ibm_cffps_id); + +static const struct of_device_id ibm_cffps_of_match[] = { + { .compatible = "ibm,cffps1" }, + {} +}; +MODULE_DEVICE_TABLE(of, ibm_cffps_of_match); + +static struct i2c_driver ibm_cffps_driver = { + .driver = { + .name = "ibm-cffps", + .of_match_table = ibm_cffps_of_match, + }, + .probe = ibm_cffps_probe, + .remove = pmbus_do_remove, + .id_table = ibm_cffps_id, +}; + +module_i2c_driver(ibm_cffps_driver); + +MODULE_AUTHOR("Eddie James"); +MODULE_DESCRIPTION("PMBus driver for IBM Common Form Factor power supplies"); +MODULE_LICENSE("GPL"); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [v5, 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver 2017-08-21 19:46 ` [PATCH v5 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James @ 2017-08-30 1:06 ` Guenter Roeck 0 siblings, 0 replies; 11+ messages in thread From: Guenter Roeck @ 2017-08-30 1:06 UTC (permalink / raw) To: eajames Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, Edward A. James On Mon, Aug 21, 2017 at 02:46:12PM -0500, eajames@linux.vnet.ibm.com wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Add the driver to monitor IBM CFF power supplies with hwmon over > pmbus. > > Signed-off-by: Edward A. James <eajames@us.ibm.com> Applied to hwmon-next with the following changes: - "default n" is unnecessary. - include jiffies.h is unnecessary, but we need to include bitops.h. Thanks, Guenter > --- > drivers/hwmon/pmbus/Kconfig | 10 +++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/ibm-cffps.c | 151 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 162 insertions(+) > create mode 100644 drivers/hwmon/pmbus/ibm-cffps.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 68d717a..f3de18a 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_IBM_CFFPS > + tristate "IBM Common Form Factor Power Supply" > + default n > + help > + If you say yes here you get hardware monitoring support for the IBM > + Common Form Factor power supply. > + > + This driver can also be built as a module. If so, the module will > + be called ibm-cffps. > + > config SENSORS_IR35221 > tristate "Infineon IR35221" > default n > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 75bb7ca..737fa4e 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_IBM_CFFPS) += ibm-cffps.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/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c > new file mode 100644 > index 0000000..1a6294c > --- /dev/null > +++ b/drivers/hwmon/pmbus/ibm-cffps.c > @@ -0,0 +1,151 @@ > +/* > + * 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 <linux/device.h> > +#include <linux/i2c.h> > +#include <linux/jiffies.h> > +#include <linux/module.h> > + > +#include "pmbus.h" > + > +/* STATUS_MFR_SPECIFIC bits */ > +#define CFFPS_MFR_FAN_FAULT BIT(0) > +#define CFFPS_MFR_THERMAL_FAULT BIT(1) > +#define CFFPS_MFR_OV_FAULT BIT(2) > +#define CFFPS_MFR_UV_FAULT BIT(3) > +#define CFFPS_MFR_PS_KILL BIT(4) > +#define CFFPS_MFR_OC_FAULT BIT(5) > +#define CFFPS_MFR_VAUX_FAULT BIT(6) > +#define CFFPS_MFR_CURRENT_SHARE_WARNING BIT(7) > + > +static int ibm_cffps_read_byte_data(struct i2c_client *client, int page, > + int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + 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 the status register instead of an error, > + * since we successfully read status. > + */ > + return rc; > + > + /* Add MFR_SPECIFIC bits to the standard pmbus status regs. */ > + if (reg == PMBUS_STATUS_FAN_12) { > + if (mfr & CFFPS_MFR_FAN_FAULT) > + rc |= PB_FAN_FAN1_FAULT; > + } else if (reg == PMBUS_STATUS_TEMPERATURE) { > + if (mfr & CFFPS_MFR_THERMAL_FAULT) > + rc |= PB_TEMP_OT_FAULT; > + } else if (reg == PMBUS_STATUS_VOUT) { > + if (mfr & (CFFPS_MFR_OV_FAULT | CFFPS_MFR_VAUX_FAULT)) > + rc |= PB_VOLTAGE_OV_FAULT; > + if (mfr & CFFPS_MFR_UV_FAULT) > + rc |= PB_VOLTAGE_UV_FAULT; > + } else if (reg == PMBUS_STATUS_IOUT) { > + if (mfr & CFFPS_MFR_OC_FAULT) > + rc |= PB_IOUT_OC_FAULT; > + if (mfr & CFFPS_MFR_CURRENT_SHARE_WARNING) > + rc |= PB_CURRENT_SHARE_FAULT; > + } > + break; > + default: > + rc = -ENODATA; > + break; > + } > + > + return rc; > +} > + > +static int ibm_cffps_read_word_data(struct i2c_client *client, int page, > + int reg) > +{ > + int rc, mfr; > + > + switch (reg) { > + case PMBUS_STATUS_WORD: > + rc = pmbus_read_word_data(client, page, reg); > + if (rc < 0) > + return rc; > + > + mfr = pmbus_read_byte_data(client, page, > + PMBUS_STATUS_MFR_SPECIFIC); > + if (mfr < 0) > + /* > + * Return the status register instead of an error, > + * since we successfully read status. > + */ > + return rc; > + > + if (mfr & CFFPS_MFR_PS_KILL) > + rc |= PB_STATUS_OFF; > + break; > + default: > + rc = -ENODATA; > + break; > + } > + > + return rc; > +} > + > +static struct pmbus_driver_info ibm_cffps_info = { > + .pages = 1, > + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP | > + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT | > + PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT | > + PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12, > + .read_byte_data = ibm_cffps_read_byte_data, > + .read_word_data = ibm_cffps_read_word_data, > +}; > + > +static int ibm_cffps_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + return pmbus_do_probe(client, id, &ibm_cffps_info); > +} > + > +static const struct i2c_device_id ibm_cffps_id[] = { > + { "ibm_cffps1", 1 }, > + {} > +}; > +MODULE_DEVICE_TABLE(i2c, ibm_cffps_id); > + > +static const struct of_device_id ibm_cffps_of_match[] = { > + { .compatible = "ibm,cffps1" }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, ibm_cffps_of_match); > + > +static struct i2c_driver ibm_cffps_driver = { > + .driver = { > + .name = "ibm-cffps", > + .of_match_table = ibm_cffps_of_match, > + }, > + .probe = ibm_cffps_probe, > + .remove = pmbus_do_remove, > + .id_table = ibm_cffps_id, > +}; > + > +module_i2c_driver(ibm_cffps_driver); > + > +MODULE_AUTHOR("Eddie James"); > +MODULE_DESCRIPTION("PMBus driver for IBM Common Form Factor power supplies"); > +MODULE_LICENSE("GPL"); ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v5 3/3] Documentation: hwmon: Document the IBM CFF power supply 2017-08-21 19:46 [PATCH v5 0/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James 2017-08-21 19:46 ` [PATCH v5 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James @ 2017-08-21 19:46 ` Eddie James 2017-08-30 1:07 ` Guenter Roeck 2 siblings, 1 reply; 11+ messages in thread From: Eddie James @ 2017-08-21 19:46 UTC (permalink / raw) To: linux Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, eajames, Edward A. James From: "Edward A. James" <eajames@us.ibm.com> Signed-off-by: Edward A. James <eajames@us.ibm.com> --- Documentation/hwmon/ibm-cffps | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/hwmon/ibm-cffps diff --git a/Documentation/hwmon/ibm-cffps b/Documentation/hwmon/ibm-cffps new file mode 100644 index 0000000..e05ecd8 --- /dev/null +++ b/Documentation/hwmon/ibm-cffps @@ -0,0 +1,54 @@ +Kernel driver ibm-cffps +======================= + +Supported chips: + * IBM Common Form Factor power supply + +Author: Eddie James <eajames@us.ibm.com> + +Description +----------- + +This driver supports IBM Common Form Factor (CFF) power supplies. This driver +is a client to the core PMBus driver. + +Usage Notes +----------- + +This driver does not auto-detect devices. You will have to instantiate the +devices explicitly. Please see Documentation/i2c/instantiating-devices for +details. + +Sysfs entries +------------- + +The following attributes are supported: + +curr1_alarm Output current over-current alarm. +curr1_input Measured output current in mA. +curr1_label "iout1" + +fan1_alarm Fan 1 warning. +fan1_fault Fan 1 fault. +fan1_input Fan 1 speed in RPM. +fan2_alarm Fan 2 warning. +fan2_fault Fan 2 fault. +fan2_input Fan 2 speed in RPM. + +in1_alarm Input voltage under-voltage alarm. +in1_input Measured input voltage in mV. +in1_label "vin" +in2_alarm Output voltage over-voltage alarm. +in2_input Measured output voltage in mV. +in2_label "vout1" + +power1_alarm Input fault or alarm. +power1_input Measured input power in uW. +power1_label "pin" + +temp1_alarm PSU inlet ambient temperature over-temperature alarm. +temp1_input Measured PSU inlet ambient temp in millidegrees C. +temp2_alarm Secondary rectifier temp over-temperature alarm. +temp2_input Measured secondary rectifier temp in millidegrees C. +temp3_alarm ORing FET temperature over-temperature alarm. +temp3_input Measured ORing FET temperature in millidegrees C. -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [v5,3/3] Documentation: hwmon: Document the IBM CFF power supply @ 2017-08-30 1:07 ` Guenter Roeck 0 siblings, 0 replies; 11+ messages in thread From: Guenter Roeck @ 2017-08-30 1:07 UTC (permalink / raw) To: eajames Cc: jdelvare, linux-kernel, linux-hwmon, mark.rutland, devicetree, corbet, Edward A. James On Mon, Aug 21, 2017 at 02:46:13PM -0500, eajames@linux.vnet.ibm.com wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Signed-off-by: Edward A. James <eajames@us.ibm.com> Applied to hwmon-next. Thanks, Guenter > --- > Documentation/hwmon/ibm-cffps | 54 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) > create mode 100644 Documentation/hwmon/ibm-cffps > > diff --git a/Documentation/hwmon/ibm-cffps b/Documentation/hwmon/ibm-cffps > new file mode 100644 > index 0000000..e05ecd8 > --- /dev/null > +++ b/Documentation/hwmon/ibm-cffps > @@ -0,0 +1,54 @@ > +Kernel driver ibm-cffps > +======================= > + > +Supported chips: > + * IBM Common Form Factor power supply > + > +Author: Eddie James <eajames@us.ibm.com> > + > +Description > +----------- > + > +This driver supports IBM Common Form Factor (CFF) power supplies. This driver > +is a client to the core PMBus driver. > + > +Usage Notes > +----------- > + > +This driver does not auto-detect devices. You will have to instantiate the > +devices explicitly. Please see Documentation/i2c/instantiating-devices for > +details. > + > +Sysfs entries > +------------- > + > +The following attributes are supported: > + > +curr1_alarm Output current over-current alarm. > +curr1_input Measured output current in mA. > +curr1_label "iout1" > + > +fan1_alarm Fan 1 warning. > +fan1_fault Fan 1 fault. > +fan1_input Fan 1 speed in RPM. > +fan2_alarm Fan 2 warning. > +fan2_fault Fan 2 fault. > +fan2_input Fan 2 speed in RPM. > + > +in1_alarm Input voltage under-voltage alarm. > +in1_input Measured input voltage in mV. > +in1_label "vin" > +in2_alarm Output voltage over-voltage alarm. > +in2_input Measured output voltage in mV. > +in2_label "vout1" > + > +power1_alarm Input fault or alarm. > +power1_input Measured input power in uW. > +power1_label "pin" > + > +temp1_alarm PSU inlet ambient temperature over-temperature alarm. > +temp1_input Measured PSU inlet ambient temp in millidegrees C. > +temp2_alarm Secondary rectifier temp over-temperature alarm. > +temp2_input Measured secondary rectifier temp in millidegrees C. > +temp3_alarm ORing FET temperature over-temperature alarm. > +temp3_input Measured ORing FET temperature in millidegrees C. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [v5,3/3] Documentation: hwmon: Document the IBM CFF power supply @ 2017-08-30 1:07 ` Guenter Roeck 0 siblings, 0 replies; 11+ messages in thread From: Guenter Roeck @ 2017-08-30 1:07 UTC (permalink / raw) To: eajames-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8 Cc: jdelvare-IBi9RG/b67k, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-hwmon-u79uwXL29TY76Z2rM5mHXA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, corbet-T1hC0tSOHrs, Edward A. James On Mon, Aug 21, 2017 at 02:46:13PM -0500, eajames-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org wrote: > From: "Edward A. James" <eajames-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > > Signed-off-by: Edward A. James <eajames-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> Applied to hwmon-next. Thanks, Guenter > --- > Documentation/hwmon/ibm-cffps | 54 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) > create mode 100644 Documentation/hwmon/ibm-cffps > > diff --git a/Documentation/hwmon/ibm-cffps b/Documentation/hwmon/ibm-cffps > new file mode 100644 > index 0000000..e05ecd8 > --- /dev/null > +++ b/Documentation/hwmon/ibm-cffps > @@ -0,0 +1,54 @@ > +Kernel driver ibm-cffps > +======================= > + > +Supported chips: > + * IBM Common Form Factor power supply > + > +Author: Eddie James <eajames-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > + > +Description > +----------- > + > +This driver supports IBM Common Form Factor (CFF) power supplies. This driver > +is a client to the core PMBus driver. > + > +Usage Notes > +----------- > + > +This driver does not auto-detect devices. You will have to instantiate the > +devices explicitly. Please see Documentation/i2c/instantiating-devices for > +details. > + > +Sysfs entries > +------------- > + > +The following attributes are supported: > + > +curr1_alarm Output current over-current alarm. > +curr1_input Measured output current in mA. > +curr1_label "iout1" > + > +fan1_alarm Fan 1 warning. > +fan1_fault Fan 1 fault. > +fan1_input Fan 1 speed in RPM. > +fan2_alarm Fan 2 warning. > +fan2_fault Fan 2 fault. > +fan2_input Fan 2 speed in RPM. > + > +in1_alarm Input voltage under-voltage alarm. > +in1_input Measured input voltage in mV. > +in1_label "vin" > +in2_alarm Output voltage over-voltage alarm. > +in2_input Measured output voltage in mV. > +in2_label "vout1" > + > +power1_alarm Input fault or alarm. > +power1_input Measured input power in uW. > +power1_label "pin" > + > +temp1_alarm PSU inlet ambient temperature over-temperature alarm. > +temp1_input Measured PSU inlet ambient temp in millidegrees C. > +temp2_alarm Secondary rectifier temp over-temperature alarm. > +temp2_input Measured secondary rectifier temp in millidegrees C. > +temp3_alarm ORing FET temperature over-temperature alarm. > +temp3_input Measured ORing FET temperature in millidegrees C. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-08-30 1:09 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-21 19:46 [PATCH v5 0/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James 2017-08-21 19:46 ` [PATCH v5 1/3] dt-bindings: hwmon: Document the IBM CCF power supply version 1 Eddie James 2017-08-21 19:56 ` Eddie James 2017-08-25 18:10 ` Rob Herring 2017-08-25 18:10 ` Rob Herring 2017-08-30 1:04 ` [v5, " Guenter Roeck 2017-08-21 19:46 ` [PATCH v5 2/3] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver Eddie James 2017-08-30 1:06 ` [v5, " Guenter Roeck 2017-08-21 19:46 ` [PATCH v5 3/3] Documentation: hwmon: Document the IBM CFF power supply Eddie James 2017-08-30 1:07 ` [v5,3/3] " Guenter Roeck 2017-08-30 1:07 ` Guenter Roeck
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.