Re: [PATCH v5 1/2] hwmon: (ucd9000) Add gpio chip interface

From: Eddie James
Date: Fri Mar 16 2018 - 14:40:03 EST



On 03/16/2018 08:40 AM, Guenter Roeck wrote:
On 03/15/2018 03:21 PM, Eddie James wrote:
From: Christopher Bostic <cbostic@xxxxxxxxxxxxxxxxxx>

Add a struct gpio_chip and define some methods so that this device's
I/O can be accessed via /sys/class/gpio.


Sorry for not noticing earlier. The 0day reports should be addressed by selecting GPIOLIB
in the Kconfig entry.

Getting kbuild recursive dependencies when I select GPIOLIB for ucd9000 :(

May have to do "depends on" instead and #ifdef GPIOLIB in ucd9000, unless you have another recommendation?

Thanks
Eddie


Guenter

Signed-off-by: Christopher Bostic <cbostic@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Jeffery <andrew@xxxxxxxx>
Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxxxxxxx>
---
 drivers/hwmon/pmbus/ucd9000.c | 201 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)

diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index b74dbec..a34ffc4 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/pmbus.h>
+#include <linux/gpio.h>
 #include "pmbus.h"
  enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd9090, ucd90910 };
@@ -35,8 +36,18 @@
 #define UCD9000_NUM_PAGES 0xd6
 #define UCD9000_FAN_CONFIG_INDEX 0xe7
 #define UCD9000_FAN_CONFIG 0xe8
+#define UCD9000_GPIO_SELECTÂÂÂÂÂÂÂ 0xfa
+#define UCD9000_GPIO_CONFIGÂÂÂÂÂÂÂ 0xfb
 #define UCD9000_DEVICE_ID 0xfd
 +/* GPIO CONFIG bits */
+#define UCD9000_GPIO_CONFIG_ENABLEÂÂÂ BIT(0)
+#define UCD9000_GPIO_CONFIG_OUT_ENABLEÂÂÂ BIT(1)
+#define UCD9000_GPIO_CONFIG_OUT_VALUEÂÂÂ BIT(2)
+#define UCD9000_GPIO_CONFIG_STATUSÂÂÂ BIT(3)
+#define UCD9000_GPIO_INPUTÂÂÂÂÂÂÂ 0
+#define UCD9000_GPIO_OUTPUTÂÂÂÂÂÂÂ 1
+
 #define UCD9000_MON_TYPE(x) (((x) >> 5) & 0x07)
 #define UCD9000_MON_PAGE(x) ((x) & 0x0f)
 @@ -47,9 +58,15 @@
  #define UCD9000_NUM_FAN 4
 +#define UCD9000_GPIO_NAME_LEN 16
+#define UCD9090_NUM_GPIOSÂÂÂ 23
+#define UCD901XX_NUM_GPIOSÂÂÂ 26
+#define UCD90910_NUM_GPIOSÂÂÂ 26
+
 struct ucd9000_data {
ÂÂÂÂÂ u8 fan_data[UCD9000_NUM_FAN][I2C_SMBUS_BLOCK_MAX];
ÂÂÂÂÂ struct pmbus_driver_info info;
+ÂÂÂ struct gpio_chip gpio;
 };
 #define to_ucd9000_data(_info) container_of(_info, struct ucd9000_data, info)
 @@ -149,6 +166,188 @@ static int ucd9000_read_byte_data(struct i2c_client *client, int page, int reg)
 };
 MODULE_DEVICE_TABLE(of, ucd9000_of_match);
 +static int ucd9000_gpio_read_config(struct i2c_client *client,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int offset)
