[PATCH linux dev-4.10 v5 0/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[PATCH linux dev-4.10 v5 0/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[Eddie 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.

These devices should be auto-probed on the I2C bus, so I added them to the
witherspoon device tree.

Changes since v4:
 * Rename the driver again...
 * Change compatible property; we can't have any '-' in the compatible
   property because pmbus will use that string for hwmon registration name,
   which disallows that character.
 * Remove debugfs bool from pmbus_driver_info
 * Add comment about returning rc when reading STATUS_MFR_SPECIFIC fails.

Edward A. James (4):
  dt-bindings: i2c: 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
  ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus

 .../devicetree/bindings/i2c/ibm,cffps1.txt         |  21 +++
 Documentation/hwmon/ibm-cffps                      |  54 ++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |  10 ++
 drivers/hwmon/pmbus/Kconfig                        |  10 ++
 drivers/hwmon/pmbus/Makefile                       |   1 +
 drivers/hwmon/pmbus/ibm-cffps.c                    | 151 +++++++++++++++++++++
 6 files changed, 247 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
 create mode 100644 Documentation/hwmon/ibm-cffps
 create mode 100644 drivers/hwmon/pmbus/ibm-cffps.c

-- 
1.8.3.1

[PATCH linux dev-4.10 v5 1/4] dt-bindings: i2c: Document the IBM CCF power supply version 1

[Eddie James]

From: "Edward A. James" <eajames@us.ibm.com>

Signed-off-by: Edward A. James <eajames@us.ibm.com>
---
 .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

diff --git a/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
new file mode 100644
index 0000000..f68a0a6
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/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

[PATCH linux dev-4.10 v5 2/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[Eddie 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 04f6baa..c05b264 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 663801c..d3d0b2e 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

[PATCH linux dev-4.10 v5 3/4] Documentation: hwmon: Document the IBM CFF power supply

[Eddie 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..e091ff2
--- /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 fault.
+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 fault.
+in1_input		Measured input voltage in mV.
+in1_label		"vin"
+in2_alarm		Output voltage over-voltage fault.
+in2_input		Measured output voltage in mV.
+in2_label		"vout1"
+
+power1_alarm		Input fault.
+power1_input		Measured input power in uW.
+power1_label		"pin"
+
+temp1_alarm		PSU inlet ambient temperature over-temperature fault.
+temp1_input		Measured PSU inlet ambient temp in millidegrees C.
+temp2_alarm		Secondary rectifier temp over-temperature fault.
+temp2_input		Measured secondary rectifier temp in millidegrees C.
+temp3_alarm		ORing FET temperature over-temperature fault.
+temp3_input		Measured ORing FET temperature in millidegrees C.
-- 
1.8.3.1

[PATCH linux dev-4.10 v5 4/4] ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus

[Eddie James]

From: "Edward A. James" <eajames@us.ibm.com>

Signed-off-by: Edward A. James <eajames@us.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 9ab8e46..dd30c20 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -417,6 +417,16 @@
 			type = <PCA955X_TYPE_GPIO>;
 		};
 	};
+
+	power-supply@68 {
+		compatible = "ibm,cffps1";
+		reg = <0x68>;
+	};
+
+	power-supply@69 {
+		compatible = "ibm,cffps1";
+		reg = <0x69>;
+	};
 };
 
 &i2c4 {
-- 
1.8.3.1

Re: [PATCH linux dev-4.10 v5 0/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[Brandon Wyman]

On Fri, Aug 11, 2017 at 12:56 PM, Eddie James
<eajames@linux.vnet.ibm.com> wrote:
> 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.
>
> These devices should be auto-probed on the I2C bus, so I added them to the
> witherspoon device tree.
>
> Changes since v4:
>  * Rename the driver again...
>  * Change compatible property; we can't have any '-' in the compatible
>    property because pmbus will use that string for hwmon registration name,
>    which disallows that character.
>  * Remove debugfs bool from pmbus_driver_info
>  * Add comment about returning rc when reading STATUS_MFR_SPECIFIC fails.
>
> Edward A. James (4):
>   dt-bindings: i2c: 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
>   ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus
>
>  .../devicetree/bindings/i2c/ibm,cffps1.txt         |  21 +++
>  Documentation/hwmon/ibm-cffps                      |  54 ++++++++
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |  10 ++
>  drivers/hwmon/pmbus/Kconfig                        |  10 ++
>  drivers/hwmon/pmbus/Makefile                       |   1 +
>  drivers/hwmon/pmbus/ibm-cffps.c                    | 151 +++++++++++++++++++++
>  6 files changed, 247 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
>  create mode 100644 Documentation/hwmon/ibm-cffps
>  create mode 100644 drivers/hwmon/pmbus/ibm-cffps.c
>
> --
> 1.8.3.1
>

Tested-by: Brandon Wyman <bjwyman@gmail.com>

Re: [PATCH linux dev-4.10 v5 1/4] dt-bindings: i2c: Document the IBM CCF power supply version 1

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

On Fri, 2017-08-11 at 12:56 -0500, Eddie James wrote:
> > From: "Edward A. James" <eajames@us.ibm.com>
> 
> > Signed-off-by: Edward A. James <eajames@us.ibm.com>
> ---
>  .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21
+++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>  create mode 100644
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> 
> diff --git a/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> new file mode 100644
> index 0000000..f68a0a6
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/i2c/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.

Should we define properties for these registers?

* OPERATION
* ON_OFF_CONFIG
* SYS_CONFIG

Cheers,

Andrew

> +
> +Example:
> +
> > +    i2c-bus@100 {
> +        #address-cells = <1>;
> +        #size-cells = <0>;
> +        #interrupt-cells = <1>;
> +        < more properties >
> +
> > +        power-supply@68 {
> +            compatible = "ibm,cffps1";
> +            reg = <0x68>;
> +        };
> +    };

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH linux dev-4.10 v5 2/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 7913 bytes --]

On Fri, 2017-08-11 at 12:56 -0500, Eddie James 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>
> ---
>  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 04f6baa..c05b264 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 663801c..d3d0b2e 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,

I feel you should also be setting the format field where relevant. In some
spots the documentation suggests different formats are used across the
different capabilities. However as a fallback it states:

	The power supply will report all values using the linear data formats,
	unless otherwise specified. The power supply will accept values using
	only the linear data formats unless otherwise specified.

The "otherwise specified" cases aren't covered by the driver or the core, so
you're out of the woods there.

However, it happens that the linear enum value is '0' and so the driver works
implicitly due to the way you're initialising the structure. I think it's
better to be explicit rather than implicit, otherwise it just looks like an
omission.

I would prefer we add something like:

	.format[PSC_VOLTAGE_IN] = linear;
	.format[PSC_VOLTAGE_OUT] = linear;
	.format[PSC_CURRENT_OUT] = linear;
	.format[PSC_POWER] = linear;
	.format[PSC_FAN] = linear;
	.format[PSC_TEMPERATURE] = linear;

That said, it's a bit of a nit as it should work regardless. I'd be happy with
a follow-up patch adding the format assignments in.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>


> > +	.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");

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH linux dev-4.10 v5 3/4] Documentation: hwmon: Document the IBM CFF power supply

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]

On Fri, 2017-08-11 at 12:56 -0500, Eddie James wrote:
> > 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..e091ff2
> --- /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 fault.
> > +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 fault.
> > +in1_input		Measured input voltage in mV.
> > +in1_label		"vin"
> > +in2_alarm		Output voltage over-voltage fault.
> > +in2_input		Measured output voltage in mV.
> > +in2_label		"vout1"
> +
> > +power1_alarm		Input fault.
> > +power1_input		Measured input power in uW.
> > +power1_label		"pin"
> +
> > +temp1_alarm		PSU inlet ambient temperature over-
temperature fault.
> > +temp1_input		Measured PSU inlet ambient temp in
millidegrees C.
> > +temp2_alarm		Secondary rectifier temp over-
temperature fault.
> > +temp2_input		Measured secondary rectifier temp in
millidegrees C.
> > +temp3_alarm		ORing FET temperature over-temperature
fault.
> > +temp3_input		Measured ORing FET temperature in
millidegrees C.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH linux dev-4.10 v5 4/4] ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 906 bytes --]

