| Message ID | 20240106160935.45487-5-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | i2c-i801 / dell-smo8800: Move instantiation of lis3lv02d i2c_client from i2c-i801 to dell-smo8800 | expand |
Hi Hans, kernel test robot noticed the following build warnings: [auto build test WARNING on linus/master] [also build test WARNING on v6.7] [cannot apply to wsa/i2c/for-next next-20240112] [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#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Hans-de-Goede/platform-x86-dell-smo8800-Change-probe-ordering-a-bit/20240107-001715 base: linus/master patch link: https://lore.kernel.org/r/20240106160935.45487-5-hdegoede%40redhat.com patch subject: [PATCH v2 4/6] platform/x86: dell-smo8800: Allow using the IIO st_accel driver config: i386-randconfig-061-20240113 (https://download.01.org/0day-ci/archive/20240113/202401131735.15ClIkvC-lkp@intel.com/config) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240113/202401131735.15ClIkvC-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401131735.15ClIkvC-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> drivers/platform/x86/dell/dell-smo8800.c:162:28: sparse: sparse: symbol 'smo8800_accel_node' was not declared. Should it be static? vim +/smo8800_accel_node +162 drivers/platform/x86/dell/dell-smo8800.c 161 > 162 const struct software_node smo8800_accel_node = { 163 .properties = smo8800_accel_props, 164 }; 165
Hi Hans,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on v6.7]
[cannot apply to wsa/i2c/for-next next-20240112]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Hans-de-Goede/platform-x86-dell-smo8800-Change-probe-ordering-a-bit/20240107-001715
base: linus/master
patch link: https://lore.kernel.org/r/20240106160935.45487-5-hdegoede%40redhat.com
patch subject: [PATCH v2 4/6] platform/x86: dell-smo8800: Allow using the IIO st_accel driver
config: i386-buildonly-randconfig-005-20240113 (https://download.01.org/0day-ci/archive/20240113/202401132242.9mmyvnaw-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240113/202401132242.9mmyvnaw-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401132242.9mmyvnaw-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/platform/x86/dell/dell-smo8800.c: In function 'smo8800_find_i801':
drivers/platform/x86/dell/dell-smo8800.c:149:21: error: implicit declaration of function 'i2c_get_adapter'; did you mean 'i2c_get_adapdata'? [-Werror=implicit-function-declaration]
149 | *adap_ret = i2c_get_adapter(adap->nr);
| ^~~~~~~~~~~~~~~
| i2c_get_adapdata
drivers/platform/x86/dell/dell-smo8800.c:149:19: warning: assignment to 'struct i2c_adapter *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
149 | *adap_ret = i2c_get_adapter(adap->nr);
| ^
drivers/platform/x86/dell/dell-smo8800.c: In function 'smo8800_detect_accel':
>> drivers/platform/x86/dell/dell-smo8800.c:174:15: error: implicit declaration of function 'i2c_smbus_xfer' [-Werror=implicit-function-declaration]
174 | err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, LIS3_WHO_AM_I,
| ^~~~~~~~~~~~~~
drivers/platform/x86/dell/dell-smo8800.c: In function 'smo8800_instantiate_i2c_client':
drivers/platform/x86/dell/dell-smo8800.c:280:28: error: implicit declaration of function 'i2c_new_client_device' [-Werror=implicit-function-declaration]
280 | smo8800->i2c_dev = i2c_new_client_device(adap, &info);
| ^~~~~~~~~~~~~~~~~~~~~
drivers/platform/x86/dell/dell-smo8800.c:280:26: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
280 | smo8800->i2c_dev = i2c_new_client_device(adap, &info);
| ^
drivers/platform/x86/dell/dell-smo8800.c:290:9: error: implicit declaration of function 'i2c_put_adapter' [-Werror=implicit-function-declaration]
290 | i2c_put_adapter(adap);
| ^~~~~~~~~~~~~~~
drivers/platform/x86/dell/dell-smo8800.c: In function 'smo8800_probe':
drivers/platform/x86/dell/dell-smo8800.c:346:9: error: implicit declaration of function 'i2c_unregister_device'; did you mean 'pci_unregister_driver'? [-Werror=implicit-function-declaration]
346 | i2c_unregister_device(smo8800->i2c_dev);
| ^~~~~~~~~~~~~~~~~~~~~
| pci_unregister_driver
cc1: some warnings being treated as errors
vim +/i2c_smbus_xfer +174 drivers/platform/x86/dell/dell-smo8800.c
134
135 static int smo8800_find_i801(struct device *dev, void *data)
136 {
137 struct i2c_adapter *adap, **adap_ret = data;
138
139 adap = i2c_verify_adapter(dev);
140 if (!adap)
141 return 0;
142
143 if (!strstarts(adap->name, "SMBus I801 adapter"))
144 return 0;
145
146 if (pci_match_id(i801_idf_ids, to_pci_dev(adap->dev.parent)))
147 return 0; /* Only register client on main SMBus channel */
148
> 149 *adap_ret = i2c_get_adapter(adap->nr);
150 return 1;
151 }
152
153 /*
154 * Set label to let iio-sensor-proxy know these freefall sensors are located in
155 * the laptop base (not the display) and are not intended for screen rotation.
156 */
157 static const struct property_entry smo8800_accel_props[] = {
158 PROPERTY_ENTRY_STRING("label", "accel-base"),
159 {}
160 };
161
162 const struct software_node smo8800_accel_node = {
163 .properties = smo8800_accel_props,
164 };
165
166 static int smo8800_detect_accel(struct smo8800_device *smo8800,
167 struct i2c_adapter *adap, u8 addr,
168 struct i2c_board_info *info)
169 {
170 union i2c_smbus_data smbus_data;
171 const char *type;
172 int err;
173
> 174 err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, LIS3_WHO_AM_I,
175 I2C_SMBUS_BYTE_DATA, &smbus_data);
176 if (err < 0) {
177 dev_warn(smo8800->dev, "Failed to read who-am-i register: %d\n", err);
178 return err;
179 }
180
181 /*
182 * These who-am-i register mappings to model strings have been
183 * taken from the old /dev/freefall chardev and joystick driver:
184 * drivers/misc/lis3lv02d/lis3lv02d.c
185 */
186 switch (smbus_data.byte) {
187 case 0x32:
188 type = "lis331dlh";
189 break;
190 case 0x33:
191 type = "lis2de12"; /* LIS3DC / HP3DC in drivers/misc/lis3lv02d/lis3lv02d.c */
192 break;
193 case 0x3a:
194 type = "lis3lv02dl_accel";
195 break;
196 case 0x3b:
197 type = "lis302dl";
198 break;
199 default:
200 dev_warn(smo8800->dev, "Unknown who-am-i register value 0x%02x\n",
201 smbus_data.byte);
202 return -ENODEV;
203 }
204
205 strscpy(info->type, type, I2C_NAME_SIZE);
206 info->addr = addr;
207 info->irq = smo8800->irq;
208 info->swnode = &smo8800_accel_node;
209 return 0;
210 }
211
diff --git a/drivers/platform/x86/dell/dell-smo8800.c b/drivers/platform/x86/dell/dell-smo8800.c index 3e64ebcf4b21..58bb7275ba5c 100644 --- a/drivers/platform/x86/dell/dell-smo8800.c +++ b/drivers/platform/x86/dell/dell-smo8800.c @@ -10,6 +10,7 @@ */ #define DRIVER_NAME "smo8800" +#define LIS3_WHO_AM_I 0x0f #include <linux/device/bus.h> #include <linux/dmi.h> @@ -24,6 +25,10 @@ #include <linux/platform_device.h> #include <linux/uaccess.h> +static bool use_iio_driver; +module_param(use_iio_driver, bool, 0444); +MODULE_PARM_DESC(use_iio_driver, "Use IIO accelerometer driver instead of /dev/freefall chardev + evdev joystick emulation"); + struct smo8800_device { u32 irq; /* acpi device irq */ atomic_t counter; /* count after last read */ @@ -145,6 +150,65 @@ static int smo8800_find_i801(struct device *dev, void *data) return 1; } +/* + * Set label to let iio-sensor-proxy know these freefall sensors are located in + * the laptop base (not the display) and are not intended for screen rotation. + */ +static const struct property_entry smo8800_accel_props[] = { + PROPERTY_ENTRY_STRING("label", "accel-base"), + {} +}; + +const struct software_node smo8800_accel_node = { + .properties = smo8800_accel_props, +}; + +static int smo8800_detect_accel(struct smo8800_device *smo8800, + struct i2c_adapter *adap, u8 addr, + struct i2c_board_info *info) +{ + union i2c_smbus_data smbus_data; + const char *type; + int err; + + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, LIS3_WHO_AM_I, + I2C_SMBUS_BYTE_DATA, &smbus_data); + if (err < 0) { + dev_warn(smo8800->dev, "Failed to read who-am-i register: %d\n", err); + return err; + } + + /* + * These who-am-i register mappings to model strings have been + * taken from the old /dev/freefall chardev and joystick driver: + * drivers/misc/lis3lv02d/lis3lv02d.c + */ + switch (smbus_data.byte) { + case 0x32: + type = "lis331dlh"; + break; + case 0x33: + type = "lis2de12"; /* LIS3DC / HP3DC in drivers/misc/lis3lv02d/lis3lv02d.c */ + break; + case 0x3a: + type = "lis3lv02dl_accel"; + break; + case 0x3b: + type = "lis302dl"; + break; + default: + dev_warn(smo8800->dev, "Unknown who-am-i register value 0x%02x\n", + smbus_data.byte); + return -ENODEV; + } + + strscpy(info->type, type, I2C_NAME_SIZE); + info->addr = addr; + info->irq = smo8800->irq; + info->swnode = &smo8800_accel_node; + return 0; +} + /* * Accelerometer's I2C address is not specified in DMI nor ACPI, * so it is needed to define mapping table based on DMI product names. @@ -177,7 +241,7 @@ static void smo8800_instantiate_i2c_client(struct smo8800_device *smo8800) struct i2c_adapter *adap = NULL; const char *dmi_product_name; u8 addr = 0; - int i; + int i, err; bus_for_each_dev(&i2c_bus_type, NULL, &adap, smo8800_find_i801); if (!adap) @@ -198,9 +262,20 @@ static void smo8800_instantiate_i2c_client(struct smo8800_device *smo8800) goto put_adapter; } - info.addr = addr; - info.irq = smo8800->irq; - strscpy(info.type, "lis3lv02d", I2C_NAME_SIZE); + /* Always detect the accel-type, this also checks the accel is actually there */ + err = smo8800_detect_accel(smo8800, adap, addr, &info); + if (err) + goto put_adapter; + + /* + * Unless using the IIO driver is requested, override the detected type + * with "lis3lv02d" so that drivers/misc/lis3lv02d/lis3lv02d.c is used + * and /dev/freefall functionality is provided. + */ + if (!use_iio_driver) { + strscpy(info.type, "lis3lv02d", I2C_NAME_SIZE); + info.swnode = NULL; + } smo8800->i2c_dev = i2c_new_client_device(adap, &info); if (IS_ERR(smo8800->i2c_dev)) {
Allow using the IIO st_accel driver so that the accelerometer gets presented to userspace as an IIO device like all modern accelerometer drivers do. Note the default is still to use the drivers/misc/lis3lv02d/lis3lv02d.c /dev/freefall + evdev joystick emulation driver, so as to not break existing userspace consumers. /dev/freefall is used by the tools/laptop/freefall/freefall.c tool which is shipped by the kernel as well as by the linux-thinkpad hdapsd daemon. Using the IIO st_accel driver can be enabled by setting the new use_iio_driver module parameter. Link: https://github.com/linux-thinkpad/hdapsd/ Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: - Keep using drivers/misc/lis3lv02d/lis3lv02d.c be default - Rename the module-parameter to use_iio_driver which can be set to use the IIO st_accel driver instead --- drivers/platform/x86/dell/dell-smo8800.c | 83 ++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 4 deletions(-)