Skip to contentSkip to conversation

hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

PATCH In review Eddie James 4 participants 13 messages Aug 11, 2017 – Aug 16, 2017

Subsystems (5)
Device tree bindings Documentation I2C subsystem host drivers Hardware monitoring +1 more subsystems
lore
Share & tools
lore

Eddie James

author
#0 lore raw

v5 cover hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

From: "Edward A. James" <[email protected]>

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
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH v5 1/4 dt-bindings: i2c: Document the IBM CCF power supply version 1

From: "Edward A. James" <[email protected]>

Signed-off-by Edward A. James <[email protected]>
---
 .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/i2c/ibm,cffps1.txt
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +21 -0
new file mode 100644
index 0000000..f68a0a6
@@ -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>;
+        };
+    };
Signature · 1 line
1.8.3.1
#2 lore raw

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

Quoted 5 lines · Eddie James
Quoted 1 line

From: "Edward A. James" <[email protected]>

Quoted 1 line
Signed-off-by Edward A. James <[email protected]>

---
 .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21

+++++++++++++++++++++

Quoted 2 lines
 1 file changed, 21 insertions(+)

 create mode 100644

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Review

Quoted 2 lines

(quoted diff) +0 -0

b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 1

Quoted 6 lines

new file mode 100644
index 0000000..f68a0a6

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
@@ -0,0 +1,21 @@
+Device-tree bindings for IBM Common Form Factor Power Supply Version

1

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 2

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+------------------------------------------------------------------

----

Quoted 4 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +3 -0
+
+Required properties:
+ - compatible = "ibm,cffps1";
Quoted 1 line

+ - reg = < I2C bus address >; : Address of the

power supply on the

Quoted 1 line

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 7

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+					  I2C bus.

Should we define properties for these registers?

* OPERATION
* ON_OFF_CONFIG
* SYS_CONFIG

Cheers,

Andrew

Quoted 14 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +3 -0
+
+Example:
+
Quoted 1 line

+    i2c-bus@100 {

+        #address-cells = <1>;
+        #size-cells = <0>;
+        #interrupt-cells = <1>;
+        < more properties >
+

Quoted 1 line

+        power-supply@68 {

+            compatible = "ibm,cffps1";
+            reg = <0x68>;
+        };
+    };

author
#3 lore raw

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

Quoted 25 lines · Andrew Jeffery
Quoted 5 lines · Eddie James
Quoted 3 lines

From: "Edward A. James" <[email protected]>

Signed-off-by Edward A. James <[email protected]>
---
  .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21

+++++++++++++++++++++

Quoted 2 lines
  1 file changed, 21 insertions(+)

create mode 100644

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Review

Quoted 2 lines
(quoted diff) +0 -0

b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 1

Quoted 6 lines

new file mode 100644
index 0000000..f68a0a6

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
@@ -0,0 +1,21 @@
+Device-tree bindings for IBM Common Form Factor Power Supply Version

1

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 2

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+------------------------------------------------------------------

----

Quoted 3 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +3 -0
+
+Required properties:
+ - compatible = "ibm,cffps1";
Quoted 8 lines
Quoted 1 line
Quoted 1 line

+ - reg = < I2C bus address >; : Address of the

power supply on the

Quoted 1 line

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 7

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+					  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

Quoted 19 lines

Cheers,

Andrew

Quoted 14 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +3 -0
+
+Example:
+
Quoted 1 line

+ i2c-bus@100 {

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +5 -0
+        #address-cells = <1>;
+        #size-cells = <0>;
+        #interrupt-cells = <1>;
+        < more properties >
+
Quoted 1 line

+ power-supply@68 {

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +4 -0
+            compatible = "ibm,cffps1";
+            reg = <0x68>;
+        };
+    };
#4 lore raw

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

Quoted 44 lines · Eddie James

Quoted 35 lines · Andrew Jeffery
Quoted 7 lines · Eddie James

From: "Edward A. James" <[email protected]>

Signed-off-by Edward A. James <[email protected]>


---
  .../devicetree/bindings/i2c/ibm,cffps1.txt          | 21


+++++++++++++++++++++

Quoted 2 lines
  1 file changed, 21 insertions(+)

  create mode 100644

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Review

Quoted 2 lines

(quoted diff) +0 -0

b/Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 1

Quoted 6 lines

new file mode 100644
index 0000000..f68a0a6

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
@@ -0,0 +1,21 @@
+Device-tree bindings for IBM Common Form Factor Power Supply Version


1

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 2

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+------------------------------------------------------------------


----

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt

Quoted 4 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +4 -0
+
+Required properties:
+ - compatible = "ibm,cffps1";
+ - reg = < I2C bus address >;		: Address of the


