diff mbox

usbhid: add quirk for another PIXART OEM mouse used by HP

Message ID 20171125055054.GA2139@dhcp-128-65.nay.redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dave Young Nov. 25, 2017, 5:53 a.m. UTC 
This mouse keep disconnecting in runleve 3 like below, add it needs the
quirk to mute the anoying messages.

[  111.230555] usb 2-2: USB disconnect, device number 6
[  112.718156] usb 2-2: new low-speed USB device number 7 using xhci_hcd
[  112.941594] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
[  112.984866] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
[  113.027731] usb 2-2: Product: HP USB Optical Mouse
[  113.069977] usb 2-2: Manufacturer: PixArt
[  113.113500] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0002/input/input14
[  113.156787] hid-generic 0003:03F0:094A.0002: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
[  173.262642] usb 2-2: USB disconnect, device number 7
[  174.750244] usb 2-2: new low-speed USB device number 8 using xhci_hcd
[  174.935740] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
[  174.990435] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
[  175.014984] usb 2-2: Product: HP USB Optical Mouse
[  175.037886] usb 2-2: Manufacturer: PixArt
[  175.061794] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0003/input/input15
[  175.084946] hid-generic 0003:03F0:094A.0003: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0

Signed-off-by: Dave Young <dyoung@redhat.com>
---
 drivers/hid/hid-ids.h           |    1 +
 drivers/hid/usbhid/hid-quirks.c |    1 +
 2 files changed, 2 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Benjamin Tissoires Nov. 27, 2017, 8:16 a.m. UTC | #1 
On Nov 25 2017 or thereabouts, Dave Young wrote:
> This mouse keep disconnecting in runleve 3 like below, add it needs the
> quirk to mute the anoying messages.
> 
> [  111.230555] usb 2-2: USB disconnect, device number 6
> [  112.718156] usb 2-2: new low-speed USB device number 7 using xhci_hcd
> [  112.941594] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> [  112.984866] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> [  113.027731] usb 2-2: Product: HP USB Optical Mouse
> [  113.069977] usb 2-2: Manufacturer: PixArt
> [  113.113500] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0002/input/input14
> [  113.156787] hid-generic 0003:03F0:094A.0002: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> [  173.262642] usb 2-2: USB disconnect, device number 7
> [  174.750244] usb 2-2: new low-speed USB device number 8 using xhci_hcd
> [  174.935740] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> [  174.990435] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> [  175.014984] usb 2-2: Product: HP USB Optical Mouse
> [  175.037886] usb 2-2: Manufacturer: PixArt
> [  175.061794] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0003/input/input15
> [  175.084946] hid-generic 0003:03F0:094A.0003: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> 
> Signed-off-by: Dave Young <dyoung@redhat.com>
> ---
>  drivers/hid/hid-ids.h           |    1 +
>  drivers/hid/usbhid/hid-quirks.c |    1 +

Patch looks good and should be good for stable too, but in the file
hid-quirks.c file has been moved one folder up. Please rebase the patch
on top of https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/log/?h=for-4.16/hid-quirks-cleanup/_base
It should be merged in linux-next in the next few days normally.

Jiri, how can we deal with such stable-ish patches?

Cheers,
Benjamin