On Fri, 2017-08-11 at 12:56 -0500, Eddie James wrote:
> > From: "Edward A. James" <eajames@us.ibm.com>
> 
> > Signed-off-by: Edward A. James <eajames@us.ibm.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 9ab8e46..dd30c20 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -417,6 +417,16 @@
> >  			type = <PCA955X_TYPE_GPIO>;
> >  		};
> >  	};
> +
> > +	power-supply@68 {
> > +		compatible = "ibm,cffps1";
> > +		reg = <0x68>;
> > +	};
> +
> > +	power-supply@69 {
> > +		compatible = "ibm,cffps1";
> > +		reg = <0x69>;
> > +	};
>  };
>  
>  &i2c4 {

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH linux dev-4.10 v5 0/4] hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

[Joel Stanley]

On Sat, Aug 12, 2017 at 11:43 PM, Brandon Wyman <bjwyman@gmail.com> wrote:
> On Fri, Aug 11, 2017 at 12:56 PM, Eddie James
> <eajames@linux.vnet.ibm.com> wrote:
>> 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.
>>
>> These devices should be auto-probed on the I2C bus, so I added them to the
>> witherspoon device tree.
>>
>> Changes since v4:
>>  * Rename the driver again...
>>  * Change compatible property; we can't have any '-' in the compatible
>>    property because pmbus will use that string for hwmon registration name,
>>    which disallows that character.
>>  * Remove debugfs bool from pmbus_driver_info
>>  * Add comment about returning rc when reading STATUS_MFR_SPECIFIC fails.
>>