power supply on the

Quoted 7 lines

Documentation/devicetree/bindings/i2c/ibm,cffps1.txt line 7

Quoted 1 line
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +1 -0
+					  I2C bus.


Should we define properties for these registers?

* OPERATION
* ON_OFF_CONFIG
* SYS_CONFIG

Quoted 3 lines


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.

Quoted 1 line

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.

Quoted 2 lines

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

Quoted 27 lines


Thanks for the review!
Eddie

Quoted 21 lines


Cheers,

Andrew

Quoted 16 lines
Documentation/devicetree/bindings/i2c/ibm,cffps1.txt new file +3 -0
+
+Example:
+
Quoted 1 line

+    i2c-bus@100 {


+        #address-cells = <1>;
+        #size-cells = <0>;
+        #interrupt-cells = <1>;
+        < more properties >
+

Quoted 1 line

+        power-supply@68 {


+            compatible = "ibm,cffps1";
+            reg = <0x68>;
+        };
+    };


author
#5 lore raw

PATCH v5 2/4 hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver

In reply to Eddie James

From: "Edward A. James" <[email protected]>

Add the driver to monitor IBM CFF power supplies with hwmon over pmbus.

Signed-off-by Edward A. James <[email protected]>
---
 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
drivers/hwmon/pmbus/Kconfig +10 -0
index 04f6baa..c05b264 100644
@@ -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
drivers/hwmon/pmbus/Makefile +1 -0
index 663801c..d3d0b2e 100644
@@ -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
drivers/hwmon/pmbus/ibm-cffps.c new file +151 -0

151 lines not on this page · raw message

Signature · 1 line
1.8.3.1
Reviewed-by on v5 2/4
#6 lore raw
Quoted 160 lines · Eddie James
Quoted 1 line

From: "Edward A. James" <[email protected]>


Add the driver to monitor IBM CFF power supplies with hwmon over pmbus.

Quoted 1 line
Signed-off-by Edward A. James <[email protected]>

---
 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

drivers/hwmon/pmbus/Kconfig +0 -0
index 04f6baa..c05b264 100644
@@ -37,6 +37,16 @@ config SENSORS_ADM1275
Quoted 2 lines

    This driver can also be built as a module. If so, the module will be called adm1275.


+config SENSORS_IBM_CFFPS

drivers/hwmon/pmbus/Kconfig config SENSORS_ADM1275 · line 45

Quoted 5 lines
drivers/hwmon/pmbus/Kconfig +5 -0
+	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.

+

drivers/hwmon/pmbus/Kconfig config SENSORS_ADM1275 · line 48

Quoted 2 lines
drivers/hwmon/pmbus/Kconfig +2 -0
+	  This driver can also be built as a module. If so, the module will
+	  be called ibm-cffps.

+
 config SENSORS_IR35221

Quoted 2 lines

  tristate "Infineon IR35221"
  default n

drivers/hwmon/pmbus/Makefile +0 -0
index 663801c..d3d0b2e 100644
@@ -5,6 +5,7 @@
Quoted 7 lines

 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

drivers/hwmon/pmbus/ibm-cffps.c new file +17 -0
new file mode 100644
index 0000000..1a6294c
@@ -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 */
Quoted 8 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +8 -0
+#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)
drivers/hwmon/pmbus/ibm-cffps.c new file +2 -0
+
+static int ibm_cffps_read_byte_data(struct i2c_client *client, int page,

Review

Quoted 1 line
(quoted diff) +1 -0
+				    int reg)