+{
+ÂÂÂ int ret;
+
+ÂÂÂ /* No page set required */
+ÂÂÂ ret = i2c_smbus_write_byte_data(client, UCD9000_GPIO_SELECT, offset);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ return i2c_smbus_read_byte_data(client, UCD9000_GPIO_CONFIG);
+}
+
+static int ucd9000_gpio_get(struct gpio_chip *gc, unsigned int offset)
+{
+ struct i2c_client *client = gpiochip_get_data(gc);
+ÂÂÂ int ret;
+
+ÂÂÂ ret = ucd9000_gpio_read_config(client, offset);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ return !!(ret & UCD9000_GPIO_CONFIG_STATUS);
+}
+
+static void ucd9000_gpio_set(struct gpio_chip *gc, unsigned int offset,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ int value)
+{
+ÂÂÂ struct i2c_client *client = gpiochip_get_data(gc);
+ÂÂÂ int ret;
+
+ÂÂÂ ret = ucd9000_gpio_read_config(client, offset);
+ÂÂÂ if (ret < 0) {
+ÂÂÂÂÂÂÂ dev_dbg(&client->dev, "failed to read GPIO %d config: %d\n",
+ÂÂÂÂÂÂÂÂÂÂÂ offset, ret);
+ÂÂÂÂÂÂÂ return;
+ÂÂÂ }
+
+ÂÂÂ if (value) {
+ÂÂÂÂÂÂÂ if (ret & UCD9000_GPIO_CONFIG_STATUS)
+ÂÂÂÂÂÂÂÂÂÂÂ return;
+
+ÂÂÂÂÂÂÂ ret |= UCD9000_GPIO_CONFIG_STATUS;
+ÂÂÂ } else {
+ÂÂÂÂÂÂÂ if (!(ret & UCD9000_GPIO_CONFIG_STATUS))
+ÂÂÂÂÂÂÂÂÂÂÂ return;
+
+ÂÂÂÂÂÂÂ ret &= ~UCD9000_GPIO_CONFIG_STATUS;
+ÂÂÂ }
+
+ÂÂÂ ret |= UCD9000_GPIO_CONFIG_ENABLE;
+
+ÂÂÂ /* Page set not required */
+ÂÂÂ ret = i2c_smbus_write_byte_data(client, UCD9000_GPIO_CONFIG, ret);
+ÂÂÂ if (ret < 0) {
+ÂÂÂÂÂÂÂ dev_dbg(&client->dev, "Failed to write GPIO %d config: %d\n",
+ÂÂÂÂÂÂÂÂÂÂÂ offset, ret);
+ÂÂÂÂÂÂÂ return;
+ÂÂÂ }
+
+ÂÂÂ ret &= ~UCD9000_GPIO_CONFIG_ENABLE;
+
+ÂÂÂ ret = i2c_smbus_write_byte_data(client, UCD9000_GPIO_CONFIG, ret);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ dev_dbg(&client->dev, "Failed to write GPIO %d config: %d\n",
+ÂÂÂÂÂÂÂÂÂÂÂ offset, ret);
+}
+
+static int ucd9000_gpio_get_direction(struct gpio_chip *gc,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int offset)
+{
+ÂÂÂ struct i2c_client *client = gpiochip_get_data(gc);
+ÂÂÂ int ret;
+
+ÂÂÂ ret = ucd9000_gpio_read_config(client, offset);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ return !(ret & UCD9000_GPIO_CONFIG_OUT_ENABLE);
+}
+
+static int ucd9000_gpio_set_direction(struct gpio_chip *gc,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int offset, bool direction_out,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ int requested_out)
+{
+ÂÂÂ struct i2c_client *client = gpiochip_get_data(gc);
+ÂÂÂ int ret, config, out_val;
+
+ÂÂÂ ret = ucd9000_gpio_read_config(client, offset);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ if (direction_out) {
+ÂÂÂÂÂÂÂ out_val = requested_out ? UCD9000_GPIO_CONFIG_OUT_VALUE : 0;
+
+ÂÂÂÂÂÂÂ if (ret & UCD9000_GPIO_CONFIG_OUT_ENABLE) {
+ÂÂÂÂÂÂÂÂÂÂÂ if ((ret & UCD9000_GPIO_CONFIG_OUT_VALUE) == out_val)
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return 0;
+ÂÂÂÂÂÂÂ } else {
+ÂÂÂÂÂÂÂÂÂÂÂ ret |= UCD9000_GPIO_CONFIG_OUT_ENABLE;
+ÂÂÂÂÂÂÂ }
+
+ÂÂÂÂÂÂÂ if (out_val)
+ÂÂÂÂÂÂÂÂÂÂÂ ret |= UCD9000_GPIO_CONFIG_OUT_VALUE;
+ÂÂÂÂÂÂÂ else
+ÂÂÂÂÂÂÂÂÂÂÂ ret &= ~UCD9000_GPIO_CONFIG_OUT_VALUE;
+
+ÂÂÂ } else {
+ÂÂÂÂÂÂÂ if (!(ret & UCD9000_GPIO_CONFIG_OUT_ENABLE))
+ÂÂÂÂÂÂÂÂÂÂÂ return 0;
+
+ÂÂÂÂÂÂÂ ret &= ~UCD9000_GPIO_CONFIG_OUT_ENABLE;
+ÂÂÂ }
+
+ÂÂÂ ret |= UCD9000_GPIO_CONFIG_ENABLE;
+ÂÂÂ config = ret;
+
+ÂÂÂ /* Page set not required */
+ÂÂÂ ret = i2c_smbus_write_byte_data(client, UCD9000_GPIO_CONFIG, config);
+ÂÂÂ if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ config &= ~UCD9000_GPIO_CONFIG_ENABLE;
+
+ÂÂÂ return i2c_smbus_write_byte_data(client, UCD9000_GPIO_CONFIG, config);
+}
+
+static int ucd9000_gpio_direction_input(struct gpio_chip *gc,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int offset)
+{
+ÂÂÂ return ucd9000_gpio_set_direction(gc, offset, UCD9000_GPIO_INPUT, 0);
+}
+
+static int ucd9000_gpio_direction_output(struct gpio_chip *gc,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int offset, int val)
+{
+ÂÂÂ return ucd9000_gpio_set_direction(gc, offset, UCD9000_GPIO_OUTPUT,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ val);
+}
+
+static void ucd9000_probe_gpio(struct i2c_client *client,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ const struct i2c_device_id *mid,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct ucd9000_data *data)
+{
+ÂÂÂ int rc;
+
+ÂÂÂ switch (mid->driver_data) {
+ÂÂÂ case ucd9090:
+ÂÂÂÂÂÂÂ data->gpio.ngpio = UCD9090_NUM_GPIOS;
+ÂÂÂÂÂÂÂ break;
+ÂÂÂ case ucd90120:
+ÂÂÂ case ucd90124:
+ÂÂÂ case ucd90160:
+ÂÂÂÂÂÂÂ data->gpio.ngpio = UCD901XX_NUM_GPIOS;
+ÂÂÂÂÂÂÂ break;
+ÂÂÂ case ucd90910:
+ÂÂÂÂÂÂÂ data->gpio.ngpio = UCD90910_NUM_GPIOS;
+ÂÂÂÂÂÂÂ break;
+ÂÂÂ default:
+ÂÂÂÂÂÂÂ return; /* GPIO support is optional. */
+ÂÂÂ }
+
+ÂÂÂ /*
+ÂÂÂÂ * Pinmux support has not been added to the new gpio_chip.
+ÂÂÂÂ * This support should be added when possible given the mux
+ÂÂÂÂ * behavior of these IO devices.
+ÂÂÂÂ */
+ÂÂÂ data->gpio.label = client->name;
+ÂÂÂ data->gpio.get_direction = ucd9000_gpio_get_direction;
+ÂÂÂ data->gpio.direction_input = ucd9000_gpio_direction_input;
+ÂÂÂ data->gpio.direction_output = ucd9000_gpio_direction_output;
+ÂÂÂ data->gpio.get = ucd9000_gpio_get;
+ÂÂÂ data->gpio.set = ucd9000_gpio_set;
+ÂÂÂ data->gpio.can_sleep = true;
+ÂÂÂ data->gpio.base = -1;
+ÂÂÂ data->gpio.parent = &client->dev;
+
+ÂÂÂ rc = devm_gpiochip_add_data(&client->dev, &data->gpio, client);
+ÂÂÂ if (rc)
+ÂÂÂÂÂÂÂ dev_warn(&client->dev, "Could not add gpiochip: %d\n", rc);
+}
+
 static int ucd9000_probe(struct i2c_client *client,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ const struct i2c_device_id *id)
 {
@@ -263,6 +462,8 @@ static int ucd9000_probe(struct i2c_client *client,
ÂÂÂÂÂÂÂÂÂÂÂ | PMBUS_HAVE_FAN34 | PMBUS_HAVE_STATUS_FAN34;
ÂÂÂÂÂ }
 + ucd9000_probe_gpio(client, mid, data);
+
ÂÂÂÂÂ return pmbus_do_probe(client, mid, info);
 }