| Message ID | 20220107091357.28960-1-xiazhengqiao@huaqin.corp-partner.google.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 8a3e634dc5a37aaa6d4876614716e84fb26dbbc0 |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [v2] HID: google: modify HID device groups of eel | expand |
Hi Jiri, As your suggestions in https://patchwork.kernel.org/project/linux-input/patch/20211228114650.31981-1-xiazhengqiao@huaqin.corp-partner.google.com/ , I add verbose changelog, and change my email name, please help to review. thanks.
On Fri, 7 Jan 2022, Zhengqiao Xia wrote: > If HID_GROUP of eel is set to HID_GROUP_GENERIC, Whiskers Tablet > Mode Switch of eel hammer will not be detected by system. when it > is set to HID_GROUP_VIVALDI, system will detect Whiskers Tablet > Mode Switch successfully. > > Signed-off-by: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com> > --- > drivers/hid/hid-google-hammer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c > index 0403beb3104b..e5acd15f4a55 100644 > --- a/drivers/hid/hid-google-hammer.c > +++ b/drivers/hid/hid-google-hammer.c > @@ -585,7 +585,7 @@ static void hammer_remove(struct hid_device *hdev) > static const struct hid_device_id hammer_devices[] = { > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_DON) }, > - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > + { HID_DEVICE(BUS_USB, HID_GROUP_VIVALDI, > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_EEL) }, > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, Color me confused, but anything with HID_GROUP_VIVALDI should be matched by hid-vivaldi driver, so what is this about? Adding some more CCs. Thanks,
Hi Jiri, > Color me confused, but anything with HID_GROUP_VIVALDI should be matched > by hid-vivaldi driver, so what is this about? yes, HID_GROUP_VIVALDI will be matched by hid-vivaldi driver. CONFIG_HID_VIVALDI will be set to y when it is used. thanks.
Quoting Jiri Kosina (2022-01-14 00:38:23) > On Fri, 7 Jan 2022, Zhengqiao Xia wrote: > > > If HID_GROUP of eel is set to HID_GROUP_GENERIC, Whiskers Tablet > > Mode Switch of eel hammer will not be detected by system. when it > > is set to HID_GROUP_VIVALDI, system will detect Whiskers Tablet > > Mode Switch successfully. > > > > Signed-off-by: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com> > > --- > > drivers/hid/hid-google-hammer.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c > > index 0403beb3104b..e5acd15f4a55 100644 > > --- a/drivers/hid/hid-google-hammer.c > > +++ b/drivers/hid/hid-google-hammer.c > > @@ -585,7 +585,7 @@ static void hammer_remove(struct hid_device *hdev) > > static const struct hid_device_id hammer_devices[] = { > > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_DON) }, > > - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > + { HID_DEVICE(BUS_USB, HID_GROUP_VIVALDI, > > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_EEL) }, > > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > Color me confused, but anything with HID_GROUP_VIVALDI should be matched > by hid-vivaldi driver, so what is this about? > My understanding is that 'vivaldi' is mostly a keyboard layout and 'hammer' is a detachable keyboard. We want to prevent the hid-vivaldi driver from probing this particular device because the hid-vivaldi driver doesn't know about detachable keyboards. Hammer devices also support 360 degree wraparound so we know that the keyboard has been put behind the screen or that it's being used to stand up the device on a table. Given all that, I'm still confused. If we make the hid-google-hammer driver probe this device and the keyboard layout is vivaldi then we'd want the part of the vivaldi driver that exposes the function_row_physmap through sysfs. Otherwise userspace won't know how to handle the function row properly. I think we need the device to stack two drivers here. Does that happen with HID?
On Fri, Jan 14, 2022 at 01:25:12PM -0600, Stephen Boyd wrote: > Quoting Jiri Kosina (2022-01-14 00:38:23) > > On Fri, 7 Jan 2022, Zhengqiao Xia wrote: > > > > > If HID_GROUP of eel is set to HID_GROUP_GENERIC, Whiskers Tablet > > > Mode Switch of eel hammer will not be detected by system. when it > > > is set to HID_GROUP_VIVALDI, system will detect Whiskers Tablet > > > Mode Switch successfully. > > > > > > Signed-off-by: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com> > > > --- > > > drivers/hid/hid-google-hammer.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c > > > index 0403beb3104b..e5acd15f4a55 100644 > > > --- a/drivers/hid/hid-google-hammer.c > > > +++ b/drivers/hid/hid-google-hammer.c > > > @@ -585,7 +585,7 @@ static void hammer_remove(struct hid_device *hdev) > > > static const struct hid_device_id hammer_devices[] = { > > > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_DON) }, > > > - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > > + { HID_DEVICE(BUS_USB, HID_GROUP_VIVALDI, > > > USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_EEL) }, > > > { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, > > > > Color me confused, but anything with HID_GROUP_VIVALDI should be matched > > by hid-vivaldi driver, so what is this about? We need this particular chunk because hid_scan_collection() forces all devices that declare usage 0x01 from the Google Vendor page to be marked as HID_GROUP_VIVALDI, so without it the hammer driver will not match eel. However this change (I believe) will break vivaldi functionality (reporting of the top row map) so we can't apply this as is. > > > > My understanding is that 'vivaldi' is mostly a keyboard layout and > 'hammer' is a detachable keyboard. We want to prevent the hid-vivaldi > driver from probing this particular device because the hid-vivaldi > driver doesn't know about detachable keyboards. Hammer devices also > support 360 degree wraparound so we know that the keyboard has been put > behind the screen or that it's being used to stand up the device on a > table. > > Given all that, I'm still confused. If we make the hid-google-hammer > driver probe this device and the keyboard layout is vivaldi then we'd > want the part of the vivaldi driver that exposes the > function_row_physmap through sysfs. Otherwise userspace won't know how > to handle the function row properly. I think we need the device to stack > two drivers here. Does that happen with HID? As far as I know HID does not easily allow "stacking" drivers like that. Probably the easiest way would be to export vivaldi_feature_mapping() and the show method for the physical row map and call them from the hammer driver. Thanks.
Quoting Dmitry Torokhov (2022-01-14 11:59:50) > On Fri, Jan 14, 2022 at 01:25:12PM -0600, Stephen Boyd wrote: > > > > My understanding is that 'vivaldi' is mostly a keyboard layout and > > 'hammer' is a detachable keyboard. We want to prevent the hid-vivaldi > > driver from probing this particular device because the hid-vivaldi > > driver doesn't know about detachable keyboards. Hammer devices also > > support 360 degree wraparound so we know that the keyboard has been put > > behind the screen or that it's being used to stand up the device on a > > table. > > > > Given all that, I'm still confused. If we make the hid-google-hammer > > driver probe this device and the keyboard layout is vivaldi then we'd > > want the part of the vivaldi driver that exposes the > > function_row_physmap through sysfs. Otherwise userspace won't know how > > to handle the function row properly. I think we need the device to stack > > two drivers here. Does that happen with HID? > > As far as I know HID does not easily allow "stacking" drivers like that. Ok. > > Probably the easiest way would be to export vivaldi_feature_mapping() > and the show method for the physical row map and call them from the > hammer driver. > I worry about builtin vs. modular drivers so probably ought to make some hid-vivaldi-common.c file that has the physmap code and then have both drivers call that mini-library. The 'vivaldi_data' structure would need to be figured out too. The hammer driver stores 'hammer_kbd_leds' in the hid_get_drvdata() whereas the vivaldi driver stores 'vivalid_data' so we can't simply call the show method for the sysfs attribute without some minor surgery.
On Fri, Jan 14, 2022 at 02:55:49PM -0600, Stephen Boyd wrote: > Quoting Dmitry Torokhov (2022-01-14 11:59:50) > > On Fri, Jan 14, 2022 at 01:25:12PM -0600, Stephen Boyd wrote: > > > > > > My understanding is that 'vivaldi' is mostly a keyboard layout and > > > 'hammer' is a detachable keyboard. We want to prevent the hid-vivaldi > > > driver from probing this particular device because the hid-vivaldi > > > driver doesn't know about detachable keyboards. Hammer devices also > > > support 360 degree wraparound so we know that the keyboard has been put > > > behind the screen or that it's being used to stand up the device on a > > > table. > > > > > > Given all that, I'm still confused. If we make the hid-google-hammer > > > driver probe this device and the keyboard layout is vivaldi then we'd > > > want the part of the vivaldi driver that exposes the > > > function_row_physmap through sysfs. Otherwise userspace won't know how > > > to handle the function row properly. I think we need the device to stack > > > two drivers here. Does that happen with HID? > > > > As far as I know HID does not easily allow "stacking" drivers like that. > > Ok. > > > > > Probably the easiest way would be to export vivaldi_feature_mapping() > > and the show method for the physical row map and call them from the > > hammer driver. > > > > I worry about builtin vs. modular drivers so probably ought to make some Just make hid-hammer depend on hid-vivaldi, hid-vivaldi is tiny otherwise. > hid-vivaldi-common.c file that has the physmap code and then have both > drivers call that mini-library. The 'vivaldi_data' structure would need > to be figured out too. The hammer driver stores 'hammer_kbd_leds' in the > hid_get_drvdata() whereas the vivaldi driver stores 'vivalid_data' so we > can't simply call the show method for the sysfs attribute without some > minor surgery. Yeah, we'll need to convert them into helpers into which callers can pass buffers. Thanks.
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c index 0403beb3104b..e5acd15f4a55 100644 --- a/drivers/hid/hid-google-hammer.c +++ b/drivers/hid/hid-google-hammer.c @@ -585,7 +585,7 @@ static void hammer_remove(struct hid_device *hdev) static const struct hid_device_id hammer_devices[] = { { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_DON) }, - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + { HID_DEVICE(BUS_USB, HID_GROUP_VIVALDI, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_EEL) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_HAMMER) },
If HID_GROUP of eel is set to HID_GROUP_GENERIC, Whiskers Tablet Mode Switch of eel hammer will not be detected by system. when it is set to HID_GROUP_VIVALDI, system will detect Whiskers Tablet Mode Switch successfully. Signed-off-by: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com> --- drivers/hid/hid-google-hammer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)