Add mp2971/mp2973 support in mp2975
Tested with:
My unit only include mp2971 and mp2973 devices
MP2973:
cat /sys/bus/i2c/devices/5-0076/hwmon/hwmon24/*label
iin
iout1
iout2
vin
vout1
vout2
pin
pout1
pout2
cat /sys/bus/i2c/devices/5-0076/hwmon/hwmon24/*input
0
82500
14000
12187
1787
1793
0
148000000
25000000
54000
MP2971:
cat /sys/bus/i2c/devices/5-0062/hwmon/hwmon20/*label
iin
iout1
iout2
vin
vout1
vout2
pin
pout1
pout2
cat /sys/bus/i2c/devices/5-0062/hwmon/hwmon20/*input
18500
22000
500
12187
1025
1800
226000000
22000000
1000000
55000
Signed-off-by: Wang Xiaohua <[email protected]>
---
drivers/hwmon/pmbus/mp2975.c | 413 +++++++++++++++++++++++++++++++----
1 file changed, 372 insertions(+), 41 deletions(-)
diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c
index 51986adfbf47..972b5b02dfdd 100644
--- a/drivers/hwmon/pmbus/mp2975.c
+++ b/drivers/hwmon/pmbus/mp2975.c
@@ -52,10 +52,33 @@
#define MP2975_MAX_PHASE_RAIL2 4
#define MP2975_PAGE_NUM 2
+#define MP2971_RAIL2_FUNC \
+ (PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_IOUT | \
+ PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT)
+
#define MP2975_RAIL2_FUNC (PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | \
PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | \
PMBUS_HAVE_POUT | PMBUS_PHASE_VIRTUAL)
+struct mp2971_device_info {
+ int max_phase_rail1;
+ int max_phase_rail2;
+ int imvp9_en_r1_mask;
+ int imvp9_en_r2_mask;
+};
+
+struct mp2971_data {
+ struct pmbus_driver_info info;
+ int vid_step[MP2975_PAGE_NUM];
+ int vout_format[MP2975_PAGE_NUM];
+ int vout_mode[MP2975_PAGE_NUM];
+ int vout_exponent[MP2975_PAGE_NUM];
+ int max_phase_rail1;
+ int max_phase_rail2;
+ int imvp9_en_r1_mask;
+ int imvp9_en_r2_mask;
+};
+
struct mp2975_data {
struct pmbus_driver_info info;
int vout_scale;
@@ -68,6 +91,9 @@ struct mp2975_data {
int curr_sense_gain[MP2975_PAGE_NUM];
};
+static const struct i2c_device_id mp2975_id[];
+
+#define to_mp2971_data(x) container_of(x, struct mp2971_data, info)
#define to_mp2975_data(x) container_of(x, struct mp2975_data, info)
static int mp2975_read_byte_data(struct i2c_client *client, int page, int reg)
@@ -95,6 +121,40 @@ mp2975_read_word_helper(struct i2c_client *client, int page, int phase, u8 reg,
return (ret > 0) ? ret & mask : ret;
}
+static int
+mp2971_linear2direct(struct mp2971_data *data, int page, int val)
+{
+ /* simple case */
+ if (val == 0)
+ return 0;
+
+ /* LINEAR16 does not support negative voltages */
+ if (val < 0)
+ return 0;
+
+ /*
+ * For a static exponents, we don't have a choice
+ * but to adjust the value to it.
+ */
+
+ if (data->vout_exponent[page] < 0)
+ val <<= -data->vout_exponent[page];
+ else
+ val >>= data->vout_exponent[page];
+ return clamp_val(val, 0, 0xffff);
+}
+
+static int
+mp2971_vid2direct(struct mp2971_data *data, int page, int val)
+{
+ int vrf = data->info.vrm_version[page];
+
+ if (vrf == imvp9)
+ return (val + 29) * data->vid_step[page];
+
+ return (val + 49) * data->vid_step[page];
+}
+
static int
mp2975_vid2direct(int vrf, int val)
{
@@ -214,6 +274,74 @@ mp2975_read_phases(struct i2c_client *client, struct mp2975_data *data,
return ret;
}
+static int
+mp2971_read_word_data(struct i2c_client *client, int page,
+ int phase, int reg)
+{
+ const struct pmbus_driver_info *info = pmbus_get_driver_info(client);
+ struct mp2971_data *data = to_mp2971_data(info);
+ int ret;
+
+ switch (reg) {
+ case PMBUS_OT_FAULT_LIMIT:
+ case PMBUS_VIN_OV_FAULT_LIMIT:
+ case PMBUS_VOUT_OV_FAULT_LIMIT:
+ case PMBUS_VOUT_UV_FAULT_LIMIT:
+ case PMBUS_READ_IOUT:
+ ret = mp2975_read_word_helper(client, page, phase,
+ reg, GENMASK(15, 0));
+ break;
+ case PMBUS_READ_VOUT:
+ ret = mp2975_read_word_helper(client, page, phase, reg,
+ GENMASK(11, 0));
+ if (ret < 0)
+ return ret;
+ /*
+ * READ_VOUT can be provided in VID or direct format. The
+ * format type is specified by bit 15 of the register
+ * MP2971_MFR_DC_LOOP_CTRL. The driver enforces VOUT direct
+ * format, since device allows to set the different formats for
+ * the different rails and also all VOUT limits registers are
+ * provided in a direct format. In case format is VID - convert
+ * to direct.
+ */
+ switch (data->vout_format[page]) {
+ case linear:
+ ret = mp2971_linear2direct(data, page, ret);
+ break;
+ case vid:
+ ret = mp2971_vid2direct(data, page, ret);
+ break;
+ case direct:
+ break;
+ default:
+ return -ENODATA;
+ }
+ break;
+ case PMBUS_UT_WARN_LIMIT:
+ case PMBUS_UT_FAULT_LIMIT:
+ case PMBUS_VIN_UV_WARN_LIMIT:
+ case PMBUS_VIN_UV_FAULT_LIMIT:
+ case PMBUS_VOUT_UV_WARN_LIMIT:
+ case PMBUS_VOUT_OV_WARN_LIMIT:
+ case PMBUS_VIN_OV_WARN_LIMIT:
+ case PMBUS_IIN_OC_FAULT_LIMIT:
+ case PMBUS_IOUT_OC_LV_FAULT_LIMIT:
+ case PMBUS_IIN_OC_WARN_LIMIT:
+ case PMBUS_IOUT_OC_WARN_LIMIT:
+ case PMBUS_IOUT_OC_FAULT_LIMIT:
+ case PMBUS_IOUT_UC_FAULT_LIMIT:
+ case PMBUS_POUT_OP_FAULT_LIMIT:
+ case PMBUS_POUT_OP_WARN_LIMIT:
+ case PMBUS_PIN_OP_WARN_LIMIT:
+ return -ENXIO;
+ default:
+ return -ENODATA;
+ }
+
+ return ret;
+}
+
static int mp2975_read_word_data(struct i2c_client *client, int page,
int phase, int reg)
{
@@ -365,6 +493,63 @@ mp2975_set_phase_rail2(struct pmbus_driver_info *info, int num_phases)
info->pfunc[MP2975_MAX_PHASE_RAIL1 - i] = PMBUS_HAVE_IOUT;
}
+static int mp2971_identify_multiphase(struct i2c_client *client,
+ struct mp2971_data *data,
+ struct pmbus_driver_info *info)
+{
+ int ret;
+
+ ret = i2c_smbus_write_byte_data(client, PMBUS_PAGE, 2);
+ if (ret < 0)
+ return ret;
+
+ /* Identify multiphase for rail 1 - could be from 1 to 12. */
+ ret = i2c_smbus_read_word_data(client, MP2975_MFR_VR_MULTI_CONFIG_R1);
+ if (ret <= 0)
+ return ret;
+
+ info->phases[0] = ret & GENMASK(3, 0);
+
+ /*
+ * The device provides a total of 8 PWM pins, and can be configured
+ * to different phase count applications for rail 1 and rail 2.
+ * Rail 1 can be set to 8 phases, while rail 2 can only be set to 4
+ * phases at most. When rail 1’s phase count is configured as 0, rail
+ * 1 operates with 1-phase DCM. When rail 2 phase count is configured
+ * as 0, rail 2 is disabled.
+ */
+ if (info->phases[0] > data->max_phase_rail1)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int
+mp2971_identify_vid(struct i2c_client *client, struct mp2971_data *data,
+ struct pmbus_driver_info *info, u32 reg, int page,
+ u32 imvp_bit, u32 vr_bit)
+{
+ int ret;
+
+ /* Identify VID mode and step selection. */
+ ret = i2c_smbus_read_word_data(client, reg);
+ if (ret < 0)
+ return ret;
+
+ if (ret & imvp_bit) {
+ info->vrm_version[page] = imvp9;
+ data->vid_step[page] = MP2975_PROT_DEV_OV_OFF;
+ } else if (ret & vr_bit) {
+ info->vrm_version[page] = vr12;
+ data->vid_step[page] = MP2975_PROT_DEV_OV_ON;
+ } else {
+ info->vrm_version[page] = vr13;
+ data->vid_step[page] = MP2975_PROT_DEV_OV_OFF;
+ }
+
+ return 0;
+}
+
static int
mp2975_identify_multiphase(struct i2c_client *client, struct mp2975_data *data,
struct pmbus_driver_info *info)
@@ -428,6 +613,68 @@ mp2975_identify_vid(struct i2c_client *client, struct mp2975_data *data,
return 0;
}
+static int
+mp2971_identify_rails_vid(struct i2c_client *client, struct mp2971_data *data,
+ struct pmbus_driver_info *info)
+{
+ int ret;
+
+ ret = i2c_smbus_write_byte_data(client, PMBUS_PAGE, 2);
+ if (ret < 0)
+ return ret;
+
+ /* Identify VID mode for rail 1. */
+ ret = mp2971_identify_vid(client, data, info,
+ MP2975_MFR_VR_MULTI_CONFIG_R1, 0,
+ data->imvp9_en_r1_mask,
+ MP2975_VID_STEP_SEL_R1);
+ if (ret < 0)
+ return ret;
+
+ /* Identify VID mode for rail 2, if connected. */
+ if (info->phases[1])
+ ret = mp2971_identify_vid(client, data, info,
+ MP2975_MFR_VR_MULTI_CONFIG_R2, 1,
+ data->imvp9_en_r2_mask,
+ MP2975_VID_STEP_SEL_R2);
+ return ret;
+}
+
+static int mp2971_identify_vout_format(struct i2c_client *client,
+ struct mp2971_data *data,
+ struct pmbus_driver_info *info)
+{
+ int i, ret, vout_mode;
+
+ for (i = 0; i < info->pages; i++) {
+ ret = i2c_smbus_write_byte_data(client, PMBUS_PAGE, i);
+ if (ret < 0)
+ return ret;
+
+ ret = i2c_smbus_read_byte_data(client, PMBUS_VOUT_MODE);
+ if (ret < 0)
+ return ret;
+
+ vout_mode = ret;
+
+ switch (vout_mode >> 5) {
+ case 0:
+ data->vout_format[i] = linear;
+ data->vout_exponent[i] = ((s8)(vout_mode << 3)) >> 3;
+ break;
+ case 1:
+ data->vout_format[i] = vid;
+ break;
+ case 2:
+ data->vout_format[i] = direct;
+ break;
+ default:
+ return -ENODEV;
+ }
+ }
+ return 0;
+}
+
static int
mp2975_identify_rails_vid(struct i2c_client *client, struct mp2975_data *data,
struct pmbus_driver_info *info)
@@ -659,6 +906,24 @@ mp2975_vout_per_rail_config_get(struct i2c_client *client,
return 0;
}
+static struct pmbus_driver_info mp2971_info = {
+ .pages = 1,
+ .format[PSC_VOLTAGE_IN] = linear,
+ .format[PSC_VOLTAGE_OUT] = direct,
+ .format[PSC_TEMPERATURE] = linear,
+ .format[PSC_CURRENT_IN] = linear,
+ .format[PSC_CURRENT_OUT] = linear,
+ .format[PSC_POWER] = linear,
+ .m[PSC_VOLTAGE_OUT] = 1,
+ .R[PSC_VOLTAGE_OUT] = 3,
+ .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT |
+ PMBUS_HAVE_IIN | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_POUT |
+ PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT,
+ .read_byte_data = mp2975_read_byte_data,
+ .read_word_data = mp2971_read_word_data,
+};
+
static struct pmbus_driver_info mp2975_info = {
.pages = 1,
.format[PSC_VOLTAGE_IN] = linear,
@@ -683,63 +948,129 @@ static struct pmbus_driver_info mp2975_info = {
static int mp2975_probe(struct i2c_client *client)
{
struct pmbus_driver_info *info;
- struct mp2975_data *data;
int ret;
+ char *name;
+
+ name = (int)i2c_match_id(mp2975_id, client)->name;
+ if (name == NULL)
+ return 0;
+ if (!strcmp(name, "mp2971") || !strcmp(name, "mp2973")) {
+ struct mp2971_data *data;
+ struct mp2971_device_info *device_info;
+
+ data = devm_kzalloc(&client->dev, sizeof(struct mp2971_data),
+ GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ device_info =
+ (struct mp2971_device_info *)i2c_match_id(mp2975_id, client)
+ ->driver_data;
+
+ memcpy(&data->info, &mp2971_info, sizeof(*info));
+ info = &data->info;
+
+ if (device_info) {
+ data->imvp9_en_r1_mask = device_info->imvp9_en_r1_mask;
+ data->imvp9_en_r2_mask = device_info->imvp9_en_r2_mask;
+ data->max_phase_rail1 = device_info->max_phase_rail1;
+ data->max_phase_rail2 = device_info->max_phase_rail2;
+ }
- data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
- GFP_KERNEL);
- if (!data)
- return -ENOMEM;
+ /* Identify multiphase configuration for rail 2. */
+ ret = mp2975_identify_multiphase_rail2(client);
+ if (ret < 0)
+ return ret;
- memcpy(&data->info, &mp2975_info, sizeof(*info));
- info = &data->info;
+ if (ret) {
+ /* Two rails are connected. */
+ data->info.pages = MP2975_PAGE_NUM;
+ data->info.phases[1] = ret;
+ data->info.func[1] = MP2971_RAIL2_FUNC;
+ }
- /* Identify multiphase configuration for rail 2. */
- ret = mp2975_identify_multiphase_rail2(client);
- if (ret < 0)
- return ret;
+ /* Identify multiphase configuration. */
+ ret = mp2971_identify_multiphase(client, data, info);
+ if (ret)
+ return ret;
- if (ret) {
- /* Two rails are connected. */
- data->info.pages = MP2975_PAGE_NUM;
- data->info.phases[1] = ret;
- data->info.func[1] = MP2975_RAIL2_FUNC;
- }
+ /* Identify VID setting per rail. */
+ ret = mp2971_identify_rails_vid(client, data, info);
+ if (ret < 0)
+ return ret;
- /* Identify multiphase configuration. */
- ret = mp2975_identify_multiphase(client, data, info);
- if (ret)
- return ret;
+ /* Identify vout format. */
+ ret = mp2971_identify_vout_format(client, data, info);
+ if (ret < 0)
+ return ret;
- /* Identify VID setting per rail. */
- ret = mp2975_identify_rails_vid(client, data, info);
- if (ret < 0)
- return ret;
+ } else {
+ struct mp2975_data *data;
- /* Obtain current sense gain of power stage. */
- ret = mp2975_current_sense_gain_get(client, data);
- if (ret)
- return ret;
+ data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
+ GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
- /* Obtain voltage reference values. */
- ret = mp2975_vref_get(client, data, info);
- if (ret)
- return ret;
+ memcpy(&data->info, &mp2975_info, sizeof(*info));
+ info = &data->info;
- /* Obtain vout over-voltage scales. */
- ret = mp2975_vout_ov_scale_get(client, data, info);
- if (ret < 0)
- return ret;
+ /* Identify multiphase configuration for rail 2. */
+ ret = mp2975_identify_multiphase_rail2(client);
+ if (ret < 0)
+ return ret;
- /* Obtain offsets, maximum and format for vout. */
- ret = mp2975_vout_per_rail_config_get(client, data, info);
- if (ret)
- return ret;
+ if (ret) {
+ /* Two rails are connected. */
+ data->info.pages = MP2975_PAGE_NUM;
+ data->info.phases[1] = ret;
+ data->info.func[1] = MP2975_RAIL2_FUNC;
+ }
+
+ /* Identify multiphase configuration. */
+ ret = mp2975_identify_multiphase(client, data, info);
+ if (ret)
+ return ret;
+
+ /* Identify VID setting per rail. */
+ ret = mp2975_identify_rails_vid(client, data, info);
+ if (ret < 0)
+ return ret;
+
+ /* Obtain current sense gain of power stage. */
+ ret = mp2975_current_sense_gain_get(client, data);
+ if (ret)
+ return ret;
+
+ /* Obtain voltage reference values. */
+ ret = mp2975_vref_get(client, data, info);
+ if (ret)
+ return ret;
+
+ /* Obtain vout over-voltage scales. */
+ ret = mp2975_vout_ov_scale_get(client, data, info);
+ if (ret < 0)
+ return ret;
+
+ /* Obtain offsets, maximum and format for vout. */
+ ret = mp2975_vout_per_rail_config_get(client, data, info);
+ if (ret)
+ return ret;
+ }
return pmbus_do_probe(client, info);
}
+static const struct mp2971_device_info mp2971_device_info = {
+ .imvp9_en_r1_mask = BIT(14),
+ .imvp9_en_r2_mask = BIT(13),
+ .max_phase_rail1 = 8,
+ .max_phase_rail2 = 4,
+};
+
static const struct i2c_device_id mp2975_id[] = {
+ {"mp2971", (kernel_ulong_t)&mp2971_device_info },
+ {"mp2973", (kernel_ulong_t)&mp2971_device_info },
{"mp2975", 0},
{}
};
--
2.25.1
Hi Wang,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
url: https://github.com/intel-lab-lkp/linux/commits/Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
patch link: https://lore.kernel.org/r/20221208082239.1062679-1-wangxiaohua.1217%40bytedance.com
patch subject: [PATCH linux dev-6.0] pmbus: Add mp2971/mp2973 support in mp2975
config: ia64-allyesconfig
compiler: ia64-linux-gcc (GCC) 12.1.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/intel-lab-lkp/linux/commit/3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
git checkout 3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash drivers/hwmon/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
drivers/hwmon/pmbus/mp2975.c: In function 'mp2975_probe':
>> drivers/hwmon/pmbus/mp2975.c:954:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
954 | name = (int)i2c_match_id(mp2975_id, client)->name;
| ^
drivers/hwmon/pmbus/mp2975.c:954:14: warning: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
954 | name = (int)i2c_match_id(mp2975_id, client)->name;
| ^
vim +954 drivers/hwmon/pmbus/mp2975.c
947
948 static int mp2975_probe(struct i2c_client *client)
949 {
950 struct pmbus_driver_info *info;
951 int ret;
952 char *name;
953
> 954 name = (int)i2c_match_id(mp2975_id, client)->name;
955 if (name == NULL)
956 return 0;
957 if (!strcmp(name, "mp2971") || !strcmp(name, "mp2973")) {
958 struct mp2971_data *data;
959 struct mp2971_device_info *device_info;
960
961 data = devm_kzalloc(&client->dev, sizeof(struct mp2971_data),
962 GFP_KERNEL);
963 if (!data)
964 return -ENOMEM;
965
966 device_info =
967 (struct mp2971_device_info *)i2c_match_id(mp2975_id, client)
968 ->driver_data;
969
970 memcpy(&data->info, &mp2971_info, sizeof(*info));
971 info = &data->info;
972
973 if (device_info) {
974 data->imvp9_en_r1_mask = device_info->imvp9_en_r1_mask;
975 data->imvp9_en_r2_mask = device_info->imvp9_en_r2_mask;
976 data->max_phase_rail1 = device_info->max_phase_rail1;
977 data->max_phase_rail2 = device_info->max_phase_rail2;
978 }
979
980 /* Identify multiphase configuration for rail 2. */
981 ret = mp2975_identify_multiphase_rail2(client);
982 if (ret < 0)
983 return ret;
984
985 if (ret) {
986 /* Two rails are connected. */
987 data->info.pages = MP2975_PAGE_NUM;
988 data->info.phases[1] = ret;
989 data->info.func[1] = MP2971_RAIL2_FUNC;
990 }
991
992 /* Identify multiphase configuration. */
993 ret = mp2971_identify_multiphase(client, data, info);
994 if (ret)
995 return ret;
996
997 /* Identify VID setting per rail. */
998 ret = mp2971_identify_rails_vid(client, data, info);
999 if (ret < 0)
1000 return ret;
1001
1002 /* Identify vout format. */
1003 ret = mp2971_identify_vout_format(client, data, info);
1004 if (ret < 0)
1005 return ret;
1006
1007 } else {
1008 struct mp2975_data *data;
1009
1010 data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
1011 GFP_KERNEL);
1012 if (!data)
1013 return -ENOMEM;
1014
1015 memcpy(&data->info, &mp2975_info, sizeof(*info));
1016 info = &data->info;
1017
1018 /* Identify multiphase configuration for rail 2. */
1019 ret = mp2975_identify_multiphase_rail2(client);
1020 if (ret < 0)
1021 return ret;
1022
1023 if (ret) {
1024 /* Two rails are connected. */
1025 data->info.pages = MP2975_PAGE_NUM;
1026 data->info.phases[1] = ret;
1027 data->info.func[1] = MP2975_RAIL2_FUNC;
1028 }
1029
1030 /* Identify multiphase configuration. */
1031 ret = mp2975_identify_multiphase(client, data, info);
1032 if (ret)
1033 return ret;
1034
1035 /* Identify VID setting per rail. */
1036 ret = mp2975_identify_rails_vid(client, data, info);
1037 if (ret < 0)
1038 return ret;
1039
1040 /* Obtain current sense gain of power stage. */
1041 ret = mp2975_current_sense_gain_get(client, data);
1042 if (ret)
1043 return ret;
1044
1045 /* Obtain voltage reference values. */
1046 ret = mp2975_vref_get(client, data, info);
1047 if (ret)
1048 return ret;
1049
1050 /* Obtain vout over-voltage scales. */
1051 ret = mp2975_vout_ov_scale_get(client, data, info);
1052 if (ret < 0)
1053 return ret;
1054
1055 /* Obtain offsets, maximum and format for vout. */
1056 ret = mp2975_vout_per_rail_config_get(client, data, info);
1057 if (ret)
1058 return ret;
1059 }
1060
1061 return pmbus_do_probe(client, info);
1062 }
1063
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Hi Wang,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
url: https://github.com/intel-lab-lkp/linux/commits/Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
patch link: https://lore.kernel.org/r/20221208082239.1062679-1-wangxiaohua.1217%40bytedance.com
patch subject: [PATCH linux dev-6.0] pmbus: Add mp2971/mp2973 support in mp2975
config: s390-randconfig-r006-20221207
compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 6e4cea55f0d1104408b26ac574566a0e4de48036)
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
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
git checkout 3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash drivers/hwmon/pmbus/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/hwmon/pmbus/mp2975.c:954:9: warning: cast to smaller integer type 'int' from 'const char *' [-Wpointer-to-int-cast]
name = (int)i2c_match_id(mp2975_id, client)->name;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/hwmon/pmbus/mp2975.c:954:7: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
name = (int)i2c_match_id(mp2975_id, client)->name;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning and 1 error generated.
vim +954 drivers/hwmon/pmbus/mp2975.c
947
948 static int mp2975_probe(struct i2c_client *client)
949 {
950 struct pmbus_driver_info *info;
951 int ret;
952 char *name;
953
> 954 name = (int)i2c_match_id(mp2975_id, client)->name;
955 if (name == NULL)
956 return 0;
957 if (!strcmp(name, "mp2971") || !strcmp(name, "mp2973")) {
958 struct mp2971_data *data;
959 struct mp2971_device_info *device_info;
960
961 data = devm_kzalloc(&client->dev, sizeof(struct mp2971_data),
962 GFP_KERNEL);
963 if (!data)
964 return -ENOMEM;
965
966 device_info =
967 (struct mp2971_device_info *)i2c_match_id(mp2975_id, client)
968 ->driver_data;
969
970 memcpy(&data->info, &mp2971_info, sizeof(*info));
971 info = &data->info;
972
973 if (device_info) {
974 data->imvp9_en_r1_mask = device_info->imvp9_en_r1_mask;
975 data->imvp9_en_r2_mask = device_info->imvp9_en_r2_mask;
976 data->max_phase_rail1 = device_info->max_phase_rail1;
977 data->max_phase_rail2 = device_info->max_phase_rail2;
978 }
979
980 /* Identify multiphase configuration for rail 2. */
981 ret = mp2975_identify_multiphase_rail2(client);
982 if (ret < 0)
983 return ret;
984
985 if (ret) {
986 /* Two rails are connected. */
987 data->info.pages = MP2975_PAGE_NUM;
988 data->info.phases[1] = ret;
989 data->info.func[1] = MP2971_RAIL2_FUNC;
990 }
991
992 /* Identify multiphase configuration. */
993 ret = mp2971_identify_multiphase(client, data, info);
994 if (ret)
995 return ret;
996
997 /* Identify VID setting per rail. */
998 ret = mp2971_identify_rails_vid(client, data, info);
999 if (ret < 0)
1000 return ret;
1001
1002 /* Identify vout format. */
1003 ret = mp2971_identify_vout_format(client, data, info);
1004 if (ret < 0)
1005 return ret;
1006
1007 } else {
1008 struct mp2975_data *data;
1009
1010 data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
1011 GFP_KERNEL);
1012 if (!data)
1013 return -ENOMEM;
1014
1015 memcpy(&data->info, &mp2975_info, sizeof(*info));
1016 info = &data->info;
1017
1018 /* Identify multiphase configuration for rail 2. */
1019 ret = mp2975_identify_multiphase_rail2(client);
1020 if (ret < 0)
1021 return ret;
1022
1023 if (ret) {
1024 /* Two rails are connected. */
1025 data->info.pages = MP2975_PAGE_NUM;
1026 data->info.phases[1] = ret;
1027 data->info.func[1] = MP2975_RAIL2_FUNC;
1028 }
1029
1030 /* Identify multiphase configuration. */
1031 ret = mp2975_identify_multiphase(client, data, info);
1032 if (ret)
1033 return ret;
1034
1035 /* Identify VID setting per rail. */
1036 ret = mp2975_identify_rails_vid(client, data, info);
1037 if (ret < 0)
1038 return ret;
1039
1040 /* Obtain current sense gain of power stage. */
1041 ret = mp2975_current_sense_gain_get(client, data);
1042 if (ret)
1043 return ret;
1044
1045 /* Obtain voltage reference values. */
1046 ret = mp2975_vref_get(client, data, info);
1047 if (ret)
1048 return ret;
1049
1050 /* Obtain vout over-voltage scales. */
1051 ret = mp2975_vout_ov_scale_get(client, data, info);
1052 if (ret < 0)
1053 return ret;
1054
1055 /* Obtain offsets, maximum and format for vout. */
1056 ret = mp2975_vout_per_rail_config_get(client, data, info);
1057 if (ret)
1058 return ret;
1059 }
1060
1061 return pmbus_do_probe(client, info);
1062 }
1063
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Hi Wang,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
url: https://github.com/intel-lab-lkp/linux/commits/Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
patch link: https://lore.kernel.org/r/20221208082239.1062679-1-wangxiaohua.1217%40bytedance.com
patch subject: [PATCH linux dev-6.0] pmbus: Add mp2971/mp2973 support in mp2975
config: i386-randconfig-a004
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
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/intel-lab-lkp/linux/commit/3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
git checkout 3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/hwmon/pmbus/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/hwmon/pmbus/mp2975.c:954:7: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
name = (int)i2c_match_id(mp2975_id, client)->name;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
vim +954 drivers/hwmon/pmbus/mp2975.c
947
948 static int mp2975_probe(struct i2c_client *client)
949 {
950 struct pmbus_driver_info *info;
951 int ret;
952 char *name;
953
> 954 name = (int)i2c_match_id(mp2975_id, client)->name;
955 if (name == NULL)
956 return 0;
957 if (!strcmp(name, "mp2971") || !strcmp(name, "mp2973")) {
958 struct mp2971_data *data;
959 struct mp2971_device_info *device_info;
960
961 data = devm_kzalloc(&client->dev, sizeof(struct mp2971_data),
962 GFP_KERNEL);
963 if (!data)
964 return -ENOMEM;
965
966 device_info =
967 (struct mp2971_device_info *)i2c_match_id(mp2975_id, client)
968 ->driver_data;
969
970 memcpy(&data->info, &mp2971_info, sizeof(*info));
971 info = &data->info;
972
973 if (device_info) {
974 data->imvp9_en_r1_mask = device_info->imvp9_en_r1_mask;
975 data->imvp9_en_r2_mask = device_info->imvp9_en_r2_mask;
976 data->max_phase_rail1 = device_info->max_phase_rail1;
977 data->max_phase_rail2 = device_info->max_phase_rail2;
978 }
979
980 /* Identify multiphase configuration for rail 2. */
981 ret = mp2975_identify_multiphase_rail2(client);
982 if (ret < 0)
983 return ret;
984
985 if (ret) {
986 /* Two rails are connected. */
987 data->info.pages = MP2975_PAGE_NUM;
988 data->info.phases[1] = ret;
989 data->info.func[1] = MP2971_RAIL2_FUNC;
990 }
991
992 /* Identify multiphase configuration. */
993 ret = mp2971_identify_multiphase(client, data, info);
994 if (ret)
995 return ret;
996
997 /* Identify VID setting per rail. */
998 ret = mp2971_identify_rails_vid(client, data, info);
999 if (ret < 0)
1000 return ret;
1001
1002 /* Identify vout format. */
1003 ret = mp2971_identify_vout_format(client, data, info);
1004 if (ret < 0)
1005 return ret;
1006
1007 } else {
1008 struct mp2975_data *data;
1009
1010 data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
1011 GFP_KERNEL);
1012 if (!data)
1013 return -ENOMEM;
1014
1015 memcpy(&data->info, &mp2975_info, sizeof(*info));
1016 info = &data->info;
1017
1018 /* Identify multiphase configuration for rail 2. */
1019 ret = mp2975_identify_multiphase_rail2(client);
1020 if (ret < 0)
1021 return ret;
1022
1023 if (ret) {
1024 /* Two rails are connected. */
1025 data->info.pages = MP2975_PAGE_NUM;
1026 data->info.phases[1] = ret;
1027 data->info.func[1] = MP2975_RAIL2_FUNC;
1028 }
1029
1030 /* Identify multiphase configuration. */
1031 ret = mp2975_identify_multiphase(client, data, info);
1032 if (ret)
1033 return ret;
1034
1035 /* Identify VID setting per rail. */
1036 ret = mp2975_identify_rails_vid(client, data, info);
1037 if (ret < 0)
1038 return ret;
1039
1040 /* Obtain current sense gain of power stage. */
1041 ret = mp2975_current_sense_gain_get(client, data);
1042 if (ret)
1043 return ret;
1044
1045 /* Obtain voltage reference values. */
1046 ret = mp2975_vref_get(client, data, info);
1047 if (ret)
1048 return ret;
1049
1050 /* Obtain vout over-voltage scales. */
1051 ret = mp2975_vout_ov_scale_get(client, data, info);
1052 if (ret < 0)
1053 return ret;
1054
1055 /* Obtain offsets, maximum and format for vout. */
1056 ret = mp2975_vout_per_rail_config_get(client, data, info);
1057 if (ret)
1058 return ret;
1059 }
1060
1061 return pmbus_do_probe(client, info);
1062 }
1063
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Hi Wang,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linux/master]
url: https://github.com/intel-lab-lkp/linux/commits/Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
patch link: https://lore.kernel.org/r/20221208082239.1062679-1-wangxiaohua.1217%40bytedance.com
patch subject: [PATCH linux dev-6.0] pmbus: Add mp2971/mp2973 support in mp2975
config: arm-randconfig-r046-20221207
compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 6e4cea55f0d1104408b26ac574566a0e4de48036)
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
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/intel-lab-lkp/linux/commit/3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Wang-Xiaohua/pmbus-Add-mp2971-mp2973-support-in-mp2975/20221208-162418
git checkout 3a3a7dfb02eb88fa39a630b20fab03bc0ff4b89b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/hwmon/pmbus/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
>> drivers/hwmon/pmbus/mp2975.c:954:7: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
name = (int)i2c_match_id(mp2975_id, client)->name;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
vim +954 drivers/hwmon/pmbus/mp2975.c
947
948 static int mp2975_probe(struct i2c_client *client)
949 {
950 struct pmbus_driver_info *info;
951 int ret;
952 char *name;
953
> 954 name = (int)i2c_match_id(mp2975_id, client)->name;
955 if (name == NULL)
956 return 0;
957 if (!strcmp(name, "mp2971") || !strcmp(name, "mp2973")) {
958 struct mp2971_data *data;
959 struct mp2971_device_info *device_info;
960
961 data = devm_kzalloc(&client->dev, sizeof(struct mp2971_data),
962 GFP_KERNEL);
963 if (!data)
964 return -ENOMEM;
965
966 device_info =
967 (struct mp2971_device_info *)i2c_match_id(mp2975_id, client)
968 ->driver_data;
969
970 memcpy(&data->info, &mp2971_info, sizeof(*info));
971 info = &data->info;
972
973 if (device_info) {
974 data->imvp9_en_r1_mask = device_info->imvp9_en_r1_mask;
975 data->imvp9_en_r2_mask = device_info->imvp9_en_r2_mask;
976 data->max_phase_rail1 = device_info->max_phase_rail1;
977 data->max_phase_rail2 = device_info->max_phase_rail2;
978 }
979
980 /* Identify multiphase configuration for rail 2. */
981 ret = mp2975_identify_multiphase_rail2(client);
982 if (ret < 0)
983 return ret;
984
985 if (ret) {
986 /* Two rails are connected. */
987 data->info.pages = MP2975_PAGE_NUM;
988 data->info.phases[1] = ret;
989 data->info.func[1] = MP2971_RAIL2_FUNC;
990 }
991
992 /* Identify multiphase configuration. */
993 ret = mp2971_identify_multiphase(client, data, info);
994 if (ret)
995 return ret;
996
997 /* Identify VID setting per rail. */
998 ret = mp2971_identify_rails_vid(client, data, info);
999 if (ret < 0)
1000 return ret;
1001
1002 /* Identify vout format. */
1003 ret = mp2971_identify_vout_format(client, data, info);
1004 if (ret < 0)
1005 return ret;
1006
1007 } else {
1008 struct mp2975_data *data;
1009
1010 data = devm_kzalloc(&client->dev, sizeof(struct mp2975_data),
1011 GFP_KERNEL);
1012 if (!data)
1013 return -ENOMEM;
1014
1015 memcpy(&data->info, &mp2975_info, sizeof(*info));
1016 info = &data->info;
1017
1018 /* Identify multiphase configuration for rail 2. */
1019 ret = mp2975_identify_multiphase_rail2(client);
1020 if (ret < 0)
1021 return ret;
1022
1023 if (ret) {
1024 /* Two rails are connected. */
1025 data->info.pages = MP2975_PAGE_NUM;
1026 data->info.phases[1] = ret;
1027 data->info.func[1] = MP2975_RAIL2_FUNC;
1028 }
1029
1030 /* Identify multiphase configuration. */
1031 ret = mp2975_identify_multiphase(client, data, info);
1032 if (ret)
1033 return ret;
1034
1035 /* Identify VID setting per rail. */
1036 ret = mp2975_identify_rails_vid(client, data, info);
1037 if (ret < 0)
1038 return ret;
1039
1040 /* Obtain current sense gain of power stage. */
1041 ret = mp2975_current_sense_gain_get(client, data);
1042 if (ret)
1043 return ret;
1044
1045 /* Obtain voltage reference values. */
1046 ret = mp2975_vref_get(client, data, info);
1047 if (ret)
1048 return ret;
1049
1050 /* Obtain vout over-voltage scales. */
1051 ret = mp2975_vout_ov_scale_get(client, data, info);
1052 if (ret < 0)
1053 return ret;
1054
1055 /* Obtain offsets, maximum and format for vout. */
1056 ret = mp2975_vout_per_rail_config_get(client, data, info);
1057 if (ret)
1058 return ret;
1059 }
1060
1061 return pmbus_do_probe(client, info);
1062 }
1063
--
0-DAY CI Kernel Test Service
https://01.org/lkp