>  2 files changed, 2 insertions(+)
> 
> --- linux-x86.orig/drivers/hid/hid-ids.h
> +++ linux-x86/drivers/hid/hid-ids.h
> @@ -535,6 +535,7 @@
>  #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A	0x0a4a
>  #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A	0x0b4a
>  #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE		0x134a
> +#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A	0x094a
>  
>  #define USB_VENDOR_ID_HUION		0x256c
>  #define USB_DEVICE_ID_HUION_TABLET	0x006e
> --- linux-x86.orig/drivers/hid/usbhid/hid-quirks.c
> +++ linux-x86/drivers/hid/usbhid/hid-quirks.c
> @@ -99,6 +99,7 @@ static const struct hid_blacklist {
>  	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A, HID_QUIRK_ALWAYS_POLL },
>  	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },
>  	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
> +	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A, HID_QUIRK_ALWAYS_POLL },
>  	{ USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6680, HID_QUIRK_MULTI_INPUT },
>  	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007, HID_QUIRK_ALWAYS_POLL },
>  	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg KH Nov. 27, 2017, 8:32 a.m. UTC | #2 
On Mon, Nov 27, 2017 at 09:16:31AM +0100, Benjamin Tissoires wrote:
> On Nov 25 2017 or thereabouts, Dave Young wrote:
> > This mouse keep disconnecting in runleve 3 like below, add it needs the
> > quirk to mute the anoying messages.
> > 
> > [  111.230555] usb 2-2: USB disconnect, device number 6
> > [  112.718156] usb 2-2: new low-speed USB device number 7 using xhci_hcd
> > [  112.941594] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > [  112.984866] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > [  113.027731] usb 2-2: Product: HP USB Optical Mouse
> > [  113.069977] usb 2-2: Manufacturer: PixArt
> > [  113.113500] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0002/input/input14
> > [  113.156787] hid-generic 0003:03F0:094A.0002: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > [  173.262642] usb 2-2: USB disconnect, device number 7
> > [  174.750244] usb 2-2: new low-speed USB device number 8 using xhci_hcd
> > [  174.935740] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > [  174.990435] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > [  175.014984] usb 2-2: Product: HP USB Optical Mouse
> > [  175.037886] usb 2-2: Manufacturer: PixArt
> > [  175.061794] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0003/input/input15
> > [  175.084946] hid-generic 0003:03F0:094A.0003: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > 
> > Signed-off-by: Dave Young <dyoung@redhat.com>
> > ---
> >  drivers/hid/hid-ids.h           |    1 +
> >  drivers/hid/usbhid/hid-quirks.c |    1 +
> 
> Patch looks good and should be good for stable too, but in the file
> hid-quirks.c file has been moved one folder up. Please rebase the patch
> on top of https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/log/?h=for-4.16/hid-quirks-cleanup/_base
> It should be merged in linux-next in the next few days normally.
> 
> Jiri, how can we deal with such stable-ish patches?

I can almost always handle things as simple as file movements, don't
worry about that.  If there's a problem, I'll be sure to let people know
:)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Benjamin Tissoires Nov. 27, 2017, 8:49 a.m. UTC | #3 
On Nov 27 2017 or thereabouts, Greg KH wrote:
> On Mon, Nov 27, 2017 at 09:16:31AM +0100, Benjamin Tissoires wrote:
> > On Nov 25 2017 or thereabouts, Dave Young wrote:
> > > This mouse keep disconnecting in runleve 3 like below, add it needs the
> > > quirk to mute the anoying messages.
> > > 
> > > [  111.230555] usb 2-2: USB disconnect, device number 6
> > > [  112.718156] usb 2-2: new low-speed USB device number 7 using xhci_hcd
> > > [  112.941594] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > > [  112.984866] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > > [  113.027731] usb 2-2: Product: HP USB Optical Mouse
> > > [  113.069977] usb 2-2: Manufacturer: PixArt
> > > [  113.113500] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0002/input/input14
> > > [  113.156787] hid-generic 0003:03F0:094A.0002: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > > [  173.262642] usb 2-2: USB disconnect, device number 7
> > > [  174.750244] usb 2-2: new low-speed USB device number 8 using xhci_hcd
> > > [  174.935740] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > > [  174.990435] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > > [  175.014984] usb 2-2: Product: HP USB Optical Mouse
> > > [  175.037886] usb 2-2: Manufacturer: PixArt
> > > [  175.061794] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0003/input/input15
> > > [  175.084946] hid-generic 0003:03F0:094A.0003: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > > 
> > > Signed-off-by: Dave Young <dyoung@redhat.com>
> > > ---
> > >  drivers/hid/hid-ids.h           |    1 +
> > >  drivers/hid/usbhid/hid-quirks.c |    1 +
> > 
> > Patch looks good and should be good for stable too, but in the file
> > hid-quirks.c file has been moved one folder up. Please rebase the patch
> > on top of https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/log/?h=for-4.16/hid-quirks-cleanup/_base
> > It should be merged in linux-next in the next few days normally.
> > 
> > Jiri, how can we deal with such stable-ish patches?
> 
> I can almost always handle things as simple as file movements, don't
> worry about that.  If there's a problem, I'll be sure to let people know
> :)
> 

OK, thanks Greg.

Dave, please rebase on top of the branch I mentioned before, and add
also the stable@ tag.

Cheers,
Benjamin
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dave Young Nov. 27, 2017, 9:15 a.m. UTC | #4 
On 11/27/17 at 09:49am, Benjamin Tissoires wrote:
> On Nov 27 2017 or thereabouts, Greg KH wrote:
> > On Mon, Nov 27, 2017 at 09:16:31AM +0100, Benjamin Tissoires wrote:
> > > On Nov 25 2017 or thereabouts, Dave Young wrote:
> > > > This mouse keep disconnecting in runleve 3 like below, add it needs the
> > > > quirk to mute the anoying messages.
> > > > 
> > > > [  111.230555] usb 2-2: USB disconnect, device number 6
> > > > [  112.718156] usb 2-2: new low-speed USB device number 7 using xhci_hcd
> > > > [  112.941594] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > > > [  112.984866] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > > > [  113.027731] usb 2-2: Product: HP USB Optical Mouse
> > > > [  113.069977] usb 2-2: Manufacturer: PixArt
> > > > [  113.113500] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0002/input/input14
> > > > [  113.156787] hid-generic 0003:03F0:094A.0002: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > > > [  173.262642] usb 2-2: USB disconnect, device number 7
> > > > [  174.750244] usb 2-2: new low-speed USB device number 8 using xhci_hcd
> > > > [  174.935740] usb 2-2: New USB device found, idVendor=03f0, idProduct=094a
> > > > [  174.990435] usb 2-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0
> > > > [  175.014984] usb 2-2: Product: HP USB Optical Mouse
> > > > [  175.037886] usb 2-2: Manufacturer: PixArt
> > > > [  175.061794] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:14.0/usb2/2-2/2-2:1.0/0003:03F0:094A.0003/input/input15
> > > > [  175.084946] hid-generic 0003:03F0:094A.0003: input: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:00:14.0-2/input0
> > > > 
> > > > Signed-off-by: Dave Young <dyoung@redhat.com>
> > > > ---
> > > >  drivers/hid/hid-ids.h           |    1 +
> > > >  drivers/hid/usbhid/hid-quirks.c |    1 +
> > > 
> > > Patch looks good and should be good for stable too, but in the file
> > > hid-quirks.c file has been moved one folder up. Please rebase the patch
> > > on top of https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/log/?h=for-4.16/hid-quirks-cleanup/_base
> > > It should be merged in linux-next in the next few days normally.
> > > 
> > > Jiri, how can we deal with such stable-ish patches?
> > 
> > I can almost always handle things as simple as file movements, don't
> > worry about that.  If there's a problem, I'll be sure to let people know
> > :)
> > 
> 
> OK, thanks Greg.
> 
> Dave, please rebase on top of the branch I mentioned before, and add
> also the stable@ tag.

Benjamin, will do.

I posted this when I was in my daughter's class last weekend, maybe I
can retest and repost it next Saturday at Dec 4th or earlier if
I can find free time before that :)

> 
> Cheers,
> Benjamin

Thanks
Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-x86.orig/drivers/hid/hid-ids.h
+++ linux-x86/drivers/hid/hid-ids.h
@@ -535,6 +535,7 @@ 
 #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A	0x0a4a
 #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A	0x0b4a
 #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE		0x134a
+#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A	0x094a
 
 #define USB_VENDOR_ID_HUION		0x256c
 #define USB_DEVICE_ID_HUION_TABLET	0x006e
--- linux-x86.orig/drivers/hid/usbhid/hid-quirks.c
+++ linux-x86/drivers/hid/usbhid/hid-quirks.c
@@ -99,6 +99,7 @@  static const struct hid_blacklist {
 	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
+	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6680, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },