mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	HID: i2c-hid: Don't reset device upon system resume
Raydium touchscreen triggers interrupt storm after system-wide suspend: [ 179.085033] i2c_hid i2c-CUST0000:00: i2c_hid_get_input: incomplete report (58/65535) According to Raydium, Windows driver does not reset the device after system resume. The HID over I2C spec does specify a reset should be used at intialization, but it doesn't specify if reset is required for system suspend. Tested this patch on other i2c-hid touchpanels I have and those touchpanels do work after S3 without doing reset. If any regression happens to other touchpanel vendors, we can use quirk for Raydium devices. There's still one device uses I2C_HID_QUIRK_RESEND_REPORT_DESCR so keep it there. Cc: Aaron Ma <aaron.ma@canonical.com> Cc: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
		
							parent
							
								
									ade573eb1e
								
							
						
					
					
						commit
						52cf93e63e
					
				
					 2 changed files with 7 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -530,10 +530,6 @@
 | 
			
		|||
#define I2C_VENDOR_ID_HANTICK		0x0911
 | 
			
		||||
#define I2C_PRODUCT_ID_HANTICK_5288	0x5288
 | 
			
		||||
 | 
			
		||||
#define I2C_VENDOR_ID_RAYD		0x2386
 | 
			
		||||
#define I2C_PRODUCT_ID_RAYD_3118	0x3118
 | 
			
		||||
#define I2C_PRODUCT_ID_RAYD_4B33	0x4B33
 | 
			
		||||
 | 
			
		||||
#define USB_VENDOR_ID_HANWANG		0x0b57
 | 
			
		||||
#define USB_DEVICE_ID_HANWANG_TABLET_FIRST	0x5000
 | 
			
		||||
#define USB_DEVICE_ID_HANWANG_TABLET_LAST	0x8fff
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -170,12 +170,8 @@ static const struct i2c_hid_quirks {
 | 
			
		|||
		I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
 | 
			
		||||
	{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
 | 
			
		||||
		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
 | 
			
		||||
	{ I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_3118,
 | 
			
		||||
		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
 | 
			
		||||
	{ USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS10FB_TOUCH,
 | 
			
		||||
		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
 | 
			
		||||
	{ I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_4B33,
 | 
			
		||||
		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
 | 
			
		||||
	{ 0, 0 }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1237,11 +1233,16 @@ static int i2c_hid_resume(struct device *dev)
 | 
			
		|||
	pm_runtime_enable(dev);
 | 
			
		||||
 | 
			
		||||
	enable_irq(client->irq);
 | 
			
		||||
	ret = i2c_hid_hwreset(client);
 | 
			
		||||
 | 
			
		||||
	/* Instead of resetting device, simply powers the device on. This
 | 
			
		||||
	 * solves "incomplete reports" on Raydium devices 2386:3118 and
 | 
			
		||||
	 * 2386:4B33
 | 
			
		||||
	 */
 | 
			
		||||
	ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
 | 
			
		||||
	if (ret)
 | 
			
		||||
		return ret;
 | 
			
		||||
 | 
			
		||||
	/* RAYDIUM device (2386:3118) need to re-send report descr cmd
 | 
			
		||||
	/* Some devices need to re-send report descr cmd
 | 
			
		||||
	 * after resume, after this it will be back normal.
 | 
			
		||||
	 * otherwise it issues too many incomplete reports.
 | 
			
		||||
	 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue