| Message ID | 20210329143833.1047539-1-kubernat@cesnet.cz (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | hwmon: Add driver for fsp-3y PSUs and PDUs | expand |
On 3/29/21 7:38 AM, Václav Kubernát wrote: > After some testing, I have found out there is a timing issue with this > device. After setting page, the device doesn't immediately react and > gives values from the previous page for some time. This is why there > needs to be a delay between pmbus_set_page and the actual read. > > Also, a lot of the standard commands don't work with the devices, so > they are filtered out in the custom read function. > This is not an appropriate patch description. Describe the driver here, not the workarounds / quirks. The reason for the delay should be a comment in the patch, not in the patch description. Also, "don't work" is inappropriate (and, again, does not belong into the patch description). It is perfectly appropriate for the core to try those commands to see if they are supported. The only reason to mask them out would be that the device reacts badly to seeing them. If that is the case, "don't work" should be replaced with a more detailed comment in the code. Describe what happens, and why the commands needs to be caught. What might be useful is a note indicating if you have a manual for those power supplies available, or if the driver is based on reverse engineering. > Signed-off-by: Václav Kubernát <kubernat@cesnet.cz> > --- > drivers/hwmon/pmbus/Kconfig | 9 ++ > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/fsp-3y.c | 164 +++++++++++++++++++++++++++++++++++ Documentation/hwmon/fsp-3y.rst is missing. > 3 files changed, 174 insertions(+) > create mode 100644 drivers/hwmon/pmbus/fsp-3y.c > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index 03606d4298a4..66d1655b6750 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -56,6 +56,15 @@ config SENSORS_BEL_PFE > This driver can also be built as a module. If so, the module will > be called bel-pfe. > > +config SENSORS_FSP_3Y > + tristate "FSP/3Y-Power power supplies" > + help > + If you say yes here you get hardware monitoring support for > + FSP/3Y-Power hot-swap power supplies. > + This should list the supported models - if not here, then at least in the (missing) documentation. > + This driver can also be built as a module. If so, the module will > + be called fsp-3y. > + > config SENSORS_IBM_CFFPS > tristate "IBM Common Form Factor Power Supply" > depends on LEDS_CLASS > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 6a4ba0fdc1db..bfe218ad898f 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -8,6 +8,7 @@ obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > obj-$(CONFIG_SENSORS_ADM1266) += adm1266.o > obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o > obj-$(CONFIG_SENSORS_BEL_PFE) += bel-pfe.o > +obj-$(CONFIG_SENSORS_FSP_3Y) += fsp-3y.o > obj-$(CONFIG_SENSORS_IBM_CFFPS) += ibm-cffps.o > obj-$(CONFIG_SENSORS_INSPUR_IPSPS) += inspur-ipsps.o > obj-$(CONFIG_SENSORS_IR35221) += ir35221.o > diff --git a/drivers/hwmon/pmbus/fsp-3y.c b/drivers/hwmon/pmbus/fsp-3y.c > new file mode 100644 > index 000000000000..7f3c3de3a1e6 > --- /dev/null > +++ b/drivers/hwmon/pmbus/fsp-3y.c > @@ -0,0 +1,164 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Hardware monitoring driver for FSP 3Y-Power PSUs > + * > + * Copyright (c) 2021 Václav Kubernát, CESNET > + */ > + > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/delay.h> > +#include <linux/i2c.h> Alphabetic include file order, please. > +#include "pmbus.h" > + > +#define YM2151_PAGE_12V 0x00 > +#define YM2151_PAGE_5V 0x20 > +#define YH5151E_PAGE_12V 0x00 > +#define YH5151E_PAGE_5V 0x10 > +#define YH5151E_PAGE_3V3 0x11 > + > +enum chips { > + ym2151e, > + yh5151e > +}; > + > +static int set_page(struct i2c_client *client, int page) > +{ > + int rv; > + > + rv = i2c_smbus_read_byte_data(client, PMBUS_PAGE); > + Please no empty line here. You might want to consider caching the current page to avoid having to read it for each access, similar to the code implemented in the pmbus core. > + if (rv < 0) > + return rv; > + > + if (rv != page) { > + rv = pmbus_set_page(client, page, 0xff); > + if (rv < 0) > + return rv; > + > + msleep(20); Please use usleep_range(), and make sure that this huge delay is actually needed. > + } > + > + return 0; > +} > + > +static int fsp3y_read_byte_data(struct i2c_client *client, int page, int reg) > +{ > + int rv; > + > + rv = set_page(client, page); > + if (rv < 0) > + return rv; > + > + return i2c_smbus_read_byte_data(client, reg); > +} > + > +static int fsp3y_read_word_data(struct i2c_client *client, int page, int phase, int reg) > +{ > + int rv; > + > + if (reg >= PMBUS_VIRT_BASE) > + return -ENXIO; > + > + switch (reg) { > + case PMBUS_OT_WARN_LIMIT: > + case PMBUS_OT_FAULT_LIMIT: > + case PMBUS_UT_WARN_LIMIT: > + case PMBUS_UT_FAULT_LIMIT: > + case PMBUS_VIN_UV_WARN_LIMIT: > + case PMBUS_VIN_UV_FAULT_LIMIT: > + case PMBUS_VIN_OV_FAULT_LIMIT: > + case PMBUS_VIN_OV_WARN_LIMIT: > + case PMBUS_IOUT_OC_WARN_LIMIT: > + case PMBUS_IOUT_UC_FAULT_LIMIT: > + case PMBUS_IOUT_OC_FAULT_LIMIT: > + case PMBUS_IIN_OC_WARN_LIMIT: > + case PMBUS_IIN_OC_FAULT_LIMIT: > + case PMBUS_VOUT_UV_WARN_LIMIT: > + case PMBUS_VOUT_UV_FAULT_LIMIT: > + case PMBUS_VOUT_OV_WARN_LIMIT: > + case PMBUS_VOUT_OV_FAULT_LIMIT: > + case PMBUS_MFR_VIN_MIN: > + case PMBUS_MFR_VIN_MAX: > + case PMBUS_MFR_IIN_MAX: > + case PMBUS_MFR_VOUT_MIN: > + case PMBUS_MFR_VOUT_MAX: > + case PMBUS_MFR_IOUT_MAX: > + case PMBUS_MFR_PIN_MAX: > + case PMBUS_POUT_MAX: > + case PMBUS_POUT_OP_WARN_LIMIT: > + case PMBUS_POUT_OP_FAULT_LIMIT: > + case PMBUS_MFR_MAX_TEMP_1: > + case PMBUS_MFR_MAX_TEMP_2: > + case PMBUS_MFR_MAX_TEMP_3: > + case PMBUS_MFR_POUT_MAX: > + return -ENXIO; > + } If that many commands indeed cause trouble (ie cause the device to get into a bad state), it might be better to list the _supported_ commands instead of the unsupported ones. There is no guarantee that the core won't start to send other commands to the device in the future. The underlying question is if those commands are indeed not supported, or if they report values in an unexpected format (ie not linear11). The data format that is auto-selected below (because it is not specified) is "linear". Is this what the device actually uses ? If not, just disabling reading the limits without explanation what exactly "does not work" is inappropriate. > + > + rv = set_page(client, page); > + if (rv < 0) > + return rv; > + > + return i2c_smbus_read_word_data(client, reg); > +} > + > +struct pmbus_driver_info fsp3y_info[] = { > + [ym2151e] = { > + .pages = 0x21, > + .func[YM2151_PAGE_12V] = > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_PIN | PMBUS_HAVE_POUT | > + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | > + PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | > + PMBUS_HAVE_FAN12, > + .func[YM2151_PAGE_5V] = > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT, > + PMBUS_HAVE_IIN, It doesn't really make sense to claim support for 0x21 = 33 pages, especially since the pmbus core (and the pmbus standard) only supports 32 pages. Since page handling is all local anyway, I would suggest to claim two pages and map the logical page to the physical page in the set_page command. How does this work (compile) anyway ? .func[] array size is 32, meaning .func[0x20] goes beyond the end of the array. The compiler should complain about that. Wait, how does this even instantiate ? The PMBus core should reject a page count larger than 32, and pmbus_do_probe() should return -ENODEV. How did you test this code ? > + .read_word_data = fsp3y_read_word_data, > + .read_byte_data = fsp3y_read_byte_data, > + }, > + [yh5151e] = { > + .pages = 0x12, Same as above. > + .func[YH5151E_PAGE_12V] = > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_POUT | > + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3, > + .func[YH5151E_PAGE_5V] = > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_POUT, > + .func[YH5151E_PAGE_3V3] = > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_POUT, > + .read_word_data = fsp3y_read_word_data, > + .read_byte_data = fsp3y_read_byte_data, > + } > +}; > + > +static int fsp3y_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ This vendor sells dozens of different power supplies. Apparently they do not have compatible PMBus attributes (or at least the pages are not compatible to each other). Given that, I think there should be a model validation here. This is even more important since an earlier discussion suggests that at least some of the 3Y power supplies use LINEAR11 instead of LINEAR16 for output voltages (eg YH5301-1EAR, FSP550-50ERS). We need to ensure that affected power supplies are not enabled with this driver, and that the enabled power supplies have been tested and are not only confirmed to work and report correct data. > + return pmbus_do_probe(client, &fsp3y_info[id->driver_data]); > +} > + > +static const struct i2c_device_id pmbus_id[] = { > + {"fsp3y_ym2151e", ym2151e}, > + {"fsp3y_yh5151e", yh5151e},> + {} > +}; > + > +MODULE_DEVICE_TABLE(i2c, pmbus_id); > + > +/* This is the driver that will be inserted */ > +static struct i2c_driver fsp3y_driver = { > + .driver = { > + .name = "fsp3y", > + }, > + .probe = fsp3y_probe, Please use the .probe_new callback. > + .id_table = pmbus_id > +}; > + > +module_i2c_driver(fsp3y_driver); > + > +MODULE_AUTHOR("Václav Kubernát"); > +MODULE_DESCRIPTION("PMBus driver for FSP/3Y-Power power supplies"); > +MODULE_LICENSE("GPL"); >
Hi "Václav,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on hwmon/hwmon-next]
[also build test WARNING on v5.12-rc5 next-20210329]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/V-clav-Kubern-t/hwmon-Add-driver-for-fsp-3y-PSUs-and-PDUs/20210329-224216
base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/48af68da782edb21e107a884db98beedfd691e81
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review V-clav-Kubern-t/hwmon-Add-driver-for-fsp-3y-PSUs-and-PDUs/20210329-224216
git checkout 48af68da782edb21e107a884db98beedfd691e81
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
drivers/hwmon/pmbus/fsp-3y.c:15:25: error: array index in initializer exceeds array bounds
15 | #define YM2151_PAGE_5V 0x20
| ^~~~
drivers/hwmon/pmbus/fsp-3y.c:114:9: note: in expansion of macro 'YM2151_PAGE_5V'
114 | .func[YM2151_PAGE_5V] =
| ^~~~~~~~~~~~~~
drivers/hwmon/pmbus/fsp-3y.c:15:25: note: (near initialization for 'fsp3y_info[0].func')
15 | #define YM2151_PAGE_5V 0x20
| ^~~~
drivers/hwmon/pmbus/fsp-3y.c:114:9: note: in expansion of macro 'YM2151_PAGE_5V'
114 | .func[YM2151_PAGE_5V] =
| ^~~~~~~~~~~~~~
In file included from include/linux/bits.h:6,
from include/linux/bitops.h:6,
from include/linux/kernel.h:11,
from drivers/hwmon/pmbus/fsp-3y.c:8:
>> include/vdso/bits.h:7:19: warning: initialized field overwritten [-Woverride-init]
7 | #define BIT(nr) (UL(1) << (nr))
| ^
drivers/hwmon/pmbus/pmbus.h:383:26: note: in expansion of macro 'BIT'
383 | #define PMBUS_HAVE_VOUT BIT(2)
| ^~~
drivers/hwmon/pmbus/fsp-3y.c:115:4: note: in expansion of macro 'PMBUS_HAVE_VOUT'
115 | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT,
| ^~~~~~~~~~~~~~~
include/vdso/bits.h:7:19: note: (near initialization for 'fsp3y_info[0].func[0]')
7 | #define BIT(nr) (UL(1) << (nr))
| ^
drivers/hwmon/pmbus/pmbus.h:383:26: note: in expansion of macro 'BIT'
383 | #define PMBUS_HAVE_VOUT BIT(2)
| ^~~
drivers/hwmon/pmbus/fsp-3y.c:115:4: note: in expansion of macro 'PMBUS_HAVE_VOUT'
115 | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT,
| ^~~~~~~~~~~~~~~
vim +7 include/vdso/bits.h
3945ff37d2f48d Vincenzo Frascino 2020-03-20 6
3945ff37d2f48d Vincenzo Frascino 2020-03-20 @7 #define BIT(nr) (UL(1) << (nr))
3945ff37d2f48d Vincenzo Frascino 2020-03-20 8
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi "Václav,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on hwmon/hwmon-next]
[also build test ERROR on v5.12-rc5 next-20210329]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/V-clav-Kubern-t/hwmon-Add-driver-for-fsp-3y-PSUs-and-PDUs/20210329-224216
base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/48af68da782edb21e107a884db98beedfd691e81
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review V-clav-Kubern-t/hwmon-Add-driver-for-fsp-3y-PSUs-and-PDUs/20210329-224216
git checkout 48af68da782edb21e107a884db98beedfd691e81
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/hwmon/pmbus/fsp-3y.c:15:25: error: array index in initializer exceeds array bounds
15 | #define YM2151_PAGE_5V 0x20
| ^~~~
drivers/hwmon/pmbus/fsp-3y.c:114:9: note: in expansion of macro 'YM2151_PAGE_5V'
114 | .func[YM2151_PAGE_5V] =
| ^~~~~~~~~~~~~~
drivers/hwmon/pmbus/fsp-3y.c:15:25: note: (near initialization for 'fsp3y_info[0].func')
15 | #define YM2151_PAGE_5V 0x20
| ^~~~
drivers/hwmon/pmbus/fsp-3y.c:114:9: note: in expansion of macro 'YM2151_PAGE_5V'
114 | .func[YM2151_PAGE_5V] =
| ^~~~~~~~~~~~~~
In file included from include/linux/bits.h:6,
from include/linux/bitops.h:6,
from include/linux/kernel.h:11,
from drivers/hwmon/pmbus/fsp-3y.c:8:
include/vdso/bits.h:7:19: warning: initialized field overwritten [-Woverride-init]
7 | #define BIT(nr) (UL(1) << (nr))
| ^
drivers/hwmon/pmbus/pmbus.h:383:26: note: in expansion of macro 'BIT'
383 | #define PMBUS_HAVE_VOUT BIT(2)
| ^~~
drivers/hwmon/pmbus/fsp-3y.c:115:4: note: in expansion of macro 'PMBUS_HAVE_VOUT'
115 | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT,
| ^~~~~~~~~~~~~~~
include/vdso/bits.h:7:19: note: (near initialization for 'fsp3y_info[0].func[0]')
7 | #define BIT(nr) (UL(1) << (nr))
| ^
drivers/hwmon/pmbus/pmbus.h:383:26: note: in expansion of macro 'BIT'
383 | #define PMBUS_HAVE_VOUT BIT(2)
| ^~~
drivers/hwmon/pmbus/fsp-3y.c:115:4: note: in expansion of macro 'PMBUS_HAVE_VOUT'
115 | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT,
| ^~~~~~~~~~~~~~~
vim +15 drivers/hwmon/pmbus/fsp-3y.c
13
14 #define YM2151_PAGE_12V 0x00
> 15 #define YM2151_PAGE_5V 0x20
16 #define YH5151E_PAGE_12V 0x00
17 #define YH5151E_PAGE_5V 0x10
18 #define YH5151E_PAGE_3V3 0x11
19
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Guenter, Thank you for the review. po 29. 3. 2021 v 19:47 odesílatel Guenter Roeck <linux@roeck-us.net> napsal: > > On 3/29/21 7:38 AM, Václav Kubernát wrote: > > After some testing, I have found out there is a timing issue with this > > device. After setting page, the device doesn't immediately react and > > gives values from the previous page for some time. This is why there > > needs to be a delay between pmbus_set_page and the actual read. > > > > Also, a lot of the standard commands don't work with the devices, so > > they are filtered out in the custom read function. > > > > This is not an appropriate patch description. Describe the driver here, > not the workarounds / quirks. The reason for the delay should be a > comment in the patch, not in the patch description. > > Also, "don't work" is inappropriate (and, again, does not belong into > the patch description). It is perfectly appropriate for the core > to try those commands to see if they are supported. The only reason > to mask them out would be that the device reacts badly to seeing > them. If that is the case, "don't work" should be replaced with > a more detailed comment in the code. Describe what happens, and why > the commands needs to be caught. > > > What might be useful is a note indicating if you have a manual for > those power supplies available, or if the driver is based on reverse > engineering. > I will rework the commit message in a V2 patch. > > Signed-off-by: Václav Kubernát <kubernat@cesnet.cz> > > --- > > drivers/hwmon/pmbus/Kconfig | 9 ++ > > drivers/hwmon/pmbus/Makefile | 1 + > > drivers/hwmon/pmbus/fsp-3y.c | 164 +++++++++++++++++++++++++++++++++++ > > Documentation/hwmon/fsp-3y.rst is missing. > > > 3 files changed, 174 insertions(+) > > create mode 100644 drivers/hwmon/pmbus/fsp-3y.c > > > > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > > index 03606d4298a4..66d1655b6750 100644 > > --- a/drivers/hwmon/pmbus/Kconfig > > +++ b/drivers/hwmon/pmbus/Kconfig > > @@ -56,6 +56,15 @@ config SENSORS_BEL_PFE > > This driver can also be built as a module. If so, the module will > > be called bel-pfe. > > > > +config SENSORS_FSP_3Y > > + tristate "FSP/3Y-Power power supplies" > > + help > > + If you say yes here you get hardware monitoring support for > > + FSP/3Y-Power hot-swap power supplies. > > + > > This should list the supported models - if not here, then at least in the > (missing) documentation. > Okay. > > + This driver can also be built as a module. If so, the module will > > + be called fsp-3y. > > + > > config SENSORS_IBM_CFFPS > > tristate "IBM Common Form Factor Power Supply" > > depends on LEDS_CLASS > > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > > index 6a4ba0fdc1db..bfe218ad898f 100644 > > --- a/drivers/hwmon/pmbus/Makefile > > +++ b/drivers/hwmon/pmbus/Makefile > > @@ -8,6 +8,7 @@ obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o > > obj-$(CONFIG_SENSORS_ADM1266) += adm1266.o > > obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o > > obj-$(CONFIG_SENSORS_BEL_PFE) += bel-pfe.o > > +obj-$(CONFIG_SENSORS_FSP_3Y) += fsp-3y.o > > obj-$(CONFIG_SENSORS_IBM_CFFPS) += ibm-cffps.o > > obj-$(CONFIG_SENSORS_INSPUR_IPSPS) += inspur-ipsps.o > > obj-$(CONFIG_SENSORS_IR35221) += ir35221.o > > diff --git a/drivers/hwmon/pmbus/fsp-3y.c b/drivers/hwmon/pmbus/fsp-3y.c > > new file mode 100644 > > index 000000000000..7f3c3de3a1e6 > > --- /dev/null > > +++ b/drivers/hwmon/pmbus/fsp-3y.c > > @@ -0,0 +1,164 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > +/* > > + * Hardware monitoring driver for FSP 3Y-Power PSUs > > + * > > + * Copyright (c) 2021 Václav Kubernát, CESNET > > + */ > > + > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/delay.h> > > +#include <linux/i2c.h> > > Alphabetic include file order, please. > > > +#include "pmbus.h" > > + > > +#define YM2151_PAGE_12V 0x00 > > +#define YM2151_PAGE_5V 0x20 > > +#define YH5151E_PAGE_12V 0x00 > > +#define YH5151E_PAGE_5V 0x10 > > +#define YH5151E_PAGE_3V3 0x11 > > + > > +enum chips { > > + ym2151e, > > + yh5151e > > +}; > > + > > +static int set_page(struct i2c_client *client, int page) > > +{ > > + int rv; > > + > > + rv = i2c_smbus_read_byte_data(client, PMBUS_PAGE); > > + > Please no empty line here. > > You might want to consider caching the current page to avoid having to read it > for each access, similar to the code implemented in the pmbus core. > This was actually what I wanted to do at first, but I wasn't able to get i2c_set_clientdata to work. Later I found out that it is because pmbus_do_probe uses sets it own data. What do you think I should use to cache the page? > > + if (rv < 0) > > + return rv; > > + > > + if (rv != page) { > > + rv = pmbus_set_page(client, page, 0xff); > > + if (rv < 0) > > + return rv; > > + > > + msleep(20); > > Please use usleep_range(), and make sure that this huge delay is actually needed. > As is written in the original commit message, the devices have some kind of timing issues and this delay really is needed. I have tested smaller delays (10ms), they are compared to no delay, but I would still sometimes get wrong values. I will move this explanation into the code. > > + } > > + > > + return 0; > > +} > > + > > +static int fsp3y_read_byte_data(struct i2c_client *client, int page, int reg) > > +{ > > + int rv; > > + > > + rv = set_page(client, page); > > + if (rv < 0) > > + return rv; > > + > > + return i2c_smbus_read_byte_data(client, reg); > > +} > > + > > +static int fsp3y_read_word_data(struct i2c_client *client, int page, int phase, int reg) > > +{ > > + int rv; > > + > > + if (reg >= PMBUS_VIRT_BASE) > > + return -ENXIO; > > + > > + switch (reg) { > > + case PMBUS_OT_WARN_LIMIT: > > + case PMBUS_OT_FAULT_LIMIT: > > + case PMBUS_UT_WARN_LIMIT: > > + case PMBUS_UT_FAULT_LIMIT: > > + case PMBUS_VIN_UV_WARN_LIMIT: > > + case PMBUS_VIN_UV_FAULT_LIMIT: > > + case PMBUS_VIN_OV_FAULT_LIMIT: > > + case PMBUS_VIN_OV_WARN_LIMIT: > > + case PMBUS_IOUT_OC_WARN_LIMIT: > > + case PMBUS_IOUT_UC_FAULT_LIMIT: > > + case PMBUS_IOUT_OC_FAULT_LIMIT: > > + case PMBUS_IIN_OC_WARN_LIMIT: > > + case PMBUS_IIN_OC_FAULT_LIMIT: > > + case PMBUS_VOUT_UV_WARN_LIMIT: > > + case PMBUS_VOUT_UV_FAULT_LIMIT: > > + case PMBUS_VOUT_OV_WARN_LIMIT: > > + case PMBUS_VOUT_OV_FAULT_LIMIT: > > + case PMBUS_MFR_VIN_MIN: > > + case PMBUS_MFR_VIN_MAX: > > + case PMBUS_MFR_IIN_MAX: > > + case PMBUS_MFR_VOUT_MIN: > > + case PMBUS_MFR_VOUT_MAX: > > + case PMBUS_MFR_IOUT_MAX: > > + case PMBUS_MFR_PIN_MAX: > > + case PMBUS_POUT_MAX: > > + case PMBUS_POUT_OP_WARN_LIMIT: > > + case PMBUS_POUT_OP_FAULT_LIMIT: > > + case PMBUS_MFR_MAX_TEMP_1: > > + case PMBUS_MFR_MAX_TEMP_2: > > + case PMBUS_MFR_MAX_TEMP_3: > > + case PMBUS_MFR_POUT_MAX: > > + return -ENXIO; > > + } > > If that many commands indeed cause trouble (ie cause the device > to get into a bad state), it might be better to list the _supported_ > commands instead of the unsupported ones. There is no guarantee > that the core won't start to send other commands to the device > in the future. > > The underlying question is if those commands are indeed not supported, > or if they report values in an unexpected format (ie not linear11). > The data format that is auto-selected below (because it is not specified) > is "linear". Is this what the device actually uses ? If not, just disabling > reading the limits without explanation what exactly "does not work" is > inappropriate. > The reason I masked these commands is because when I was reading from the associated files, I would get weird values (like -500). But it's not like the commands confuse the device. If you think it isn't a good idea to mask them like that, I'm fine with removing the masking. > > + > > + rv = set_page(client, page); > > + if (rv < 0) > > + return rv; > > + > > + return i2c_smbus_read_word_data(client, reg); > > +} > > + > > +struct pmbus_driver_info fsp3y_info[] = { > > + [ym2151e] = { > > + .pages = 0x21, > > + .func[YM2151_PAGE_12V] = > > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > > + PMBUS_HAVE_PIN | PMBUS_HAVE_POUT | > > + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | > > + PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | > > + PMBUS_HAVE_FAN12, > > + .func[YM2151_PAGE_5V] = > > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT, > > + PMBUS_HAVE_IIN, > > It doesn't really make sense to claim support for 0x21 = 33 > pages, especially since the pmbus core (and the pmbus standard) > only supports 32 pages. Since page handling is all local anyway, > I would suggest to claim two pages and map the logical page > to the physical page in the set_page command. > > How does this work (compile) anyway ? .func[] array size > is 32, meaning .func[0x20] goes beyond the end of the array. > The compiler should complain about that. > > Wait, how does this even instantiate ? The PMBus core > should reject a page count larger than 32, and pmbus_do_probe() > should return -ENODEV. How did you test this code ? > Sorry, I forgot I was building this patch on top of another patch (written by my colleague), which increases the page limit. The pmbus specification does say that pages 0x00 through 0x1F are "reserved specifically for multiple outputs on a device with a single physical address", but it does not say that there is a page limit. Anyway, The PSU really does use the 0x20 page. Either way, I'm fine with doing a mapping between a logical a page and physical, if you decide you don't want to change the page limit. > > + .read_word_data = fsp3y_read_word_data, > > + .read_byte_data = fsp3y_read_byte_data, > > + }, > > + [yh5151e] = { > > + .pages = 0x12, > > Same as above. > > > + .func[YH5151E_PAGE_12V] = > > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > > + PMBUS_HAVE_POUT | > > + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3, > > + .func[YH5151E_PAGE_5V] = > > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > > + PMBUS_HAVE_POUT, > > + .func[YH5151E_PAGE_3V3] = > > + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > > + PMBUS_HAVE_POUT, > > + .read_word_data = fsp3y_read_word_data, > > + .read_byte_data = fsp3y_read_byte_data, > > + } > > +}; > > + > > +static int fsp3y_probe(struct i2c_client *client, > > + const struct i2c_device_id *id) > > +{ > > This vendor sells dozens of different power supplies. Apparently > they do not have compatible PMBus attributes (or at least the pages > are not compatible to each other). Given that, I think there should > be a model validation here. How should I go about doing model validation? I'm already using i2c_device_id to differentiate between the PDU and the PSU, but I suppose, that's not the best thing. Maybe I should use an identify function in pmbus_driver_info? > > This is even more important since an earlier discussion suggests that > at least some of the 3Y power supplies use LINEAR11 instead of LINEAR16 > for output voltages (eg YH5301-1EAR, FSP550-50ERS). We need to ensure > that affected power supplies are not enabled with this driver, and that > the enabled power supplies have been tested and are not only confirmed > to work and report correct data. > > > + return pmbus_do_probe(client, &fsp3y_info[id->driver_data]); > > +} > > + > > +static const struct i2c_device_id pmbus_id[] = { > > + {"fsp3y_ym2151e", ym2151e}, > > + {"fsp3y_yh5151e", yh5151e},> + {} > > +}; > > + > > +MODULE_DEVICE_TABLE(i2c, pmbus_id); > > + > > +/* This is the driver that will be inserted */ > > +static struct i2c_driver fsp3y_driver = { > > + .driver = { > > + .name = "fsp3y", > > + }, > > + .probe = fsp3y_probe, > > Please use the .probe_new callback. > > > + .id_table = pmbus_id > > +}; > > + > > +module_i2c_driver(fsp3y_driver); > > + > > +MODULE_AUTHOR("Václav Kubernát"); > > +MODULE_DESCRIPTION("PMBus driver for FSP/3Y-Power power supplies"); > > +MODULE_LICENSE("GPL"); > > > Václav
On 3/29/21 8:31 PM, Václav Kubernát wrote: > Hi Guenter, > > Thank you for the review. > > po 29. 3. 2021 v 19:47 odesílatel Guenter Roeck <linux@roeck-us.net> napsal: >> >> On 3/29/21 7:38 AM, Václav Kubernát wrote: >>> After some testing, I have found out there is a timing issue with this >>> device. After setting page, the device doesn't immediately react and >>> gives values from the previous page for some time. This is why there >>> needs to be a delay between pmbus_set_page and the actual read. >>> >>> Also, a lot of the standard commands don't work with the devices, so >>> they are filtered out in the custom read function. >>> >> >> This is not an appropriate patch description. Describe the driver here, >> not the workarounds / quirks. The reason for the delay should be a >> comment in the patch, not in the patch description. >> >> Also, "don't work" is inappropriate (and, again, does not belong into >> the patch description). It is perfectly appropriate for the core >> to try those commands to see if they are supported. The only reason >> to mask them out would be that the device reacts badly to seeing >> them. If that is the case, "don't work" should be replaced with >> a more detailed comment in the code. Describe what happens, and why >> the commands needs to be caught. >> >> >> What might be useful is a note indicating if you have a manual for >> those power supplies available, or if the driver is based on reverse >> engineering. >> > > I will rework the commit message in a V2 patch. > >>> Signed-off-by: Václav Kubernát <kubernat@cesnet.cz> >>> --- >>> drivers/hwmon/pmbus/Kconfig | 9 ++ >>> drivers/hwmon/pmbus/Makefile | 1 + >>> drivers/hwmon/pmbus/fsp-3y.c | 164 +++++++++++++++++++++++++++++++++++ >> >> Documentation/hwmon/fsp-3y.rst is missing. >> >>> 3 files changed, 174 insertions(+) >>> create mode 100644 drivers/hwmon/pmbus/fsp-3y.c >>> >>> diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig >>> index 03606d4298a4..66d1655b6750 100644 >>> --- a/drivers/hwmon/pmbus/Kconfig >>> +++ b/drivers/hwmon/pmbus/Kconfig >>> @@ -56,6 +56,15 @@ config SENSORS_BEL_PFE >>> This driver can also be built as a module. If so, the module will >>> be called bel-pfe. >>> >>> +config SENSORS_FSP_3Y >>> + tristate "FSP/3Y-Power power supplies" >>> + help >>> + If you say yes here you get hardware monitoring support for >>> + FSP/3Y-Power hot-swap power supplies. >>> + >> >> This should list the supported models - if not here, then at least in the >> (missing) documentation. >> > > Okay. > >>> + This driver can also be built as a module. If so, the module will >>> + be called fsp-3y. >>> + >>> config SENSORS_IBM_CFFPS >>> tristate "IBM Common Form Factor Power Supply" >>> depends on LEDS_CLASS >>> diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile >>> index 6a4ba0fdc1db..bfe218ad898f 100644 >>> --- a/drivers/hwmon/pmbus/Makefile >>> +++ b/drivers/hwmon/pmbus/Makefile >>> @@ -8,6 +8,7 @@ obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o >>> obj-$(CONFIG_SENSORS_ADM1266) += adm1266.o >>> obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o >>> obj-$(CONFIG_SENSORS_BEL_PFE) += bel-pfe.o >>> +obj-$(CONFIG_SENSORS_FSP_3Y) += fsp-3y.o >>> obj-$(CONFIG_SENSORS_IBM_CFFPS) += ibm-cffps.o >>> obj-$(CONFIG_SENSORS_INSPUR_IPSPS) += inspur-ipsps.o >>> obj-$(CONFIG_SENSORS_IR35221) += ir35221.o >>> diff --git a/drivers/hwmon/pmbus/fsp-3y.c b/drivers/hwmon/pmbus/fsp-3y.c >>> new file mode 100644 >>> index 000000000000..7f3c3de3a1e6 >>> --- /dev/null >>> +++ b/drivers/hwmon/pmbus/fsp-3y.c >>> @@ -0,0 +1,164 @@ >>> +// SPDX-License-Identifier: GPL-2.0-or-later >>> +/* >>> + * Hardware monitoring driver for FSP 3Y-Power PSUs >>> + * >>> + * Copyright (c) 2021 Václav Kubernát, CESNET >>> + */ >>> + >>> +#include <linux/kernel.h> >>> +#include <linux/module.h> >>> +#include <linux/delay.h> >>> +#include <linux/i2c.h> >> >> Alphabetic include file order, please. >> >>> +#include "pmbus.h" >>> + >>> +#define YM2151_PAGE_12V 0x00 >>> +#define YM2151_PAGE_5V 0x20 >>> +#define YH5151E_PAGE_12V 0x00 >>> +#define YH5151E_PAGE_5V 0x10 >>> +#define YH5151E_PAGE_3V3 0x11 >>> + >>> +enum chips { >>> + ym2151e, >>> + yh5151e >>> +}; >>> + >>> +static int set_page(struct i2c_client *client, int page) >>> +{ >>> + int rv; >>> + >>> + rv = i2c_smbus_read_byte_data(client, PMBUS_PAGE); >>> + >> Please no empty line here. >> >> You might want to consider caching the current page to avoid having to read it >> for each access, similar to the code implemented in the pmbus core. >> > > This was actually what I wanted to do at first, but I wasn't able to > get i2c_set_clientdata to work. Later I found out that it is because > pmbus_do_probe uses sets it own data. What do you think I should use > to cache the page? > Several other PMBus drivers use local data. The trick is to put the pmbus_driver_info data structure into that local data, then use container_of() to access it. >>> + if (rv < 0) >>> + return rv; >>> + >>> + if (rv != page) { >>> + rv = pmbus_set_page(client, page, 0xff); >>> + if (rv < 0) >>> + return rv; >>> + >>> + msleep(20); >> >> Please use usleep_range(), and make sure that this huge delay is actually needed. >> > > As is written in the original commit message, the devices have some > kind of timing issues and this delay really is needed. I have tested > smaller delays (10ms), they are compared to no delay, but I would > still sometimes get wrong values. I will move this explanation into > the code. > Ok. >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int fsp3y_read_byte_data(struct i2c_client *client, int page, int reg) >>> +{ >>> + int rv; >>> + >>> + rv = set_page(client, page); >>> + if (rv < 0) >>> + return rv; >>> + >>> + return i2c_smbus_read_byte_data(client, reg); >>> +} >>> + >>> +static int fsp3y_read_word_data(struct i2c_client *client, int page, int phase, int reg) >>> +{ >>> + int rv; >>> + >>> + if (reg >= PMBUS_VIRT_BASE) >>> + return -ENXIO; >>> + >>> + switch (reg) { >>> + case PMBUS_OT_WARN_LIMIT: >>> + case PMBUS_OT_FAULT_LIMIT: >>> + case PMBUS_UT_WARN_LIMIT: >>> + case PMBUS_UT_FAULT_LIMIT: >>> + case PMBUS_VIN_UV_WARN_LIMIT: >>> + case PMBUS_VIN_UV_FAULT_LIMIT: >>> + case PMBUS_VIN_OV_FAULT_LIMIT: >>> + case PMBUS_VIN_OV_WARN_LIMIT: >>> + case PMBUS_IOUT_OC_WARN_LIMIT: >>> + case PMBUS_IOUT_UC_FAULT_LIMIT: >>> + case PMBUS_IOUT_OC_FAULT_LIMIT: >>> + case PMBUS_IIN_OC_WARN_LIMIT: >>> + case PMBUS_IIN_OC_FAULT_LIMIT: >>> + case PMBUS_VOUT_UV_WARN_LIMIT: >>> + case PMBUS_VOUT_UV_FAULT_LIMIT: >>> + case PMBUS_VOUT_OV_WARN_LIMIT: >>> + case PMBUS_VOUT_OV_FAULT_LIMIT: >>> + case PMBUS_MFR_VIN_MIN: >>> + case PMBUS_MFR_VIN_MAX: >>> + case PMBUS_MFR_IIN_MAX: >>> + case PMBUS_MFR_VOUT_MIN: >>> + case PMBUS_MFR_VOUT_MAX: >>> + case PMBUS_MFR_IOUT_MAX: >>> + case PMBUS_MFR_PIN_MAX: >>> + case PMBUS_POUT_MAX: >>> + case PMBUS_POUT_OP_WARN_LIMIT: >>> + case PMBUS_POUT_OP_FAULT_LIMIT: >>> + case PMBUS_MFR_MAX_TEMP_1: >>> + case PMBUS_MFR_MAX_TEMP_2: >>> + case PMBUS_MFR_MAX_TEMP_3: >>> + case PMBUS_MFR_POUT_MAX: >>> + return -ENXIO; >>> + } >> >> If that many commands indeed cause trouble (ie cause the device >> to get into a bad state), it might be better to list the _supported_ >> commands instead of the unsupported ones. There is no guarantee >> that the core won't start to send other commands to the device >> in the future. >> >> The underlying question is if those commands are indeed not supported, >> or if they report values in an unexpected format (ie not linear11). >> The data format that is auto-selected below (because it is not specified) >> is "linear". Is this what the device actually uses ? If not, just disabling >> reading the limits without explanation what exactly "does not work" is >> inappropriate. >> > > The reason I masked these commands is because when I was reading from > the associated files, I would get weird values (like -500). But it's > not like the commands confuse the device. If you think it isn't a good > idea to mask them like that, I'm fine with removing the masking. > The problem is that the power supplies do support those commands. The question is what data format they use. Given that we know which pages map which voltage, it should be possible to figure that out based on the raw data reported on the multiple pages. Also, another question is if all those commands are affected. If it is PMBUS_VOUT_xxx, it is probably because they are (wrongly) reported in LINEAR 11 instead of LINEAR16 format. It may as well be that other limits are reported as LINEAR16 when it should be LINEAR11. All that is difficult to determine without seeing the raw data and without datasheet. >>> + >>> + rv = set_page(client, page); >>> + if (rv < 0) >>> + return rv; >>> + >>> + return i2c_smbus_read_word_data(client, reg); >>> +} >>> + >>> +struct pmbus_driver_info fsp3y_info[] = { >>> + [ym2151e] = { >>> + .pages = 0x21, >>> + .func[YM2151_PAGE_12V] = >>> + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >>> + PMBUS_HAVE_PIN | PMBUS_HAVE_POUT | >>> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | >>> + PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | >>> + PMBUS_HAVE_FAN12, >>> + .func[YM2151_PAGE_5V] = >>> + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT, >>> + PMBUS_HAVE_IIN, >> >> It doesn't really make sense to claim support for 0x21 = 33 >> pages, especially since the pmbus core (and the pmbus standard) >> only supports 32 pages. Since page handling is all local anyway, >> I would suggest to claim two pages and map the logical page >> to the physical page in the set_page command. >> >> How does this work (compile) anyway ? .func[] array size >> is 32, meaning .func[0x20] goes beyond the end of the array. >> The compiler should complain about that. >> >> Wait, how does this even instantiate ? The PMBus core >> should reject a page count larger than 32, and pmbus_do_probe() >> should return -ENODEV. How did you test this code ? >> > > Sorry, I forgot I was building this patch on top of another patch > (written by my colleague), which increases the page limit. The pmbus > specification does say that pages 0x00 through 0x1F are "reserved > specifically for multiple outputs on a device with a single physical > address", but it does not say that there is a page limit. Anyway, The Ah yes, sorry, too long ago. > PSU really does use the 0x20 page. Either way, I'm fine with doing a > mapping between a logical a page and physical, if you decide you don't > want to change the page limit. > Unless there is a good reason to do so (ie a device with more than 32 legitimate pages) I do not really want to increase that limit since that would affect all PMBus drivers. >>> + .read_word_data = fsp3y_read_word_data, >>> + .read_byte_data = fsp3y_read_byte_data, >>> + }, >>> + [yh5151e] = { >>> + .pages = 0x12, >> >> Same as above. >> >>> + .func[YH5151E_PAGE_12V] = >>> + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >>> + PMBUS_HAVE_POUT | >>> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3, >>> + .func[YH5151E_PAGE_5V] = >>> + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >>> + PMBUS_HAVE_POUT, >>> + .func[YH5151E_PAGE_3V3] = >>> + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >>> + PMBUS_HAVE_POUT, Assuming this is really YH5151-1EBR, doesn't it also support -12V (possibly on page 0x22) and +5Vsb ? >>> + .read_word_data = fsp3y_read_word_data, >>> + .read_byte_data = fsp3y_read_byte_data, >>> + } >>> +}; >>> + >>> +static int fsp3y_probe(struct i2c_client *client, >>> + const struct i2c_device_id *id) >>> +{ >> >> This vendor sells dozens of different power supplies. Apparently >> they do not have compatible PMBus attributes (or at least the pages >> are not compatible to each other). Given that, I think there should >> be a model validation here. > > How should I go about doing model validation? I'm already using > i2c_device_id to differentiate between the PDU and the PSU, but I > suppose, that's not the best thing. Maybe I should use an identify > function in pmbus_driver_info? > By reading PMBUS_MFR_ID ? PMBUS_MFR_MODEL ? PMBUS_IC_DEVICE_ID ? I don't have the manual, and manuals from this manufacturer are not public, so I have no idea what those power supplies report. >> >> This is even more important since an earlier discussion suggests that >> at least some of the 3Y power supplies use LINEAR11 instead of LINEAR16 >> for output voltages (eg YH5301-1EAR, FSP550-50ERS). We need to ensure >> that affected power supplies are not enabled with this driver, and that >> the enabled power supplies have been tested and are not only confirmed >> to work and report correct data. >> > > >>> + return pmbus_do_probe(client, &fsp3y_info[id->driver_data]); >>> +} >>> + >>> +static const struct i2c_device_id pmbus_id[] = { >>> + {"fsp3y_ym2151e", ym2151e}, >>> + {"fsp3y_yh5151e", yh5151e},> + {} >>> +}; >>> + >>> +MODULE_DEVICE_TABLE(i2c, pmbus_id); >>> + >>> +/* This is the driver that will be inserted */ >>> +static struct i2c_driver fsp3y_driver = { >>> + .driver = { >>> + .name = "fsp3y", >>> + }, >>> + .probe = fsp3y_probe, >> >> Please use the .probe_new callback. >> >>> + .id_table = pmbus_id >>> +}; >>> + >>> +module_i2c_driver(fsp3y_driver); >>> + >>> +MODULE_AUTHOR("Václav Kubernát"); >>> +MODULE_DESCRIPTION("PMBus driver for FSP/3Y-Power power supplies"); >>> +MODULE_LICENSE("GPL"); >>> >> > > Václav >
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 03606d4298a4..66d1655b6750 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig @@ -56,6 +56,15 @@ config SENSORS_BEL_PFE This driver can also be built as a module. If so, the module will be called bel-pfe. +config SENSORS_FSP_3Y + tristate "FSP/3Y-Power power supplies" + help + If you say yes here you get hardware monitoring support for + FSP/3Y-Power hot-swap power supplies. + + This driver can also be built as a module. If so, the module will + be called fsp-3y. + config SENSORS_IBM_CFFPS tristate "IBM Common Form Factor Power Supply" depends on LEDS_CLASS diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile index 6a4ba0fdc1db..bfe218ad898f 100644 --- a/drivers/hwmon/pmbus/Makefile +++ b/drivers/hwmon/pmbus/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o obj-$(CONFIG_SENSORS_ADM1266) += adm1266.o obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o obj-$(CONFIG_SENSORS_BEL_PFE) += bel-pfe.o +obj-$(CONFIG_SENSORS_FSP_3Y) += fsp-3y.o obj-$(CONFIG_SENSORS_IBM_CFFPS) += ibm-cffps.o obj-$(CONFIG_SENSORS_INSPUR_IPSPS) += inspur-ipsps.o obj-$(CONFIG_SENSORS_IR35221) += ir35221.o diff --git a/drivers/hwmon/pmbus/fsp-3y.c b/drivers/hwmon/pmbus/fsp-3y.c new file mode 100644 index 000000000000..7f3c3de3a1e6 --- /dev/null +++ b/drivers/hwmon/pmbus/fsp-3y.c @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Hardware monitoring driver for FSP 3Y-Power PSUs + * + * Copyright (c) 2021 Václav Kubernát, CESNET + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/i2c.h> +#include "pmbus.h" + +#define YM2151_PAGE_12V 0x00 +#define YM2151_PAGE_5V 0x20 +#define YH5151E_PAGE_12V 0x00 +#define YH5151E_PAGE_5V 0x10 +#define YH5151E_PAGE_3V3 0x11 + +enum chips { + ym2151e, + yh5151e +}; + +static int set_page(struct i2c_client *client, int page) +{ + int rv; + + rv = i2c_smbus_read_byte_data(client, PMBUS_PAGE); + + if (rv < 0) + return rv; + + if (rv != page) { + rv = pmbus_set_page(client, page, 0xff); + if (rv < 0) + return rv; + + msleep(20); + } + + return 0; +} + +static int fsp3y_read_byte_data(struct i2c_client *client, int page, int reg) +{ + int rv; + + rv = set_page(client, page); + if (rv < 0) + return rv; + + return i2c_smbus_read_byte_data(client, reg); +} + +static int fsp3y_read_word_data(struct i2c_client *client, int page, int phase, int reg) +{ + int rv; + + if (reg >= PMBUS_VIRT_BASE) + return -ENXIO; + + switch (reg) { + case PMBUS_OT_WARN_LIMIT: + case PMBUS_OT_FAULT_LIMIT: + case PMBUS_UT_WARN_LIMIT: + case PMBUS_UT_FAULT_LIMIT: + case PMBUS_VIN_UV_WARN_LIMIT: + case PMBUS_VIN_UV_FAULT_LIMIT: + case PMBUS_VIN_OV_FAULT_LIMIT: + case PMBUS_VIN_OV_WARN_LIMIT: + case PMBUS_IOUT_OC_WARN_LIMIT: + case PMBUS_IOUT_UC_FAULT_LIMIT: + case PMBUS_IOUT_OC_FAULT_LIMIT: + case PMBUS_IIN_OC_WARN_LIMIT: + case PMBUS_IIN_OC_FAULT_LIMIT: + case PMBUS_VOUT_UV_WARN_LIMIT: + case PMBUS_VOUT_UV_FAULT_LIMIT: + case PMBUS_VOUT_OV_WARN_LIMIT: + case PMBUS_VOUT_OV_FAULT_LIMIT: + case PMBUS_MFR_VIN_MIN: + case PMBUS_MFR_VIN_MAX: + case PMBUS_MFR_IIN_MAX: + case PMBUS_MFR_VOUT_MIN: + case PMBUS_MFR_VOUT_MAX: + case PMBUS_MFR_IOUT_MAX: + case PMBUS_MFR_PIN_MAX: + case PMBUS_POUT_MAX: + case PMBUS_POUT_OP_WARN_LIMIT: + case PMBUS_POUT_OP_FAULT_LIMIT: + case PMBUS_MFR_MAX_TEMP_1: + case PMBUS_MFR_MAX_TEMP_2: + case PMBUS_MFR_MAX_TEMP_3: + case PMBUS_MFR_POUT_MAX: + return -ENXIO; + } + + rv = set_page(client, page); + if (rv < 0) + return rv; + + return i2c_smbus_read_word_data(client, reg); +} + +struct pmbus_driver_info fsp3y_info[] = { + [ym2151e] = { + .pages = 0x21, + .func[YM2151_PAGE_12V] = + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | + PMBUS_HAVE_PIN | PMBUS_HAVE_POUT | + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | + PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | + PMBUS_HAVE_FAN12, + .func[YM2151_PAGE_5V] = + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT, + PMBUS_HAVE_IIN, + .read_word_data = fsp3y_read_word_data, + .read_byte_data = fsp3y_read_byte_data, + }, + [yh5151e] = { + .pages = 0x12, + .func[YH5151E_PAGE_12V] = + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | + PMBUS_HAVE_POUT | + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3, + .func[YH5151E_PAGE_5V] = + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | + PMBUS_HAVE_POUT, + .func[YH5151E_PAGE_3V3] = + PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | + PMBUS_HAVE_POUT, + .read_word_data = fsp3y_read_word_data, + .read_byte_data = fsp3y_read_byte_data, + } +}; + +static int fsp3y_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + return pmbus_do_probe(client, &fsp3y_info[id->driver_data]); +} + +static const struct i2c_device_id pmbus_id[] = { + {"fsp3y_ym2151e", ym2151e}, + {"fsp3y_yh5151e", yh5151e}, + {} +}; + +MODULE_DEVICE_TABLE(i2c, pmbus_id); + +/* This is the driver that will be inserted */ +static struct i2c_driver fsp3y_driver = { + .driver = { + .name = "fsp3y", + }, + .probe = fsp3y_probe, + .id_table = pmbus_id +}; + +module_i2c_driver(fsp3y_driver); + +MODULE_AUTHOR("Václav Kubernát"); +MODULE_DESCRIPTION("PMBus driver for FSP/3Y-Power power supplies"); +MODULE_LICENSE("GPL");
After some testing, I have found out there is a timing issue with this device. After setting page, the device doesn't immediately react and gives values from the previous page for some time. This is why there needs to be a delay between pmbus_set_page and the actual read. Also, a lot of the standard commands don't work with the devices, so they are filtered out in the custom read function. Signed-off-by: Václav Kubernát <kubernat@cesnet.cz> --- drivers/hwmon/pmbus/Kconfig | 9 ++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/fsp-3y.c | 164 +++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+) create mode 100644 drivers/hwmon/pmbus/fsp-3y.c