* Re: [PATCH V1 1/5] dt-bindings: input: Add YAML to Awinic sar sensor.
From: wangshuaijie @ 2024-06-05 9:02 UTC (permalink / raw)
To: robh
Cc: conor+dt, devicetree, dmitry.torokhov, jeff, kangjiajun, krzk+dt,
linux-input, linux-kernel, liweilei, wangshuaijie
In-Reply-To: <20240531013607.GA3665090-robh@kernel.org>
On Thu, 30 May 2024 20:36:07 -0500, robh@kernel.org wrote:
>On Wed, May 29, 2024 at 01:06:04PM +0000, wangshuaijie@awinic.com wrote:
>> From: shuaijie wang <wangshuaijie@awinic.com>
>>
>> Add the awinic,aw_sar.yaml file to adapt to the awinic sar sensor driver.
>>
>> Signed-off-by: shuaijie wang <wangshuaijie@awinic.com>
>> ---
>> .../bindings/input/awinic,aw_sar.yaml | 110 ++++++++++++++++++
>> 1 file changed, 110 insertions(+)
>> create mode 100644
>> Documentation/devicetree/bindings/input/awinic,aw_sar.yaml
>>
>> diff --git
>> a/Documentation/devicetree/bindings/input/awinic,aw_sar.yaml
>> b/Documentation/devicetree/bindings/input/awinic,aw_sar.yaml
>> new file mode 100644
>> index 000000000000..ed4ec29c9b4d
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/input/awinic,aw_sar.yaml
>> @@ -0,0 +1,110 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/input/awinic,aw_sar.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Awinic sar sensor driver family
>> +
>> +maintainers:
>> + - Shuaijie Wang <wangshuaijie@awinic.com>
>> +
>> +properties:
>> + compatible:
>> + enum:
>> + - awinic,aw_aw96103
>> + - awinic,aw_aw96105
>> + - awinic,aw_aw96303
>> + - awinic,aw_aw96305
>> + - awinic,aw_aw96308
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + interrupts:
>> + maxItems: 1
>> +
>> + sar-num:
>
>Custom properties need vendor prefix.
The patch for version v2 will fix this issue.
>
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + set the index of the sar sensor.
>
>What is 'sar'? It's never defined.
SAR(Specific Absorption Rate), The patch for version v2 will include this explanation.
>
>How is the index determined? We generally don't do indexes in DT unless there is some correlation to the h/w.
Perhaps using "label" is more appropriate, as it represents the order of the SAR sensor.
The patch for version v2 will fix this issue.
>
>> +
>> + vcc0-supply:
>> + description:
>> + Optional regulator for chip, 1.7V-3.6V.
>> +
>> + channel_use_flag:
>
>vendor prefix needed plus use '-' rather than '_'. Here and elsewhere.
The patch for version v2 will fix this issue.
>
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + The flag of channels used.
>> + Configure according to the specific chip channel used.
>> + Bit[31:0] Each bit represents a channel.
>
>So a mask rather than a flag.
The patch for version v2 will fix this issue.
>
>Up to 32 channels possible? If not, add constraints.
>
>> + If the customer uses ch0 and ch2, then channel_use_flag=<0x05>
>> +
>> + aw_sar,update_fw:
>> + type: boolean
>> + description:
>> + Choose if you want to update the firmware.
>
>DT is mostly fixed. So someone would want to update the firmware every time?
In certain situations, if the program in the chip's ROM does not meet the needs,
it is necessary to reload new firmware into the SRAM after each power-on,
and then use the new firmware.
>
>> +
>> + aw_sar,monitor_esd:
>> + type: boolean
>> + description:
>> + Choose if you want to monitor ESD.
>> +
>> + aw_sar,pin_set_inter_pull-up:
>> + type: boolean
>> + description:
>> + Choose if you want to set the interrupt pin to internal pull-up.
>> +
>> + aw_sar,using_pm_ops:
>> + type: boolean
>> + description:
>> + Choose if you want to use suspend and resume related function.
>
>OS configuration. Doesn't belong in DT.
Perhaps this name is not quite appropriate. It mainly determines whether to
put the chip into sleep mode in the PM, and there are other operations in
the PM that are not controlled by this option.
>
>> +
>> + aw_sar,use_plug_cail:
>> + type: boolean
>> + description:
>> + Choose If you want to perform calibration when plugging and unplugging the charger.
>> +
>> + start-mode:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + When connecting to aw963xx, select the location where the firmware starts.
>> + set 0 if start in rom.
>> + set 1 if start in ram
>
>Looks like constraints.
Only the AW963XX series chips need to configure this option.
I will redescribe it in the V2 version of the patch.
>
>> +
>> + irq-mux:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + set csx as irq pin. config this field when connect to
>> + aw96308/aw96305BFOR
>
>Constraints? Can you imply this based on the compatible?
Yes, only AW96308 and AW96305BFOR need to configure this option.
I will redescribe it in the V2 version of the patch.
>
>> +
>> +required:
>> + - compatible
>> + - reg
>> + - sar-num
>> + - interrupts
>> + - channel_use_flag
>> +
>> +unevaluatedProperties: false
>> +
>> +examples:
>> + - |
>> + #include <dt-bindings/gpio/gpio.h>
>> + #include <dt-bindings/interrupt-controller/irq.h>
>> + i2c {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + awinic_sar@12 {
>> + compatible = "awinic,aw_sar";
>> + reg = <0x12>;
>> + sar-num = < 0 >;
>> + interrupt-parent = < &tlmm >;
>> + interrupts = <72 0>;
>> + //vcc0-supply = <&pm660l_l4>;
>
>Why commented?
This is a non-essential configuration,
and I will remove it in the v2 version of the patch.
>
>> + channel_use_flag = <0xff>;
>> + aw_sar,update_fw;
>> + //aw_sar,monitor_esd;
>> + start-mode = < 1 >;
>> + irq-mux = < 2 >;
>> + };
>> + };
>> --
>> 2.45.1
>>
>
--
Thanks,
Wang Shuaijie
^ permalink raw reply
* Re: [PATCH V1 5/5] Add support for Awinic sar sensor.
From: wangshuaijie @ 2024-06-05 8:42 UTC (permalink / raw)
To: dan.carpenter
Cc: conor+dt, devicetree, dmitry.torokhov, jeff, kangjiajun, krzk+dt,
linux-input, linux-kernel, liweilei, lkp, oe-kbuild-all,
oe-kbuild, robh, wangshuaijie
In-Reply-To: <9d90f11f-c476-40f2-a7b1-41b35783b27e@moroto.mountain>
Hi Rob Herring,
On Fri, 31 May 2024 11:12:51 +0300, dan.carpenter@linaro.org wrote:
>Hi,
>
>kernel test robot noticed the following build warnings:
>
>url: https://github.com/intel-lab-lkp/linux/commits/wangshuaijie-awinic-com/dt-bindings-input-Add-YAML-to-Awinic-sar-sensor/20240529-211303
>base: e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc
>patch link: https://lore.kernel.org/r/20240529130608.783624-6-wangshuaijie%40awinic.com
>patch subject: [PATCH V1 5/5] Add support for Awinic sar sensor.
>config: riscv-randconfig-r071-20240530 (https://download.01.org/0day-ci/archive/20240531/202405310138.ry5jf9hL-lkp@intel.com/config)
>compiler: riscv64-linux-gcc (GCC) 13.2.0
>
>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>
>| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
>| Closes: https://lore.kernel.org/r/202405310138.ry5jf9hL-lkp@intel.com/
>
>New smatch warnings:
>drivers/input/misc/aw_sar/aw_sar.c:221 aw_sar_load_bin_comm() warn: 'fw' from request_firmware() not released on lines: 217.
>drivers/input/misc/aw_sar/aw_sar.c:283 aw_sar_irq() error: uninitialized symbol 'irq_status'.
>drivers/input/misc/aw_sar/./aw9610x/aw9610x.c:479 aw9610x_get_chip_version() error: __builtin_memcpy() 'aw9610x->chip_name[__builtin_choose_expr((4 == 1), __builtin_strlen(aw9610x->chip_name), __fortify_strlen(aw9610x->chip_name))]' too small (1 vs 2)
>drivers/input/misc/aw_sar/./aw963xx/aw963xx.c:227 aw963xx_sram_data_write() error: uninitialized symbol 'ret'.
>drivers/input/misc/aw_sar/./aw963xx/aw963xx.c:522 aw963xx_get_cap_offset() warn: inconsistent indenting
>
>Old smatch warnings:
>drivers/input/misc/aw_sar/./aw963xx/aw963xx.c:557 aw963xx_get_cap_offset() warn: inconsistent indenting
>
The patch for version v2 will fix these issues.
>vim +/fw +221 drivers/input/misc/aw_sar/aw_sar.c
>
>e5df082e247559 shuaijie wang 2024-05-29 203 static int32_t aw_sar_load_bin_comm(struct aw_sar *p_sar)
>e5df082e247559 shuaijie wang 2024-05-29 204 {
>e5df082e247559 shuaijie wang 2024-05-29 205 const struct firmware *fw;
>e5df082e247559 shuaijie wang 2024-05-29 206 int32_t ret;
>e5df082e247559 shuaijie wang 2024-05-29 207
>e5df082e247559 shuaijie wang 2024-05-29 208 ret = request_firmware(&fw, p_sar->load_bin.bin_name, p_sar->dev);
>e5df082e247559 shuaijie wang 2024-05-29 209 if (ret != 0) {
>e5df082e247559 shuaijie wang 2024-05-29 210 dev_err(p_sar->dev, "parse %s error!", p_sar->load_bin.bin_name);
>e5df082e247559 shuaijie wang 2024-05-29 211 return ret;
>e5df082e247559 shuaijie wang 2024-05-29 212 }
>e5df082e247559 shuaijie wang 2024-05-29 213
>e5df082e247559 shuaijie wang 2024-05-29 214 ret = aw_sar_parse_bin(fw, p_sar);
>e5df082e247559 shuaijie wang 2024-05-29 215 if (ret != 0) {
>e5df082e247559 shuaijie wang 2024-05-29 216 dev_err(p_sar->dev, "reg_bin %s load error!", p_sar->load_bin.bin_name);
>
>release_firmware(fw);
>
The patch for version v2 will fix this issue.
>e5df082e247559 shuaijie wang 2024-05-29 217 return ret;
>e5df082e247559 shuaijie wang 2024-05-29 218 }
>e5df082e247559 shuaijie wang 2024-05-29 219 release_firmware(fw);
>e5df082e247559 shuaijie wang 2024-05-29 220
>e5df082e247559 shuaijie wang 2024-05-29 @221 return 0;
>e5df082e247559 shuaijie wang 2024-05-29 222 }
>e5df082e247559 shuaijie wang 2024-05-29 223
>e5df082e247559 shuaijie wang 2024-05-29 224 static int32_t aw_sar_parse_dts_comm(struct device *dev, struct device_node *np,
>e5df082e247559 shuaijie wang 2024-05-29 225 struct aw_sar_dts_info *p_dts_info)
>e5df082e247559 shuaijie wang 2024-05-29 226 {
>e5df082e247559 shuaijie wang 2024-05-29 227 int32_t val;
>e5df082e247559 shuaijie wang 2024-05-29 228
>e5df082e247559 shuaijie wang 2024-05-29 229 val = of_property_read_u32(np, "sar-num", &p_dts_info->sar_num);
>e5df082e247559 shuaijie wang 2024-05-29 230 dev_info(dev, "sar num = %d", p_dts_info->sar_num);
>e5df082e247559 shuaijie wang 2024-05-29 231 if (val != 0) {
>e5df082e247559 shuaijie wang 2024-05-29 232 dev_err(dev, "multiple sar failed!");
>e5df082e247559 shuaijie wang 2024-05-29 233 return -EINVAL;
>e5df082e247559 shuaijie wang 2024-05-29 234 }
>e5df082e247559 shuaijie wang 2024-05-29 235
>e5df082e247559 shuaijie wang 2024-05-29 236 p_dts_info->irq_gpio = of_get_named_gpio(np, "irq-gpio", 0);
>e5df082e247559 shuaijie wang 2024-05-29 237 if (p_dts_info->irq_gpio < 0) {
>e5df082e247559 shuaijie wang 2024-05-29 238 p_dts_info->irq_gpio = -1;
>e5df082e247559 shuaijie wang 2024-05-29 239 dev_err(dev, "no irq gpio provided.");
>e5df082e247559 shuaijie wang 2024-05-29 240 return -EINVAL;
>e5df082e247559 shuaijie wang 2024-05-29 241 }
>e5df082e247559 shuaijie wang 2024-05-29 242
>e5df082e247559 shuaijie wang 2024-05-29 243 val = of_property_read_u32(np, "channel_use_flag", &p_dts_info->channel_use_flag);
>e5df082e247559 shuaijie wang 2024-05-29 244 if (val != 0) {
>e5df082e247559 shuaijie wang 2024-05-29 245 dev_err(dev, "channel_use_flag failed!");
>e5df082e247559 shuaijie wang 2024-05-29 246 return -EINVAL;
>e5df082e247559 shuaijie wang 2024-05-29 247 }
>e5df082e247559 shuaijie wang 2024-05-29 248
>e5df082e247559 shuaijie wang 2024-05-29 249 //GPIO is set as internal pull-up input
>e5df082e247559 shuaijie wang 2024-05-29 250 p_dts_info->use_inter_pull_up = of_property_read_bool(np, "aw_sar,pin_set_inter_pull-up");
>e5df082e247559 shuaijie wang 2024-05-29 251 p_dts_info->use_pm = of_property_read_bool(np, "aw_sar,using_pm_ops");
>e5df082e247559 shuaijie wang 2024-05-29 252 p_dts_info->update_fw_flag = of_property_read_bool(np, "aw_sar,update_fw");
>e5df082e247559 shuaijie wang 2024-05-29 253 p_dts_info->use_plug_cail_flag = of_property_read_bool(np, "aw_sar,use_plug_cail");
>e5df082e247559 shuaijie wang 2024-05-29 254 p_dts_info->monitor_esd_flag = of_property_read_bool(np, "aw_sar,monitor_esd");
>e5df082e247559 shuaijie wang 2024-05-29 255
>e5df082e247559 shuaijie wang 2024-05-29 256 return 0;
>e5df082e247559 shuaijie wang 2024-05-29 257 }
>e5df082e247559 shuaijie wang 2024-05-29 258
>e5df082e247559 shuaijie wang 2024-05-29 259 static int32_t aw_sar_parse_dts(struct aw_sar *p_sar)
>e5df082e247559 shuaijie wang 2024-05-29 260 {
>e5df082e247559 shuaijie wang 2024-05-29 261 int32_t ret;
>e5df082e247559 shuaijie wang 2024-05-29 262
>e5df082e247559 shuaijie wang 2024-05-29 263 ret = aw_sar_parse_dts_comm(p_sar->dev, p_sar->i2c->dev.of_node, &p_sar->dts_info);
>e5df082e247559 shuaijie wang 2024-05-29 264
>e5df082e247559 shuaijie wang 2024-05-29 265 //Special requirements of SAR chip
>e5df082e247559 shuaijie wang 2024-05-29 266 if (p_sar->p_sar_para->p_platform_config->p_add_parse_dts_fn != NULL)
>e5df082e247559 shuaijie wang 2024-05-29 267 ret |= p_sar->p_sar_para->p_platform_config->p_add_parse_dts_fn(p_sar);
>e5df082e247559 shuaijie wang 2024-05-29 268
>e5df082e247559 shuaijie wang 2024-05-29 269 return ret;
>e5df082e247559 shuaijie wang 2024-05-29 270 }
>e5df082e247559 shuaijie wang 2024-05-29 271
>e5df082e247559 shuaijie wang 2024-05-29 272 static irqreturn_t aw_sar_irq(int32_t irq, void *data)
>e5df082e247559 shuaijie wang 2024-05-29 273 {
>e5df082e247559 shuaijie wang 2024-05-29 274 struct aw_sar *p_sar = (struct aw_sar *)data;
>e5df082e247559 shuaijie wang 2024-05-29 275 uint32_t irq_status;
>e5df082e247559 shuaijie wang 2024-05-29 276
>e5df082e247559 shuaijie wang 2024-05-29 277 //step1: read clear interrupt
>e5df082e247559 shuaijie wang 2024-05-29 278 if (p_sar->p_sar_para->p_platform_config->p_irq_init->rc_irq_fn != NULL)
>e5df082e247559 shuaijie wang 2024-05-29 279 irq_status = p_sar->p_sar_para->p_platform_config->p_irq_init->rc_irq_fn(p_sar->i2c);
>e5df082e247559 shuaijie wang 2024-05-29 280
>e5df082e247559 shuaijie wang 2024-05-29 281 //step2: Read the status register for status reporting
>e5df082e247559 shuaijie wang 2024-05-29 282 if (p_sar->p_sar_para->p_platform_config->p_irq_init->irq_spec_handler_fn != NULL)
>e5df082e247559 shuaijie wang 2024-05-29 @283 p_sar->p_sar_para->p_platform_config->p_irq_init->irq_spec_handler_fn(irq_status,
>e5df082e247559 shuaijie wang 2024-05-29 284 p_sar);
>
>Probably if ->irq_spec_handler_fn is non-NULL then ->rc_irq_fn is also
>non-NULL, but the static checker doesn't know that so it warns about
>uninitialized variables.
>
The patch for version v2 will fix this issue.
>e5df082e247559 shuaijie wang 2024-05-29 285
>e5df082e247559 shuaijie wang 2024-05-29 286 //step3: The chip
>e5df082e247559 shuaijie wang 2024-05-29 287
>e5df082e247559 shuaijie wang 2024-05-29 288 if ((!p_sar->dts_info.monitor_esd_flag) && (p_sar->fault_flag == AW_SAR_UNHEALTHY)) {
>e5df082e247559 shuaijie wang 2024-05-29 289 p_sar->fault_flag = AW_SAR_HEALTHY;
>e5df082e247559 shuaijie wang 2024-05-29 290 disable_irq_nosync(p_sar->irq_init.to_irq);
>e5df082e247559 shuaijie wang 2024-05-29 291 p_sar->irq_init.host_irq_stat = IRQ_DISABLE;
>e5df082e247559 shuaijie wang 2024-05-29 292 //aw_sar_soft_reset(p_sar);
>e5df082e247559 shuaijie wang 2024-05-29 293 schedule_delayed_work(&p_sar->update_work, msecs_to_jiffies(500));
>e5df082e247559 shuaijie wang 2024-05-29 294 }
>e5df082e247559 shuaijie wang 2024-05-29 295
>e5df082e247559 shuaijie wang 2024-05-29 296 return IRQ_HANDLED;
>e5df082e247559 shuaijie wang 2024-05-29 297 }
>
>--
>0-DAY CI Kernel Test Service
--
Thanks,
Wang Shuaijie
^ permalink raw reply
* Re: [PATCH v2] HID: hid-goodix: Add Goodix HID-over-SPI driver
From: Charles Wang @ 2024-06-05 8:16 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: jikos, bentiss, hbarnor, dianders, linux-input, linux-kernel
In-Reply-To: <Zl9eUVpojZI2Z3ur@google.com>
On Tue, Jun 04, 2024 at 11:34:57AM -0700, Dmitry Torokhov wrote:
> On Tue, Jun 04, 2024 at 07:23:59PM +0800, Charles Wang wrote:
> > Hi Dmitry,
> >
> > On Mon, Jun 03, 2024 at 05:50:23PM -0700, Dmitry Torokhov wrote:
> > > Hi Charles,
> > >
> ...
> > > > +};
> > > > +
> > > > +static int goodix_spi_read(struct goodix_ts_data *ts, u32 addr,
> > > > + u8 *data, unsigned int len)
> > > > +{
> > > > + struct spi_device *spi = to_spi_device(&ts->spi->dev);
> > > > + struct spi_transfer xfers;
> > > > + struct spi_message spi_msg;
> > > > + u8 *buf;
> > > > + int error;
> > > > +
> > > > + buf = kzalloc(GOODIX_SPI_READ_PREFIX_LEN + len, GFP_KERNEL);
> > > > + if (!buf)
> > > > + return -ENOMEM;
> > >
> > > Can you try using ts->xfer_buf without making allocations and copies?
> > > Maybe have goodix_spi_read() have data as u8 **data, and do
> > >
> > > *data = buf + GOODIX_SPI_READ_PREFIX_LEN;
> > > return 0;
> > >
> > > at the end. I.e. callers do not supply buffer but rather are given one.
> > > Of course you need to make sure there are no concurrent calls to
> > > goodix_spi_read(), but I do not think you have them anyways.
> > >
> >
> > Unfortunately, there are concurrent calls to goodix_spi_read(). The functions
> > goodix_hid_get_raw_report() and goodix_hid_irq() may execute concurrently.
> >
> > Anyways, I will try to optimize this part and reduce the malloc operations
> > where possible.
>
> I think you will need to serialize this anyway, as (AFAICS) you write to
> report address, and then perform the read. There is nothing in the upper
> layers that says that several report requests can not be sent at once,
> and I think the device may also raise interrupt at the same time.
> Without serializing/locking you may mix up the data.
>
Thank you for pointing out this issue. You are correct that
serialization is required to ensure the integrity of report requests.
>
> > > > +
> > > > +/* Empty callbacks with success return code */
> > >
> > > Hmm, I see you are using falling edge interrupt. Don't you have concern
> > > of having it "stuck" here? I do not think all these should be stubs...
> > >
> > Thank you for pointing this out. The trigger method shouldn't be fixed
> > within the driver. As for "stuck", I believe this issue does not exit.
> > The firmware won't wait for the host's response.
>
> It is not the touch controller that will get stuck. The host interrupt
> controller will not repeat signalling the interrupt that is configured
> as edge and it was asserted earlier.
>
> Or are you saying that the touch controller will de-assert and re-assert
> the interrupt line if it is not serviced within given time?
>
Yes, to ensure that critical events are not missed by the host, such as the
touch up event, the firmware is designed to re-assert the interrupt line if
it is not serviced within a given time.
Charles
Thanks
^ permalink raw reply
* Re: [syzbot] [usb?] [input?] INFO: task hung in __input_unregister_device (5)
From: syzbot @ 2024-06-04 23:26 UTC (permalink / raw)
To: Henk.Vergonet, dmitry.torokhov, linux-input, linux-kernel,
linux-trace-kernel, linux-usb, linux1394-devel, mathieu.desnoyers,
mhiramat, o-takashi, ricardo, rostedt, rydberg, syzkaller-bugs,
usbb2k-api-dev
In-Reply-To: <0000000000003d63410605a18363@google.com>
syzbot has bisected this issue to:
commit 6b0b708f12d18f9cccfb1c418bea59fcbff8798c
Author: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Wed May 1 07:32:38 2024 +0000
firewire: core: add tracepoint event for handling bus reset
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=14969a16980000
start commit: e0cce98fe279 Merge tag 'tpmdd-next-6.10-rc2' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=12969a16980000
kernel config: https://syzkaller.appspot.com/x/.config?x=238430243a58f702
dashboard link: https://syzkaller.appspot.com/bug?extid=78e2288f58b881ed3c45
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1318e162980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=122e8eaa980000
Reported-by: syzbot+78e2288f58b881ed3c45@syzkaller.appspotmail.com
Fixes: 6b0b708f12d1 ("firewire: core: add tracepoint event for handling bus reset")
For information about bisection process see: https://goo.gl/tpsmEJ#bisection
^ permalink raw reply
* [PATCH v4 2/2] input: Add support for "Do Not Disturb"
From: Aseda Aboagye @ 2024-06-04 23:16 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Benjamin Tissoires, Dmitry Torokhov, linux-input
HUTRR94 added support for a new usage titled "System Do Not Disturb"
which toggles a system-wide Do Not Disturb setting. This commit simply
adds a new event code for the usage.
Signed-off-by: Aseda Aboagye <aaboagye@chromium.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes from v3:
- Fixed patch sending workflow to not muck with whitespace.
Changes from v2:
- Added underscores to make `KEY_DO_NOT_DISTURB`.
Changes from v1:
- Modified formatting to match existing code, ignoring checkpatch.pl.
drivers/hid/hid-debug.c | 1 +
drivers/hid/hid-input.c | 8 ++++++++
include/uapi/linux/input-event-codes.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 7749c81b6227..4ccfbd860bbe 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -975,6 +975,7 @@ static const char *keys[KEY_MAX + 1] = {
[KEY_CAMERA_ACCESS_DISABLE] = "CameraAccessDisable",
[KEY_CAMERA_ACCESS_TOGGLE] = "CameraAccessToggle",
[KEY_ACCESSIBILITY] = "Accessibility",
+ [KEY_DO_NOT_DISTURB] = "DoNotDisturb",
[KEY_DICTATE] = "Dictate",
[KEY_MICMUTE] = "MicrophoneMute",
[KEY_BRIGHTNESS_MIN] = "BrightnessMin",
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 1ecc5ad57b56..31feb5e0714f 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -826,6 +826,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
break;
}
+ if ((usage->hid & 0xf0) == 0x90) { /* SystemControl*/
+ switch (usage->hid & 0xf) {
+ case 0xb: map_key_clear(KEY_DO_NOT_DISTURB); break;
+ default: goto ignore;
+ }
+ break;
+ }
+
if ((usage->hid & 0xf0) == 0xa0) { /* SystemControl */
switch (usage->hid & 0xf) {
case 0x9: map_key_clear(KEY_MICMUTE); break;
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 7ff6eeef1af0..07038fd9682d 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -618,6 +618,7 @@
#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */
#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */
#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */
+#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
--
2.45.1.288.g0e0cd299f1-goog
^ permalink raw reply related
* [PATCH v4 1/2] input: Add event code for accessibility key
From: Aseda Aboagye @ 2024-06-04 23:10 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Benjamin Tissoires, Dmitry Torokhov, linux-input
HUTRR116 added support for a new usage titled "System Accessibility
Binding" which toggles a system-wide bound accessibility UI or command.
This commit simply adds a new event code for the usage.
Signed-off-by: Aseda Aboagye <aaboagye@chromium.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes from v3:
- Fixed patch sending workflow to not muck with whitespace.
Changes from v2:
- None
Changes from v1:
- Modified formatting to match existing code, ignoring checkpatch.pl.
drivers/hid/hid-debug.c | 1 +
drivers/hid/hid-input.c | 1 +
include/uapi/linux/input-event-codes.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index e7ef1ea107c9..7749c81b6227 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -974,6 +974,7 @@ static const char *keys[KEY_MAX + 1] = {
[KEY_CAMERA_ACCESS_ENABLE] = "CameraAccessEnable",
[KEY_CAMERA_ACCESS_DISABLE] = "CameraAccessDisable",
[KEY_CAMERA_ACCESS_TOGGLE] = "CameraAccessToggle",
+ [KEY_ACCESSIBILITY] = "Accessibility",
[KEY_DICTATE] = "Dictate",
[KEY_MICMUTE] = "MicrophoneMute",
[KEY_BRIGHTNESS_MIN] = "BrightnessMin",
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 851ee86eff32..1ecc5ad57b56 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -829,6 +829,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
if ((usage->hid & 0xf0) == 0xa0) { /* SystemControl */
switch (usage->hid & 0xf) {
case 0x9: map_key_clear(KEY_MICMUTE); break;
+ case 0xa: map_key_clear(KEY_ACCESSIBILITY); break;
default: goto ignore;
}
break;
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 022a520e31fc..7ff6eeef1af0 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -617,6 +617,7 @@
#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */
#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */
#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */
+#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
base-commit: 5128de84d8fc849400d00f7a6982711f129699ea
--
2.45.1.288.g0e0cd299f1-goog
^ permalink raw reply related
* [PATCH 3/3] ARM: dts: cros-ec-keyboard: Add keyboard matrix v3.0
From: Daisuke Nojiri @ 2024-06-04 23:09 UTC (permalink / raw)
Cc: Daisuke Nojiri, Dmitry Torokhov, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Benson Leung, Guenter Roeck, linux-input,
devicetree, chrome-platform, linux-kernel
In-Reply-To: <20240604005354.2294468-1-dnojiri@chromium.org>
Add support for keyboard matrix version 3.0.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I18957556bcd01c74ded84571638de2583dccb93f
---
include/dt-bindings/input/cros-ec-keyboard.h | 104 +++++++++++++++++++
1 file changed, 104 insertions(+)
diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h
index f0ae03634a96..afc12f6aa642 100644
--- a/include/dt-bindings/input/cros-ec-keyboard.h
+++ b/include/dt-bindings/input/cros-ec-keyboard.h
@@ -100,4 +100,108 @@
MATRIX_KEY(0x07, 0x0b, KEY_UP) \
MATRIX_KEY(0x07, 0x0c, KEY_LEFT)
+/* No numpad */
+#define CROS_TOP_ROW_KEYMAP_V30 \
+ MATRIX_KEY(0x00, 0x01, KEY_F11) /* T11 */ \
+ MATRIX_KEY(0x00, 0x02, KEY_F1) /* T1 */ \
+ MATRIX_KEY(0x00, 0x04, KEY_F10) /* T10 */ \
+ MATRIX_KEY(0x00, 0x0b, KEY_F14) /* T14 */ \
+ MATRIX_KEY(0x00, 0x0c, KEY_F15) /* T15 */ \
+ MATRIX_KEY(0x01, 0x02, KEY_F4) /* T4 */ \
+ MATRIX_KEY(0x01, 0x04, KEY_F7) /* T7 */ \
+ MATRIX_KEY(0x01, 0x05, KEY_F12) /* T12 */ \
+ MATRIX_KEY(0x01, 0x09, KEY_F9) /* T9 */ \
+ MATRIX_KEY(0x02, 0x02, KEY_F3) /* T3 */ \
+ MATRIX_KEY(0x02, 0x04, KEY_F6) /* T6 */ \
+ MATRIX_KEY(0x02, 0x0b, KEY_F8) /* T8 */ \
+ MATRIX_KEY(0x03, 0x02, KEY_F2) /* T2 */ \
+ MATRIX_KEY(0x03, 0x05, KEY_F13) /* T13 */ \
+ MATRIX_KEY(0x04, 0x04, KEY_F5) /* T5 */
+
+#define CROS_MAIN_KEYMAP_V30 /* Keycode */ \
+ MATRIX_KEY(0x00, 0x03, KEY_B) /* 50 */ \
+ MATRIX_KEY(0x00, 0x05, KEY_N) /* 51 */ \
+ MATRIX_KEY(0x00, 0x06, KEY_RO) /* 56 (JIS) */ \
+ MATRIX_KEY(0x00, 0x08, KEY_EQUAL) /* 13 */ \
+ MATRIX_KEY(0x00, 0x09, KEY_HOME) /* 80 (Numpad) */ \
+ MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) /* 62 */ \
+ MATRIX_KEY(0x00, 0x10, KEY_FN) /* 127 */ \
+ \
+ MATRIX_KEY(0x01, 0x01, KEY_ESC) /* 110 */ \
+ MATRIX_KEY(0x01, 0x03, KEY_G) /* 35 */ \
+ MATRIX_KEY(0x01, 0x06, KEY_H) /* 36 */ \
+ MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) /* 41 */ \
+ MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) /* 15 */ \
+ MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) /* 65 (JIS) */ \
+ MATRIX_KEY(0x01, 0x0e, KEY_LEFTCTRL) /* 58 */ \
+ \
+ MATRIX_KEY(0x02, 0x01, KEY_TAB) /* 16 */ \
+ MATRIX_KEY(0x02, 0x03, KEY_T) /* 21 */ \
+ MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) /* 28 */ \
+ MATRIX_KEY(0x02, 0x06, KEY_Y) /* 22 */ \
+ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) /* 27 */ \
+ MATRIX_KEY(0x02, 0x09, KEY_DELETE) /* 76 (Numpad) */ \
+ MATRIX_KEY(0x02, 0x0c, KEY_PAGEUP) /* 85 (Numpad) */ \
+ MATRIX_KEY(0x02, 0x011, KEY_YEN) /* 14 (JIS) */ \
+ \
+ MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA) /* Launcher */ \
+ MATRIX_KEY(0x03, 0x01, KEY_GRAVE) /* 1 */ \
+ MATRIX_KEY(0x03, 0x03, KEY_5) /* 6 */ \
+ MATRIX_KEY(0x03, 0x04, KEY_S) /* 32 */ \
+ MATRIX_KEY(0x03, 0x06, KEY_MINUS) /* 12 */ \
+ MATRIX_KEY(0x03, 0x08, KEY_6) /* 7 */ \
+ MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* Lock */ \
+ MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) /* 29 */ \
+ MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) /* 63 (JIS) */ \
+ MATRIX_KEY(0x03, 0x0e, KEY_RIGHTCTRL) /* 64 */ \
+ \
+ MATRIX_KEY(0x04, 0x01, KEY_A) /* 31 */ \
+ MATRIX_KEY(0x04, 0x02, KEY_D) /* 33 */ \
+ MATRIX_KEY(0x04, 0x03, KEY_F) /* 34 */ \
+ MATRIX_KEY(0x04, 0x05, KEY_K) /* 38 */ \
+ MATRIX_KEY(0x04, 0x06, KEY_J) /* 37 */ \
+ MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) /* 40 */ \
+ MATRIX_KEY(0x04, 0x09, KEY_L) /* 39 */ \
+ MATRIX_KEY(0x04, 0x0b, KEY_ENTER) /* 43 */ \
+ MATRIX_KEY(0x04, 0x0c, KEY_END) /* 81 (Numpad) */ \
+ \
+ MATRIX_KEY(0x05, 0x01, KEY_1) /* 2 */ \
+ MATRIX_KEY(0x05, 0x02, KEY_COMMA) /* 53 */ \
+ MATRIX_KEY(0x05, 0x03, KEY_DOT) /* 54 */ \
+ MATRIX_KEY(0x05, 0x04, KEY_SLASH) /* 55 */ \
+ MATRIX_KEY(0x05, 0x05, KEY_C) /* 48 */ \
+ MATRIX_KEY(0x05, 0x06, KEY_SPACE) /* 61 */ \
+ MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) /* 44 */ \
+ MATRIX_KEY(0x05, 0x08, KEY_X) /* 47 */ \
+ MATRIX_KEY(0x05, 0x09, KEY_V) /* 49 */ \
+ MATRIX_KEY(0x05, 0x0b, KEY_M) /* 52 */ \
+ MATRIX_KEY(0x05, 0x0c, KEY_PAGEDOWN) /* 86 (Numpad) */ \
+ \
+ MATRIX_KEY(0x06, 0x01, KEY_Z) /* 46 */ \
+ MATRIX_KEY(0x06, 0x02, KEY_3) /* 4 */ \
+ MATRIX_KEY(0x06, 0x03, KEY_4) /* 5 */ \
+ MATRIX_KEY(0x06, 0x04, KEY_2) /* 3 */ \
+ MATRIX_KEY(0x06, 0x05, KEY_8) /* 9 */ \
+ MATRIX_KEY(0x06, 0x06, KEY_0) /* 11 */ \
+ MATRIX_KEY(0x06, 0x08, KEY_7) /* 8 */ \
+ MATRIX_KEY(0x06, 0x09, KEY_9) /* 10 */ \
+ MATRIX_KEY(0x06, 0x0b, KEY_DOWN) /* 84 */ \
+ MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) /* 89 */ \
+ MATRIX_KEY(0x06, 0x0d, KEY_LEFTALT) /* 60 */ \
+ MATRIX_KEY(0x06, 0x0f, KEY_ASSISTANT) /* 128 */ \
+ MATRIX_KEY(0x06, 0x11, KEY_BACKSLASH) /* 42 (JIS, ISO) */ \
+ \
+ MATRIX_KEY(0x07, 0x01, KEY_U) /* 23 */ \
+ MATRIX_KEY(0x07, 0x02, KEY_I) /* 24 */ \
+ MATRIX_KEY(0x07, 0x03, KEY_O) /* 25 */ \
+ MATRIX_KEY(0x07, 0x04, KEY_P) /* 26 */ \
+ MATRIX_KEY(0x07, 0x05, KEY_Q) /* 17 */ \
+ MATRIX_KEY(0x07, 0x06, KEY_W) /* 18 */ \
+ MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) /* 57 */ \
+ MATRIX_KEY(0x07, 0x08, KEY_E) /* 19 */ \
+ MATRIX_KEY(0x07, 0x09, KEY_R) /* 20 */ \
+ MATRIX_KEY(0x07, 0x0b, KEY_UP) /* 83 */ \
+ MATRIX_KEY(0x07, 0x0c, KEY_LEFT) /* 79 */ \
+ MATRIX_KEY(0x07, 0x11, KEY_102ND) /* 45 (ISO) */
+
#endif /* _CROS_EC_KEYBOARD_H */
--
2.45.1.288.g0e0cd299f1-goog
^ permalink raw reply related
* [PATCH] HID: add missing MODULE_DESCRIPTION() macros
From: Jeff Johnson @ 2024-06-04 22:10 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors, Jeff Johnson
make allmodconfig && make W=1 C=1 reports:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-a4tech.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-apple.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-aureal.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-belkin.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-betopff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-bigbenff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-cherry.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-chicony.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-cypress.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-dr.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-emsff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-elecom.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-elo.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-evision.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-ezkey.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-vivaldi-common.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-google-hammer.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-google-stadiaff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-gyration.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-holtek-kbd.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-holtek-mouse.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-ite.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-kensington.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-keytouch.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-kye.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-lcpower.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-lenovo.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-logitech.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-magicmouse.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-maltron.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-mf.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-megaworld.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-microsoft.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-monterey.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-ntrig.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-ortek.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-prodikeys.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-pl.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-petalynx.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-primax.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-razer.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-redragon.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-retrode.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-saitek.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-samsung.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-semitek.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-sjoy.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-sony.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-speedlink.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-steam.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-steelseries.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-sunplus.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-gaff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-tmff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-tivo.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-topseed.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-twinhan.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-uclogic.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-xinmo.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-zpff.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-zydacron.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-viewsonic.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-waltop.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-winwing.o
Add the missing invocations of the MODULE_DESCRIPTION() macro.
Note: All HID drivers that had explicit entries in the MAINTAINERS
file were fixed individually. This patch fixes all remaining HID
drivers that fall under the generic "HID CORE LAYER" entry in the
MAINTAINERS file. Almost all descriptions were taken from the header
comment in each file.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
Let me know if there are any individual files you wish to be
segregated into separate patches.
---
drivers/hid/hid-a4tech.c | 1 +
drivers/hid/hid-apple.c | 1 +
drivers/hid/hid-aureal.c | 1 +
drivers/hid/hid-belkin.c | 1 +
drivers/hid/hid-betopff.c | 1 +
drivers/hid/hid-bigbenff.c | 1 +
drivers/hid/hid-cherry.c | 1 +
drivers/hid/hid-chicony.c | 1 +
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-cypress.c | 1 +
drivers/hid/hid-dr.c | 1 +
drivers/hid/hid-elecom.c | 1 +
drivers/hid/hid-elo.c | 1 +
drivers/hid/hid-emsff.c | 1 +
drivers/hid/hid-evision.c | 1 +
drivers/hid/hid-ezkey.c | 1 +
drivers/hid/hid-gaff.c | 1 +
drivers/hid/hid-google-hammer.c | 1 +
drivers/hid/hid-google-stadiaff.c | 1 +
drivers/hid/hid-gyration.c | 1 +
drivers/hid/hid-holtek-kbd.c | 1 +
drivers/hid/hid-lg.c | 1 +
drivers/hid/hid-magicmouse.c | 1 +
drivers/hid/hid-maltron.c | 1 +
drivers/hid/hid-megaworld.c | 1 +
drivers/hid/hid-mf.c | 1 +
drivers/hid/hid-microsoft.c | 1 +
drivers/hid/hid-monterey.c | 1 +
drivers/hid/hid-ntrig.c | 1 +
drivers/hid/hid-ortek.c | 1 +
drivers/hid/hid-petalynx.c | 1 +
drivers/hid/hid-pl.c | 1 +
drivers/hid/hid-primax.c | 1 +
drivers/hid/hid-prodikeys.c | 1 +
drivers/hid/hid-razer.c | 1 +
drivers/hid/hid-redragon.c | 1 +
drivers/hid/hid-retrode.c | 1 +
drivers/hid/hid-saitek.c | 1 +
drivers/hid/hid-samsung.c | 1 +
drivers/hid/hid-semitek.c | 1 +
drivers/hid/hid-sjoy.c | 1 +
drivers/hid/hid-sony.c | 1 +
drivers/hid/hid-speedlink.c | 1 +
drivers/hid/hid-steam.c | 1 +
drivers/hid/hid-steelseries.c | 1 +
drivers/hid/hid-sunplus.c | 1 +
drivers/hid/hid-tivo.c | 1 +
drivers/hid/hid-tmff.c | 1 +
drivers/hid/hid-topseed.c | 1 +
drivers/hid/hid-twinhan.c | 1 +
drivers/hid/hid-uclogic-core.c | 1 +
drivers/hid/hid-viewsonic.c | 1 +
drivers/hid/hid-vivaldi-common.c | 1 +
drivers/hid/hid-waltop.c | 1 +
drivers/hid/hid-xinmo.c | 1 +
drivers/hid/hid-zpff.c | 1 +
drivers/hid/hid-zydacron.c | 1 +
57 files changed, 57 insertions(+)
diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c
index 2cbc32dda7f7..54bfaf61182b 100644
--- a/drivers/hid/hid-a4tech.c
+++ b/drivers/hid/hid-a4tech.c
@@ -163,4 +163,5 @@ static struct hid_driver a4_driver = {
};
module_hid_driver(a4_driver);
+MODULE_DESCRIPTION("HID driver for some a4tech \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index bd022e004356..37280f558157 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -1091,4 +1091,5 @@ static struct hid_driver apple_driver = {
};
module_hid_driver(apple_driver);
+MODULE_DESCRIPTION("Apple USB HID quirks support for Linux");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-aureal.c b/drivers/hid/hid-aureal.c
index ac8946f80e22..cf1a562d8523 100644
--- a/drivers/hid/hid-aureal.c
+++ b/drivers/hid/hid-aureal.c
@@ -41,4 +41,5 @@ static struct hid_driver aureal_driver = {
};
module_hid_driver(aureal_driver);
+MODULE_DESCRIPTION("HID driver for Aureal Cy se W-01RN USB_V3.1 devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-belkin.c b/drivers/hid/hid-belkin.c
index fc0b3bb383cc..75aaed35ee9f 100644
--- a/drivers/hid/hid-belkin.c
+++ b/drivers/hid/hid-belkin.c
@@ -85,4 +85,5 @@ static struct hid_driver belkin_driver = {
};
module_hid_driver(belkin_driver);
+MODULE_DESCRIPTION("HID driver for some belkin \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-betopff.c b/drivers/hid/hid-betopff.c
index 25ed7b9a917e..a6d5f030d023 100644
--- a/drivers/hid/hid-betopff.c
+++ b/drivers/hid/hid-betopff.c
@@ -162,4 +162,5 @@ static struct hid_driver betop_driver = {
};
module_hid_driver(betop_driver);
+MODULE_DESCRIPTION("Force feedback support for Betop based devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-bigbenff.c b/drivers/hid/hid-bigbenff.c
index a02cb517b4c4..be17af3d9c0c 100644
--- a/drivers/hid/hid-bigbenff.c
+++ b/drivers/hid/hid-bigbenff.c
@@ -490,4 +490,5 @@ static struct hid_driver bigben_driver = {
};
module_hid_driver(bigben_driver);
+MODULE_DESCRIPTION("LED & force feedback support for BigBen Interactive");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c
index 6a71187b5cf6..549c73b05b8d 100644
--- a/drivers/hid/hid-cherry.c
+++ b/drivers/hid/hid-cherry.c
@@ -68,4 +68,5 @@ static struct hid_driver ch_driver = {
};
module_hid_driver(ch_driver);
+MODULE_DESCRIPTION("HID driver for some cherry \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
index f04d2aa23efe..99954c6b3242 100644
--- a/drivers/hid/hid-chicony.c
+++ b/drivers/hid/hid-chicony.c
@@ -152,4 +152,5 @@ static struct hid_driver ch_driver = {
};
module_hid_driver(ch_driver);
+MODULE_DESCRIPTION("HID driver for some chicony \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b1fa0378e8f4..3ef169a6c903 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -3025,4 +3025,5 @@ module_exit(hid_exit);
MODULE_AUTHOR("Andreas Gal");
MODULE_AUTHOR("Vojtech Pavlik");
MODULE_AUTHOR("Jiri Kosina");
+MODULE_DESCRIPTION("HID support for Linux");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
index b88f889b3932..b952b235e70a 100644
--- a/drivers/hid/hid-cypress.c
+++ b/drivers/hid/hid-cypress.c
@@ -176,4 +176,5 @@ static struct hid_driver cp_driver = {
};
module_hid_driver(cp_driver);
+MODULE_DESCRIPTION("HID driver for some cypress \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c
index 947f19f8685f..c88224a96e9e 100644
--- a/drivers/hid/hid-dr.c
+++ b/drivers/hid/hid-dr.c
@@ -316,4 +316,5 @@ static struct hid_driver dr_driver = {
};
module_hid_driver(dr_driver);
+MODULE_DESCRIPTION("Force feedback support for DragonRise Inc. game controllers");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c
index 4fa45ee77503..5973a3bab29f 100644
--- a/drivers/hid/hid-elecom.c
+++ b/drivers/hid/hid-elecom.c
@@ -136,4 +136,5 @@ static struct hid_driver elecom_driver = {
};
module_hid_driver(elecom_driver);
+MODULE_DESCRIPTION("HID driver for ELECOM devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index 2876cb6a7dca..cf17bdd14d9c 100644
--- a/drivers/hid/hid-elo.c
+++ b/drivers/hid/hid-elo.c
@@ -313,4 +313,5 @@ static void __exit elo_driver_exit(void)
module_exit(elo_driver_exit);
MODULE_AUTHOR("Jiri Slaby <jslaby@suse.cz>");
+MODULE_DESCRIPTION("HID driver for ELO usb touchscreen 4000/4500");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c
index c34f2e5a049f..60bfb6a924d7 100644
--- a/drivers/hid/hid-emsff.c
+++ b/drivers/hid/hid-emsff.c
@@ -144,5 +144,6 @@ static struct hid_driver ems_driver = {
};
module_hid_driver(ems_driver);
+MODULE_DESCRIPTION("Force feedback support for EMS Trio Linker Plus II");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-evision.c b/drivers/hid/hid-evision.c
index ef6b4b435215..bb5997078491 100644
--- a/drivers/hid/hid-evision.c
+++ b/drivers/hid/hid-evision.c
@@ -50,4 +50,5 @@ static struct hid_driver evision_driver = {
};
module_hid_driver(evision_driver);
+MODULE_DESCRIPTION("HID driver for EVision devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-ezkey.c b/drivers/hid/hid-ezkey.c
index d14f91d78c96..0e28bc0b87fa 100644
--- a/drivers/hid/hid-ezkey.c
+++ b/drivers/hid/hid-ezkey.c
@@ -75,4 +75,5 @@ static struct hid_driver ez_driver = {
};
module_hid_driver(ez_driver);
+MODULE_DESCRIPTION("HID driver for some ezkey \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c
index ecbd3995a4eb..c6db8b6cc8ee 100644
--- a/drivers/hid/hid-gaff.c
+++ b/drivers/hid/hid-gaff.c
@@ -169,4 +169,5 @@ static struct hid_driver ga_driver = {
};
module_hid_driver(ga_driver);
+MODULE_DESCRIPTION("Force feedback support for GreenAsia (Product ID 0x12) based devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 25331695ae32..6e4ebc349e45 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -641,4 +641,5 @@ static void __exit hammer_exit(void)
}
module_exit(hammer_exit);
+MODULE_DESCRIPTION("HID driver for Google Hammer device.");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-google-stadiaff.c b/drivers/hid/hid-google-stadiaff.c
index 3731575562ab..6b38d2421d3d 100644
--- a/drivers/hid/hid-google-stadiaff.c
+++ b/drivers/hid/hid-google-stadiaff.c
@@ -155,4 +155,5 @@ static struct hid_driver stadia_driver = {
};
module_hid_driver(stadia_driver);
+MODULE_DESCRIPTION("Google Stadia controller rumble support.");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c
index b99a611479b3..6606b57abe83 100644
--- a/drivers/hid/hid-gyration.c
+++ b/drivers/hid/hid-gyration.c
@@ -87,4 +87,5 @@ static struct hid_driver gyration_driver = {
};
module_hid_driver(gyration_driver);
+MODULE_DESCRIPTION("HID driver for some gyration \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-holtek-kbd.c b/drivers/hid/hid-holtek-kbd.c
index b346d68a06f5..1f014ac54e14 100644
--- a/drivers/hid/hid-holtek-kbd.c
+++ b/drivers/hid/hid-holtek-kbd.c
@@ -180,4 +180,5 @@ static struct hid_driver holtek_kbd_driver = {
};
module_hid_driver(holtek_kbd_driver);
+MODULE_DESCRIPTION("HID driver for Holtek keyboard");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index fb3f7258009c..cfe2f4f6e93f 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -942,4 +942,5 @@ module_param_named(lg4ff_no_autoswitch, lg4ff_no_autoswitch, int, S_IRUGO);
MODULE_PARM_DESC(lg4ff_no_autoswitch, "Do not switch multimode wheels to their native mode automatically");
#endif
+MODULE_DESCRIPTION("HID driver for some logitech \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index a46ff4e8b99f..2eb285b97fc0 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -968,4 +968,5 @@ static struct hid_driver magicmouse_driver = {
};
module_hid_driver(magicmouse_driver);
+MODULE_DESCRIPTION("Apple \"Magic\" Wireless Mouse driver");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-maltron.c b/drivers/hid/hid-maltron.c
index dcd6db6a646e..caba0def938c 100644
--- a/drivers/hid/hid-maltron.c
+++ b/drivers/hid/hid-maltron.c
@@ -162,4 +162,5 @@ static struct hid_driver maltron_driver = {
};
module_hid_driver(maltron_driver);
+MODULE_DESCRIPTION("HID driver for Maltron L90");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-megaworld.c b/drivers/hid/hid-megaworld.c
index 599657863cb9..0476d7d16e7f 100644
--- a/drivers/hid/hid-megaworld.c
+++ b/drivers/hid/hid-megaworld.c
@@ -122,4 +122,5 @@ static struct hid_driver mwctrl_driver = {
};
module_hid_driver(mwctrl_driver);
+MODULE_DESCRIPTION("Vibration support for Mega World controllers");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-mf.c b/drivers/hid/hid-mf.c
index 92d7ecd41a78..49a4052a1496 100644
--- a/drivers/hid/hid-mf.c
+++ b/drivers/hid/hid-mf.c
@@ -166,4 +166,5 @@ static struct hid_driver mf_driver = {
};
module_hid_driver(mf_driver);
+MODULE_DESCRIPTION("Force feedback support for Mayflash game controller adapters.");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
index 9345e2bfd56e..4cf0fcddb379 100644
--- a/drivers/hid/hid-microsoft.c
+++ b/drivers/hid/hid-microsoft.c
@@ -475,4 +475,5 @@ static struct hid_driver ms_driver = {
};
module_hid_driver(ms_driver);
+MODULE_DESCRIPTION("HID driver for some microsoft \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-monterey.c b/drivers/hid/hid-monterey.c
index c63f9f1e61b8..989681f73d77 100644
--- a/drivers/hid/hid-monterey.c
+++ b/drivers/hid/hid-monterey.c
@@ -62,4 +62,5 @@ static struct hid_driver mr_driver = {
};
module_hid_driver(mr_driver);
+MODULE_DESCRIPTION("HID driver for some monterey \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index b5d26f03fe6b..2738ce947434 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -1029,4 +1029,5 @@ static struct hid_driver ntrig_driver = {
};
module_hid_driver(ntrig_driver);
+MODULE_DESCRIPTION("HID driver for N-Trig touchscreens");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c
index 9a4770d79c64..99e3b06a8331 100644
--- a/drivers/hid/hid-ortek.c
+++ b/drivers/hid/hid-ortek.c
@@ -51,4 +51,5 @@ static struct hid_driver ortek_driver = {
};
module_hid_driver(ortek_driver);
+MODULE_DESCRIPTION("HID driver for Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-petalynx.c b/drivers/hid/hid-petalynx.c
index ea0af9f7ad90..5e47634bb07d 100644
--- a/drivers/hid/hid-petalynx.c
+++ b/drivers/hid/hid-petalynx.c
@@ -102,4 +102,5 @@ static struct hid_driver pl_driver = {
};
module_hid_driver(pl_driver);
+MODULE_DESCRIPTION("HID driver for some petalynx \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 93fb07ec3180..3c8827081dea 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -219,4 +219,5 @@ static struct hid_driver pl_driver = {
};
module_hid_driver(pl_driver);
+MODULE_DESCRIPTION("Force feedback support for PantherLord/GreenAsia based devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-primax.c b/drivers/hid/hid-primax.c
index 1e6413d07cae..e44d79dff8de 100644
--- a/drivers/hid/hid-primax.c
+++ b/drivers/hid/hid-primax.c
@@ -70,4 +70,5 @@ static struct hid_driver px_driver = {
module_hid_driver(px_driver);
MODULE_AUTHOR("Terry Lambert <tlambert@google.com>");
+MODULE_DESCRIPTION("HID driver for primax and similar keyboards with in-band modifiers");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index a593ed62c969..757361593e52 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -862,4 +862,5 @@ static struct hid_driver pk_driver = {
};
module_hid_driver(pk_driver);
+MODULE_DESCRIPTION("HID driver for the Prodikeys PC-MIDI Keyboard");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-razer.c b/drivers/hid/hid-razer.c
index 740df148b0ef..7f48258c61f7 100644
--- a/drivers/hid/hid-razer.c
+++ b/drivers/hid/hid-razer.c
@@ -122,4 +122,5 @@ static struct hid_driver razer_driver = {
module_hid_driver(razer_driver);
MODULE_AUTHOR("Jelle van der Waa <jvanderwaa@redhat.com>");
+MODULE_DESCRIPTION("HID driver for gaming keys on Razer Blackwidow gaming keyboards");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-redragon.c b/drivers/hid/hid-redragon.c
index 73c9d4c4fa34..07d803513f27 100644
--- a/drivers/hid/hid-redragon.c
+++ b/drivers/hid/hid-redragon.c
@@ -59,4 +59,5 @@ static struct hid_driver redragon_driver = {
module_hid_driver(redragon_driver);
+MODULE_DESCRIPTION("HID driver for Redragon keyboards");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-retrode.c b/drivers/hid/hid-retrode.c
index 6a08e25aa296..7997627fdccc 100644
--- a/drivers/hid/hid-retrode.c
+++ b/drivers/hid/hid-retrode.c
@@ -94,4 +94,5 @@ static struct hid_driver retrode_driver = {
module_hid_driver(retrode_driver);
+MODULE_DESCRIPTION("HID driver for Retrode 2 controller adapter and plug-in extensions");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-saitek.c b/drivers/hid/hid-saitek.c
index b84e975977c4..85ac8def368f 100644
--- a/drivers/hid/hid-saitek.c
+++ b/drivers/hid/hid-saitek.c
@@ -204,4 +204,5 @@ static struct hid_driver saitek_driver = {
};
module_hid_driver(saitek_driver);
+MODULE_DESCRIPTION("HID driver for Saitek devices.");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c
index 08fb25b8459a..d4e27142245c 100644
--- a/drivers/hid/hid-samsung.c
+++ b/drivers/hid/hid-samsung.c
@@ -561,4 +561,5 @@ static struct hid_driver samsung_driver = {
};
module_hid_driver(samsung_driver);
+MODULE_DESCRIPTION("HID driver for some samsung \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-semitek.c b/drivers/hid/hid-semitek.c
index ba6607d5e051..710766f6839d 100644
--- a/drivers/hid/hid-semitek.c
+++ b/drivers/hid/hid-semitek.c
@@ -37,4 +37,5 @@ static struct hid_driver semitek_driver = {
};
module_hid_driver(semitek_driver);
+MODULE_DESCRIPTION("HID driver for Semitek keyboards");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 49971be7c3ff..d3a777f52a3f 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -168,6 +168,7 @@ static struct hid_driver sjoy_driver = {
};
module_hid_driver(sjoy_driver);
+MODULE_DESCRIPTION("Force feedback support for SmartJoy PLUS PS2->USB adapter");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jussi Kivilinna");
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 5a07a91a89ae..eac75f98f08a 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2308,4 +2308,5 @@ static void __exit sony_exit(void)
module_init(sony_init);
module_exit(sony_exit);
+MODULE_DESCRIPTION("HID driver for Sony / PS2 / PS3 / PS4 BD devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-speedlink.c b/drivers/hid/hid-speedlink.c
index 9e75f1aae0ca..22ee078c42c6 100644
--- a/drivers/hid/hid-speedlink.c
+++ b/drivers/hid/hid-speedlink.c
@@ -75,4 +75,5 @@ static struct hid_driver speedlink_driver = {
};
module_hid_driver(speedlink_driver);
+MODULE_DESCRIPTION("HID driver for Speedlink Vicious and Divine Cezanne (USB mouse)");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
index f166188c21ec..bfba204fc45e 100644
--- a/drivers/hid/hid-steam.c
+++ b/drivers/hid/hid-steam.c
@@ -45,6 +45,7 @@
#include <linux/power_supply.h>
#include "hid-ids.h"
+MODULE_DESCRIPTION("HID driver for Valve Steam Controller");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>");
diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c
index b3edadf42d6d..2154e14f55f1 100644
--- a/drivers/hid/hid-steelseries.c
+++ b/drivers/hid/hid-steelseries.c
@@ -662,6 +662,7 @@ static struct hid_driver steelseries_driver = {
};
module_hid_driver(steelseries_driver);
+MODULE_DESCRIPTION("HID driver for Steelseries devices");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Bastien Nocera <hadess@hadess.net>");
MODULE_AUTHOR("Simon Wood <simon@mungewell.org>");
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c
index aa2855c2ed4e..f32e60d4420f 100644
--- a/drivers/hid/hid-sunplus.c
+++ b/drivers/hid/hid-sunplus.c
@@ -62,4 +62,5 @@ static struct hid_driver sp_driver = {
};
module_hid_driver(sp_driver);
+MODULE_DESCRIPTION("HID driver for some sunplus \"special\" devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-tivo.c b/drivers/hid/hid-tivo.c
index 68eb08b63945..827bf67abeb9 100644
--- a/drivers/hid/hid-tivo.c
+++ b/drivers/hid/hid-tivo.c
@@ -73,5 +73,6 @@ static struct hid_driver tivo_driver = {
};
module_hid_driver(tivo_driver);
+MODULE_DESCRIPTION("HID driver for TiVo Slide Bluetooth remote");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index 4040cd98dafe..fcd859aa3a8c 100644
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -265,4 +265,5 @@ static struct hid_driver tm_driver = {
};
module_hid_driver(tm_driver);
+MODULE_DESCRIPTION("Force feedback support for various HID compliant devices by ThrustMaster");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c
index 2125327b8de1..645e36cd83a6 100644
--- a/drivers/hid/hid-topseed.c
+++ b/drivers/hid/hid-topseed.c
@@ -78,4 +78,5 @@ static struct hid_driver ts_driver = {
};
module_hid_driver(ts_driver);
+MODULE_DESCRIPTION("HID driver for TopSeed Cyberlink remote");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c
index 14af794146c0..0ef5194085b2 100644
--- a/drivers/hid/hid-twinhan.c
+++ b/drivers/hid/hid-twinhan.c
@@ -131,4 +131,5 @@ static struct hid_driver twinhan_driver = {
};
module_hid_driver(twinhan_driver);
+MODULE_DESCRIPTION("HID driver for TwinHan IR remote control");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index ad74cbc9a0aa..02520824ce77 100644
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -567,6 +567,7 @@ module_hid_driver(uclogic_driver);
MODULE_AUTHOR("Martin Rusko");
MODULE_AUTHOR("Nikolai Kondrashov");
+MODULE_DESCRIPTION("HID driver for UC-Logic devices not fully compliant with HID standard");
MODULE_LICENSE("GPL");
#ifdef CONFIG_HID_KUNIT_TEST
diff --git a/drivers/hid/hid-viewsonic.c b/drivers/hid/hid-viewsonic.c
index 8024b1d370e2..668c2adb77b6 100644
--- a/drivers/hid/hid-viewsonic.c
+++ b/drivers/hid/hid-viewsonic.c
@@ -102,4 +102,5 @@ static struct hid_driver viewsonic_driver = {
};
module_hid_driver(viewsonic_driver);
+MODULE_DESCRIPTION("HID driver for ViewSonic devices not fully compliant with HID standard");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-vivaldi-common.c b/drivers/hid/hid-vivaldi-common.c
index b0af2be94895..bf734055d4b6 100644
--- a/drivers/hid/hid-vivaldi-common.c
+++ b/drivers/hid/hid-vivaldi-common.c
@@ -138,4 +138,5 @@ const struct attribute_group *vivaldi_attribute_groups[] = {
};
EXPORT_SYMBOL_GPL(vivaldi_attribute_groups);
+MODULE_DESCRIPTION("Helpers for ChromeOS HID Vivaldi keyboards");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-waltop.c b/drivers/hid/hid-waltop.c
index bc355b1a5b30..1e590c61eef5 100644
--- a/drivers/hid/hid-waltop.c
+++ b/drivers/hid/hid-waltop.c
@@ -742,4 +742,5 @@ static struct hid_driver waltop_driver = {
};
module_hid_driver(waltop_driver);
+MODULE_DESCRIPTION("HID driver for Waltop devices not fully compliant with HID standard");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-xinmo.c b/drivers/hid/hid-xinmo.c
index 5c2860a9d8c9..66b8bfb6e647 100644
--- a/drivers/hid/hid-xinmo.c
+++ b/drivers/hid/hid-xinmo.c
@@ -56,4 +56,5 @@ static struct hid_driver xinmo_driver = {
};
module_hid_driver(xinmo_driver);
+MODULE_DESCRIPTION("HID driver for Xin-Mo devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index 3abaca045869..aacf7f137b18 100644
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -138,4 +138,5 @@ static struct hid_driver zp_driver = {
};
module_hid_driver(zp_driver);
+MODULE_DESCRIPTION("Force feedback support for Zeroplus based devices");
MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-zydacron.c b/drivers/hid/hid-zydacron.c
index 0d003caee113..998a3db19c1f 100644
--- a/drivers/hid/hid-zydacron.c
+++ b/drivers/hid/hid-zydacron.c
@@ -205,4 +205,5 @@ static struct hid_driver zc_driver = {
};
module_hid_driver(zc_driver);
+MODULE_DESCRIPTION("HID driver for zydacron remote control");
MODULE_LICENSE("GPL");
---
base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
change-id: 20240604-md-hid-misc-5178ef6ebaea
^ permalink raw reply related
* Re: [PATCH 3/3] ARM: dts: cros-ec-keyboard: Add keyboard matrix v3.0
From: Dmitry Torokhov @ 2024-06-04 19:09 UTC (permalink / raw)
To: Daisuke Nojiri
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Benson Leung,
Guenter Roeck, Tzung-Bi Shih, devicetree, chrome-platform,
linux-kernel, linux-input
In-Reply-To: <20240604170935.2518856-1-dnojiri@chromium.org>
Hi Daisuke,
On Tue, Jun 04, 2024 at 10:09:33AM -0700, Daisuke Nojiri wrote:
> Add support for keyboard matrix version 3.0. To enable it, define
> CONFIG_CROS_KBD_V30.
I might be wrong but it looks to me if one enables support for v3 keymap
then the kernel will not work for devices using other/older versions of
keymap. It might be acceptable for Chrome OS kernels but will nto work
for upstream.
I think you need to create arch/arm/boot/dts/cros-ec-keyboard-v3.dtsi
that would define "keyboard_controller" node with proper keymap and
include this new dtsi into std files for devices/boards that need it.
Thanks.
--
Dmitry
^ permalink raw reply
* Re: [PATCH v2] HID: hid-goodix: Add Goodix HID-over-SPI driver
From: Dmitry Torokhov @ 2024-06-04 18:34 UTC (permalink / raw)
To: Charles Wang; +Cc: jikos, bentiss, hbarnor, dianders, linux-input, linux-kernel
In-Reply-To: <Zl75T3ioNqsofyQd@ux-UP-WHL01>
On Tue, Jun 04, 2024 at 07:23:59PM +0800, Charles Wang wrote:
> Hi Dmitry,
>
> On Mon, Jun 03, 2024 at 05:50:23PM -0700, Dmitry Torokhov wrote:
> > Hi Charles,
> >
...
> > > +};
> > > +
> > > +static int goodix_spi_read(struct goodix_ts_data *ts, u32 addr,
> > > + u8 *data, unsigned int len)
> > > +{
> > > + struct spi_device *spi = to_spi_device(&ts->spi->dev);
> > > + struct spi_transfer xfers;
> > > + struct spi_message spi_msg;
> > > + u8 *buf;
> > > + int error;
> > > +
> > > + buf = kzalloc(GOODIX_SPI_READ_PREFIX_LEN + len, GFP_KERNEL);
> > > + if (!buf)
> > > + return -ENOMEM;
> >
> > Can you try using ts->xfer_buf without making allocations and copies?
> > Maybe have goodix_spi_read() have data as u8 **data, and do
> >
> > *data = buf + GOODIX_SPI_READ_PREFIX_LEN;
> > return 0;
> >
> > at the end. I.e. callers do not supply buffer but rather are given one.
> > Of course you need to make sure there are no concurrent calls to
> > goodix_spi_read(), but I do not think you have them anyways.
> >
>
> Unfortunately, there are concurrent calls to goodix_spi_read(). The functions
> goodix_hid_get_raw_report() and goodix_hid_irq() may execute concurrently.
>
> Anyways, I will try to optimize this part and reduce the malloc operations
> where possible.
I think you will need to serialize this anyway, as (AFAICS) you write to
report address, and then perform the read. There is nothing in the upper
layers that says that several report requests can not be sent at once,
and I think the device may also raise interrupt at the same time.
Without serializing/locking you may mix up the data.
...
> > > +
> > > +/* Empty callbacks with success return code */
> >
> > Hmm, I see you are using falling edge interrupt. Don't you have concern
> > of having it "stuck" here? I do not think all these should be stubs...
> >
> Thank you for pointing this out. The trigger method shouldn't be fixed
> within the driver. As for "stuck", I believe this issue does not exit.
> The firmware won't wait for the host's response.
It is not the touch controller that will get stuck. The host interrupt
controller will not repeat signalling the interrupt that is configured
as edge and it was asserted earlier.
Or are you saying that the touch controller will de-assert and re-assert
the interrupt line if it is not serviced within given time?
Thanks.
--
Dmitry
^ permalink raw reply
* Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in usbhid_parse()
From: Alan Stern @ 2024-06-04 17:45 UTC (permalink / raw)
To: Kees Cook
Cc: Nikita Zhandarovich, Jiri Kosina, Benjamin Tissoires, linux-usb,
linux-input, syzkaller-bugs, linux-kernel,
syzbot+c52569baf0c843f35495, linux-hardening
In-Reply-To: <202406041019.BCD0A93C@keescook>
On Tue, Jun 04, 2024 at 10:21:15AM -0700, Kees Cook wrote:
> On Tue, Jun 04, 2024 at 10:09:43AM -0700, Nikita Zhandarovich wrote:
> > Hi,
> >
> > On 6/4/24 07:15, Jiri Kosina wrote:
> > > On Tue, 4 Jun 2024, Kees Cook wrote:
> > >
> > >> This isn't the right solution. The problem is that hid_class_descriptor
> > >> is a flexible array but was sized as a single element fake flexible
> > >> array:
> > >>
> > >> struct hid_descriptor {
> > >> __u8 bLength;
> > >> __u8 bDescriptorType;
> > >> __le16 bcdHID;
> > >> __u8 bCountryCode;
> > >> __u8 bNumDescriptors;
> > >>
> > >> struct hid_class_descriptor desc[1];
> > >> } __attribute__ ((packed));
> > >>
> > >> This likely needs to be:
> > >>
> > >> struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
> > >>
> > >> And then check for any sizeof() uses of the struct that might have changed.
> > >
> > > Ah, you are of course right, not sure what I was thinking. Thanks a lot
> > > for catching my brainfart.
> > >
> > > I am dropping the patch for now; Nikita, will you please send a refreshed
> > > one?
> > >
> >
> > Thanks for catching my mistake.
> >
> > I'll gladly send a revised version, hoping to do it very soon.
>
> I spent a little more time looking at this, and I'm not sure I
> understand where the actual space for the descriptors comes from?
> There's interface->extra that is being parsed, and effectively
> hid_descriptor is being mapped into it, but it uses "sizeof(struct
> hid_descriptor)" for the limit.
That's a lower limit, not an upper limit. The hid_descriptor must
include at least one hid_class_descriptor, but it can include more.
That's what the min_t() calculation of num_descriptors is meant to
figure out.
> Is more than 1 descriptor expected to
> work correctly?
More than one hid_class_descriptor -- yes.
> Or is the limit being ignored? I'm a bit confused by
> this code...
Does this explain it?
Alan Stern
^ permalink raw reply
* Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in usbhid_parse()
From: Kees Cook @ 2024-06-04 17:21 UTC (permalink / raw)
To: Nikita Zhandarovich
Cc: Jiri Kosina, Benjamin Tissoires, linux-usb, linux-input,
syzkaller-bugs, linux-kernel, syzbot+c52569baf0c843f35495,
linux-hardening
In-Reply-To: <2a38e355-af5c-4b3d-81be-0cc97376c1f5@fintech.ru>
On Tue, Jun 04, 2024 at 10:09:43AM -0700, Nikita Zhandarovich wrote:
> Hi,
>
> On 6/4/24 07:15, Jiri Kosina wrote:
> > On Tue, 4 Jun 2024, Kees Cook wrote:
> >
> >> This isn't the right solution. The problem is that hid_class_descriptor
> >> is a flexible array but was sized as a single element fake flexible
> >> array:
> >>
> >> struct hid_descriptor {
> >> __u8 bLength;
> >> __u8 bDescriptorType;
> >> __le16 bcdHID;
> >> __u8 bCountryCode;
> >> __u8 bNumDescriptors;
> >>
> >> struct hid_class_descriptor desc[1];
> >> } __attribute__ ((packed));
> >>
> >> This likely needs to be:
> >>
> >> struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
> >>
> >> And then check for any sizeof() uses of the struct that might have changed.
> >
> > Ah, you are of course right, not sure what I was thinking. Thanks a lot
> > for catching my brainfart.
> >
> > I am dropping the patch for now; Nikita, will you please send a refreshed
> > one?
> >
>
> Thanks for catching my mistake.
>
> I'll gladly send a revised version, hoping to do it very soon.
I spent a little more time looking at this, and I'm not sure I
understand where the actual space for the descriptors comes from?
There's interface->extra that is being parsed, and effectively
hid_descriptor is being mapped into it, but it uses "sizeof(struct
hid_descriptor)" for the limit. Is more than 1 descriptor expected to
work correctly? Or is the limit being ignored? I'm a bit confused by
this code...
--
Kees Cook
^ permalink raw reply
* Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in usbhid_parse()
From: Nikita Zhandarovich @ 2024-06-04 17:09 UTC (permalink / raw)
To: Jiri Kosina, Kees Cook
Cc: Benjamin Tissoires, Kees Cook, linux-usb, linux-input,
syzkaller-bugs, linux-kernel, syzbot+c52569baf0c843f35495,
linux-hardening
In-Reply-To: <nycvar.YFH.7.76.2406041614210.24940@cbobk.fhfr.pm>
Hi,
On 6/4/24 07:15, Jiri Kosina wrote:
> On Tue, 4 Jun 2024, Kees Cook wrote:
>
>> This isn't the right solution. The problem is that hid_class_descriptor
>> is a flexible array but was sized as a single element fake flexible
>> array:
>>
>> struct hid_descriptor {
>> __u8 bLength;
>> __u8 bDescriptorType;
>> __le16 bcdHID;
>> __u8 bCountryCode;
>> __u8 bNumDescriptors;
>>
>> struct hid_class_descriptor desc[1];
>> } __attribute__ ((packed));
>>
>> This likely needs to be:
>>
>> struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
>>
>> And then check for any sizeof() uses of the struct that might have changed.
>
> Ah, you are of course right, not sure what I was thinking. Thanks a lot
> for catching my brainfart.
>
> I am dropping the patch for now; Nikita, will you please send a refreshed
> one?
>
Thanks for catching my mistake.
I'll gladly send a revised version, hoping to do it very soon.
Regards,
Nikita
^ permalink raw reply
* [PATCH 3/3] ARM: dts: cros-ec-keyboard: Add keyboard matrix v3.0
From: Daisuke Nojiri @ 2024-06-04 17:09 UTC (permalink / raw)
Cc: Daisuke Nojiri, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Benson Leung, Guenter Roeck, Tzung-Bi Shih, Dmitry Torokhov,
devicetree, chrome-platform, linux-kernel, linux-input
In-Reply-To: <20240604005354.2294468-1-dnojiri@chromium.org>
Add support for keyboard matrix version 3.0. To enable it, define
CONFIG_CROS_KBD_V30.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
---
arch/arm/boot/dts/cros-ec-keyboard.dtsi | 16 ++-
drivers/platform/chrome/Kconfig | 6 ++
include/dt-bindings/input/cros-ec-keyboard.h | 104 +++++++++++++++++++
3 files changed, 123 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/cros-ec-keyboard.dtsi b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
index 55c4744fa7e7..0499e254596a 100644
--- a/arch/arm/boot/dts/cros-ec-keyboard.dtsi
+++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
@@ -8,16 +8,26 @@
#include <dt-bindings/input/input.h>
#include <dt-bindings/input/cros-ec-keyboard.h>
+#ifdef CONFIG_CROS_KBD_V30
+#define CROS_EC_KEYBOARD_COLUMN_SIZE 18
+#define CROS_TOP_ROW_KEYMAP CROS_TOP_ROW_KEYMAP_V30
+#define CROS_MAIN_KEYMAP CROS_MAIN_KEYMAP_V30
+#else
+#define CROS_EC_KEYBOARD_COLUMN_SIZE 13
+#define CROS_TOP_ROW_KEYMAP CROS_STD_TOP_ROW_KEYMAP
+#define CROS_MAIN_KEYMAP CROS_STD_MAIN_KEYMAP
+#endif
+
&cros_ec {
keyboard_controller: keyboard-controller {
compatible = "google,cros-ec-keyb";
keypad,num-rows = <8>;
- keypad,num-columns = <13>;
+ keypad,num-columns = <CROS_EC_KEYBOARD_COLUMN_SIZE>;
google,needs-ghost-filter;
linux,keymap = <
- CROS_STD_TOP_ROW_KEYMAP
- CROS_STD_MAIN_KEYMAP
+ CROS_TOP_ROW_KEYMAP
+ CROS_MAIN_KEYMAP
>;
};
};
diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index d48f7f43f9e5..8f66beaa48ec 100644
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -157,6 +157,12 @@ config CROS_KBD_LED_BACKLIGHT
To compile this driver as a module, choose M here: the
module will be called cros_kbd_led_backlight.
+config CROS_KBD_V30
+ bool "ChromeOS built-in keyboard version 3.0"
+ default n
+ help
+ If you say Y here, you get support for built-in keyboard ver 3.0.
+
config CROS_EC_CHARDEV
tristate "ChromeOS EC miscdevice"
depends on MFD_CROS_EC_DEV
diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h
index f0ae03634a96..afc12f6aa642 100644
--- a/include/dt-bindings/input/cros-ec-keyboard.h
+++ b/include/dt-bindings/input/cros-ec-keyboard.h
@@ -100,4 +100,108 @@
MATRIX_KEY(0x07, 0x0b, KEY_UP) \
MATRIX_KEY(0x07, 0x0c, KEY_LEFT)
+/* No numpad */
+#define CROS_TOP_ROW_KEYMAP_V30 \
+ MATRIX_KEY(0x00, 0x01, KEY_F11) /* T11 */ \
+ MATRIX_KEY(0x00, 0x02, KEY_F1) /* T1 */ \
+ MATRIX_KEY(0x00, 0x04, KEY_F10) /* T10 */ \
+ MATRIX_KEY(0x00, 0x0b, KEY_F14) /* T14 */ \
+ MATRIX_KEY(0x00, 0x0c, KEY_F15) /* T15 */ \
+ MATRIX_KEY(0x01, 0x02, KEY_F4) /* T4 */ \
+ MATRIX_KEY(0x01, 0x04, KEY_F7) /* T7 */ \
+ MATRIX_KEY(0x01, 0x05, KEY_F12) /* T12 */ \
+ MATRIX_KEY(0x01, 0x09, KEY_F9) /* T9 */ \
+ MATRIX_KEY(0x02, 0x02, KEY_F3) /* T3 */ \
+ MATRIX_KEY(0x02, 0x04, KEY_F6) /* T6 */ \
+ MATRIX_KEY(0x02, 0x0b, KEY_F8) /* T8 */ \
+ MATRIX_KEY(0x03, 0x02, KEY_F2) /* T2 */ \
+ MATRIX_KEY(0x03, 0x05, KEY_F13) /* T13 */ \
+ MATRIX_KEY(0x04, 0x04, KEY_F5) /* T5 */
+
+#define CROS_MAIN_KEYMAP_V30 /* Keycode */ \
+ MATRIX_KEY(0x00, 0x03, KEY_B) /* 50 */ \
+ MATRIX_KEY(0x00, 0x05, KEY_N) /* 51 */ \
+ MATRIX_KEY(0x00, 0x06, KEY_RO) /* 56 (JIS) */ \
+ MATRIX_KEY(0x00, 0x08, KEY_EQUAL) /* 13 */ \
+ MATRIX_KEY(0x00, 0x09, KEY_HOME) /* 80 (Numpad) */ \
+ MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) /* 62 */ \
+ MATRIX_KEY(0x00, 0x10, KEY_FN) /* 127 */ \
+ \
+ MATRIX_KEY(0x01, 0x01, KEY_ESC) /* 110 */ \
+ MATRIX_KEY(0x01, 0x03, KEY_G) /* 35 */ \
+ MATRIX_KEY(0x01, 0x06, KEY_H) /* 36 */ \
+ MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) /* 41 */ \
+ MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) /* 15 */ \
+ MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) /* 65 (JIS) */ \
+ MATRIX_KEY(0x01, 0x0e, KEY_LEFTCTRL) /* 58 */ \
+ \
+ MATRIX_KEY(0x02, 0x01, KEY_TAB) /* 16 */ \
+ MATRIX_KEY(0x02, 0x03, KEY_T) /* 21 */ \
+ MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) /* 28 */ \
+ MATRIX_KEY(0x02, 0x06, KEY_Y) /* 22 */ \
+ MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) /* 27 */ \
+ MATRIX_KEY(0x02, 0x09, KEY_DELETE) /* 76 (Numpad) */ \
+ MATRIX_KEY(0x02, 0x0c, KEY_PAGEUP) /* 85 (Numpad) */ \
+ MATRIX_KEY(0x02, 0x011, KEY_YEN) /* 14 (JIS) */ \
+ \
+ MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA) /* Launcher */ \
+ MATRIX_KEY(0x03, 0x01, KEY_GRAVE) /* 1 */ \
+ MATRIX_KEY(0x03, 0x03, KEY_5) /* 6 */ \
+ MATRIX_KEY(0x03, 0x04, KEY_S) /* 32 */ \
+ MATRIX_KEY(0x03, 0x06, KEY_MINUS) /* 12 */ \
+ MATRIX_KEY(0x03, 0x08, KEY_6) /* 7 */ \
+ MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* Lock */ \
+ MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) /* 29 */ \
+ MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) /* 63 (JIS) */ \
+ MATRIX_KEY(0x03, 0x0e, KEY_RIGHTCTRL) /* 64 */ \
+ \
+ MATRIX_KEY(0x04, 0x01, KEY_A) /* 31 */ \
+ MATRIX_KEY(0x04, 0x02, KEY_D) /* 33 */ \
+ MATRIX_KEY(0x04, 0x03, KEY_F) /* 34 */ \
+ MATRIX_KEY(0x04, 0x05, KEY_K) /* 38 */ \
+ MATRIX_KEY(0x04, 0x06, KEY_J) /* 37 */ \
+ MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) /* 40 */ \
+ MATRIX_KEY(0x04, 0x09, KEY_L) /* 39 */ \
+ MATRIX_KEY(0x04, 0x0b, KEY_ENTER) /* 43 */ \
+ MATRIX_KEY(0x04, 0x0c, KEY_END) /* 81 (Numpad) */ \
+ \
+ MATRIX_KEY(0x05, 0x01, KEY_1) /* 2 */ \
+ MATRIX_KEY(0x05, 0x02, KEY_COMMA) /* 53 */ \
+ MATRIX_KEY(0x05, 0x03, KEY_DOT) /* 54 */ \
+ MATRIX_KEY(0x05, 0x04, KEY_SLASH) /* 55 */ \
+ MATRIX_KEY(0x05, 0x05, KEY_C) /* 48 */ \
+ MATRIX_KEY(0x05, 0x06, KEY_SPACE) /* 61 */ \
+ MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) /* 44 */ \
+ MATRIX_KEY(0x05, 0x08, KEY_X) /* 47 */ \
+ MATRIX_KEY(0x05, 0x09, KEY_V) /* 49 */ \
+ MATRIX_KEY(0x05, 0x0b, KEY_M) /* 52 */ \
+ MATRIX_KEY(0x05, 0x0c, KEY_PAGEDOWN) /* 86 (Numpad) */ \
+ \
+ MATRIX_KEY(0x06, 0x01, KEY_Z) /* 46 */ \
+ MATRIX_KEY(0x06, 0x02, KEY_3) /* 4 */ \
+ MATRIX_KEY(0x06, 0x03, KEY_4) /* 5 */ \
+ MATRIX_KEY(0x06, 0x04, KEY_2) /* 3 */ \
+ MATRIX_KEY(0x06, 0x05, KEY_8) /* 9 */ \
+ MATRIX_KEY(0x06, 0x06, KEY_0) /* 11 */ \
+ MATRIX_KEY(0x06, 0x08, KEY_7) /* 8 */ \
+ MATRIX_KEY(0x06, 0x09, KEY_9) /* 10 */ \
+ MATRIX_KEY(0x06, 0x0b, KEY_DOWN) /* 84 */ \
+ MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) /* 89 */ \
+ MATRIX_KEY(0x06, 0x0d, KEY_LEFTALT) /* 60 */ \
+ MATRIX_KEY(0x06, 0x0f, KEY_ASSISTANT) /* 128 */ \
+ MATRIX_KEY(0x06, 0x11, KEY_BACKSLASH) /* 42 (JIS, ISO) */ \
+ \
+ MATRIX_KEY(0x07, 0x01, KEY_U) /* 23 */ \
+ MATRIX_KEY(0x07, 0x02, KEY_I) /* 24 */ \
+ MATRIX_KEY(0x07, 0x03, KEY_O) /* 25 */ \
+ MATRIX_KEY(0x07, 0x04, KEY_P) /* 26 */ \
+ MATRIX_KEY(0x07, 0x05, KEY_Q) /* 17 */ \
+ MATRIX_KEY(0x07, 0x06, KEY_W) /* 18 */ \
+ MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) /* 57 */ \
+ MATRIX_KEY(0x07, 0x08, KEY_E) /* 19 */ \
+ MATRIX_KEY(0x07, 0x09, KEY_R) /* 20 */ \
+ MATRIX_KEY(0x07, 0x0b, KEY_UP) /* 83 */ \
+ MATRIX_KEY(0x07, 0x0c, KEY_LEFT) /* 79 */ \
+ MATRIX_KEY(0x07, 0x11, KEY_102ND) /* 45 (ISO) */
+
#endif /* _CROS_EC_KEYBOARD_H */
--
2.45.1.288.g0e0cd299f1-goog
^ permalink raw reply related
* [linux-next:master] BUILD REGRESSION d97496ca23a2d4ee80b7302849404859d9058bcd
From: kernel test robot @ 2024-06-04 16:40 UTC (permalink / raw)
To: Andrew Morton
Cc: Linux Memory Management List, amd-gfx, bpf, dri-devel, intel-gfx,
intel-xe, linux-hwmon, linux-input, linux-mtd, linux-pm,
linux-renesas-soc
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
branch HEAD: d97496ca23a2d4ee80b7302849404859d9058bcd Add linux-next specific files for 20240604
Error/Warning reports:
https://lore.kernel.org/oe-kbuild-all/202406041641.wE3cCT4C-lkp@intel.com
Error/Warning: (recently discovered and may have been fixed)
drivers/input/touchscreen/wacom_w8001.c:637:29: warning: ' Pen' directive output may be truncated writing 4 bytes into a region of size between 1 and 64 [-Wformat-truncation=]
drivers/input/touchscreen/wacom_w8001.c:653:29: warning: ' Finger' directive output may be truncated writing 7 bytes into a region of size between 1 and 64 [-Wformat-truncation=]
Error/Warning ids grouped by kconfigs:
gcc_recent_errors
|-- i386-randconfig-063-20240604
| `-- drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16
|-- loongarch-defconfig
| |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-hubbub-dcn401-dcn401_hubbub.o:warning:objtool:unexpected-relocation-symbol-type-in-.rela.discard.reachable
| `-- drivers-thermal-thermal_trip.o:warning:objtool:unexpected-relocation-symbol-type-in-.rela.discard.reachable
|-- microblaze-randconfig-r006-20230312
| |-- drivers-input-touchscreen-wacom_w8001.c:warning:Finger-directive-output-may-be-truncated-writing-bytes-into-a-region-of-size-between-and
| `-- drivers-input-touchscreen-wacom_w8001.c:warning:Pen-directive-output-may-be-truncated-writing-bytes-into-a-region-of-size-between-and
|-- nios2-randconfig-r111-20240604
| |-- drivers-gpu-drm-arm-display-komeda-komeda_dev.c:error:implicit-declaration-of-function-seq_puts
| |-- drivers-gpu-drm-arm-display-komeda-komeda_dev.c:error:invalid-use-of-undefined-type-struct-seq_file
| `-- drivers-gpu-drm-arm-display-komeda-komeda_dev.c:error:type-defaults-to-int-in-declaration-of-DEFINE_SHOW_ATTRIBUTE
`-- um-allyesconfig
`-- kernel-bpf-verifier.c:error:pcpu_hot-undeclared-(first-use-in-this-function)
clang_recent_errors
|-- arm64-allmodconfig
| |-- drivers-gpu-drm-amd-amdgpu-..-display-amdgpu_dm-amdgpu_dm.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dce110-irq_service_dce110.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_cursor.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_ddi.c:error:arithmetic-between-different-enumeration-types-(-enum-hpd_pin-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_ddi.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-phy-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-tc_port-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_dpll_mgr.c:error:arithmetic-between-different-enumeration-types-(-enum-tc_port-and-enum-intel_dpll_id-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_hotplug.c:error:arithmetic-between-different-enumeration-types-(-enum-hpd_pin-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_pipe_crc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_tc.c:error:arithmetic-between-different-enumeration-types-(-enum-intel_display_power_domain-and-enum-tc_port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_vdsc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-skl_universal_plane.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-skl_watermark.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| `-- drivers-gpu-drm-renesas-rcar-du-rcar_cmm.c:error:unused-function-rcar_cmm_read-Werror-Wunused-function
|-- arm64-randconfig-001-20240604
| |-- drivers-gpu-drm-drm_mm.c:error:function-drm_mm_node_scanned_block-is-not-needed-and-will-not-be-emitted-Werror-Wunneeded-internal-declaration
| `-- drivers-gpu-drm-renesas-rcar-du-rcar_cmm.c:error:unused-function-rcar_cmm_read-Werror-Wunused-function
|-- powerpc-randconfig-r112-20240604
| |-- drivers-mtd-nand-raw-mxc_nand.c:sparse:sparse:incorrect-type-in-argument-(different-address-spaces)-expected-void-buf-got-void-noderef-__iomem
| `-- drivers-mtd-nand-raw-mxc_nand.c:sparse:sparse:incorrect-type-in-initializer-(different-address-spaces)-expected-unsigned-short-noderef-usertype-__iomem-t-got-void-buf
|-- riscv-allmodconfig
| |-- drivers-gpu-drm-amd-amdgpu-..-display-amdgpu_dm-amdgpu_dm.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dce110-irq_service_dce110.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_cursor.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_ddi.c:error:arithmetic-between-different-enumeration-types-(-enum-hpd_pin-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_ddi.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-phy-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-tc_port-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_dpll_mgr.c:error:arithmetic-between-different-enumeration-types-(-enum-tc_port-and-enum-intel_dpll_id-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_hotplug.c:error:arithmetic-between-different-enumeration-types-(-enum-hpd_pin-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_pipe_crc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_tc.c:error:arithmetic-between-different-enumeration-types-(-enum-intel_display_power_domain-and-enum-tc_port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_vdsc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-skl_universal_plane.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| `-- drivers-gpu-drm-i915-display-skl_watermark.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
|-- riscv-allyesconfig
| |-- drivers-gpu-drm-amd-amdgpu-..-display-amdgpu_dm-amdgpu_dm.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
| `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dce110-irq_service_dce110.c:error:arithmetic-between-different-enumeration-types-(-enum-dc_irq_source-and-enum-irq_type-)-Werror-Wenum-enum-conversion
|-- s390-allmodconfig
| |-- drivers-gpu-drm-i915-display-intel_cursor.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_ddi.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-phy-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_display_irq.c:error:arithmetic-between-different-enumeration-types-(-enum-transcoder-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_dpll_mgr.c:error:arithmetic-between-different-enumeration-types-(-enum-tc_port-and-enum-intel_dpll_id-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_hotplug.c:error:arithmetic-between-different-enumeration-types-(-enum-hpd_pin-and-enum-port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_pipe_crc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_tc.c:error:arithmetic-between-different-enumeration-types-(-enum-intel_display_power_domain-and-enum-tc_port-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-intel_vdsc.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| |-- drivers-gpu-drm-i915-display-skl_universal_plane.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
| `-- drivers-gpu-drm-i915-display-skl_watermark.c:error:arithmetic-between-different-enumeration-types-(-enum-pipe-and-enum-intel_display_power_domain-)-Werror-Wenum-enum-conversion
|-- x86_64-randconfig-011-20240604
| `-- drivers-gpu-drm-drm_mm.c:error:function-drm_mm_node_scanned_block-is-not-needed-and-will-not-be-emitted-Werror-Wunneeded-internal-declaration
|-- x86_64-randconfig-122-20240604
| `-- drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16
`-- x86_64-randconfig-161-20240604
`-- drivers-gpu-drm-drm_mm.c:error:function-drm_mm_node_scanned_block-is-not-needed-and-will-not-be-emitted-Werror-Wunneeded-internal-declaration
elapsed time: 734m
configs tested: 179
configs skipped: 3
tested configs:
alpha allnoconfig gcc
alpha allyesconfig gcc
alpha defconfig gcc
arc allmodconfig gcc
arc allnoconfig gcc
arc allyesconfig gcc
arc defconfig gcc
arc randconfig-001-20240604 gcc
arc randconfig-002-20240604 gcc
arm allmodconfig gcc
arm allnoconfig clang
arm allyesconfig gcc
arm defconfig clang
arm ep93xx_defconfig clang
arm hisi_defconfig gcc
arm randconfig-001-20240604 clang
arm randconfig-002-20240604 gcc
arm randconfig-003-20240604 clang
arm randconfig-004-20240604 gcc
arm64 allmodconfig clang
arm64 allnoconfig gcc
arm64 defconfig gcc
arm64 randconfig-001-20240604 clang
arm64 randconfig-002-20240604 gcc
arm64 randconfig-003-20240604 gcc
arm64 randconfig-004-20240604 clang
csky allmodconfig gcc
csky allnoconfig gcc
csky allyesconfig gcc
csky defconfig gcc
csky randconfig-001-20240604 gcc
csky randconfig-002-20240604 gcc
hexagon allmodconfig clang
hexagon allnoconfig clang
hexagon allyesconfig clang
hexagon defconfig clang
hexagon randconfig-001-20240604 clang
hexagon randconfig-002-20240604 clang
i386 allmodconfig gcc
i386 allnoconfig gcc
i386 allyesconfig gcc
i386 buildonly-randconfig-001-20240604 gcc
i386 buildonly-randconfig-002-20240604 clang
i386 buildonly-randconfig-003-20240604 clang
i386 buildonly-randconfig-004-20240604 gcc
i386 buildonly-randconfig-005-20240604 clang
i386 buildonly-randconfig-006-20240604 clang
i386 defconfig clang
i386 randconfig-001-20240604 clang
i386 randconfig-002-20240604 clang
i386 randconfig-003-20240604 clang
i386 randconfig-004-20240604 clang
i386 randconfig-005-20240604 gcc
i386 randconfig-006-20240604 gcc
i386 randconfig-011-20240604 clang
i386 randconfig-012-20240604 gcc
i386 randconfig-013-20240604 gcc
i386 randconfig-014-20240604 clang
i386 randconfig-015-20240604 clang
i386 randconfig-016-20240604 clang
loongarch allmodconfig gcc
loongarch allnoconfig gcc
loongarch defconfig gcc
loongarch randconfig-001-20240604 gcc
loongarch randconfig-002-20240604 gcc
m68k allmodconfig gcc
m68k allnoconfig gcc
m68k allyesconfig gcc
m68k defconfig gcc
m68k m5307c3_defconfig gcc
m68k mac_defconfig gcc
m68k q40_defconfig gcc
microblaze allmodconfig gcc
microblaze allnoconfig gcc
microblaze allyesconfig gcc
microblaze defconfig gcc
mips allnoconfig gcc
mips allyesconfig gcc
nios2 allmodconfig gcc
nios2 allnoconfig gcc
nios2 allyesconfig gcc
nios2 defconfig gcc
nios2 randconfig-001-20240604 gcc
nios2 randconfig-002-20240604 gcc
openrisc allnoconfig gcc
openrisc allyesconfig gcc
openrisc defconfig gcc
parisc allmodconfig gcc
parisc allnoconfig gcc
parisc allyesconfig gcc
parisc defconfig gcc
parisc randconfig-001-20240604 gcc
parisc randconfig-002-20240604 gcc
parisc64 defconfig gcc
powerpc allmodconfig gcc
powerpc allnoconfig gcc
powerpc allyesconfig clang
powerpc amigaone_defconfig gcc
powerpc cell_defconfig gcc
powerpc chrp32_defconfig clang
powerpc eiger_defconfig clang
powerpc microwatt_defconfig gcc
powerpc rainier_defconfig gcc
powerpc randconfig-001-20240604 gcc
powerpc randconfig-002-20240604 gcc
powerpc randconfig-003-20240604 gcc
powerpc tqm8560_defconfig gcc
powerpc warp_defconfig gcc
powerpc64 randconfig-001-20240604 gcc
powerpc64 randconfig-002-20240604 gcc
powerpc64 randconfig-003-20240604 clang
riscv allmodconfig clang
riscv allnoconfig gcc
riscv allyesconfig clang
riscv defconfig clang
riscv randconfig-001-20240604 clang
riscv randconfig-002-20240604 gcc
s390 allmodconfig clang
s390 allnoconfig clang
s390 allyesconfig gcc
s390 defconfig clang
s390 randconfig-001-20240604 clang
s390 randconfig-002-20240604 gcc
sh allmodconfig gcc
sh allnoconfig gcc
sh allyesconfig gcc
sh defconfig gcc
sh lboxre2_defconfig gcc
sh randconfig-001-20240604 gcc
sh randconfig-002-20240604 gcc
sh urquell_defconfig gcc
sparc allmodconfig gcc
sparc allnoconfig gcc
sparc defconfig gcc
sparc64 alldefconfig gcc
sparc64 allmodconfig gcc
sparc64 allyesconfig gcc
sparc64 defconfig gcc
sparc64 randconfig-001-20240604 gcc
sparc64 randconfig-002-20240604 gcc
um allmodconfig clang
um allnoconfig clang
um allyesconfig gcc
um defconfig clang
um i386_defconfig gcc
um randconfig-001-20240604 clang
um randconfig-002-20240604 clang
um x86_64_defconfig clang
x86_64 allnoconfig clang
x86_64 allyesconfig clang
x86_64 buildonly-randconfig-001-20240604 clang
x86_64 buildonly-randconfig-002-20240604 clang
x86_64 buildonly-randconfig-003-20240604 gcc
x86_64 buildonly-randconfig-004-20240604 clang
x86_64 buildonly-randconfig-005-20240604 gcc
x86_64 buildonly-randconfig-006-20240604 clang
x86_64 defconfig gcc
x86_64 randconfig-001-20240604 clang
x86_64 randconfig-002-20240604 gcc
x86_64 randconfig-003-20240604 gcc
x86_64 randconfig-004-20240604 gcc
x86_64 randconfig-005-20240604 gcc
x86_64 randconfig-006-20240604 gcc
x86_64 randconfig-011-20240604 clang
x86_64 randconfig-012-20240604 clang
x86_64 randconfig-013-20240604 clang
x86_64 randconfig-014-20240604 clang
x86_64 randconfig-015-20240604 clang
x86_64 randconfig-016-20240604 clang
x86_64 randconfig-071-20240604 clang
x86_64 randconfig-072-20240604 gcc
x86_64 randconfig-073-20240604 gcc
x86_64 randconfig-074-20240604 clang
x86_64 randconfig-075-20240604 clang
x86_64 randconfig-076-20240604 clang
x86_64 rhel-8.3-rust clang
xtensa allnoconfig gcc
xtensa randconfig-001-20240604 gcc
xtensa randconfig-002-20240604 gcc
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply
* [PATCH] HID: logitech-dj: add missing MODULE_DESCRIPTION() macro
From: Jeff Johnson @ 2024-06-04 15:34 UTC (permalink / raw)
To: Filipe Laíns, Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors, Jeff Johnson
make allmodconfig && make W=1 C=1 reports:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-logitech-dj.o
Add the missing invocation of the MODULE_DESCRIPTION() macro.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/hid/hid-logitech-dj.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 3c3c497b6b91..dfa4e3d1a3b3 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -2045,6 +2045,7 @@ static struct hid_driver logi_djreceiver_driver = {
module_hid_driver(logi_djreceiver_driver);
+MODULE_DESCRIPTION("HID driver for Logitech receivers");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Logitech");
MODULE_AUTHOR("Nestor Lopez Casado");
---
base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
change-id: 20240604-md-hid-logitech-dj-250a4c6afe7c
^ permalink raw reply related
* Re: [PATCH v9 0/4] Input: support overlay objects on touchscreens
From: Javier Carrasco @ 2024-06-04 15:31 UTC (permalink / raw)
To: Dmitry Torokhov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Bastian Hecht, Michael Riesch
Cc: linux-input, devicetree, linux-kernel, Jeff LaBundy
In-Reply-To: <20240422-feature-ts_virtobj_patch-v9-0-acf118d12a8a@wolfvision.net>
On 22/04/2024 12:07, Javier Carrasco wrote:
> Some touchscreens are shipped with a physical layer on top of them where
> a number of buttons and a resized touchscreen surface might be available.
>
> In order to generate proper key events by overlay buttons and adjust the
> touch events to a clipped surface, this series offers a documented,
> device-tree-based solution by means of helper functions.
> An implementation for a specific touchscreen driver is also included.
>
> The functions in touch-overlay provide a simple workflow to acquire
> physical objects from the device tree, map them into a list and generate
> events according to the object descriptions.
>
> This feature has been tested with a JT240MHQS-E3 display, which consists
> of an st1624 as the base touchscreen and an overlay with two buttons and
> a frame that clips its effective surface mounted on it.
>
> To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> To: Rob Herring <robh@kernel.org>
> To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
> To: Conor Dooley <conor+dt@kernel.org>
> To: Bastian Hecht <hechtb@gmail.com>
> To: Michael Riesch <michael.riesch@wolfvision.net>
> Cc: linux-input@vger.kernel.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net>
>
> Changes in v9:
> - touch-overlay.c: trigger a button release if the finger slides out of
> the button segment to be consistent with the button press when sliding
> into a button segment (see touch_overlay_button_event()).
> - touch-overlay.c: (nit) remove braces in if with a single statement in
> touch_overaly_process_event().
> - Link to v8: https://lore.kernel.org/r/20240320-feature-ts_virtobj_patch-v8-0-cab6e7dcb1f6@wolfvision.net
>
> Changes in v8:
> - touchscreen bindings: fix description formatting.
> - Link to v7: https://lore.kernel.org/r/20240119-feature-ts_virtobj_patch-v7-0-eda70985808f@wolfvision.net
>
> Changes in v7:
> - General: return to a single input device implementation.
> - touchscreen bindings: segment instead of button in the label
> description.
> - touch-overlay.c: define button-specific data inside segment struct.
> - touch-overlay.c: remove fwnode_property_present() and check return
> value of fwnode_property_read_u32() in touch_overlay_get_segment().
> - touch-overlay.c: simplify return path in touch_overlay_map().
> - Link to v6: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v6-0-d8a605975153@wolfvision.net
>
> Changes in v6:
> - General: use a single list to manage a single type of object.
> - General: swap patches to have bindings preceding the code.
> - touch-overlay.c: minor code-sytle fixes.
> - Link to v5: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v5-0-ff6b5c4db693@wolfvision.net
>
> Changes in v5:
> - touchscreen bindings: move overlay common properties to a $def entry (Rob Herring)
> - st1232 bindings: move overlays to the existing example instead of
> making a new one (Rob Herring)
> - Link to v4: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v4-0-5c6c0fc1eed6@wolfvision.net
>
> Changes in v4:
> - General: rename "touchscreen" to "touch" to include other consumers.
> - PATCH 1/4: move touch-overlay feature to input core.
> - PATCH 1/4, 3/4: set key caps and report key events without consumer's
> intervention.
> - PATCH 2/4: add missing 'required' field with the required properties.
> - Link to v3: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v3-0-b4fb7fc4bab7@wolfvision.net
>
> Changes in v3:
> - General: rename "virtobj" and "virtual" to "overlay"
> - PATCH 1/4: Make feature bool instead of tristate (selected by
> supported touchscreens)
> - Link to v2: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v2-0-f68a6bfe7a0f@wolfvision.net
>
> Changes in v2:
> - PATCH 1/4: remove preprocessor directives (the module is selected by
> the drivers that support the feature). Typo in the commit message.
> - PATCH 2/4: more detailed documentation. Images and examples were added.
> - PATCH 3/4: select ts-virtobj automatically.
> - Link to v1: https://lore.kernel.org/r/20230510-feature-ts_virtobj_patch-v1-0-5ae5e81bc264@wolfvision.net
>
> ---
> Javier Carrasco (4):
> dt-bindings: touchscreen: add touch-overlay property
> Input: touch-overlay - Add touchscreen overlay handling
> dt-bindings: input: touchscreen: st1232: add touch-overlay example
> Input: st1232 - add touch overlays handling
>
> .../input/touchscreen/sitronix,st1232.yaml | 29 +++
> .../bindings/input/touchscreen/touchscreen.yaml | 119 ++++++++++
> MAINTAINERS | 7 +
> drivers/input/Makefile | 2 +-
> drivers/input/touch-overlay.c | 263 +++++++++++++++++++++
> drivers/input/touchscreen/st1232.c | 48 ++--
> include/linux/input/touch-overlay.h | 22 ++
> 7 files changed, 475 insertions(+), 15 deletions(-)
> ---
> base-commit: 0bbac3facb5d6cc0171c45c9873a2dc96bea9680
> change-id: 20230510-feature-ts_virtobj_patch-e267540aae74
>
> Best regards,
Little reminder: this feature was reviewed a few weeks ago, and it is
waiting to be applied or receive new feedback if required.
Thanks and best regards,
Javier Carrasco
^ permalink raw reply
* Re: [PATCH] HID: lg-g15: add missing MODULE_DESCRIPTION() macro
From: Hans de Goede @ 2024-06-04 14:42 UTC (permalink / raw)
To: Jeff Johnson, Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors
In-Reply-To: <20240604-md-hid-lg-g15-v1-1-265b094db089@quicinc.com>
Hi,
On 6/4/24 4:33 PM, Jeff Johnson wrote:
> make allmodconfig && make W=1 C=1 reports:
> WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-lg-g15.o
>
> Add the missing invocation of the MODULE_DESCRIPTION() macro.
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/hid/hid-lg-g15.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hid/hid-lg-g15.c b/drivers/hid/hid-lg-g15.c
> index acbec1dcf196..53e7b90f9cc3 100644
> --- a/drivers/hid/hid-lg-g15.c
> +++ b/drivers/hid/hid-lg-g15.c
> @@ -954,4 +954,5 @@ static struct hid_driver lg_g15_driver = {
> module_hid_driver(lg_g15_driver);
>
> MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
> +MODULE_DESCRIPTION("HID driver for gaming keys on Logitech gaming keyboards");
> MODULE_LICENSE("GPL");
>
> ---
> base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
> change-id: 20240604-md-hid-lg-g15-e4a106ba126b
>
^ permalink raw reply
* [PATCH] HID: lg-g15: add missing MODULE_DESCRIPTION() macro
From: Jeff Johnson @ 2024-06-04 14:33 UTC (permalink / raw)
To: Hans de Goede, Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors, Jeff Johnson
make allmodconfig && make W=1 C=1 reports:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-lg-g15.o
Add the missing invocation of the MODULE_DESCRIPTION() macro.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/hid/hid-lg-g15.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/hid/hid-lg-g15.c b/drivers/hid/hid-lg-g15.c
index acbec1dcf196..53e7b90f9cc3 100644
--- a/drivers/hid/hid-lg-g15.c
+++ b/drivers/hid/hid-lg-g15.c
@@ -954,4 +954,5 @@ static struct hid_driver lg_g15_driver = {
module_hid_driver(lg_g15_driver);
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("HID driver for gaming keys on Logitech gaming keyboards");
MODULE_LICENSE("GPL");
---
base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
change-id: 20240604-md-hid-lg-g15-e4a106ba126b
^ permalink raw reply related
* Re: [PATCH] HID: letsketch: add missing MODULE_DESCRIPTION() macro
From: Hans de Goede @ 2024-06-04 14:31 UTC (permalink / raw)
To: Jeff Johnson, Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors
In-Reply-To: <20240604-md-hid-letsketch-v1-1-ff38ae7b4cb0@quicinc.com>
Hi,
On 6/4/24 4:20 PM, Jeff Johnson wrote:
> make allmodconfig && make W=1 C=1 reports:
> WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-letsketch.o
>
> Add the missing invocation of the MODULE_DESCRIPTION() macro.
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/hid/hid-letsketch.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hid/hid-letsketch.c b/drivers/hid/hid-letsketch.c
> index 97f047f18136..229820fda960 100644
> --- a/drivers/hid/hid-letsketch.c
> +++ b/drivers/hid/hid-letsketch.c
> @@ -319,4 +319,5 @@ static struct hid_driver letsketch_driver = {
> module_hid_driver(letsketch_driver);
>
> MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
> +MODULE_DESCRIPTION("Driver for the LetSketch / VSON WP9620N drawing tablet");
> MODULE_LICENSE("GPL");
>
> ---
> base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
> change-id: 20240604-md-hid-letsketch-53206a0faa79
>
^ permalink raw reply
* [PATCH] HID: letsketch: add missing MODULE_DESCRIPTION() macro
From: Jeff Johnson @ 2024-06-04 14:20 UTC (permalink / raw)
To: Hans de Goede, Jiri Kosina, Benjamin Tissoires
Cc: linux-input, linux-kernel, kernel-janitors, Jeff Johnson
make allmodconfig && make W=1 C=1 reports:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/hid/hid-letsketch.o
Add the missing invocation of the MODULE_DESCRIPTION() macro.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/hid/hid-letsketch.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/hid/hid-letsketch.c b/drivers/hid/hid-letsketch.c
index 97f047f18136..229820fda960 100644
--- a/drivers/hid/hid-letsketch.c
+++ b/drivers/hid/hid-letsketch.c
@@ -319,4 +319,5 @@ static struct hid_driver letsketch_driver = {
module_hid_driver(letsketch_driver);
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Driver for the LetSketch / VSON WP9620N drawing tablet");
MODULE_LICENSE("GPL");
---
base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
change-id: 20240604-md-hid-letsketch-53206a0faa79
^ permalink raw reply related
* Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in usbhid_parse()
From: Jiri Kosina @ 2024-06-04 14:15 UTC (permalink / raw)
To: Kees Cook
Cc: Nikita Zhandarovich, Benjamin Tissoires, Kees Cook, linux-usb,
linux-input, syzkaller-bugs, linux-kernel,
syzbot+c52569baf0c843f35495, linux-hardening
In-Reply-To: <E62FA5CB-D7AE-4A11-9D2E-7D78D7C10ADA@kernel.org>
On Tue, 4 Jun 2024, Kees Cook wrote:
> This isn't the right solution. The problem is that hid_class_descriptor
> is a flexible array but was sized as a single element fake flexible
> array:
>
> struct hid_descriptor {
> __u8 bLength;
> __u8 bDescriptorType;
> __le16 bcdHID;
> __u8 bCountryCode;
> __u8 bNumDescriptors;
>
> struct hid_class_descriptor desc[1];
> } __attribute__ ((packed));
>
> This likely needs to be:
>
> struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
>
> And then check for any sizeof() uses of the struct that might have changed.
Ah, you are of course right, not sure what I was thinking. Thanks a lot
for catching my brainfart.
I am dropping the patch for now; Nikita, will you please send a refreshed
one?
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in usbhid_parse()
From: Kees Cook @ 2024-06-04 14:11 UTC (permalink / raw)
To: Jiri Kosina, Nikita Zhandarovich
Cc: Benjamin Tissoires, Kees Cook, linux-usb, linux-input,
syzkaller-bugs, linux-kernel, syzbot+c52569baf0c843f35495,
linux-hardening
In-Reply-To: <nycvar.YFH.7.76.2406041015210.16865@cbobk.fhfr.pm>
On June 4, 2024 1:15:35 AM PDT, Jiri Kosina <jikos@kernel.org> wrote:
>On Fri, 24 May 2024, Nikita Zhandarovich wrote:
>
>> Syzbot reports [1] a reemerging out-of-bounds bug regarding hid
>> descriptors possibly having incorrect bNumDescriptors values in
>> usbhid_parse().
>>
>> Build on the previous fix in "HID: usbhid: fix out-of-bounds bug"
>> and run a sanity-check ensuring that number of descriptors doesn't
>> exceed the size of desc[] in struct hid_descriptor.
>>
>> [1] Syzbot report:
>> Link: https://syzkaller.appspot.com/bug?extid=c52569baf0c843f35495
>>
>> UBSAN: array-index-out-of-bounds in drivers/hid/usbhid/hid-core.c:1024:7
>> index 1 is out of range for type 'struct hid_class_descriptor[1]'
>> CPU: 0 PID: 8 Comm: kworker/0:1 Not tainted 6.9.0-rc6-syzkaller-00290-gb9158815de52 #0
>> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
>> Workqueue: usb_hub_wq hub_event
>> Call Trace:
>> <TASK>
>> __dump_stack lib/dump_stack.c:88 [inline]
>> dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
>> ubsan_epilogue lib/ubsan.c:231 [inline]
>> __ubsan_handle_out_of_bounds+0x121/0x150 lib/ubsan.c:429
>> usbhid_parse+0x5a7/0xc80 drivers/hid/usbhid/hid-core.c:1024
>> hid_add_device+0x132/0x520 drivers/hid/hid-core.c:2790
>> usbhid_probe+0xb38/0xea0 drivers/hid/usbhid/hid-core.c:1429
>> usb_probe_interface+0x645/0xbb0 drivers/usb/core/driver.c:399
>> really_probe+0x2b8/0xad0 drivers/base/dd.c:656
>> __driver_probe_device+0x1a2/0x390 drivers/base/dd.c:798
>> driver_probe_device+0x50/0x430 drivers/base/dd.c:828
>> __device_attach_driver+0x2d6/0x530 drivers/base/dd.c:956
>> bus_for_each_drv+0x24e/0x2e0 drivers/base/bus.c:457
>> __device_attach+0x333/0x520 drivers/base/dd.c:1028
>> bus_probe_device+0x189/0x260 drivers/base/bus.c:532
>> device_add+0x8ff/0xca0 drivers/base/core.c:3720
>> usb_set_configuration+0x1976/0x1fb0 drivers/usb/core/message.c:2210
>> usb_generic_driver_probe+0x88/0x140 drivers/usb/core/generic.c:254
>> usb_probe_device+0x1b8/0x380 drivers/usb/core/driver.c:294
>>
>> Reported-and-tested-by: syzbot+c52569baf0c843f35495@syzkaller.appspotmail.com
>> Fixes: f043bfc98c19 ("HID: usbhid: fix out-of-bounds bug")
>> Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
>
>Applied, thanks.
This isn't the right solution. The problem is that hid_class_descriptor is a flexible array but was sized as a single element fake flexible array:
struct hid_descriptor {
__u8 bLength;
__u8 bDescriptorType;
__le16 bcdHID;
__u8 bCountryCode;
__u8 bNumDescriptors;
struct hid_class_descriptor desc[1];
} __attribute__ ((packed));
This likely needs to be:
struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
And then check for any sizeof() uses of the struct that might have changed.
--
Kees Cook
^ permalink raw reply
* Re: [PATCH v2] HID: hid-goodix: Add Goodix HID-over-SPI driver
From: Charles Wang @ 2024-06-04 11:23 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: jikos, bentiss, hbarnor, dianders, linux-input, linux-kernel
In-Reply-To: <Zl5kz_S4FJaGzfiW@google.com>
Hi Dmitry,
On Mon, Jun 03, 2024 at 05:50:23PM -0700, Dmitry Torokhov wrote:
> Hi Charles,
>
> > This patch introduces a new driver to support the Goodix GT7986U
> > touch controller. The data reported is packaged according to the
> > HID protocol but uses SPI for communication to improve speed. This
> > enables the device to transmit not only coordinate data but also
> > corresponding raw data that can be accessed by user-space programs
> > through the hidraw interface. The raw data can be utilized for
> > functions like palm rejection, thereby improving the touch experience.
> >
> > Key features:
> > - Device connection confirmation and initialization
> > - IRQ-based event reporting to the input subsystem
> > - Support for HIDRAW operations (GET_REPORT and SET_REPORT)
>
> Can you please mention in the patch description that this device is not
> compatible with Microsoft's HID-over-SPI protocol and therefore needs to
> implement its own flavor.
>
Ack,
> >
> > Signed-off-by: Charles Wang <charles.goodix@gmail.com>
> > ---
> > Changes in v2:
> > - Fixed build warnings reported by kernel test robot
> > ---
> > drivers/hid/Kconfig | 6 +
> > drivers/hid/Makefile | 1 +
> > drivers/hid/hid-goodix.c | 652 +++++++++++++++++++++++++++++++++++++++
>
> Do you have similar i2c parts that are not compatible with MS
> HID-over-I2C, and if you do have them do you have plans to add support
> for them to this driver? If not maybe call this hid-goodix-spi.c?
> Or maybe create drivers/hid/spi-hid/hid-goodix.c to separate HID upper
> layer drivers from the HID low layer/transport drivers?
>
No, all Goodix I2C devices will comply with the MS HID-over-I2C standard,
so there's no need to support them in this driver. Renaming the file to
hid-goodix-spi.c seems better. I belive the path drivers/hid/spi-hid/hid-goodix.c
would be more appropriate for future MS HID-over-SPI compatible devices.
>
> > 3 files changed, 659 insertions(+)
> > create mode 100644 drivers/hid/hid-goodix.c
> >
> > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> > index 4c682c650..f57d8fb88 100644
> > --- a/drivers/hid/Kconfig
> > +++ b/drivers/hid/Kconfig
> > @@ -404,6 +404,12 @@ config HID_VIVALDI_COMMON
> > option so that drivers can use common code to parse the HID
> > descriptors for vivaldi function row keymap.
> >
> > +config HID_GOODIX
> > + tristate "Goodix GT7986U SPI HID touchscreen"
> > + depends on SPI_MASTER
> > + help
> > + Support for Goodix GT7986U SPI HID touchscreen device.
> > +
> > config HID_GOOGLE_HAMMER
> > tristate "Google Hammer Keyboard"
> > select HID_VIVALDI_COMMON
> > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
> > index 082a728ea..4e799f7e5 100644
> > --- a/drivers/hid/Makefile
> > +++ b/drivers/hid/Makefile
> > @@ -54,6 +54,7 @@ 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_GOODIX) += hid-goodix.o
> > obj-$(CONFIG_HID_GOOGLE_HAMMER) += hid-google-hammer.o
> > obj-$(CONFIG_HID_GOOGLE_STADIA_FF) += hid-google-stadiaff.o
> > obj-$(CONFIG_HID_VIVALDI) += hid-vivaldi.o
> > diff --git a/drivers/hid/hid-goodix.c b/drivers/hid/hid-goodix.c
> > new file mode 100644
> > index 000000000..a67f7d9ef
> > --- /dev/null
> > +++ b/drivers/hid/hid-goodix.c
> > @@ -0,0 +1,652 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +/*
> > + * Goodix GT7986U SPI Driver Code for HID.
> > + *
> > + * Copyright (C) 2024 Godix, Inc.
> > + */
> > +#include <asm/unaligned.h>
> > +#include <linux/delay.h>
> > +#include <linux/hid.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/sizes.h>
> > +#include <linux/spi/spi.h>
> > +
> > +#define GOODIX_DEV_CONFIRM_ADDR 0x10000
> > +#define GOODIX_HID_DESC_ADDR 0x1058C
> > +#define GOODIX_HID_REPORT_DESC_ADDR 0x105AA
> > +#define GOODIX_HID_SIGN_ADDR 0x10D32
> > +#define GOODIX_HID_REPORT_ADDR 0x22C8C
>
> I wonder if some if not all of these should come from DT/device
> properties.
>
Thanks, I will move the addresses that might change in the future
to be obtained from DT/device properties, to enhance the adaptability
of the driver.
> > +
> > +#define GOODIX_HID_GET_REPORT_CMD 0x02
> > +#define GOODIX_HID_SET_REPORT_CMD 0x03
> > +
> > +#define GOODIX_HID_MAX_INBUF_SIZE 128
> > +#define GOODIX_HID_ACK_READY_FLAG 0x01
> > +#define GOODIX_HID_REPORT_READY_FLAG 0x80
> > +
> > +#define GOODIX_DEV_CONFIRM_VAL 0xAA
> > +
> > +#define GOODIX_SPI_WRITE_FLAG 0xF0
> > +#define GOODIX_SPI_READ_FLAG 0xF1
> > +#define GOODIX_SPI_TRANS_PREFIX_LEN 1
> > +#define GOODIX_REGISTER_WIDTH 4
> > +#define GOODIX_SPI_READ_DUMMY_LEN 3
> > +#define GOODIX_SPI_READ_PREFIX_LEN (GOODIX_SPI_TRANS_PREFIX_LEN + \
> > + GOODIX_REGISTER_WIDTH + \
> > + GOODIX_SPI_READ_DUMMY_LEN)
> > +#define GOODIX_SPI_WRITE_PREFIX_LEN (GOODIX_SPI_TRANS_PREFIX_LEN + \
> > + GOODIX_REGISTER_WIDTH)
> > +
> > +#define GOODIX_CHECKSUM_SIZE sizeof(u16)
> > +#define GOODIX_NORMAL_RESET_DELAY_MS 150
> > +
> > +struct goodix_hid_report_header {
> > + u8 flag;
> > + __le16 size;
> > +} __packed;
> > +#define GOODIX_HID_ACK_HEADER_SIZE sizeof(struct goodix_hid_report_header)
> > +
> > +struct goodix_hid_report_package {
> > + __le16 size;
> > + u8 data[];
> > +};
> > +
> > +#define GOODIX_HID_PKG_LEN_SIZE sizeof(u16)
> > +#define GOODIX_HID_COOR_DATA_LEN 82
> > +#define GOODIX_HID_COOR_PKG_LEN (GOODIX_HID_PKG_LEN_SIZE + \
> > + GOODIX_HID_COOR_DATA_LEN)
> > +
> > +#define GOODIX_REPORT_DATA_ADDR (GOODIX_HID_REPORT_ADDR + \
> > + GOODIX_HID_ACK_HEADER_SIZE + \
> > + GOODIX_HID_PKG_LEN_SIZE)
> > +
> > +struct goodix_hid_report_event {
> > + struct goodix_hid_report_header hdr;
> > + u8 data[GOODIX_HID_COOR_PKG_LEN];
> > +} __packed;
> > +
> > +struct goodix_hid_desc {
> > + __le16 desc_length;
> > + __le16 bcd_version;
> > + __le16 report_desc_lenght;
> > + __le16 report_desc_register;
> > + __le16 input_register;
> > + __le16 max_input_length;
> > + __le16 output_register;
> > + __le16 max_output_length;
> > + __le16 cmd_register;
> > + __le16 data_register;
> > + __le16 vendor_id;
> > + __le16 product_id;
> > + __le16 version_id;
> > + __le32 reserved;
> > +} __packed;
> > +
> > +struct goodix_ts_data {
> > + struct device *dev;
> > + struct spi_device *spi;
> > + struct hid_device *hid;
> > + struct goodix_hid_desc hid_desc;
> > +
> > + struct gpio_desc *reset_gpio;
> > +
> > + /* Buffer used to store hid report data */
> > + u8 xfer_buf[SZ_4K];
>
> Maybe have it as ____cacheline_aligned to allow SPI controller to DMA to
> it directly.
>
Ack.
> > +};
> > +
> > +static int goodix_spi_read(struct goodix_ts_data *ts, u32 addr,
> > + u8 *data, unsigned int len)
> > +{
> > + struct spi_device *spi = to_spi_device(&ts->spi->dev);
> > + struct spi_transfer xfers;
> > + struct spi_message spi_msg;
> > + u8 *buf;
> > + int error;
> > +
> > + buf = kzalloc(GOODIX_SPI_READ_PREFIX_LEN + len, GFP_KERNEL);
> > + if (!buf)
> > + return -ENOMEM;
>
> Can you try using ts->xfer_buf without making allocations and copies?
> Maybe have goodix_spi_read() have data as u8 **data, and do
>
> *data = buf + GOODIX_SPI_READ_PREFIX_LEN;
> return 0;
>
> at the end. I.e. callers do not supply buffer but rather are given one.
> Of course you need to make sure there are no concurrent calls to
> goodix_spi_read(), but I do not think you have them anyways.
>
Unfortunately, there are concurrent calls to goodix_spi_read(). The functions
goodix_hid_get_raw_report() and goodix_hid_irq() may execute concurrently.
Anyways, I will try to optimize this part and reduce the malloc operations
where possible.
>
> > +
> > + spi_message_init(&spi_msg);
> > + memset(&xfers, 0, sizeof(xfers));
> > +
> > + /* buffer format: 0xF1 + addr(4bytes) + dummy(3bytes) + data */
> > + buf[0] = GOODIX_SPI_READ_FLAG;
> > + put_unaligned_be32(addr, buf + GOODIX_SPI_TRANS_PREFIX_LEN);
> > + memset(buf + GOODIX_SPI_TRANS_PREFIX_LEN + GOODIX_REGISTER_WIDTH,
> > + 0xff, GOODIX_SPI_READ_DUMMY_LEN);
>
> Does the "data" have to be set to 0xff?
>
Rechecked the datasheet the dummy value are no requirement.
> > +
> > + xfers.tx_buf = buf;
> > + xfers.rx_buf = buf;
> > + xfers.len = GOODIX_SPI_READ_PREFIX_LEN + len;
> > + xfers.cs_change = 0;
> > + spi_message_add_tail(&xfers, &spi_msg);
> > +
> > + error = spi_sync(spi, &spi_msg);
> > + if (error)
> > + dev_err(ts->dev, "spi transfer error:%d", error);
> > + else
> > + memcpy(data, buf + GOODIX_SPI_READ_PREFIX_LEN, len);
> > +
> > + kfree(buf);
> > + return error;
> > +}
> > +
> > +static int goodix_spi_write(struct goodix_ts_data *ts, u32 addr,
> > + u8 *data, unsigned int len)
> > +{
> > + struct spi_device *spi = to_spi_device(&ts->spi->dev);
> > + struct spi_transfer xfers;
> > + struct spi_message spi_msg;
> > + u8 *buf;
> > + int error;
> > +
> > + buf = kzalloc(GOODIX_SPI_WRITE_PREFIX_LEN + len, GFP_KERNEL);
> > + if (!buf)
> > + return -ENOMEM;
>
> Same comments here as for goodix_spi_write()...
>
Ack.
> > +
> > + spi_message_init(&spi_msg);
> > + memset(&xfers, 0, sizeof(xfers));
> > +
> > + /* buffer format: 0xF0 + addr(4bytes) + data */
> > + buf[0] = GOODIX_SPI_WRITE_FLAG;
> > + put_unaligned_be32(addr, buf + GOODIX_SPI_TRANS_PREFIX_LEN);
> > + memcpy(buf + GOODIX_SPI_WRITE_PREFIX_LEN, data, len);
> > +
> > + xfers.tx_buf = buf;
> > + xfers.len = GOODIX_SPI_WRITE_PREFIX_LEN + len;
> > + xfers.cs_change = 0;
> > + spi_message_add_tail(&xfers, &spi_msg);
> > +
> > + error = spi_sync(spi, &spi_msg);
> > + if (error)
> > + dev_err(ts->dev, "spi transfer error:%d", error);
> > +
> > + kfree(buf);
> > + return error;
> > +}
> > +
> > +static int goodix_dev_confirm(struct goodix_ts_data *ts)
> > +{
> > + u8 tx_buf[8], rx_buf[8];
> > + int retry = 3;
> > + int error;
> > +
> > + gpiod_set_value_cansleep(ts->reset_gpio, 0);
> > + usleep_range(4000, 4100);
> > +
> > + memset(tx_buf, GOODIX_DEV_CONFIRM_VAL, sizeof(tx_buf));
> > + while (retry--) {
> > + error = goodix_spi_write(ts, GOODIX_DEV_CONFIRM_ADDR,
> > + tx_buf, sizeof(tx_buf));
> > + if (error)
> > + return error;
> > +
> > + error = goodix_spi_read(ts, GOODIX_DEV_CONFIRM_ADDR,
> > + rx_buf, sizeof(rx_buf));
> > + if (error)
> > + return error;
> > +
> > + if (!memcmp(tx_buf, rx_buf, sizeof(tx_buf)))
> > + return 0;
> > +
> > + usleep_range(5000, 5100);
> > + }
> > +
> > + dev_err(ts->dev, "device confirm failed, rx_buf:%*ph", 8, rx_buf);
> > + return -EINVAL;
> > +}
> > +
> > +/**
> > + * goodix_hid_parse() - hid-core .parse() callback
> > + * @hid: hid device instance
> > + *
> > + * This function gets called during call to hid_add_device
> > + *
> > + * Return: 0 on success and non zero on error
> > + */
> > +static int goodix_hid_parse(struct hid_device *hid)
> > +{
> > + struct goodix_ts_data *ts = hid->driver_data;
> > + u16 rsize;
> > + u8 *rdesc;
> > + int error;
> > +
> > + rsize = le16_to_cpu(ts->hid_desc.report_desc_lenght);
> > + if (!rsize || rsize > HID_MAX_DESCRIPTOR_SIZE) {
> > + dev_err(ts->dev, "invalid report desc size %d", rsize);
> > + return -EINVAL;
> > + }
> > +
> > + rdesc = kzalloc(rsize, GFP_KERNEL);
>
> We now have nifty
>
> u8 *rdesc __free(kfree) = kzalloc(rsize, GFP_KERNEL);
>
> (see include/linux/cleanup.h) and you do not need to free memory by
> hand.
>
Ack, this great.
> > + if (!rdesc)
> > + return -ENOMEM;
> > +
> > + error = goodix_spi_read(ts, GOODIX_HID_REPORT_DESC_ADDR, rdesc, rsize);
> > + if (error) {
> > + dev_err(ts->dev, "failed get report desc, %d", error);
> > + goto free_mem;
> > + }
> > +
> > + error = hid_parse_report(hid, rdesc, rsize);
> > + if (error)
> > + dev_err(ts->dev, "failed parse report, %d", error);
> > +
> > +free_mem:
> > + kfree(rdesc);
> > + return error;
> > +}
> > +
> > +/* Empty callbacks with success return code */
>
> Hmm, I see you are using falling edge interrupt. Don't you have concern
> of having it "stuck" here? I do not think all these should be stubs...
>
Thank you for pointing this out. The trigger method shouldn't be fixed
within the driver. As for "stuck", I believe this issue does not exit.
The firmware won't wait for the host's response.
> Does the device have low power mode that can be used when controller is
> not in use (inhibited for example)?
>
The low power control function is currently being tested and will be
updated later.
> > +static int goodix_hid_start(struct hid_device *hid)
> > +{
> > + return 0;
> > +}
> > +
> > +static void goodix_hid_stop(struct hid_device *hid)
> > +{
> > +}
> > +
> > +static int goodix_hid_open(struct hid_device *hid)
> > +{
> > + return 0;
> > +}
> > +
> > +static void goodix_hid_close(struct hid_device *hid)
> > +{
> > +}
> > +
> > +/* Return date length of response data */
> > +static int goodix_hid_check_ack_status(struct goodix_ts_data *ts)
> > +{
> > + struct goodix_hid_report_header hdr;
> > + int retry = 20;
> > + int error;
> > +
> > + while (retry--) {
> > + /*
> > + * 3 bytes of hid request response data
> > + * - byte 0: Ack flag, value of 1 for data ready
> > + * - bytes 1-2: Response data length
> > + */
> > + error = goodix_spi_read(ts, GOODIX_HID_REPORT_ADDR,
> > + (u8 *)&hdr, sizeof(hdr));
> > + if (!error && (hdr.flag & GOODIX_HID_ACK_READY_FLAG))
> > + return le16_to_cpu(hdr.size);
> > +
> > + /* Wait 10ms for another try */
> > + usleep_range(10000, 11000);
> > + }
> > +
> > + return -EINVAL;
> > +}
> > +
> > +/**
> > + * goodix_hid_get_raw_report() - Process hidraw GET REPORT operation
> > + * @hid: hid device instance
> > + * @reportnum: Report ID
> > + * @buf: Buffer for store the reprot date
> > + * @len: Length fo reprot data
> > + * @report_type: Report type
> > + *
> > + * The function for hid_ll_driver.get_raw_report to handle the HIDRAW ioctl
> > + * get report request. The transmitted data follows the standard i2c-hid
> > + * protocol with a specified header.
> > + *
> > + * Return: The length of the data in the buf on success, negative error code
> > + */
> > +static int goodix_hid_get_raw_report(struct hid_device *hid,
> > + unsigned char reportnum,
> > + __u8 *buf, size_t len,
> > + unsigned char report_type)
> > +{
> > + struct goodix_ts_data *ts = hid->driver_data;
> > + u16 data_register = le16_to_cpu(ts->hid_desc.data_register);
> > + u16 cmd_register = le16_to_cpu(ts->hid_desc.cmd_register);
> > + u8 tmp_buf[GOODIX_HID_MAX_INBUF_SIZE];
> > + int tx_len = 0, args_len = 0;
> > + int response_data_len;
> > + u8 args[3];
> > + int error;
> > +
> > + if (report_type == HID_OUTPUT_REPORT)
> > + return -EINVAL;
> > +
> > + if (reportnum == 3) {
> > + /* Get win8 signature data */
> > + error = goodix_spi_read(ts, GOODIX_HID_SIGN_ADDR, buf, len);
> > + if (error) {
> > + dev_err(ts->dev, "failed get win8 sign:%d", error);
> > + return -EINVAL;
> > + }
> > + return len;
> > + }
> > +
> > + if (reportnum >= 0x0F) {
> > + args[args_len++] = reportnum;
> > + reportnum = 0x0F;
> > + }
> > + put_unaligned_le16(data_register, args + args_len);
> > + args_len += sizeof(data_register);
> > +
> > + /* Clean 3 bytes of hid ack header data */
> > + memset(tmp_buf, 0, GOODIX_HID_ACK_HEADER_SIZE);
> > + tx_len += GOODIX_HID_ACK_HEADER_SIZE;
> > +
> > + put_unaligned_le16(cmd_register, tmp_buf + tx_len);
> > + tx_len += sizeof(cmd_register);
> > +
> > + tmp_buf[tx_len++] = ((report_type == HID_FEATURE_REPORT ? 0x03 : 0x01) << 4) | reportnum;
> > + tmp_buf[tx_len++] = GOODIX_HID_GET_REPORT_CMD;
> > +
> > + memcpy(tmp_buf + tx_len, args, args_len);
> > + tx_len += args_len;
> > +
> > + /* Step1: write report request info */
> > + error = goodix_spi_write(ts, GOODIX_HID_REPORT_ADDR, tmp_buf, tx_len);
> > + if (error) {
> > + dev_err(ts->dev, "failed send read feature cmd, %d", error);
> > + return error;
> > + }
> > +
> > + /* No need read response data */
> > + if (!len)
> > + return 0;
> > +
> > + /* Step2: check response data status */
> > + response_data_len = goodix_hid_check_ack_status(ts);
> > + if (response_data_len <= 0)
> > + return -EINVAL;
> > +
> > + /* Step3: read response data(skip 2bytes of hid pkg length) */
> > + error = goodix_spi_read(ts, GOODIX_REPORT_DATA_ADDR, buf,
> > + response_data_len - GOODIX_HID_PKG_LEN_SIZE);
> > + if (error) {
> > + dev_err(ts->dev, "failed read hid response data, %d", error);
> > + return error;
> > + }
> > +
> > + return response_data_len - GOODIX_HID_PKG_LEN_SIZE;
> > +}
> > +
> > +/**
> > + * goodix_hid_set_raw_report() - process hidraw SET REPORT operation
> > + * @hid: HID device
> > + * @reportnum: Report ID
> > + * @buf: Buffer for communication
> > + * @len: Length of data in the buffer
> > + * @report_type: Report type
> > + *
> > + * The function for hid_ll_driver.get_raw_report to handle the HIDRAW ioctl
> > + * set report request. The transmitted data follows the standard i2c-hid
> > + * protocol with a specified header.
> > + *
> > + * Return: The length of the data sent, negative error code on failure
> > + */
> > +static int goodix_hid_set_raw_report(struct hid_device *hid,
> > + unsigned char reportnum,
> > + __u8 *buf, size_t len,
> > + unsigned char report_type)
> > +{
> > + struct goodix_ts_data *ts = hid->driver_data;
> > + u16 data_register = le16_to_cpu(ts->hid_desc.data_register);
> > + u16 cmd_register = le16_to_cpu(ts->hid_desc.cmd_register);
> > + int tx_len = 0, args_len = 0;
> > + u8 tmp_buf[GOODIX_HID_MAX_INBUF_SIZE];
> > + u8 args[5];
> > + int error;
> > +
> > + if (reportnum >= 0x0F) {
> > + args[args_len++] = reportnum;
> > + reportnum = 0x0F;
> > + }
> > +
> > + put_unaligned_le16(data_register, args + args_len);
> > + args_len += sizeof(data_register);
> > +
> > + put_unaligned_le16(GOODIX_HID_PKG_LEN_SIZE + len, args + args_len);
> > + args_len += GOODIX_HID_PKG_LEN_SIZE;
> > +
> > + /* Clean 3 bytes of hid ack header data */
> > + memset(tmp_buf, 0, GOODIX_HID_ACK_HEADER_SIZE);
> > + tx_len += GOODIX_HID_ACK_HEADER_SIZE;
> > +
> > + put_unaligned_le16(cmd_register, tmp_buf + tx_len);
> > + tx_len += sizeof(cmd_register);
> > +
> > + tmp_buf[tx_len++] = ((report_type == HID_FEATURE_REPORT ? 0x03 : 0x02) << 4) | reportnum;
> > + tmp_buf[tx_len++] = GOODIX_HID_SET_REPORT_CMD;
> > +
> > + memcpy(tmp_buf + tx_len, args, args_len);
> > + tx_len += args_len;
> > +
> > + memcpy(tmp_buf + tx_len, buf, len);
> > + tx_len += len;
> > +
> > + error = goodix_spi_write(ts, GOODIX_HID_REPORT_ADDR, tmp_buf, tx_len);
> > + if (error) {
> > + dev_err(ts->dev, "failed send report %*ph", tx_len, tmp_buf);
> > + return error;
> > + }
> > + return len;
> > +}
> > +
> > +static int goodix_hid_raw_request(struct hid_device *hid,
> > + unsigned char reportnum,
> > + __u8 *buf, size_t len,
> > + unsigned char rtype, int reqtype)
> > +{
> > + switch (reqtype) {
> > + case HID_REQ_GET_REPORT:
> > + return goodix_hid_get_raw_report(hid, reportnum, buf,
> > + len, rtype);
> > + case HID_REQ_SET_REPORT:
> > + if (buf[0] != reportnum)
> > + return -EINVAL;
> > + return goodix_hid_set_raw_report(hid, reportnum, buf,
> > + len, rtype);
> > + default:
> > + return -EIO;
> > + }
> > +
> > + return -EINVAL;
> > +}
> > +
> > +static struct hid_ll_driver goodix_hid_ll_driver = {
> > + .parse = goodix_hid_parse,
> > + .start = goodix_hid_start,
> > + .stop = goodix_hid_stop,
> > + .open = goodix_hid_open,
> > + .close = goodix_hid_close,
> > + .raw_request = goodix_hid_raw_request
> > +};
> > +
> > +static irqreturn_t goodix_hid_irq(int irq, void *data)
> > +{
> > + struct goodix_ts_data *ts = data;
> > + struct goodix_hid_report_event event;
> > + struct goodix_hid_report_package *pkg;
> > + u16 report_size;
> > + int error;
> > +
> > + /*
> > + * First, read buffer with space for header and coordinate package:
> > + * - event header = 3 bytes
> > + * - coordinate event = GOODIX_HID_COOR_PKG_LEN bytes
> > + *
> > + * If the data size info in the event header exceeds
> > + * GOODIX_HID_COOR_PKG_LEN, it means that there are other packages
> > + * besides the coordinate package.
> > + */
> > + error = goodix_spi_read(ts, GOODIX_HID_REPORT_ADDR, (u8 *)&event,
> > + sizeof(event));
> > + if (error) {
> > + dev_err(ts->dev, "failed get coordinate data, %d", error);
> > + return IRQ_HANDLED;
> > + }
> > +
> > + /* Check coordinate data valid falg */
> > + if (event.hdr.flag != GOODIX_HID_REPORT_READY_FLAG) {
> > + dev_err(ts->dev, "invalid event flag 0x%x", event.hdr.flag);
> > + return IRQ_HANDLED;
> > + }
> > +
> > + pkg = (struct goodix_hid_report_package *)event.data;
> > + hid_input_report(ts->hid, HID_INPUT_REPORT, pkg->data,
> > + le16_to_cpu(pkg->size) - GOODIX_HID_PKG_LEN_SIZE, 1);
> > +
> > + report_size = le16_to_cpu(event.hdr.size);
> > + /* Check if there are other packages */
> > + if (report_size <= GOODIX_HID_COOR_PKG_LEN)
> > + return IRQ_HANDLED;
> > +
> > + if (report_size - GOODIX_HID_COOR_PKG_LEN > sizeof(ts->xfer_buf)) {
> > + dev_err(ts->dev, "invalid package size, %d", report_size);
> > + return IRQ_HANDLED;
> > + }
> > +
> > + /* Read the package behind the coordinate data */
> > + error = goodix_spi_read(ts, GOODIX_HID_REPORT_ADDR + sizeof(event),
> > + ts->xfer_buf,
> > + report_size - GOODIX_HID_COOR_PKG_LEN);
> > + if (error) {
> > + dev_err(ts->dev, "failed read data, %d", error);
> > + return IRQ_HANDLED;
> > + }
> > +
> > + pkg = (struct goodix_hid_report_package *)ts->xfer_buf;
> > + hid_input_report(ts->hid, HID_INPUT_REPORT, pkg->data,
> > + le16_to_cpu(pkg->size) - GOODIX_HID_PKG_LEN_SIZE, 1);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int goodix_hid_init(struct goodix_ts_data *ts)
> > +{
> > + struct hid_device *hid;
> > + int error;
> > +
> > + /* Get hid descriptor */
> > + error = goodix_spi_read(ts, GOODIX_HID_DESC_ADDR, (u8 *)&ts->hid_desc,
> > + sizeof(ts->hid_desc));
> > + if (error) {
> > + dev_err(ts->dev, "failed get hid desc, %d", error);
> > + return error;
> > + }
> > +
> > + hid = hid_allocate_device();
> > + if (IS_ERR(hid))
> > + return PTR_ERR(hid);
> > +
> > + hid->driver_data = ts;
> > + hid->ll_driver = &goodix_hid_ll_driver;
> > + hid->bus = BUS_SPI;
> > + hid->dev.parent = &ts->spi->dev;
> > +
> > + hid->version = le16_to_cpu(ts->hid_desc.bcd_version);
> > + hid->vendor = le16_to_cpu(ts->hid_desc.vendor_id);
> > + hid->product = le16_to_cpu(ts->hid_desc.product_id);
> > + snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", "hid-gdix",
> > + hid->vendor, hid->product);
> > +
> > + error = hid_add_device(hid);
> > + if (error) {
> > + dev_err(ts->dev, "failed add hid device, %d", error);
> > + hid_destroy_device(hid);
> > + return error;
> > + }
> > +
> > + ts->hid = hid;
> > + return 0;
> > +}
> > +
> > +static int goodix_spi_probe(struct spi_device *spi)
> > +{
> > + struct device *dev = &spi->dev;
> > + struct goodix_ts_data *ts;
> > + int error;
> > +
> > + /* init spi_device */
> > + spi->mode = SPI_MODE_0;
> > + spi->bits_per_word = 8;
> > + error = spi_setup(spi);
> > + if (error)
> > + return error;
> > +
> > + ts = devm_kzalloc(dev, sizeof(*ts), GFP_KERNEL);
> > + if (!ts)
> > + return -ENOMEM;
> > +
> > + spi_set_drvdata(spi, ts);
> > + ts->spi = spi;
> > + ts->dev = dev;
> > + ts->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
> > + if (IS_ERR(ts->reset_gpio))
> > + return dev_err_probe(dev, PTR_ERR(ts->reset_gpio),
> > + "Failed to request reset gpio\n");
> > +
> > + error = goodix_dev_confirm(ts);
> > + if (error)
> > + return error;
> > +
> > + /* Waits 150ms for firmware to fully boot */
> > + msleep(GOODIX_NORMAL_RESET_DELAY_MS);
> > +
> > + error = devm_request_threaded_irq(&ts->spi->dev, ts->spi->irq,
> > + NULL, goodix_hid_irq,
> > + IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> > + "goodix_spi_hid", ts);
> > + if (error < 0) {
> > + dev_err(ts->dev, "could not register interrupt, irq = %d, %d",
> > + ts->spi->irq, error);
> > + return error;
> > + }
>
> I do not think it is safe. Your interrupt is hot here, but you are
> allocating and registering HID device instance in goodix_hid_init(). If
> interrupt arrives right away you will likely crash.
>
Thank you for identifying this issue. You are right; Will address this
problem in the next version.
> > +
> > + error = goodix_hid_init(ts);
> > + if (error) {
> > + dev_err(dev, "failed init hid device");
> > + return error;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static void goodix_spi_remove(struct spi_device *spi)
> > +{
> > + struct goodix_ts_data *ts = spi_get_drvdata(spi);
> > +
> > + hid_destroy_device(ts->hid);
>
> This is not safe either, you destroy the device, but interrupts are
> enabled and nothing stops them from coming...
>
Thanks a lot, will fix this in the next version.
After rereading the kernel source, I realized that the devres release
are called after driver remove function.
> > +}
> > +
> > +static void goodix_spi_shutdown(struct spi_device *spi)
> > +{
> > + struct goodix_ts_data *ts = spi_get_drvdata(spi);
> > +
> > + disable_irq_nosync(spi->irq);
>
> Why nosync? Seems dangerous. Please add a comment why nosync is needed
> and why it is safe.
>
Sorry, I just copied this from another place without deep thinking.
disable_irq seems more suitable here.
> > + hid_destroy_device(ts->hid);
> > +}
> > +
> > +#ifdef CONFIG_ACPI
> > +static const struct acpi_device_id goodix_spi_acpi_match[] = {
> > + { "GXTS7986" },
> > + { },
> > +};
> > +MODULE_DEVICE_TABLE(acpi, goodix_spi_acpi_match);
> > +#endif
> > +
> > +static struct spi_driver goodix_spi_driver = {
> > + .driver = {
> > + .name = "goodix-spi-hid",
> > + .acpi_match_table = ACPI_PTR(goodix_spi_acpi_match),
> > + },
> > + .probe = goodix_spi_probe,
> > + .remove = goodix_spi_remove,
> > + .shutdown = goodix_spi_shutdown,
> > +};
> > +module_spi_driver(goodix_spi_driver);
> > +
> > +MODULE_DESCRIPTION("Goodix SPI driver for HID touchscreen");
> > +MODULE_AUTHOR("Goodix, Inc.");
> > +MODULE_LICENSE("GPL");
> > --
> > 2.43.0
> >
> >
>
Thanks
Charles
^ permalink raw reply
* Re: [PATCH] [v3] HID: intel-ish-hid: fix endian-conversion
From: srinivas pandruvada @ 2024-06-04 11:23 UTC (permalink / raw)
To: Zhang, Lixu, Arnd Bergmann, Jiri Kosina
Cc: Arnd Bergmann, Benjamin Tissoires, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <DM4PR11MB599501461E04F76B9F32374093FF2@DM4PR11MB5995.namprd11.prod.outlook.com>
On Mon, 2024-06-03 at 08:38 +0000, Zhang, Lixu wrote:
> > -----Original Message-----
> > From: Arnd Bergmann <arnd@kernel.org>
> > Sent: Monday, June 3, 2024 3:41 PM
> > To: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>; Jiri
> > Kosina
> > <jikos@kernel.org>; Zhang, Lixu <lixu.zhang@intel.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>; Benjamin Tissoires
> > <bentiss@kernel.org>; linux-input@vger.kernel.org; linux-
> > kernel@vger.kernel.org
> > Subject: [PATCH] [v3] HID: intel-ish-hid: fix endian-conversion
> >
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > The newly added file causes a ton of sparse warnings about the
> > incorrect use of
> > __le32 and similar types:
> >
> > Add the necessary conversions and use temporary variables where
> > appropriate
> > to avoid converting back.
> >
> > Fixes: 579a267e4617 ("HID: intel-ish-hid: Implement loading
> > firmware from
> > host feature")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Reviewed-by: Zhang Lixu <lixu.zhang@intel.com>
> Tested-by: Zhang Lixu <lixu.zhang@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>
> Thanks,
> Lixu
> > ---
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).