Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: proximity: hx9023s: Added firmware file parsing functionality

Configuration information is now prioritized from the firmware file.
If the firmware file is missing or fails to parse, the driver falls
back to using the default configuration list for writing the settings.

Signed-off-by: Yasin Lee <yasin.lee.x@gmail.com>
Link: https://patch.msgid.link/20241216-hx9023s-firmware-20241209-v2-1-ce1b0a1121d0@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Yasin Lee and committed by
Jonathan Cameron
e9ed97be 0b9c8583

+86 -7
+86 -7
drivers/iio/proximity/hx9023s.c
··· 14 14 #include <linux/cleanup.h> 15 15 #include <linux/device.h> 16 16 #include <linux/errno.h> 17 + #include <linux/firmware.h> 17 18 #include <linux/i2c.h> 18 19 #include <linux/interrupt.h> 19 20 #include <linux/irqreturn.h> ··· 100 99 #define HX9023S_DATA_LOCK_MASK BIT(4) 101 100 #define HX9023S_INTERRUPT_MASK GENMASK(9, 0) 102 101 #define HX9023S_PROX_DEBOUNCE_MASK GENMASK(3, 0) 102 + 103 + #define FW_VER_OFFSET 2 104 + #define FW_REG_CNT_OFFSET 3 105 + #define FW_DATA_OFFSET 16 106 + 107 + struct hx9023s_bin { 108 + u16 reg_count; 109 + u16 fw_size; 110 + u8 fw_ver; 111 + u8 data[] __counted_by(fw_size); 112 + }; 103 113 104 114 struct hx9023s_ch_data { 105 115 s16 raw; /* Raw Data*/ ··· 1010 998 return 0; 1011 999 } 1012 1000 1001 + static int hx9023s_bin_load(struct hx9023s_data *data, struct hx9023s_bin *bin) 1002 + { 1003 + u8 *cfg_start = bin->data + FW_DATA_OFFSET; 1004 + u8 addr, val; 1005 + u16 i; 1006 + int ret; 1007 + 1008 + for (i = 0; i < bin->reg_count; i++) { 1009 + addr = cfg_start[i * 2]; 1010 + val = cfg_start[i * 2 + 1]; 1011 + ret = regmap_write(data->regmap, addr, val); 1012 + if (ret < 0) 1013 + return ret; 1014 + } 1015 + 1016 + return 0; 1017 + } 1018 + 1019 + static int hx9023s_send_cfg(const struct firmware *fw, struct hx9023s_data *data) 1020 + { 1021 + struct hx9023s_bin *bin __free(kfree) = 1022 + kzalloc(fw->size + sizeof(*bin), GFP_KERNEL); 1023 + if (!bin) 1024 + return -ENOMEM; 1025 + 1026 + memcpy(bin->data, fw->data, fw->size); 1027 + release_firmware(fw); 1028 + 1029 + bin->fw_size = fw->size; 1030 + bin->fw_ver = bin->data[FW_VER_OFFSET]; 1031 + bin->reg_count = get_unaligned_le16(bin->data + FW_REG_CNT_OFFSET); 1032 + 1033 + return hx9023s_bin_load(data, bin); 1034 + } 1035 + 1036 + static void hx9023s_cfg_update(const struct firmware *fw, void *context) 1037 + { 1038 + struct hx9023s_data *data = context; 1039 + struct device *dev = regmap_get_device(data->regmap); 1040 + int ret; 1041 + 1042 + if (!fw || !fw->data) { 1043 + dev_warn(dev, "No firmware\n"); 1044 + goto no_fw; 1045 + } 1046 + 1047 + ret = hx9023s_send_cfg(fw, data); 1048 + if (ret) { 1049 + dev_warn(dev, "Firmware update failed: %d\n", ret); 1050 + goto no_fw; 1051 + } 1052 + 1053 + ret = regcache_sync(data->regmap); 1054 + if (ret) 1055 + dev_err(dev, "regcache sync failed\n"); 1056 + 1057 + return; 1058 + 1059 + no_fw: 1060 + ret = regmap_multi_reg_write(data->regmap, hx9023s_reg_init_list, 1061 + ARRAY_SIZE(hx9023s_reg_init_list)); 1062 + if (ret) { 1063 + dev_err(dev, "Error loading default configuration\n"); 1064 + return; 1065 + } 1066 + 1067 + ret = regcache_sync(data->regmap); 1068 + if (ret) 1069 + dev_err(dev, "regcache sync failed\n"); 1070 + } 1071 + 1013 1072 static int hx9023s_probe(struct i2c_client *client) 1014 1073 { 1015 1074 struct device *dev = &client->dev; ··· 1119 1036 indio_dev->modes = INDIO_DIRECT_MODE; 1120 1037 i2c_set_clientdata(client, indio_dev); 1121 1038 1122 - ret = regmap_multi_reg_write(data->regmap, hx9023s_reg_init_list, 1123 - ARRAY_SIZE(hx9023s_reg_init_list)); 1124 - if (ret) 1125 - return dev_err_probe(dev, ret, "device init failed\n"); 1126 - 1127 1039 ret = hx9023s_ch_cfg(data); 1128 1040 if (ret) 1129 1041 return dev_err_probe(dev, ret, "channel config failed\n"); 1130 1042 1131 - ret = regcache_sync(data->regmap); 1043 + ret = request_firmware_nowait(THIS_MODULE, true, "hx9023s.bin", dev, 1044 + GFP_KERNEL, data, hx9023s_cfg_update); 1132 1045 if (ret) 1133 - return dev_err_probe(dev, ret, "regcache sync failed\n"); 1046 + return dev_err_probe(dev, ret, "reg config failed\n"); 1134 1047 1135 1048 if (client->irq) { 1136 1049 ret = devm_request_threaded_irq(dev, client->irq,