+{

Review

Quoted 1 line
(quoted diff) +1 -0
+	int rc, mfr;

+

drivers/hwmon/pmbus/ibm-cffps.c line 39

Quoted 8 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +8 -0
+	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;

+

drivers/hwmon/pmbus/ibm-cffps.c line 48

Quoted 8 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +8 -0
+		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;

+

Quoted 13 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +13 -0
+		/* 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) {

drivers/hwmon/pmbus/ibm-cffps.c line 72

Quoted 10 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +10 -0
+			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;
+	}

+

Quoted 1 line
(quoted diff) +1 -0
+	return rc;
drivers/hwmon/pmbus/ibm-cffps.c new file +3 -0
+}
+
+static int ibm_cffps_read_word_data(struct i2c_client *client, int page,

Review

Quoted 1 line
(quoted diff) +1 -0
+				    int reg)

+{

Review

Quoted 1 line
(quoted diff) +1 -0
+	int rc, mfr;

+

drivers/hwmon/pmbus/ibm-cffps.c line 86

Quoted 5 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +5 -0
+	switch (reg) {
+	case PMBUS_STATUS_WORD:
+		rc = pmbus_read_word_data(client, page, reg);
+		if (rc < 0)
+			return rc;

+

drivers/hwmon/pmbus/ibm-cffps.c line 48

Quoted 8 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +8 -0
+		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;

+

drivers/hwmon/pmbus/ibm-cffps.c line 103

Quoted 7 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +7 -0
+		if (mfr & CFFPS_MFR_PS_KILL)
+			rc |= PB_STATUS_OFF;
+		break;
+	default:
+		rc = -ENODATA;
+		break;
+	}

+

Quoted 1 line
(quoted diff) +1 -0
+	return rc;
drivers/hwmon/pmbus/ibm-cffps.c new file +3 -0
+}
+
+static struct pmbus_driver_info ibm_cffps_info = {
Quoted 6 lines

drivers/hwmon/pmbus/ibm-cffps.c line 114

Quoted 6 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +6 -0
+	.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 <[email protected]>
Quoted 37 lines
Quoted 2 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +2 -0
+	.read_byte_data = ibm_cffps_read_byte_data,
+	.read_word_data = ibm_cffps_read_word_data,
drivers/hwmon/pmbus/ibm-cffps.c new file +3 -0
+};
+
+static int ibm_cffps_probe(struct i2c_client *client,

drivers/hwmon/pmbus/ibm-cffps.c line 120

Quoted 1 line
drivers/hwmon/pmbus/ibm-cffps.c new file +1 -0
+			   const struct i2c_device_id *id)

+{

Quoted 1 line
drivers/hwmon/pmbus/ibm-cffps.c new file +1 -0
+	return pmbus_do_probe(client, id, &ibm_cffps_info);
drivers/hwmon/pmbus/ibm-cffps.c new file +3 -0
+}
+
+static const struct i2c_device_id ibm_cffps_id[] = {
Quoted 2 lines
(quoted diff) +2 -0
+	{ "ibm_cffps1", 1 },
+	{}
drivers/hwmon/pmbus/ibm-cffps.c new file +4 -0
+};
+MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
+
+static const struct of_device_id ibm_cffps_of_match[] = {
Quoted 2 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +2 -0
+	{ .compatible = "ibm,cffps1" },
+	{}
drivers/hwmon/pmbus/ibm-cffps.c new file +4 -0
+};
+MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
+
+static struct i2c_driver ibm_cffps_driver = {
Quoted 7 lines
drivers/hwmon/pmbus/ibm-cffps.c new file +7 -0
+	.driver = {
+		.name = "ibm-cffps",
+		.of_match_table = ibm_cffps_of_match,
+	},
+	.probe = ibm_cffps_probe,
+	.remove = pmbus_do_remove,
+	.id_table = ibm_cffps_id,
drivers/hwmon/pmbus/ibm-cffps.c new file +7 -0
+};
+
+module_i2c_driver(ibm_cffps_driver);
+
+MODULE_AUTHOR("Eddie James");
+MODULE_DESCRIPTION("PMBus driver for IBM Common Form Factor power supplies");
+MODULE_LICENSE("GPL");
author
#7 lore raw

PATCH v5 3/4 Documentation: hwmon: Document the IBM CFF power supply

In reply to Eddie James

From: "Edward A. James" <[email protected]>

Signed-off-by Edward A. James <[email protected]>
---
 Documentation/hwmon/ibm-cffps | 54 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 Documentation/hwmon/ibm-cffps
Documentation/hwmon/ibm-cffps new file +54 -0
new file mode 100644
index 0000000..e091ff2
@@ -0,0 +1,54 @@
+Kernel driver ibm-cffps
+=======================
+
+Supported chips:
+  * IBM Common Form Factor power supply
+
+Author: Eddie James <[email protected]>
+
+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.
Signature · 1 line
1.8.3.1
Reviewed-by on v5 3/4
#8 lore raw

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

Quoted 5 lines · Eddie James
Quoted 1 line

From: "Edward A. James" <[email protected]>

Quoted 1 line
Signed-off-by Edward A. James <[email protected]>

---
 Documentation/hwmon/ibm-cffps | 54

+++++++++++++++++++++++++++++++++++++++++++

Documentation/hwmon/ibm-

Quoted 4 lines
 1 file changed, 54 insertions(+)

 create mode 100644 Documentation/hwmon/ibm-cffps

Documentation/hwmon/ibm- renamed from Documentation/hwmon/ibm-cffps +0 -0

cffps

Quoted 12 lines

new file mode 100644
index 0000000..e091ff2

Documentation/hwmon/ibm-cffps new file +6 -0
@@ -0,0 +1,54 @@
+Kernel driver ibm-cffps
+=======================
+
+Supported chips:
+  * IBM Common Form Factor power supply
+
Quoted 1 line

+Author: Eddie James <[email protected]>

Documentation/hwmon/ibm-cffps

Quoted 5 lines
Documentation/hwmon/ibm-cffps new file +5 -0
+
+Description
+-----------
+
+This driver supports IBM Common Form Factor (CFF) power supplies.

This driver

Documentation/hwmon/ibm-cffps

Quoted 6 lines
Documentation/hwmon/ibm-cffps new file +6 -0
+is a client to the core PMBus driver.
+
+Usage Notes
+-----------
+
+This driver does not auto-detect devices. You will have to

instantiate the

Quoted 1 line

+devices explicitly. Please see Documentation/i2c/instantiating-

devices for

Quoted 25 lines
Documentation/hwmon/ibm-cffps new file +7 -0
+details.
+
+Sysfs entries
+-------------
+
+The following attributes are supported:
+

Documentation/hwmon/ibm-cffps line 29

Quoted 3 lines
Documentation/hwmon/ibm-cffps new file +3 -0
+curr1_alarm		Output current over-current fault.
+curr1_input		Measured output current in mA.
+curr1_label		"iout1"

+

Documentation/hwmon/ibm-cffps line 36

Quoted 6 lines
Documentation/hwmon/ibm-cffps new file +6 -0
+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.

+

Documentation/hwmon/ibm-cffps line 43

Quoted 6 lines
Documentation/hwmon/ibm-cffps new file +6 -0
+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"

+

Quoted 5 lines

Documentation/hwmon/ibm-cffps line 47

Quoted 3 lines
Documentation/hwmon/ibm-cffps new file +3 -0
+power1_alarm		Input fault.
+power1_input		Measured input power in uW.
+power1_label		"pin"

+

Quoted 1 line

+temp1_alarm PSU inlet ambient temperature over-

temperature fault.

Quoted 1 line
Quoted 1 line

+temp1_input Measured PSU inlet ambient temp in

millidegrees C.

Quoted 1 line
Quoted 1 line

+temp2_alarm Secondary rectifier temp over-

temperature fault.

Quoted 1 line
Quoted 1 line

+temp2_input Measured secondary rectifier temp in

millidegrees C.

Quoted 1 line
Quoted 1 line

+temp3_alarm ORing FET temperature over-temperature

fault.

Quoted 1 line
Quoted 1 line

+temp3_input Measured ORing FET temperature in

millidegrees C.

Reviewed-by Andrew Jeffery <[email protected]>
author
#9 lore raw

PATCH v5 4/4 ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus

In reply to Eddie James

From: "Edward A. James" <[email protected]>

Signed-off-by Edward A. James <[email protected]>
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +10 -0
index 9ab8e46..dd30c20 100644
@@ -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 {
Signature · 1 line
1.8.3.1
Reviewed-by on v5 4/4
#10 lore raw

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

Review

Quoted 8 lines · Eddie James
Quoted 1 line

From: "Edward A. James" <[email protected]>

Quoted 1 line
Signed-off-by Edward A. James <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 10 ++++++++++

 1 file changed, 10 insertions(+)

(quoted diff) +0 -0

b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts

Quoted 13 lines

index 9ab8e46..dd30c20 100644

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +1 -0
@@ -417,6 +417,16 @@
 >  			type = <PCA955X_TYPE_GPIO>;
 >  		};
 >  	};
+
 > +	power-supply@68 {
 > +		compatible = "ibm,cffps1";
 > +		reg = <0x68>;

Review

Quoted 1 line
(quoted diff) +1 -0
+	};

+

Quoted 7 lines

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts line 429

Quoted 4 lines
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +4 -0
+	power-supply@69 {
+		compatible = "ibm,cffps1";
+		reg = <0x69>;
+	};

 };

 &i2c4 {

Reviewed-by Andrew Jeffery <[email protected]>
Tested-by on the v5 series
#11 lore raw
In reply to Eddie James
Quoted 33 lines · Eddie James

From: "Edward A. James" <[email protected]>

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
Quoted 3 lines

--
1.8.3.1

Tested-by Brandon Wyman <[email protected]>
maintainer
#12 lore raw
Quoted 19 lines · Brandon Wyman
Quoted 8 lines · Eddie James

From: "Edward A. James" <[email protected]>

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.

Quoted 8 lines

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.

Quoted 1 line
Tested-by Brandon Wyman <[email protected]>

Thanks for the testing Brandon.

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

Cheers,

Joel