> Tested-by: Brandon Wyman <bjwyman@gmail.com>

Thanks for the testing Brandon.

I've applied this series to dev-4.10, along with Andrew's reviewed-by tags.

Cheers,

Joel

Re: [PATCH linux dev-4.10 v5 1/4] dt-bindings: i2c: Document the IBM CCF power supply version 1

[Eddie James]

On 08/14/2017 02:33 AM, Andrew Jeffery wrote:
> On Fri, 2017-08-11 at 12:56 -0500, Eddie James wrote:
>>> From: "Edward A. James" <eajames@us.ibm.com>
>>   
>>> Signed-off-by: Edward A. James <eajames@us.ibm.com>
>> ---
>>   .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21
> +++++++++++++++++++++
>>   1 file changed, 21 insertions(+)
>>   create mode 100644
> Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
>>   
>> diff --git a/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
>> new file mode 100644
>> index 0000000..f68a0a6
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/i2c/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.
> Should we define properties for these registers?
>
> * OPERATION
> * ON_OFF_CONFIG
> * SYS_CONFIG

We could I suppose. I don't see why though; is it normal to document 
specific registers on devices? And why just those ones? The driver 
doesn't use them. Presumably someone who wants to use them can look at 
the spec.

Thanks for the review!
Eddie

>
> Cheers,
>
> Andrew
>
>> +
>> +Example:
>> +
>>> +    i2c-bus@100 {
>> +        #address-cells = <1>;
>> +        #size-cells = <0>;
>> +        #interrupt-cells = <1>;
>> +        < more properties >
>> +
>>> +        power-supply@68 {
>> +            compatible = "ibm,cffps1";
>> +            reg = <0x68>;
>> +        };
>> +    };

Re: [PATCH linux dev-4.10 v5 1/4] dt-bindings: i2c: Document the IBM CCF power supply version 1

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 2911 bytes --]

On Mon, 2017-08-14 at 10:09 -0500, Eddie James wrote:
> 
> On 08/14/2017 02:33 AM, Andrew Jeffery wrote:
> > On Fri, 2017-08-11 at 12:56 -0500, Eddie James wrote:
> > > From: "Edward A. James" <eajames@us.ibm.com>
> > > 
> > >   
> > > Signed-off-by: Edward A. James <eajames@us.ibm.com>
> > > 
> > > ---
> > >   .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21
> > 
> > +++++++++++++++++++++
> > >   1 file changed, 21 insertions(+)
> > >   create mode 100644
> > 
> > Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> > >   
> > > diff --git a/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> > 
> > b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
> > > new file mode 100644
> > > index 0000000..f68a0a6
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/i2c/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.
> > 
> > Should we define properties for these registers?
> > 
> > * OPERATION
> > * ON_OFF_CONFIG
> > * SYS_CONFIG
> 
> We could I suppose. I don't see why though; is it normal to document 
> specific registers on devices?

It's not normal to document specific registers, no. However, it is normal to
expose the device's configuration fields as properties. Reading back I chose my
words poorly, but my query was about the properties of the device that can be
configured through these registers, not really about the registers themselves.

> And why just those ones?

Because from a quick scan of the datasheet, these seem to be the remaining
registers that contained fields that could be configured.

> The driver doesn't use them. Presumably someone who wants to use them can
> look at the spec.

Upstream's stance is that the bindings describe the hardware, and the
strong preferences is that the description is complete at the time of
submission.

Though maybe if there are optional properties it's not so significant.

Cheers,

Andrew

> 
> Thanks for the review!
> Eddie
> 
> > 
> > Cheers,
> > 
> > Andrew
> > 
> > > +
> > > +Example:
> > > +
> > > > +    i2c-bus@100 {
> > > 
> > > +        #address-cells = <1>;
> > > +        #size-cells = <0>;
> > > +        #interrupt-cells = <1>;
> > > +        < more properties >
> > > +
> > > > +        power-supply@68 {
> > > 
> > > +            compatible = "ibm,cffps1";
> > > +            reg = <0x68>;
> > > +        };
> > > +    };
> 
> 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]