* [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function
2022-02-16 19:58 [PATCH v4 0/4] Input/HID: Consolidate ChromeOS Vivaldi keyboard logic Stephen Boyd
@ 2022-02-16 19:58 ` Stephen Boyd
2022-02-16 22:23 ` Stephen Boyd
2022-02-28 7:59 ` Dmitry Torokhov
2022-02-16 19:58 ` [PATCH v4 2/4] HID: Extract vivaldi hid feature mapping for use in hid-hammer Stephen Boyd
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Stephen Boyd @ 2022-02-16 19:58 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia
Let's introduce a common library file for the physmap show function
duplicated between three different keyboard drivers. This largely copies
the code from cros_ec_keyb.c which has the most recent version of the
show function, while using the vivaldi_data struct from the hid-vivaldi
driver. This saves a small amount of space in an allyesconfig build.
$ ./scripts/bloat-o-meter vmlinux.before vmlinux.after
add/remove: 3/0 grow/shrink: 2/3 up/down: 412/-720 (-308)
Function old new delta
vivaldi_function_row_physmap_show - 292 +292
_sub_I_65535_1 1057564 1057616 +52
_sub_D_65535_0 1057564 1057616 +52
e843419@49f2_00062737_9b04 - 8 +8
e843419@20f6_0002a34d_35bc - 8 +8
atkbd_parse_fwnode_data 480 472 -8
atkbd_do_show_function_row_physmap 316 76 -240
function_row_physmap_show 620 148 -472
Total: Before=285581925, After=285581617, chg -0.00%
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: "Sean O'Brien" <seobrien@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-vivaldi.c | 27 +++++--------------
drivers/input/Kconfig | 7 +++++
drivers/input/Makefile | 1 +
drivers/input/keyboard/Kconfig | 2 ++
drivers/input/keyboard/atkbd.c | 22 +++++----------
drivers/input/keyboard/cros_ec_keyb.c | 32 ++++++++--------------
drivers/input/vivaldi-fmap.c | 39 +++++++++++++++++++++++++++
include/linux/input/vivaldi-fmap.h | 28 +++++++++++++++++++
9 files changed, 102 insertions(+), 57 deletions(-)
create mode 100644 drivers/input/vivaldi-fmap.c
create mode 100644 include/linux/input/vivaldi-fmap.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f5544157576c..5569a2029dab 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -411,6 +411,7 @@ config HID_GOOGLE_HAMMER
config HID_VIVALDI
tristate "Vivaldi Keyboard"
+ select INPUT_VIVALDIFMAP
depends on HID
help
Say Y here if you want to enable support for Vivaldi keyboards.
diff --git a/drivers/hid/hid-vivaldi.c b/drivers/hid/hid-vivaldi.c
index efa6140915f4..adb56b342948 100644
--- a/drivers/hid/hid-vivaldi.c
+++ b/drivers/hid/hid-vivaldi.c
@@ -8,37 +8,22 @@
#include <linux/device.h>
#include <linux/hid.h>
+#include <linux/input/vivaldi-fmap.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sysfs.h>
-#define MIN_FN_ROW_KEY 1
-#define MAX_FN_ROW_KEY 24
#define HID_VD_FN_ROW_PHYSMAP 0x00000001
#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
-struct vivaldi_data {
- u32 function_row_physmap[MAX_FN_ROW_KEY - MIN_FN_ROW_KEY + 1];
- int max_function_row_key;
-};
-
static ssize_t function_row_physmap_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct hid_device *hdev = to_hid_device(dev);
struct vivaldi_data *drvdata = hid_get_drvdata(hdev);
- ssize_t size = 0;
- int i;
-
- if (!drvdata->max_function_row_key)
- return 0;
- for (i = 0; i < drvdata->max_function_row_key; i++)
- size += sprintf(buf + size, "%02X ",
- drvdata->function_row_physmap[i]);
- size += sprintf(buf + size, "\n");
- return size;
+ return vivaldi_function_row_physmap_show(drvdata, buf);
}
static DEVICE_ATTR_RO(function_row_physmap);
@@ -86,10 +71,10 @@ static void vivaldi_feature_mapping(struct hid_device *hdev,
return;
fn_key = (usage->hid & HID_USAGE);
- if (fn_key < MIN_FN_ROW_KEY || fn_key > MAX_FN_ROW_KEY)
+ if (fn_key < VIVALDI_MIN_FN_ROW_KEY || fn_key > VIVALDI_MAX_FN_ROW_KEY)
return;
- if (fn_key > drvdata->max_function_row_key)
- drvdata->max_function_row_key = fn_key;
+ if (fn_key > drvdata->num_function_row_keys)
+ drvdata->num_function_row_keys = fn_key;
report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
if (!report_data)
@@ -134,7 +119,7 @@ static void vivaldi_feature_mapping(struct hid_device *hdev,
goto out;
}
- drvdata->function_row_physmap[fn_key - MIN_FN_ROW_KEY] =
+ drvdata->function_row_physmap[fn_key - VIVALDI_MIN_FN_ROW_KEY] =
field->value[usage->usage_index];
out:
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5baebf62df33..e2752f7364bc 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -77,6 +77,13 @@ config INPUT_MATRIXKMAP
To compile this driver as a module, choose M here: the
module will be called matrix-keymap.
+config INPUT_VIVALDIFMAP
+ tristate
+ help
+ ChromeOS Vivaldi keymap support library. This is a hidden
+ option so that drivers can use common code to parse and
+ expose the vivaldi function row keymap.
+
comment "Userland interfaces"
config INPUT_MOUSEDEV
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 037cc595106c..f91874e76567 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_INPUT) += input-core.o
input-core-y := input.o input-compat.o input-mt.o input-poller.o ff-core.o
input-core-y += touchscreen.o
+obj-$(CONFIG_INPUT_VIVALDIFMAP) += vivaldi-fmap.o
obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
obj-$(CONFIG_INPUT_SPARSEKMAP) += sparse-keymap.o
obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0c607da9ee10..8b4477e54a01 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -103,6 +103,7 @@ config KEYBOARD_ATKBD
select SERIO_LIBPS2
select SERIO_I8042 if ARCH_MIGHT_HAVE_PC_SERIO
select SERIO_GSCPS2 if GSC
+ select INPUT_VIVALDIFMAP
help
Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
you'll need this, unless you have a different type keyboard (USB, ADB
@@ -749,6 +750,7 @@ config KEYBOARD_XTKBD
config KEYBOARD_CROS_EC
tristate "ChromeOS EC keyboard"
select INPUT_MATRIXKMAP
+ select INPUT_VIVALDIFMAP
depends on CROS_EC
help
Say Y here to enable the matrix keyboard used by ChromeOS devices
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index fbdef95291e9..fc980435c97a 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -19,6 +19,7 @@
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/input.h>
+#include <linux/input/vivaldi-fmap.h>
#include <linux/serio.h>
#include <linux/workqueue.h>
#include <linux/libps2.h>
@@ -237,8 +238,7 @@ struct atkbd {
/* Serializes reconnect(), attr->set() and event work */
struct mutex mutex;
- u32 function_row_physmap[MAX_FUNCTION_ROW_KEYS];
- int num_function_row_keys;
+ struct vivaldi_data vdata;
};
/*
@@ -308,17 +308,9 @@ static struct attribute *atkbd_attributes[] = {
static ssize_t atkbd_show_function_row_physmap(struct atkbd *atkbd, char *buf)
{
- ssize_t size = 0;
- int i;
-
- if (!atkbd->num_function_row_keys)
- return 0;
+ const struct vivaldi_data *data = &atkbd->vdata;
- for (i = 0; i < atkbd->num_function_row_keys; i++)
- size += scnprintf(buf + size, PAGE_SIZE - size, "%02X ",
- atkbd->function_row_physmap[i]);
- size += scnprintf(buf + size, PAGE_SIZE - size, "\n");
- return size;
+ return vivaldi_function_row_physmap_show(data, buf);
}
static umode_t atkbd_attr_is_visible(struct kobject *kobj,
@@ -329,7 +321,7 @@ static umode_t atkbd_attr_is_visible(struct kobject *kobj,
struct atkbd *atkbd = serio_get_drvdata(serio);
if (attr == &atkbd_attr_function_row_physmap.attr &&
- !atkbd->num_function_row_keys)
+ !atkbd->vdata.num_function_row_keys)
return 0;
return attr->mode;
@@ -1208,8 +1200,8 @@ static void atkbd_parse_fwnode_data(struct serio *serio)
n = device_property_count_u32(dev, "function-row-physmap");
if (n > 0 && n <= MAX_FUNCTION_ROW_KEYS &&
!device_property_read_u32_array(dev, "function-row-physmap",
- atkbd->function_row_physmap, n)) {
- atkbd->num_function_row_keys = n;
+ atkbd->vdata.function_row_physmap, n)) {
+ atkbd->vdata.num_function_row_keys = n;
dev_dbg(dev, "FW reported %d function-row key locations\n", n);
}
}
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index fc02c540636e..3151e887b0f1 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -15,6 +15,7 @@
#include <linux/bitops.h>
#include <linux/i2c.h>
#include <linux/input.h>
+#include <linux/input/vivaldi-fmap.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/notifier.h>
@@ -44,9 +45,7 @@
* @idev: The input device for the matrix keys.
* @bs_idev: The input device for non-matrix buttons and switches (or NULL).
* @notifier: interrupt event notifier for transport devices
- * @function_row_physmap: An array of the encoded rows/columns for the top
- * row function keys, in an order from left to right
- * @num_function_row_keys: The number of top row keys in a custom keyboard
+ * @vdata: vivaldi function row data
*/
struct cros_ec_keyb {
unsigned int rows;
@@ -64,8 +63,7 @@ struct cros_ec_keyb {
struct input_dev *bs_idev;
struct notifier_block notifier;
- u16 function_row_physmap[MAX_NUM_TOP_ROW_KEYS];
- size_t num_function_row_keys;
+ struct vivaldi_data vdata;
};
/**
@@ -537,7 +535,7 @@ static int cros_ec_keyb_register_matrix(struct cros_ec_keyb *ckdev)
int err;
struct property *prop;
const __be32 *p;
- u16 *physmap;
+ u32 *physmap;
u32 key_pos;
int row, col;
@@ -591,10 +589,10 @@ static int cros_ec_keyb_register_matrix(struct cros_ec_keyb *ckdev)
ckdev->idev = idev;
cros_ec_keyb_compute_valid_keys(ckdev);
- physmap = ckdev->function_row_physmap;
+ physmap = ckdev->vdata.function_row_physmap;
of_property_for_each_u32(dev->of_node, "function-row-physmap",
prop, p, key_pos) {
- if (ckdev->num_function_row_keys == MAX_NUM_TOP_ROW_KEYS) {
+ if (ckdev->vdata.num_function_row_keys == MAX_NUM_TOP_ROW_KEYS) {
dev_warn(dev, "Only support up to %d top row keys\n",
MAX_NUM_TOP_ROW_KEYS);
break;
@@ -603,7 +601,7 @@ static int cros_ec_keyb_register_matrix(struct cros_ec_keyb *ckdev)
col = KEY_COL(key_pos);
*physmap = MATRIX_SCAN_CODE(row, col, ckdev->row_shift);
physmap++;
- ckdev->num_function_row_keys++;
+ ckdev->vdata.num_function_row_keys++;
}
err = input_register_device(ckdev->idev);
@@ -619,18 +617,10 @@ static ssize_t function_row_physmap_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- ssize_t size = 0;
- int i;
- struct cros_ec_keyb *ckdev = dev_get_drvdata(dev);
- u16 *physmap = ckdev->function_row_physmap;
-
- for (i = 0; i < ckdev->num_function_row_keys; i++)
- size += scnprintf(buf + size, PAGE_SIZE - size,
- "%s%02X", size ? " " : "", physmap[i]);
- if (size)
- size += scnprintf(buf + size, PAGE_SIZE - size, "\n");
+ const struct cros_ec_keyb *ckdev = dev_get_drvdata(dev);
+ const struct vivaldi_data *data = &ckdev->vdata;
- return size;
+ return vivaldi_function_row_physmap_show(data, buf);
}
static DEVICE_ATTR_RO(function_row_physmap);
@@ -648,7 +638,7 @@ static umode_t cros_ec_keyb_attr_is_visible(struct kobject *kobj,
struct cros_ec_keyb *ckdev = dev_get_drvdata(dev);
if (attr == &dev_attr_function_row_physmap.attr &&
- !ckdev->num_function_row_keys)
+ !ckdev->vdata.num_function_row_keys)
return 0;
return attr->mode;
diff --git a/drivers/input/vivaldi-fmap.c b/drivers/input/vivaldi-fmap.c
new file mode 100644
index 000000000000..6dae83d96806
--- /dev/null
+++ b/drivers/input/vivaldi-fmap.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Helpers for ChromeOS Vivaldi keyboard function row mapping
+ *
+ * Copyright (C) 2022 Google, Inc
+ */
+
+#include <linux/export.h>
+#include <linux/input/vivaldi-fmap.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+/**
+ * vivaldi_function_row_physmap_show - Print vivaldi function row physmap attribute
+ * @data: The vivaldi function row map
+ * @buf: Buffer to print the function row phsymap to
+ */
+ssize_t vivaldi_function_row_physmap_show(const struct vivaldi_data *data,
+ char *buf)
+{
+ ssize_t size = 0;
+ int i;
+ const u32 *physmap = data->function_row_physmap;
+
+ if (!data->num_function_row_keys)
+ return 0;
+
+ for (i = 0; i < data->num_function_row_keys; i++)
+ size += scnprintf(buf + size, PAGE_SIZE - size,
+ "%s%02X", size ? " " : "", physmap[i]);
+ if (size)
+ size += scnprintf(buf + size, PAGE_SIZE - size, "\n");
+
+ return size;
+}
+EXPORT_SYMBOL_GPL(vivaldi_function_row_physmap_show);
+
+MODULE_LICENSE("GPL");
diff --git a/include/linux/input/vivaldi-fmap.h b/include/linux/input/vivaldi-fmap.h
new file mode 100644
index 000000000000..57563d9da022
--- /dev/null
+++ b/include/linux/input/vivaldi-fmap.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _VIVALDI_KEYMAP_H
+#define _VIVALDI_KEYMAP_H
+
+#include <linux/types.h>
+
+#define VIVALDI_MIN_FN_ROW_KEY 1
+#define VIVALDI_MAX_FN_ROW_KEY 24
+
+/**
+ * struct vivaldi_data - Function row keymap data for ChromeOS vivaldi keyboards
+ * @function_row_physmap: An array of the encoded rows/columns for the top
+ * row function keys, in an order from left to right
+ * @num_function_row_keys: The number of top row keys in a custom keyboard
+ *
+ * This structure is supposed to be used by ChromeOS keyboards using
+ * the vivaldi keyboard function row design.
+ */
+struct vivaldi_data {
+ u32 function_row_physmap[VIVALDI_MAX_FN_ROW_KEY - VIVALDI_MIN_FN_ROW_KEY + 1];
+ int num_function_row_keys;
+};
+
+
+ssize_t vivaldi_function_row_physmap_show(const struct vivaldi_data *data,
+ char *buf);
+
+#endif /* _VIVALDI_KEYMAP_H */
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function
2022-02-16 19:58 ` [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function Stephen Boyd
@ 2022-02-16 22:23 ` Stephen Boyd
2022-02-28 7:59 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Stephen Boyd @ 2022-02-16 22:23 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia
Quoting Stephen Boyd (2022-02-16 11:58:58)
> diff --git a/include/linux/input/vivaldi-fmap.h b/include/linux/input/vivaldi-fmap.h
> new file mode 100644
> index 000000000000..57563d9da022
> --- /dev/null
> +++ b/include/linux/input/vivaldi-fmap.h
> @@ -0,0 +1,28 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _VIVALDI_KEYMAP_H
> +#define _VIVALDI_KEYMAP_H
Doug pointed out this missed the update. This patch can be squashed in.
---8<---
diff --git a/include/linux/input/vivaldi-fmap.h
b/include/linux/input/vivaldi-fmap.h
index c736200b4511..a0784a6e7a1c 100644
--- a/include/linux/input/vivaldi-fmap.h
+++ b/include/linux/input/vivaldi-fmap.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _VIVALDI_KEYMAP_H
-#define _VIVALDI_KEYMAP_H
+#ifndef _VIVALDI_FMAP_H
+#define _VIVALDI_FMAP_H
#include <linux/types.h>
@@ -34,4 +34,4 @@ void vivaldi_hid_feature_mapping(struct vivaldi_data *data,
struct hid_field *field,
struct hid_usage *usage);
-#endif /* _VIVALDI_KEYMAP_H */
+#endif /* _VIVALDI_FMAP_H */
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function
2022-02-16 19:58 ` [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function Stephen Boyd
2022-02-16 22:23 ` Stephen Boyd
@ 2022-02-28 7:59 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2022-02-28 7:59 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia
Hi Stephen,
On Wed, Feb 16, 2022 at 11:58:58AM -0800, Stephen Boyd wrote:
> diff --git a/include/linux/input/vivaldi-fmap.h b/include/linux/input/vivaldi-fmap.h
> new file mode 100644
> index 000000000000..57563d9da022
> --- /dev/null
> +++ b/include/linux/input/vivaldi-fmap.h
> @@ -0,0 +1,28 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _VIVALDI_KEYMAP_H
> +#define _VIVALDI_KEYMAP_H
> +
> +#include <linux/types.h>
> +
> +#define VIVALDI_MIN_FN_ROW_KEY 1
> +#define VIVALDI_MAX_FN_ROW_KEY 24
These 2 are actually details of HID, we had a #define in atkbd which I
lifted as VIVALDI_MAX_FUNCTION_ROW_KEYS and put here, and dropped it
from atkbd and made cros_ec keyboard driver use it as well.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/4] HID: Extract vivaldi hid feature mapping for use in hid-hammer
2022-02-16 19:58 [PATCH v4 0/4] Input/HID: Consolidate ChromeOS Vivaldi keyboard logic Stephen Boyd
2022-02-16 19:58 ` [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function Stephen Boyd
@ 2022-02-16 19:58 ` Stephen Boyd
2022-02-28 8:01 ` Dmitry Torokhov
2022-02-16 19:59 ` [PATCH v4 3/4] HID: google: Add support for vivaldi to hid-hammer Stephen Boyd
2022-02-16 19:59 ` [PATCH v4 4/4] HID: google: modify HID device groups of eel Stephen Boyd
3 siblings, 1 reply; 8+ messages in thread
From: Stephen Boyd @ 2022-02-16 19:58 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia, Jiri Kosina
We need to support parsing the HID device in both the vivaldi and the
hammer drivers so that we can properly expose the function row physmap
to userspace when a hammer device uses a vivaldi keyboard layout for the
function row keys. Extract the feature mapping logic from the vivaldi
driver into an hid specific vivaldi library so we can use it from both
HID drivers.
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: "Sean O'Brien" <seobrien@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/hid/Kconfig | 9 +++
drivers/hid/Makefile | 1 +
drivers/hid/hid-vivaldi-common.c | 97 ++++++++++++++++++++++++++++++
drivers/hid/hid-vivaldi.c | 69 +--------------------
include/linux/input/vivaldi-fmap.h | 9 +++
5 files changed, 118 insertions(+), 67 deletions(-)
create mode 100644 drivers/hid/hid-vivaldi-common.c
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5569a2029dab..ea8fa71c9e9c 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -403,14 +403,23 @@ config HOLTEK_FF
Say Y here if you have a Holtek On Line Grip based game controller
and want to have force feedback support for it.
+config HID_VIVALDI_COMMON
+ tristate
+ help
+ ChromeOS Vivaldi HID parsing support library. This is a hidden
+ option so that drivers can use common code to parse the HID
+ descriptors for vivaldi function row keymap.
+
config HID_GOOGLE_HAMMER
tristate "Google Hammer Keyboard"
+ select HID_VIVALDI_COMMON
depends on USB_HID && LEDS_CLASS && CROS_EC
help
Say Y here if you have a Google Hammer device.
config HID_VIVALDI
tristate "Vivaldi Keyboard"
+ select HID_VIVALDI_COMMON
select INPUT_VIVALDIFMAP
depends on HID
help
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 6d3e630e81af..469a6159ebae 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_HID_FT260) += hid-ft260.o
obj-$(CONFIG_HID_GEMBIRD) += hid-gembird.o
obj-$(CONFIG_HID_GFRM) += hid-gfrm.o
obj-$(CONFIG_HID_GLORIOUS) += hid-glorious.o
+obj-$(CONFIG_HID_VIVALDI_COMMON) += hid-vivaldi-common.o
obj-$(CONFIG_HID_GOOGLE_HAMMER) += hid-google-hammer.o
obj-$(CONFIG_HID_VIVALDI) += hid-vivaldi.o
obj-$(CONFIG_HID_GT683R) += hid-gt683r.o
diff --git a/drivers/hid/hid-vivaldi-common.c b/drivers/hid/hid-vivaldi-common.c
new file mode 100644
index 000000000000..8a5074fd63b7
--- /dev/null
+++ b/drivers/hid/hid-vivaldi-common.c
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Helpers for ChromeOS HID Vivaldi keyboards
+ *
+ * Copyright (C) 2022 Google, Inc
+ */
+
+#include <linux/export.h>
+#include <linux/hid.h>
+#include <linux/input/vivaldi-fmap.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+#define HID_VD_FN_ROW_PHYSMAP 0x00000001
+#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
+
+/**
+ * vivaldi_hid_feature_mapping - Fill out vivaldi keymap data exposed via HID
+ * @data: The vivaldi function keymap
+ * @hdev: HID device to parse
+ * @field: HID field to parse
+ * @usage: HID usage to parse
+ */
+void vivaldi_hid_feature_mapping(struct vivaldi_data *data,
+ struct hid_device *hdev,
+ struct hid_field *field,
+ struct hid_usage *usage)
+{
+ struct hid_report *report = field->report;
+ int fn_key;
+ int ret;
+ u32 report_len;
+ u8 *report_data, *buf;
+
+ if (field->logical != HID_USAGE_FN_ROW_PHYSMAP ||
+ (usage->hid & HID_USAGE_PAGE) != HID_UP_ORDINAL)
+ return;
+
+ fn_key = (usage->hid & HID_USAGE);
+ if (fn_key < VIVALDI_MIN_FN_ROW_KEY || fn_key > VIVALDI_MAX_FN_ROW_KEY)
+ return;
+ if (fn_key > data->num_function_row_keys)
+ data->num_function_row_keys = fn_key;
+
+ report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
+ if (!report_data)
+ return;
+
+ report_len = hid_report_len(report);
+ if (!report->id) {
+ /*
+ * hid_hw_raw_request() will stuff report ID (which will be 0)
+ * into the first byte of the buffer even for unnumbered
+ * reports, so we need to account for this to avoid getting
+ * -EOVERFLOW in return.
+ * Note that hid_alloc_report_buf() adds 7 bytes to the size
+ * so we can safely say that we have space for an extra byte.
+ */
+ report_len++;
+ }
+
+ ret = hid_hw_raw_request(hdev, report->id, report_data,
+ report_len, HID_FEATURE_REPORT,
+ HID_REQ_GET_REPORT);
+ if (ret < 0) {
+ dev_warn(&hdev->dev, "failed to fetch feature %d\n",
+ field->report->id);
+ goto out;
+ }
+
+ if (!report->id) {
+ /*
+ * Undo the damage from hid_hw_raw_request() for unnumbered
+ * reports.
+ */
+ report_data++;
+ report_len--;
+ }
+
+ ret = hid_report_raw_event(hdev, HID_FEATURE_REPORT, report_data,
+ report_len, 0);
+ if (ret) {
+ dev_warn(&hdev->dev, "failed to report feature %d\n",
+ field->report->id);
+ goto out;
+ }
+
+ data->function_row_physmap[fn_key - VIVALDI_MIN_FN_ROW_KEY] =
+ field->value[usage->usage_index];
+
+out:
+ kfree(buf);
+}
+EXPORT_SYMBOL_GPL(vivaldi_hid_feature_mapping);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-vivaldi.c b/drivers/hid/hid-vivaldi.c
index adb56b342948..f70cab6a192b 100644
--- a/drivers/hid/hid-vivaldi.c
+++ b/drivers/hid/hid-vivaldi.c
@@ -13,9 +13,6 @@
#include <linux/module.h>
#include <linux/sysfs.h>
-#define HID_VD_FN_ROW_PHYSMAP 0x00000001
-#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
-
static ssize_t function_row_physmap_show(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -60,70 +57,8 @@ static void vivaldi_feature_mapping(struct hid_device *hdev,
struct hid_usage *usage)
{
struct vivaldi_data *drvdata = hid_get_drvdata(hdev);
- struct hid_report *report = field->report;
- int fn_key;
- int ret;
- u32 report_len;
- u8 *report_data, *buf;
-
- if (field->logical != HID_USAGE_FN_ROW_PHYSMAP ||
- (usage->hid & HID_USAGE_PAGE) != HID_UP_ORDINAL)
- return;
-
- fn_key = (usage->hid & HID_USAGE);
- if (fn_key < VIVALDI_MIN_FN_ROW_KEY || fn_key > VIVALDI_MAX_FN_ROW_KEY)
- return;
- if (fn_key > drvdata->num_function_row_keys)
- drvdata->num_function_row_keys = fn_key;
-
- report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
- if (!report_data)
- return;
-
- report_len = hid_report_len(report);
- if (!report->id) {
- /*
- * hid_hw_raw_request() will stuff report ID (which will be 0)
- * into the first byte of the buffer even for unnumbered
- * reports, so we need to account for this to avoid getting
- * -EOVERFLOW in return.
- * Note that hid_alloc_report_buf() adds 7 bytes to the size
- * so we can safely say that we have space for an extra byte.
- */
- report_len++;
- }
-
- ret = hid_hw_raw_request(hdev, report->id, report_data,
- report_len, HID_FEATURE_REPORT,
- HID_REQ_GET_REPORT);
- if (ret < 0) {
- dev_warn(&hdev->dev, "failed to fetch feature %d\n",
- field->report->id);
- goto out;
- }
-
- if (!report->id) {
- /*
- * Undo the damage from hid_hw_raw_request() for unnumbered
- * reports.
- */
- report_data++;
- report_len--;
- }
-
- ret = hid_report_raw_event(hdev, HID_FEATURE_REPORT, report_data,
- report_len, 0);
- if (ret) {
- dev_warn(&hdev->dev, "failed to report feature %d\n",
- field->report->id);
- goto out;
- }
-
- drvdata->function_row_physmap[fn_key - VIVALDI_MIN_FN_ROW_KEY] =
- field->value[usage->usage_index];
-
-out:
- kfree(buf);
+
+ vivaldi_hid_feature_mapping(drvdata, hdev, field, usage);
}
static int vivaldi_input_configured(struct hid_device *hdev,
diff --git a/include/linux/input/vivaldi-fmap.h b/include/linux/input/vivaldi-fmap.h
index 57563d9da022..c736200b4511 100644
--- a/include/linux/input/vivaldi-fmap.h
+++ b/include/linux/input/vivaldi-fmap.h
@@ -4,6 +4,10 @@
#include <linux/types.h>
+struct hid_device;
+struct hid_field;
+struct hid_usage;
+
#define VIVALDI_MIN_FN_ROW_KEY 1
#define VIVALDI_MAX_FN_ROW_KEY 24
@@ -25,4 +29,9 @@ struct vivaldi_data {
ssize_t vivaldi_function_row_physmap_show(const struct vivaldi_data *data,
char *buf);
+void vivaldi_hid_feature_mapping(struct vivaldi_data *data,
+ struct hid_device *hdev,
+ struct hid_field *field,
+ struct hid_usage *usage);
+
#endif /* _VIVALDI_KEYMAP_H */
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v4 2/4] HID: Extract vivaldi hid feature mapping for use in hid-hammer
2022-02-16 19:58 ` [PATCH v4 2/4] HID: Extract vivaldi hid feature mapping for use in hid-hammer Stephen Boyd
@ 2022-02-28 8:01 ` Dmitry Torokhov
0 siblings, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2022-02-28 8:01 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia, Jiri Kosina
On Wed, Feb 16, 2022 at 11:58:59AM -0800, Stephen Boyd wrote:
> We need to support parsing the HID device in both the vivaldi and the
> hammer drivers so that we can properly expose the function row physmap
> to userspace when a hammer device uses a vivaldi keyboard layout for the
> function row keys. Extract the feature mapping logic from the vivaldi
> driver into an hid specific vivaldi library so we can use it from both
> HID drivers.
>
> Cc: Jiri Kosina <jikos@kernel.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Tested-by: "Sean O'Brien" <seobrien@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
> Acked-by: Jiri Kosina <jkosina@suse.cz>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> drivers/hid/Kconfig | 9 +++
> drivers/hid/Makefile | 1 +
> drivers/hid/hid-vivaldi-common.c | 97 ++++++++++++++++++++++++++++++
> drivers/hid/hid-vivaldi.c | 69 +--------------------
> include/linux/input/vivaldi-fmap.h | 9 +++
> 5 files changed, 118 insertions(+), 67 deletions(-)
> create mode 100644 drivers/hid/hid-vivaldi-common.c
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 5569a2029dab..ea8fa71c9e9c 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -403,14 +403,23 @@ config HOLTEK_FF
> Say Y here if you have a Holtek On Line Grip based game controller
> and want to have force feedback support for it.
>
> +config HID_VIVALDI_COMMON
> + tristate
> + help
> + ChromeOS Vivaldi HID parsing support library. This is a hidden
> + option so that drivers can use common code to parse the HID
> + descriptors for vivaldi function row keymap.
> +
> config HID_GOOGLE_HAMMER
> tristate "Google Hammer Keyboard"
> + select HID_VIVALDI_COMMON
This chunk belongs to the next patch.
> depends on USB_HID && LEDS_CLASS && CROS_EC
> help
> Say Y here if you have a Google Hammer device.
>
> config HID_VIVALDI
> tristate "Vivaldi Keyboard"
> + select HID_VIVALDI_COMMON
> select INPUT_VIVALDIFMAP
> depends on HID
> help
> diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
> index 6d3e630e81af..469a6159ebae 100644
> --- a/drivers/hid/Makefile
> +++ b/drivers/hid/Makefile
> @@ -50,6 +50,7 @@ obj-$(CONFIG_HID_FT260) += hid-ft260.o
> obj-$(CONFIG_HID_GEMBIRD) += hid-gembird.o
> obj-$(CONFIG_HID_GFRM) += hid-gfrm.o
> obj-$(CONFIG_HID_GLORIOUS) += hid-glorious.o
> +obj-$(CONFIG_HID_VIVALDI_COMMON) += hid-vivaldi-common.o
> obj-$(CONFIG_HID_GOOGLE_HAMMER) += hid-google-hammer.o
> obj-$(CONFIG_HID_VIVALDI) += hid-vivaldi.o
> obj-$(CONFIG_HID_GT683R) += hid-gt683r.o
> diff --git a/drivers/hid/hid-vivaldi-common.c b/drivers/hid/hid-vivaldi-common.c
> new file mode 100644
> index 000000000000..8a5074fd63b7
> --- /dev/null
> +++ b/drivers/hid/hid-vivaldi-common.c
> @@ -0,0 +1,97 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Helpers for ChromeOS HID Vivaldi keyboards
> + *
> + * Copyright (C) 2022 Google, Inc
> + */
> +
> +#include <linux/export.h>
> +#include <linux/hid.h>
> +#include <linux/input/vivaldi-fmap.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/types.h>
> +
> +#define HID_VD_FN_ROW_PHYSMAP 0x00000001
> +#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
> +
> +/**
> + * vivaldi_hid_feature_mapping - Fill out vivaldi keymap data exposed via HID
> + * @data: The vivaldi function keymap
> + * @hdev: HID device to parse
> + * @field: HID field to parse
> + * @usage: HID usage to parse
> + */
> +void vivaldi_hid_feature_mapping(struct vivaldi_data *data,
> + struct hid_device *hdev,
> + struct hid_field *field,
> + struct hid_usage *usage)
> +{
> + struct hid_report *report = field->report;
> + int fn_key;
> + int ret;
> + u32 report_len;
> + u8 *report_data, *buf;
> +
> + if (field->logical != HID_USAGE_FN_ROW_PHYSMAP ||
> + (usage->hid & HID_USAGE_PAGE) != HID_UP_ORDINAL)
> + return;
> +
> + fn_key = (usage->hid & HID_USAGE);
> + if (fn_key < VIVALDI_MIN_FN_ROW_KEY || fn_key > VIVALDI_MAX_FN_ROW_KEY)
> + return;
> + if (fn_key > data->num_function_row_keys)
> + data->num_function_row_keys = fn_key;
> +
> + report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
> + if (!report_data)
> + return;
> +
> + report_len = hid_report_len(report);
> + if (!report->id) {
> + /*
> + * hid_hw_raw_request() will stuff report ID (which will be 0)
> + * into the first byte of the buffer even for unnumbered
> + * reports, so we need to account for this to avoid getting
> + * -EOVERFLOW in return.
> + * Note that hid_alloc_report_buf() adds 7 bytes to the size
> + * so we can safely say that we have space for an extra byte.
> + */
> + report_len++;
> + }
> +
> + ret = hid_hw_raw_request(hdev, report->id, report_data,
> + report_len, HID_FEATURE_REPORT,
> + HID_REQ_GET_REPORT);
> + if (ret < 0) {
> + dev_warn(&hdev->dev, "failed to fetch feature %d\n",
> + field->report->id);
> + goto out;
> + }
> +
> + if (!report->id) {
> + /*
> + * Undo the damage from hid_hw_raw_request() for unnumbered
> + * reports.
> + */
> + report_data++;
> + report_len--;
> + }
> +
> + ret = hid_report_raw_event(hdev, HID_FEATURE_REPORT, report_data,
> + report_len, 0);
> + if (ret) {
> + dev_warn(&hdev->dev, "failed to report feature %d\n",
> + field->report->id);
> + goto out;
> + }
> +
> + data->function_row_physmap[fn_key - VIVALDI_MIN_FN_ROW_KEY] =
> + field->value[usage->usage_index];
> +
> +out:
> + kfree(buf);
> +}
> +EXPORT_SYMBOL_GPL(vivaldi_hid_feature_mapping);
> +
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/hid/hid-vivaldi.c b/drivers/hid/hid-vivaldi.c
> index adb56b342948..f70cab6a192b 100644
> --- a/drivers/hid/hid-vivaldi.c
> +++ b/drivers/hid/hid-vivaldi.c
> @@ -13,9 +13,6 @@
> #include <linux/module.h>
> #include <linux/sysfs.h>
>
> -#define HID_VD_FN_ROW_PHYSMAP 0x00000001
> -#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
> -
> static ssize_t function_row_physmap_show(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> @@ -60,70 +57,8 @@ static void vivaldi_feature_mapping(struct hid_device *hdev,
> struct hid_usage *usage)
> {
> struct vivaldi_data *drvdata = hid_get_drvdata(hdev);
> - struct hid_report *report = field->report;
> - int fn_key;
> - int ret;
> - u32 report_len;
> - u8 *report_data, *buf;
> -
> - if (field->logical != HID_USAGE_FN_ROW_PHYSMAP ||
> - (usage->hid & HID_USAGE_PAGE) != HID_UP_ORDINAL)
> - return;
> -
> - fn_key = (usage->hid & HID_USAGE);
> - if (fn_key < VIVALDI_MIN_FN_ROW_KEY || fn_key > VIVALDI_MAX_FN_ROW_KEY)
> - return;
> - if (fn_key > drvdata->num_function_row_keys)
> - drvdata->num_function_row_keys = fn_key;
> -
> - report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
> - if (!report_data)
> - return;
> -
> - report_len = hid_report_len(report);
> - if (!report->id) {
> - /*
> - * hid_hw_raw_request() will stuff report ID (which will be 0)
> - * into the first byte of the buffer even for unnumbered
> - * reports, so we need to account for this to avoid getting
> - * -EOVERFLOW in return.
> - * Note that hid_alloc_report_buf() adds 7 bytes to the size
> - * so we can safely say that we have space for an extra byte.
> - */
> - report_len++;
> - }
> -
> - ret = hid_hw_raw_request(hdev, report->id, report_data,
> - report_len, HID_FEATURE_REPORT,
> - HID_REQ_GET_REPORT);
> - if (ret < 0) {
> - dev_warn(&hdev->dev, "failed to fetch feature %d\n",
> - field->report->id);
> - goto out;
> - }
> -
> - if (!report->id) {
> - /*
> - * Undo the damage from hid_hw_raw_request() for unnumbered
> - * reports.
> - */
> - report_data++;
> - report_len--;
> - }
> -
> - ret = hid_report_raw_event(hdev, HID_FEATURE_REPORT, report_data,
> - report_len, 0);
> - if (ret) {
> - dev_warn(&hdev->dev, "failed to report feature %d\n",
> - field->report->id);
> - goto out;
> - }
> -
> - drvdata->function_row_physmap[fn_key - VIVALDI_MIN_FN_ROW_KEY] =
> - field->value[usage->usage_index];
> -
> -out:
> - kfree(buf);
> +
> + vivaldi_hid_feature_mapping(drvdata, hdev, field, usage);
> }
>
> static int vivaldi_input_configured(struct hid_device *hdev,
> diff --git a/include/linux/input/vivaldi-fmap.h b/include/linux/input/vivaldi-fmap.h
> index 57563d9da022..c736200b4511 100644
> --- a/include/linux/input/vivaldi-fmap.h
> +++ b/include/linux/input/vivaldi-fmap.h
> @@ -4,6 +4,10 @@
>
> #include <linux/types.h>
>
> +struct hid_device;
> +struct hid_field;
> +struct hid_usage;
> +
This all HID-specific and does not belong here, I created a new
hid-vivaldi-common.h in drivers/hid for it.
> #define VIVALDI_MIN_FN_ROW_KEY 1
> #define VIVALDI_MAX_FN_ROW_KEY 24
>
> @@ -25,4 +29,9 @@ struct vivaldi_data {
> ssize_t vivaldi_function_row_physmap_show(const struct vivaldi_data *data,
> char *buf);
>
> +void vivaldi_hid_feature_mapping(struct vivaldi_data *data,
> + struct hid_device *hdev,
> + struct hid_field *field,
> + struct hid_usage *usage);
> +
> #endif /* _VIVALDI_KEYMAP_H */
> --
> https://chromeos.dev
>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 3/4] HID: google: Add support for vivaldi to hid-hammer
2022-02-16 19:58 [PATCH v4 0/4] Input/HID: Consolidate ChromeOS Vivaldi keyboard logic Stephen Boyd
2022-02-16 19:58 ` [PATCH v4 1/4] Input: Extract ChromeOS vivaldi physmap show function Stephen Boyd
2022-02-16 19:58 ` [PATCH v4 2/4] HID: Extract vivaldi hid feature mapping for use in hid-hammer Stephen Boyd
@ 2022-02-16 19:59 ` Stephen Boyd
2022-02-16 19:59 ` [PATCH v4 4/4] HID: google: modify HID device groups of eel Stephen Boyd
3 siblings, 0 replies; 8+ messages in thread
From: Stephen Boyd @ 2022-02-16 19:59 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, benjamin.tissoires, Jiri Kosina, linux-input,
Sean O'Brien, Douglas Anderson, Zhengqiao Xia, Jiri Kosina
Add support to the hammer driver to parse vivaldi keyboard layouts and
expose them to userspace. This allows hammer devices to use vivaldi
function row keys while also supporting the other features this driver
supports, like the CBAS (chrome base attached switch) and a keyboard
backlight.
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: "Sean O'Brien" <seobrien@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-google-hammer.c | 95 +++++++++++++++++++++++++--------
2 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ea8fa71c9e9c..4bea966e617b 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -413,6 +413,7 @@ config HID_VIVALDI_COMMON
config HID_GOOGLE_HAMMER
tristate "Google Hammer Keyboard"
select HID_VIVALDI_COMMON
+ select INPUT_VIVALDIFMAP
depends on USB_HID && LEDS_CLASS && CROS_EC
help
Say Y here if you have a Google Hammer device.
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 0403beb3104b..f8e6dccf6ed8 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -15,6 +15,7 @@
#include <linux/acpi.h>
#include <linux/hid.h>
+#include <linux/input/vivaldi-fmap.h>
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -22,6 +23,7 @@
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h>
#include <linux/pm_wakeup.h>
+#include <linux/sysfs.h>
#include <asm/unaligned.h>
#include "hid-ids.h"
@@ -300,6 +302,11 @@ struct hammer_kbd_leds {
u8 buf[2] ____cacheline_aligned;
};
+struct hammer_drvdata {
+ struct vivaldi_data vdata;
+ struct hammer_kbd_leds leds;
+};
+
static int hammer_kbd_brightness_set_blocking(struct led_classdev *cdev,
enum led_brightness br)
{
@@ -337,15 +344,11 @@ static int hammer_kbd_brightness_set_blocking(struct led_classdev *cdev,
return ret;
}
-static int hammer_register_leds(struct hid_device *hdev)
+static int hammer_register_leds(struct hammer_drvdata *hdata, struct hid_device *hdev)
{
struct hammer_kbd_leds *kbd_backlight;
- int error;
-
- kbd_backlight = kzalloc(sizeof(*kbd_backlight), GFP_KERNEL);
- if (!kbd_backlight)
- return -ENOMEM;
+ kbd_backlight = &hdata->leds;
kbd_backlight->hdev = hdev;
kbd_backlight->cdev.name = "hammer::kbd_backlight";
kbd_backlight->cdev.max_brightness = MAX_BRIGHTNESS;
@@ -356,26 +359,16 @@ static int hammer_register_leds(struct hid_device *hdev)
/* Set backlight to 0% initially. */
hammer_kbd_brightness_set_blocking(&kbd_backlight->cdev, 0);
- error = led_classdev_register(&hdev->dev, &kbd_backlight->cdev);
- if (error)
- goto err_free_mem;
-
- hid_set_drvdata(hdev, kbd_backlight);
- return 0;
-
-err_free_mem:
- kfree(kbd_backlight);
- return error;
+ return led_classdev_register(&hdev->dev, &kbd_backlight->cdev);
}
static void hammer_unregister_leds(struct hid_device *hdev)
{
- struct hammer_kbd_leds *kbd_backlight = hid_get_drvdata(hdev);
+ struct hammer_drvdata *hdata = hid_get_drvdata(hdev);
+ struct hammer_kbd_leds *kbd_backlight = &hdata->leds;
- if (kbd_backlight) {
+ if (kbd_backlight)
led_classdev_unregister(&kbd_backlight->cdev);
- kfree(kbd_backlight);
- }
}
#define HID_UP_GOOGLEVENDOR 0xffd10000
@@ -385,6 +378,58 @@ static void hammer_unregister_leds(struct hid_device *hdev)
/* HID usage for keyboard backlight (Alphanumeric display brightness) */
#define HID_AD_BRIGHTNESS 0x00140046
+static void hammer_feature_mapping(struct hid_device *hdev,
+ struct hid_field *field,
+ struct hid_usage *usage)
+{
+ struct hammer_drvdata *hdata = hid_get_drvdata(hdev);
+
+ vivaldi_hid_feature_mapping(&hdata->vdata, hdev, field, usage);
+}
+
+static ssize_t function_row_physmap_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct hid_device *hdev = to_hid_device(dev);
+ struct hammer_drvdata *hdata = hid_get_drvdata(hdev);
+ struct vivaldi_data *vdata = &hdata->vdata;
+
+ return vivaldi_function_row_physmap_show(vdata, buf);
+}
+
+static DEVICE_ATTR_RO(function_row_physmap);
+static struct attribute *hammer_sysfs_attrs[] = {
+ &dev_attr_function_row_physmap.attr,
+ NULL
+};
+
+static umode_t hammer_attr_is_visible(struct kobject *kobj,
+ struct attribute *attr, int n)
+{
+ struct device *dev = kobj_to_dev(kobj);
+ struct hid_device *hdev = to_hid_device(dev);
+ struct hammer_drvdata *hdata = hid_get_drvdata(hdev);
+ struct vivaldi_data *vdata = &hdata->vdata;
+
+ if (attr == &dev_attr_function_row_physmap.attr &&
+ !vdata->num_function_row_keys)
+ return 0;
+
+ return attr->mode;
+}
+
+static const struct attribute_group input_attribute_group = {
+ .is_visible = hammer_attr_is_visible,
+ .attrs = hammer_sysfs_attrs,
+};
+
+static int hammer_input_configured(struct hid_device *hdev,
+ struct hid_input *hidinput)
+{
+ return sysfs_create_group(&hdev->dev.kobj, &input_attribute_group);
+}
+
static int hammer_input_mapping(struct hid_device *hdev, struct hid_input *hi,
struct hid_field *field,
struct hid_usage *usage,
@@ -516,6 +561,12 @@ static int hammer_probe(struct hid_device *hdev,
const struct hid_device_id *id)
{
int error;
+ struct hammer_drvdata *hdata;
+
+ hdata = devm_kzalloc(&hdev->dev, sizeof(*hdata), GFP_KERNEL);
+ if (!hdata)
+ return -ENOMEM;
+ hid_set_drvdata(hdev, hdata);
error = hid_parse(hdev);
if (error)
@@ -541,7 +592,7 @@ static int hammer_probe(struct hid_device *hdev,
}
if (hammer_has_backlight_control(hdev)) {
- error = hammer_register_leds(hdev);
+ error = hammer_register_leds(hdata, hdev);
if (error)
hid_warn(hdev,
"Failed to register keyboard backlight: %d\n",
@@ -610,6 +661,8 @@ static struct hid_driver hammer_driver = {
.id_table = hammer_devices,
.probe = hammer_probe,
.remove = hammer_remove,
+ .feature_mapping = hammer_feature_mapping,
+ .input_configured = hammer_input_configured,
.input_mapping = hammer_input_mapping,
.event = hammer_event,
};
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v4 4/4] HID: google: modify HID device groups of eel
2022-02-16 19:58 [PATCH v4 0/4] Input/HID: Consolidate ChromeOS Vivaldi keyboard logic Stephen Boyd
` (2 preceding siblings ...)
2022-02-16 19:59 ` [PATCH v4 3/4] HID: google: Add support for vivaldi to hid-hammer Stephen Boyd
@ 2022-02-16 19:59 ` Stephen Boyd
3 siblings, 0 replies; 8+ messages in thread
From: Stephen Boyd @ 2022-02-16 19:59 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Zhengqiao Xia, linux-kernel, benjamin.tissoires, Jiri Kosina,
linux-input, Sean O'Brien, Douglas Anderson, Jiri Kosina
From: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
If HID_GROUP of eel is set to HID_GROUP_GENERIC, Whiskers Tablet Mode
Switch of eel hammer will not be detected by system because the
hid-vivaldi driver probes the device. When it is set to
HID_GROUP_VIVALDI, system will detect Whiskers Tablet Mode Switch
successfully and also support the vivaldi keyboard layout.
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: "Sean O'Brien" <seobrien@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Zhengqiao Xia <xiazhengqiao@huaqin.corp-partner.google.com>
[swboyd@chromium.org: Expand on commit text]
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
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 f8e6dccf6ed8..8c4881796a0c 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -636,7 +636,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) },
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 8+ messages in thread