From patchwork Fri Feb 25 00:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E33BC433FE for ; Fri, 25 Feb 2022 00:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236233AbiBYBAQ (ORCPT ); Thu, 24 Feb 2022 20:00:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236091AbiBYBAQ (ORCPT ); Thu, 24 Feb 2022 20:00:16 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A28C12804FE; Thu, 24 Feb 2022 16:59:45 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id v4so3458922pjh.2; Thu, 24 Feb 2022 16:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iyT2GuPTXkTjkm6mgXba55Gka6UiyKyqHH8exrFhwZs=; b=INX2p11o5cxymZOBn5JdiSz4t9cclINTplxsmdL1XPsEy5YFGJsgX9fPWHvAmSG342 sIs8q4ZZGt7ncnxL1bM4PixnbA58s+BXbWtd7Sa9Qw/Y2v/IF8VMxnmyGfNegxynBOB+ /w0aGuEEtrwZe+VwhK501ZPDtVpJsymi2Qa1xiFT4n9Me4IIVh8lRsefqv9AaW9dhh4N g6C65x7fw4OwN+bguVgP/EuoXgj5sWpftI+oV7t0ZptCcy8S4huTa6y875yrEMUNIChn tSVMF3LBSiccWDr2Xe/hGt7mYdv/9zAzUw6hp2xO/9xmJYIXtpaEkUPRP2W1QegkC2a1 ENdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iyT2GuPTXkTjkm6mgXba55Gka6UiyKyqHH8exrFhwZs=; b=N0blV/vpUzsD0etyEU4xR68whdpHZYtqvdodxGYyeiGKg7YXrSm2JEn2Rz5Q+wDZLg s92ZUb9BAmoUMZK/HJAdo4iNeIivLHu7vp2pYZc+sPLL4YzN7filtUQADIkTNVjVApd6 uFLrkOeaZ58JGBPD45ojKjey9bgPhbMgqmyfgjogf48csNE7r0ZutUE9pZ41XRpgdNY5 TAvYMx1D1t97br4aBz/OzHTukgfh+eMKc/9EzzW7wEUn4TDSYP3EWhYn2WcUWCaJJ+bT nyaDM+CJRyZhVPPWBB2LlDxnb2IdzA8pJys7VlXzNbm55hBAzZh8Cn5G0Vwt6gCN0Y8H WCig== X-Gm-Message-State: AOAM531tns+Ws4FHsK+8A7SDZDIDYzJE+Xk2wbF6CDuW4dCHOSEo3sWl P9LMXSbHNaOrYgVGpuTQicI= X-Google-Smtp-Source: ABdhPJyzrKjtyL/s5LlgGiZaXsisYkfPP5OGOZFr0WRnbRaRTX+pgHBLEX43sM5iWvml6X3M6JBxHA== X-Received: by 2002:a17:90a:2c0c:b0:1b9:fa47:1caf with SMTP id m12-20020a17090a2c0c00b001b9fa471cafmr735590pjd.34.1645750784632; Thu, 24 Feb 2022 16:59:44 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:44 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 1/6] HID: Add BUS_SPI support when printing out device info in hid_connect() Date: Thu, 24 Feb 2022 16:59:31 -0800 Message-Id: <20220225005936.3485405-2-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov If connecting a hid_device with bus field indicating BUS_SPI print out "SPI" in the debug print. Signed-off-by: Dmitry Antipov --- drivers/hid/hid-core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index dbed2524fd47..65350ad985fe 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2005,6 +2005,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) case BUS_I2C: bus = "I2C"; break; + case BUS_SPI: + bus = "SPI"; + break; case BUS_VIRTUAL: bus = "VIRTUAL"; break; From patchwork Fri Feb 25 00:59:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759498 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7269AC433F5 for ; Fri, 25 Feb 2022 00:59:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236238AbiBYBAU (ORCPT ); Thu, 24 Feb 2022 20:00:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236091AbiBYBAT (ORCPT ); Thu, 24 Feb 2022 20:00:19 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9A292804FE; Thu, 24 Feb 2022 16:59:48 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id bx9-20020a17090af48900b001bc64ee7d3cso3419676pjb.4; Thu, 24 Feb 2022 16:59:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SiBHZa5nz3s5X5wtDcIiG42DYwgMJ7OeGuL/D9inyEI=; b=oCT9eDwoPZ9uCBJkvNKZMqGI+N2XaSrU5s3Lqs2loQn0ErNtYeqGMTt2kj3/mu7dfy DQ4MqvHBBzV1cGKWlhHshkjabKNo+Y5VYVIaSQAnyt2naQDMoBvhsiJICHbzhkGkuWlx BVY4FzOPGgyMgfH44dRMPPmouR9SihEScivLP2MRUKehLNIli2bXDhWG4Wti0Mo/NM+L 3wV461aGepjroqRVHRbvSl6jqy59PVStcls43hNanLtLeCAUvYorTdmuCmPon887uNcz hXFeobyMBxRn4xsi89ERsz8hP/LflpYZJrUgLe75BijLHfNA0U70iKEhhsEXULkWyEkz uSZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SiBHZa5nz3s5X5wtDcIiG42DYwgMJ7OeGuL/D9inyEI=; b=aDdilA+Wqe5Rf34e8OV1wAvYOyOWqyUMceu9PjD9e9cyM3ddO9vfccvVMDbHMaJbV8 QFmAQXE4R34qTWeRwSMbnL3xPjlv08dzUgbdh8qeK2GAEXB5+FseW9ZMbyIdwJnnEWnp Iti1wzV12/r43SF68IGsraVlGPa7jnMmnhEmIX5c1AbxkO431xjuIQIdzcs9SfYzi0as ZLounYbVWMU7OrJXipVUVxFI35Z/Nr1tooNCAnm/FCAEhHuWSuDbb3ZCDWodxKP3XULz I5hJ4+mn/xSjSeqYqMwkHiIJu6m5XZJk1NiCiCd3HYbyyweNFkQY1PwhjBdFNif2AtMJ omXA== X-Gm-Message-State: AOAM532A00pLX4DQD5JEwQKu9I4TjZ7PMVPisefb59AUqi0lHheR4t3g Cz8JtE9N4LR9OFFlboGgLSY= X-Google-Smtp-Source: ABdhPJyS07kVLUhnBXeQXLkOT/TsdkvbuP2OXSWni6R3nHkTg8wP9DMOgAQnVUP2Chfo+PyYZlaXNQ== X-Received: by 2002:a17:902:be14:b0:14f:ce67:d0a1 with SMTP id r20-20020a170902be1400b0014fce67d0a1mr4926367pls.29.1645750788415; Thu, 24 Feb 2022 16:59:48 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:48 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 2/6] HID: define HID_SPI_DEVICE macro in hid.h Date: Thu, 24 Feb 2022 16:59:32 -0800 Message-Id: <20220225005936.3485405-3-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov Macro sets the bus field to BUS_SPI and uses arguments to set vendor product fields. Signed-off-by: Dmitry Antipov --- include/linux/hid.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/hid.h b/include/linux/hid.h index f453be385bd4..1f134c8f8972 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -684,6 +684,8 @@ struct hid_descriptor { .bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod) #define HID_I2C_DEVICE(ven, prod) \ .bus = BUS_I2C, .vendor = (ven), .product = (prod) +#define HID_SPI_DEVICE(ven, prod) \ + .bus = BUS_SPI, .vendor = (ven), .product = (prod) #define HID_REPORT_ID(rep) \ .report_type = (rep) From patchwork Fri Feb 25 00:59:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67D5DC433FE for ; Fri, 25 Feb 2022 00:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236236AbiBYBAW (ORCPT ); Thu, 24 Feb 2022 20:00:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235011AbiBYBAV (ORCPT ); Thu, 24 Feb 2022 20:00:21 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA7062804FE; Thu, 24 Feb 2022 16:59:50 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id y5so3358535pfe.4; Thu, 24 Feb 2022 16:59:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HarL5/zDESWzDbkIHnU59WJXVsMBep1/fNRKYTr9jAE=; b=FEfUlf6EJgS98MtGimS+TaZAMOGU6ogXn3khmumCxAAHVsHW6YXrKCekr2UDEgRB6G zF9FBHE6aWk0I9tmg60kDIWT/6LVG6tpQh2j+7D3fd5ASqfGthjCTinqmBT6+YaVvfWK Zdruapk3pnFmjL8jpYOA+glnNRxIdogcYrv6MVi59UzvdarSCAAt6ZKi/R9ewIrH6eRO 01ISaoULIU5VkjmxibPWUENWZSgZfMDDDWMywZyXBDmiEeTVvJdEULq7Y+uh72zjXdl8 z0QTiFSD4MdLVLfYDWrwnpudbYqstC6rGvfGlaS4pAsfZKzJstl5jYzK3z06FpaTkJch pcwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HarL5/zDESWzDbkIHnU59WJXVsMBep1/fNRKYTr9jAE=; b=yFoesZoI5ljVpJB+vBPnXfWhmkjh1JYG01UPcqPr1eA1dbGwVI8H4/FfDkyQJ9CVeU WOtj5wHcL0x+SKuAiM8y2meARoTHL4i1k4IXdIhwsT0aJlTgXDx6JUFVavEjdwxMXNOP BxBXtQucTSzyN3LzbIFg5RyUI6X2cHezK1BQbBbO4nNIo+HUzVHOquxmNvhEYbNZTtJj g0xx8Pwo3owpg23hBJj6ty3TlVpXEI9NlxC0UOvhYV3VWomRgt6kY38vUXl1H+PCOISM ArEoFbV5Hu4JqV/7zDz7HklbqDr3a5944Y64SXfNFKlokQdtbgcYL3ZaZSfRxzkEjvUd andQ== X-Gm-Message-State: AOAM530yQOqafWLV/8AnXWrP5jdi/EjClKNo2uiz/TjDBzWI0fCN+koE A7Tyte3lfqjXxyEKyMGJbo0= X-Google-Smtp-Source: ABdhPJwFN51nYhY5jXI1+TkBsvmb7jPAdyQOkOIghEZDXb52VVLNKcu/nuYLzyhsOgeagqbOZlU0Ow== X-Received: by 2002:a65:6a13:0:b0:373:14f6:5d33 with SMTP id m19-20020a656a13000000b0037314f65d33mr4216673pgu.62.1645750790165; Thu, 24 Feb 2022 16:59:50 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:49 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 3/6] Documentation: DT bindings for Microsoft G6 Touch Digitizer Date: Thu, 24 Feb 2022 16:59:33 -0800 Message-Id: <20220225005936.3485405-4-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov Documentation describes the required and optional properties for implementing Device Tree for a Microsoft G6 Touch Digitizer that supports HID over SPI Protocol 1.0 specification. Signed-off-by: Dmitry Antipov --- .../input/microsoft,g6-touch-digitizer.yaml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/microsoft,g6-touch-digitizer.yaml diff --git a/Documentation/devicetree/bindings/input/microsoft,g6-touch-digitizer.yaml b/Documentation/devicetree/bindings/input/microsoft,g6-touch-digitizer.yaml new file mode 100644 index 000000000000..e516717527e9 --- /dev/null +++ b/Documentation/devicetree/bindings/input/microsoft,g6-touch-digitizer.yaml @@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/microsoft,g6-touch-digitizer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microsoft G6 Touch Digitizer + +maintainers: + - Dmitry Antipov + +description: | + Microsoft G6 touch digitizer is a HID over SPI device supporting HID Over SPI + Protocol Specification 1.0, available at + https://www.microsoft.com/en-us/download/details.aspx?id=103325. + +properties: + compatible: + oneOf: + - const: microsoft,g6-touch-digitizer + - items: + - const: microsoft,g6-touch-digitizer + - const: hid-over-spi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + reset-gpios: + maxItems: 1 + description: + GPIO specifier for the digitizer's reset pin (active low). The line must + be flagged with GPIO_ACTIVE_LOW. + + vdd-supply: + description: + Regulator for the VDD supply voltage. + + input-report-header-address: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This property and the rest are described in HID Over SPI Protocol Spec 1.0 + + input-report-body-address: + $ref: /schemas/types.yaml#/definitions/uint32 + + output-report-address: + $ref: /schemas/types.yaml#/definitions/uint32 + + read-opcode: + $ref: /schemas/types.yaml#/definitions/uint32 + + write-opcode: + $ref: /schemas/types.yaml#/definitions/uint32 + + hid-over-spi-flags: + $ref: /schemas/types.yaml#/definitions/uint32 + + post-power-on-delay-ms: + description: + Optional time in ms required by the device after enabling its regulators + or powering it on, before it is ready for communication. + + minimal-reset-delay-ms: + description: + Optional minimum amount of time in ms that device needs to be in reset + state for the reset to take effect. + +required: + - compatible + - interrupts + - reset-gpios + - vdd-supply + - input-report-header-address + - input-report-body-address + - output-report-address + - read-opcode + - write-opcode + - hid-over-spi-flags + +additionalProperties: false + +examples: + - | + #include + #include + spi-hid-dev0 { + compatible = "microsoft,g6-touch-digitizer", "hid-over-spi"; + reg = <0>; + interrupts-extended = <&gpio 42 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>; + vdd-supply = <&pm8350c_l3>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_d6_reset_assert &ts_d6_int_bias>; + input-report-header-address = <0x1000>; + input-report-body-address = <0x1004>; + output-report-address = <0x2000>; + read-opcode = <0x0b>; + write-opcode = <0x02>; + hid-over-spi-flags = <0x00>; + post-power-on-delay-ms = <5>; + minimal-reset-delay-ms = <5>; + }; From patchwork Fri Feb 25 00:59:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759500 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 772F6C433F5 for ; Fri, 25 Feb 2022 00:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236091AbiBYBAY (ORCPT ); Thu, 24 Feb 2022 20:00:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235011AbiBYBAX (ORCPT ); Thu, 24 Feb 2022 20:00:23 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46ACB2819A5; Thu, 24 Feb 2022 16:59:53 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id ev16-20020a17090aead000b001bc3835fea8so3487781pjb.0; Thu, 24 Feb 2022 16:59:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1LYyiuzySTYab5AWLbomJLC5ogjyw6DZmtGr16Spi3E=; b=kA4ahrerTGSfUevzXA6H2Nksdb2K+8y4H8Xe552TZ11Kq+zljpuVJewrtwLwelw66j BXGMOhMfp5uOO5mEGvNLvdMsaLS+nh8E0XYtecGZpVI5LkBA/zZscDlq6vqFtSAdHOMX esiiflHUCm1zm6gxSQuKW/xl37CpWl2iQGsQQ0pQPkwKT9ENJC/L+vSy5bmgk8CY/v11 WGSPEczMSLgoY5FmnaKEti1Myhkhqy1eWvUlgxLPcWwCLTL9R6Cm0Ska8TGJyWtLyQvQ JMzb7HlAjTP/kYhj58GGd1QfXokG+cK3tNI+RIhfuhmEQ+/7wKvaLvMTh0GjNXofDqd6 xwkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1LYyiuzySTYab5AWLbomJLC5ogjyw6DZmtGr16Spi3E=; b=7lKwvc+uy3qjjvQQEim7UJ2bSt7njp3NJ00sQUwesjvIt/nG9yjfqfAgef9dO8bc5a xVhzF19TfzoBBTtZp3suRi9i43gGjwR5eIGlW2vgPXzfsurKoRHcPp2Mt7UycKsn4oDU 2F9fcd4ebXe1cWCGzbyZ/TKS8vPEXyWcsG50L9wOvThJsybE+WaTJU4A0A2D6h1pvkQD M4upeHiJ3g7Rh+2zJaozbRAIt5RtymjTJCQZRUINapyYK1TtaDDFUM0lNx4+3gIIm6lA c1VU8yUWTOVLwZno6IiBb6T+b7caSw2mG9ifj27k/YyGwEIpx5xwSjhEozMHMaY9BGqY eGpA== X-Gm-Message-State: AOAM532Na8EQDd0FlupxqQW/G5KNHxNQI7/jTNOhWOagMblL0O5QUsMO sxwXlFYEQnr5QSr9+24hrymmGDwGnp4= X-Google-Smtp-Source: ABdhPJyHupZy2cugbsFgHGZ8p4gJ5YOcfPBkYXZtYFXlhIZnrIVfdN/VaqdAmLOmeEh0xvbMpk/3JQ== X-Received: by 2002:a17:90a:2849:b0:1bc:50a8:6970 with SMTP id p9-20020a17090a284900b001bc50a86970mr702116pjf.193.1645750792788; Thu, 24 Feb 2022 16:59:52 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:52 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 4/6] Documentation: Correction in HID output_report callback description. Date: Thu, 24 Feb 2022 16:59:34 -0800 Message-Id: <20220225005936.3485405-5-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov Originally output_report callback was described as must-be asynchronous, but that is not the case in some implementations, namely i2c-hid. Correct the documentation to say that it may be asynchronous. Signed-off-by: Dmitry Antipov --- Documentation/hid/hid-transport.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/hid/hid-transport.rst b/Documentation/hid/hid-transport.rst index 6f1692da296c..2008cf432af1 100644 --- a/Documentation/hid/hid-transport.rst +++ b/Documentation/hid/hid-transport.rst @@ -327,8 +327,8 @@ The available HID callbacks are: Send raw output report via intr channel. Used by some HID device drivers which require high throughput for outgoing requests on the intr channel. This - must not cause SET_REPORT calls! This must be implemented as asynchronous - output report on the intr channel! + must not cause SET_REPORT calls! This call might be asynchronous, so the + caller should not expect an immediate response! :: From patchwork Fri Feb 25 00:59:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759502 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E629C4332F for ; Fri, 25 Feb 2022 01:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236252AbiBYBA3 (ORCPT ); Thu, 24 Feb 2022 20:00:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235011AbiBYBA3 (ORCPT ); Thu, 24 Feb 2022 20:00:29 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CE822804FE; Thu, 24 Feb 2022 16:59:56 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id ge19-20020a17090b0e1300b001bcca16e2e7so2696647pjb.3; Thu, 24 Feb 2022 16:59:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6H9Ptpf2tYzna/ajDhlNgdyhKKMU3BSI/i4Qyj5f1V0=; b=Eb8a+J/m19+T//eTyf/EW3VXWo2N2RBkim1IPcN2v4bESsjcF3ibGuKlbZUdxSnClG YQqyTMsUSTDoL/S0MGFIwN16vXQehxcfG+3lWfBNnazsh7DFYX08hG+18MHBaE+4Gqtz OGD3vZf/skEf6ogXkGi3U6fcYVeit9OWqfRzNlodqHaOQr0LNrKGj9OwLBWVtRLiUO9+ 1n+WpPWHHy0WKxuhuIyg802t3ypYTDAPjgmkSL9Ka/iiGSywchwNXYLkBuOwsCN+e/lz yynbxiXNdqrrxbKZU8uh81jw9HjGXSmQgIpkWvk+NQptjT8CfmRyv3YX2G5oHWwnkISa 8n/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6H9Ptpf2tYzna/ajDhlNgdyhKKMU3BSI/i4Qyj5f1V0=; b=b8hs7YNFVwfadJ817iAN1MlvP0VcqsafNAYAtXv8JfbSiEcNQOPDcVyucLNylOVzzZ PfTiWGidEeXhY+WaKCh5+rL+A8ugjZvSjjyDg8an6nRtPAloZtf44yErJA48fm1ZZFOe TGicWoRXuZ7xNGDwYhz77ZZ99duGV6aCTu4tPmtoFv+ydSiSxxzY+I0Ji0tBq8RkZs/o 5oggaP2g+Nf6E8R1qOxLCg3MfL3fyB1HH1BCClQV5xi54k0uEvoBTcvCxqPEWlz3a0IA x8wvai3KCZe99ifH2kG1Lml/OuNSjiiNGkp/Me26/9lMUxt3zoZiOP9CNotUubqbKNMT F4lg== X-Gm-Message-State: AOAM533uvsmP3XSA0TLcD7iVrDn5/trH7f5w90IkNQrA8kNxZluaKh10 O4xg9swLiY6uBsy8Un7ww58= X-Google-Smtp-Source: ABdhPJzP20Q4dHlfsiOmeMn1zSjB4HVAT3DfOTvhRMkUw3SZ+mM0S+Kp79OHwxaow+DYpGQQvBz+5A== X-Received: by 2002:a17:902:9a4c:b0:14d:b0c0:1f7a with SMTP id x12-20020a1709029a4c00b0014db0c01f7amr4853683plv.57.1645750795072; Thu, 24 Feb 2022 16:59:55 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:54 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 5/6] HID: add spi-hid, transport driver for HID over SPI bus Date: Thu, 24 Feb 2022 16:59:35 -0800 Message-Id: <20220225005936.3485405-6-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov This driver follows HID Over SPI Protocol Specification 1.0 available at https://www.microsoft.com/en-us/download/details.aspx?id=103325. The initial version of the driver does not support: 1) multi-fragment input reports, 2) sending GET_INPUT and COMMAND output report types and processing their respective acknowledge input reports, and 3) device sleep power state. Signed-off-by: Dmitry Antipov --- drivers/hid/Kconfig | 2 + drivers/hid/Makefile | 1 + drivers/hid/spi-hid/Kconfig | 25 + drivers/hid/spi-hid/Makefile | 12 + drivers/hid/spi-hid/spi-hid-core.c | 1326 +++++++++++++++++++++++++++ drivers/hid/spi-hid/spi-hid-core.h | 188 ++++ drivers/hid/spi-hid/spi-hid-of.c | 141 +++ drivers/hid/spi-hid/spi-hid-of.h | 30 + drivers/hid/spi-hid/spi-hid_trace.h | 194 ++++ drivers/hid/spi-hid/trace.c | 9 + 10 files changed, 1928 insertions(+) create mode 100644 drivers/hid/spi-hid/Kconfig create mode 100644 drivers/hid/spi-hid/Makefile create mode 100644 drivers/hid/spi-hid/spi-hid-core.c create mode 100644 drivers/hid/spi-hid/spi-hid-core.h create mode 100644 drivers/hid/spi-hid/spi-hid-of.c create mode 100644 drivers/hid/spi-hid/spi-hid-of.h create mode 100644 drivers/hid/spi-hid/spi-hid_trace.h create mode 100644 drivers/hid/spi-hid/trace.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a7c78ac96270..cd2c10703fcf 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -1262,6 +1262,8 @@ source "drivers/hid/usbhid/Kconfig" source "drivers/hid/i2c-hid/Kconfig" +source "drivers/hid/spi-hid/Kconfig" + source "drivers/hid/intel-ish-hid/Kconfig" source "drivers/hid/amd-sfh-hid/Kconfig" diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 55a6fa3eca5a..caf418dda343 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -144,6 +144,7 @@ obj-$(CONFIG_USB_MOUSE) += usbhid/ obj-$(CONFIG_USB_KBD) += usbhid/ obj-$(CONFIG_I2C_HID_CORE) += i2c-hid/ +obj-$(CONFIG_SPI_HID) += spi-hid/ obj-$(CONFIG_INTEL_ISH_HID) += intel-ish-hid/ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/ diff --git a/drivers/hid/spi-hid/Kconfig b/drivers/hid/spi-hid/Kconfig new file mode 100644 index 000000000000..37302d658162 --- /dev/null +++ b/drivers/hid/spi-hid/Kconfig @@ -0,0 +1,25 @@ +# +# Copyright (c) 2021 Microsoft Corporation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +menu "SPI HID support" + depends on SPI + +config SPI_HID + tristate "HID over SPI transport layer" + default n + depends on SPI && INPUT && OF + select HID + help + Say Y here if you use a keyboard, a touchpad, a touchscreen, or any + other HID based devices which is connected to your computer via SPI. + + If unsure, say N. + + This support is also available as a module. If so, the module + will be called spi-hid. + +endmenu diff --git a/drivers/hid/spi-hid/Makefile b/drivers/hid/spi-hid/Makefile new file mode 100644 index 000000000000..b9f73982b956 --- /dev/null +++ b/drivers/hid/spi-hid/Makefile @@ -0,0 +1,12 @@ +# +# Copyright (c) 2021 Microsoft Corporation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +# Makefile for the HID over SPI transport driver +# +CFLAGS_trace.o = -I$(src) +obj-$(CONFIG_SPI_HID) += spi-hid.o +spi-hid-objs := spi-hid-core.o spi-hid-of.o trace.o diff --git a/drivers/hid/spi-hid/spi-hid-core.c b/drivers/hid/spi-hid/spi-hid-core.c new file mode 100644 index 000000000000..8a29bfe40590 --- /dev/null +++ b/drivers/hid/spi-hid/spi-hid-core.c @@ -0,0 +1,1326 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * HID over SPI protocol implementation + * + * Copyright (c) 2021 Microsoft Corporation + * + * This code is partly based on "HID over I2C protocol implementation: + * + * Copyright (c) 2012 Benjamin Tissoires + * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France + * Copyright (c) 2012 Red Hat, Inc + * + * which in turn is partly based on "USB HID support for Linux": + * + * Copyright (c) 1999 Andreas Gal + * Copyright (c) 2000-2005 Vojtech Pavlik + * Copyright (c) 2005 Michael Haboustak for Concept2, Inc + * Copyright (c) 2007-2008 Oliver Neukum + * Copyright (c) 2006-2010 Jiri Kosina + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "spi-hid-core.h" +#include "spi-hid_trace.h" +#include "spi-hid-of.h" +#include "../hid-ids.h" + +#define SPI_HID_MAX_RESET_ATTEMPTS 3 + +static struct hid_ll_driver spi_hid_ll_driver; + +static void spi_hid_populate_read_approvals(struct spi_hid_of_config *conf, + u8 *header_buf, u8 *body_buf) +{ + header_buf[0] = conf->read_opcode; + header_buf[1] = (conf->input_report_header_address >> 16) & 0xff; + header_buf[2] = (conf->input_report_header_address >> 8) & 0xff; + header_buf[3] = (conf->input_report_header_address >> 0) & 0xff; + header_buf[4] = SPI_HID_READ_APPROVAL_CONSTANT; + + body_buf[0] = conf->read_opcode; + body_buf[1] = (conf->input_report_body_address >> 16) & 0xff; + body_buf[2] = (conf->input_report_body_address >> 8) & 0xff; + body_buf[3] = (conf->input_report_body_address >> 0) & 0xff; + body_buf[4] = SPI_HID_READ_APPROVAL_CONSTANT; +} + +static void spi_hid_parse_dev_desc(struct spi_hid_device_desc_raw *raw, + struct spi_hid_device_descriptor *desc) +{ + desc->hid_version = le16_to_cpu(raw->bcdVersion); + desc->report_descriptor_length = le16_to_cpu(raw->wReportDescLength); + desc->max_input_length = le16_to_cpu(raw->wMaxInputLength); + desc->max_output_length = le16_to_cpu(raw->wMaxOutputLength); + + /* FIXME: multi-fragment not supported, field below not used */ + desc->max_fragment_length = le16_to_cpu(raw->wMaxFragmentLength); + + desc->vendor_id = le16_to_cpu(raw->wVendorID); + desc->product_id = le16_to_cpu(raw->wProductID); + desc->version_id = le16_to_cpu(raw->wVersionID); + desc->no_output_report_ack = le16_to_cpu(raw->wFlags) & BIT(0); +} + +static void spi_hid_populate_input_header(u8 *buf, + struct spi_hid_input_header *header) +{ + header->version = buf[0] & 0xf; + header->report_length = le16_to_cpu((buf[1] | ((buf[2] & 0x3f) << 8)) * 4); + header->last_fragment_flag = (buf[2] & 0x40) >> 6; + header->sync_const = buf[3]; +} + +static void spi_hid_populate_input_body(u8 *buf, + struct spi_hid_input_body *body) +{ + body->report_type = buf[0]; + body->content_length = le16_to_cpu(buf[1] | (buf[2] << 8)); + body->content_id = buf[3]; +} + +static void spi_hid_input_report_prepare(struct spi_hid_input_buf *buf, + struct spi_hid_input_report *report) +{ + struct spi_hid_input_header header; + struct spi_hid_input_body body; + + spi_hid_populate_input_header(buf->header, &header); + spi_hid_populate_input_body(buf->body, &body); + report->report_type = body.report_type; + report->content_length = body.content_length; + report->content_id = body.content_id; + report->content = buf->content; +} + +static void spi_hid_populate_output_header(u8 *buf, + struct spi_hid_of_config *conf, + struct spi_hid_output_report *report) +{ + buf[0] = conf->write_opcode; + buf[1] = (conf->output_report_address >> 16) & 0xff; + buf[2] = (conf->output_report_address >> 8) & 0xff; + buf[3] = (conf->output_report_address >> 0) & 0xff; + buf[4] = report->report_type; + buf[5] = report->content_length & 0xff; + buf[6] = (report->content_length >> 8) & 0xff; + buf[7] = report->content_id; +} + +static int spi_hid_input_sync(struct spi_hid *shid, void *buf, u16 length, + bool is_header) +{ + int ret; + struct device *dev = &shid->spi->dev; + + shid->input_transfer[0].tx_buf = is_header ? shid->read_approval_header : + shid->read_approval_body; + shid->input_transfer[0].len = SPI_HID_READ_APPROVAL_LEN; + + shid->input_transfer[1].rx_buf = buf; + shid->input_transfer[1].len = length; + + spi_message_init_with_transfers(&shid->input_message, + shid->input_transfer, 2); + + trace_spi_hid_input_sync(shid, + shid->input_transfer[0].tx_buf, + shid->input_transfer[0].len, + shid->input_transfer[1].rx_buf, + shid->input_transfer[1].len, 0); + + ret = spi_sync(shid->spi, &shid->input_message); + if (ret) { + dev_err(dev, "Error starting async transfer: %d, resetting\n", + ret); + shid->bus_error_count++; + shid->bus_last_error = ret; + schedule_work(&shid->error_work); + } + + return ret; +} + +static int spi_hid_output(struct spi_hid *shid, void *buf, u16 length) +{ + struct spi_transfer transfer; + struct spi_message message; + int ret; + + memset(&transfer, 0, sizeof(transfer)); + + transfer.tx_buf = buf; + transfer.len = length; + + spi_message_init_with_transfers(&message, &transfer, 1); + + trace_spi_hid_output_begin(shid, transfer.tx_buf, + transfer.len, NULL, 0, 0); + + ret = spi_sync(shid->spi, &message); + + trace_spi_hid_output_end(shid, transfer.tx_buf, + transfer.len, NULL, 0, ret); + + if (ret) { + shid->bus_error_count++; + shid->bus_last_error = ret; + } + + return ret; +} + +static const char *const spi_hid_power_mode_string(u8 power_state) +{ + switch (power_state) { + case SPI_HID_POWER_MODE_ON: + return "d0"; + case SPI_HID_POWER_MODE_SLEEP: + return "d2"; + case SPI_HID_POWER_MODE_OFF: + return "d3"; + case SPI_HID_POWER_MODE_WAKING_SLEEP: + return "d3*"; + default: + return "unknown"; + } +} + +static void spi_hid_suspend(struct spi_hid *shid) +{ + int ret; + struct device *dev = &shid->spi->dev; + + if (shid->power_state == SPI_HID_POWER_MODE_OFF) + return; + + if (shid->irq_enabled) { + disable_irq(shid->spi->irq); + shid->irq_enabled = false; + } else { + dev_err(dev, "%s called with interrupt already disabled\n", + __func__); + } + + shid->ready = false; + + spi_hid_of_assert_reset(&shid->conf); + + ret = spi_hid_of_power_down(&shid->conf); + if (ret) { + dev_err(dev, "%s: could not power down\n", __func__); + shid->regulator_error_count++; + shid->regulator_last_error = ret; + return; + } + + shid->power_state = SPI_HID_POWER_MODE_OFF; +} + +static void spi_hid_resume(struct spi_hid *shid) +{ + int ret; + struct device *dev = &shid->spi->dev; + + if (shid->power_state == SPI_HID_POWER_MODE_ON) + return; + + if (!shid->irq_enabled) { + enable_irq(shid->spi->irq); + shid->irq_enabled = true; + } else { + dev_err(dev, "%s called with interrupt already enabled\n", + __func__); + } + + ret = spi_hid_of_power_up(&shid->conf); + if (ret) { + dev_err(dev, "%s: could not power up\n", __func__); + shid->regulator_error_count++; + shid->regulator_last_error = ret; + return; + } + shid->power_state = SPI_HID_POWER_MODE_ON; + + spi_hid_of_deassert_reset(&shid->conf); +} + +static struct hid_device *spi_hid_disconnect_hid(struct spi_hid *shid) +{ + struct hid_device *hid = shid->hid; + + shid->hid = NULL; + + return hid; +} + +static void spi_hid_stop_hid(struct spi_hid *shid) +{ + struct hid_device *hid; + + hid = spi_hid_disconnect_hid(shid); + if (hid) { + cancel_work_sync(&shid->create_device_work); + cancel_work_sync(&shid->refresh_device_work); + hid_destroy_device(hid); + } +} + +static void spi_hid_error_work(struct work_struct *work) +{ + struct spi_hid *shid = container_of(work, struct spi_hid, error_work); + struct device *dev = &shid->spi->dev; + int ret; + + mutex_lock(&shid->power_lock); + if (shid->power_state == SPI_HID_POWER_MODE_OFF) + goto out; + + if (shid->attempts++ >= SPI_HID_MAX_RESET_ATTEMPTS) { + dev_err(dev, "unresponsive device, aborting.\n"); + spi_hid_stop_hid(shid); + spi_hid_of_assert_reset(&shid->conf); + ret = spi_hid_of_power_down(&shid->conf); + if (ret) { + dev_err(dev, "failed to disable regulator\n"); + shid->regulator_error_count++; + shid->regulator_last_error = ret; + } + goto out; + } + + trace_spi_hid_error_work(shid); + + shid->ready = false; + + spi_hid_of_assert_reset(&shid->conf); + + shid->power_state = SPI_HID_POWER_MODE_OFF; + cancel_work_sync(&shid->reset_response_work); + + spi_hid_of_sleep_minimal_reset_delay(&shid->conf); + + shid->power_state = SPI_HID_POWER_MODE_ON; + + spi_hid_of_deassert_reset(&shid->conf); +out: + mutex_unlock(&shid->power_lock); +} + +static int spi_hid_send_output_report(struct spi_hid *shid, + struct spi_hid_output_report *report) +{ + struct spi_hid_output_buf *buf = &shid->output; + struct device *dev = &shid->spi->dev; + u16 report_length; + u16 padded_length; + u8 padding; + int ret; + + if (report->content_length > shid->desc.max_output_length) { + dev_err(dev, "Output report too big, content_length 0x%x\n", + report->content_length); + ret = -E2BIG; + goto out; + } + + spi_hid_populate_output_header(buf->header, &shid->conf, report); + + if (report->content_length) + memcpy(&buf->content, report->content, report->content_length); + + report_length = sizeof(buf->header) + report->content_length; + padded_length = round_up(report_length, 4); + padding = padded_length - report_length; + memset(&buf->content[report->content_length], 0, padding); + + ret = spi_hid_output(shid, buf, padded_length); + if (ret) { + dev_err(dev, "Failed output transfer\n"); + goto out; + } + + return 0; + +out: + return ret; +} + +static int spi_hid_sync_request(struct spi_hid *shid, + struct spi_hid_output_report *report) +{ + struct device *dev = &shid->spi->dev; + int ret = 0; + + ret = spi_hid_send_output_report(shid, report); + if (ret) { + dev_err(dev, "Failed to transfer output report\n"); + return ret; + } + + mutex_unlock(&shid->output_lock); + ret = wait_for_completion_interruptible_timeout(&shid->output_done, + msecs_to_jiffies(1000)); + mutex_lock(&shid->output_lock); + if (ret == 0) { + dev_err(dev, "Response timed out\n"); + return -ETIMEDOUT; + } + + return 0; +} + +/** + * Handle the reset response from the FW by sending a request for the device + * descriptor. + */ +static void spi_hid_reset_response_work(struct work_struct *work) +{ + struct spi_hid *shid = + container_of(work, struct spi_hid, reset_response_work); + struct device *dev = &shid->spi->dev; + struct spi_hid_output_report report = { + .report_type = SPI_HID_OUTPUT_REPORT_TYPE_DEVICE_DESC_REQUEST, + .content_length = 0x0, + .content_id = SPI_HID_OUTPUT_REPORT_CONTENT_ID_DESC_REQUEST, + .content = NULL, + }; + int ret; + + trace_spi_hid_reset_response_work(shid); + + if (shid->ready) { + dev_err(dev, "Spontaneous FW reset!"); + shid->ready = false; + shid->dir_count++; + } + + if (shid->power_state == SPI_HID_POWER_MODE_OFF) + return; + + if (flush_work(&shid->create_device_work)) + dev_err(dev, "Reset handler waited for create_device_work"); + + if (flush_work(&shid->refresh_device_work)) + dev_err(dev, "Reset handler waited for refresh_device_work"); + + mutex_lock(&shid->output_lock); + ret = spi_hid_sync_request(shid, &report); + mutex_unlock(&shid->output_lock); + if (ret) { + dev_WARN_ONCE(dev, true, + "Failed to send device descriptor request\n"); + schedule_work(&shid->error_work); + } +} + +static int spi_hid_input_report_handler(struct spi_hid *shid, + struct spi_hid_input_buf *buf) +{ + struct device *dev = &shid->spi->dev; + struct spi_hid_input_report r; + int ret; + + trace_spi_hid_input_report_handler(shid); + + if (!shid->ready || shid->refresh_in_progress || !shid->hid) + return 0; + + spi_hid_input_report_prepare(buf, &r); + + ret = hid_input_report(shid->hid, HID_INPUT_REPORT, + r.content - 1, + r.content_length + 1, 1); + + if (ret == -ENODEV || ret == -EBUSY) { + dev_err(dev, "ignoring report --> %d\n", ret); + return 0; + } else if (ret) { + dev_err(dev, "Bad input report, error %d\n", ret); + } + + return ret; +} + +static void spi_hid_response_handler(struct spi_hid *shid, + struct spi_hid_input_buf *buf) +{ + trace_spi_hid_response_handler(shid); + + /* completion_done returns 0 if there are waiters, otherwise 1 */ + if (completion_done(&shid->output_done)) { + dev_err(&shid->spi->dev, "Unexpected response report\n"); + } else { + if (shid->input.body[0] == + SPI_HID_INPUT_REPORT_TYPE_REPORT_DESC || + shid->input.body[0] == + SPI_HID_INPUT_REPORT_TYPE_GET_FEATURE_RESP) { + size_t response_length = (shid->input.body[1] | + (shid->input.body[2] << 8)) + + sizeof(shid->input.body); + memcpy(shid->response.body, shid->input.body, + response_length); + } + complete(&shid->output_done); + } +} + +/* + * This function returns the length of the report descriptor, or a negative + * error code if something went wrong. + */ +static int spi_hid_report_descriptor_request(struct spi_hid *shid) +{ + int ret; + struct device *dev = &shid->spi->dev; + struct spi_hid_output_report report = { + .report_type = SPI_HID_OUTPUT_REPORT_TYPE_REPORT_DESC_REQUEST, + .content_length = 0, + .content_id = SPI_HID_OUTPUT_REPORT_CONTENT_ID_DESC_REQUEST, + .content = NULL, + }; + + ret = spi_hid_sync_request(shid, &report); + if (ret) { + dev_err(dev, + "Expected report descriptor not received! Error %d\n", + ret); + schedule_work(&shid->error_work); + goto out; + } + + ret = (shid->response.body[1] | (shid->response.body[2] << 8)); + if (ret != shid->desc.report_descriptor_length) { + ret = min_t(unsigned int, ret, + shid->desc.report_descriptor_length); + dev_err(dev, + "Received report descriptor length doesn't match device descriptor field, using min of the two: %d\n", + ret); + } +out: + return ret; +} + +static void spi_hid_process_input_report(struct spi_hid *shid, + struct spi_hid_input_buf *buf) +{ + struct spi_hid_input_header header; + struct spi_hid_input_body body; + struct device *dev = &shid->spi->dev; + struct spi_hid_device_desc_raw *raw; + int ret; + + trace_spi_hid_process_input_report(shid); + + spi_hid_populate_input_header(buf->header, &header); + spi_hid_populate_input_body(buf->body, &body); + + if (body.content_length > header.report_length) { + dev_err(dev, "Bad body length %d > %d\n", body.content_length, + header.report_length); + schedule_work(&shid->error_work); + return; + } + + switch (body.report_type) { + case SPI_HID_INPUT_REPORT_TYPE_DATA: + ret = spi_hid_input_report_handler(shid, buf); + if (ret) + schedule_work(&shid->error_work); + break; + case SPI_HID_INPUT_REPORT_TYPE_RESET_RESP: + schedule_work(&shid->reset_response_work); + break; + case SPI_HID_INPUT_REPORT_TYPE_DEVICE_DESC: + /* Mark the completion done to avoid timeout */ + spi_hid_response_handler(shid, buf); + + /* Reset attempts at every device descriptor fetch */ + shid->attempts = 0; + + raw = (struct spi_hid_device_desc_raw *)buf->content; + + /* Validate device descriptor length before parsing */ + if (body.content_length != SPI_HID_DEVICE_DESCRIPTOR_LENGTH) { + dev_err(dev, + "Invalid content length %d, expected %d\n", + body.content_length, + SPI_HID_DEVICE_DESCRIPTOR_LENGTH); + schedule_work(&shid->error_work); + break; + } + + if (le16_to_cpu(raw->wDeviceDescLength) != + SPI_HID_DEVICE_DESCRIPTOR_LENGTH) { + dev_err(dev, + "Invalid wDeviceDescLength %d, expected %d\n", + raw->wDeviceDescLength, + SPI_HID_DEVICE_DESCRIPTOR_LENGTH); + schedule_work(&shid->error_work); + break; + } + + spi_hid_parse_dev_desc(raw, &shid->desc); + + if (shid->desc.hid_version != SPI_HID_SUPPORTED_VERSION) { + dev_err(dev, + "Unsupported device descriptor version %4x\n", + shid->desc.hid_version); + schedule_work(&shid->error_work); + break; + } + + if (!shid->hid) + schedule_work(&shid->create_device_work); + else + schedule_work(&shid->refresh_device_work); + + break; + case SPI_HID_INPUT_REPORT_TYPE_SET_OUTPUT_REPORT_RESP: + if (shid->desc.no_output_report_ack) { + dev_err(dev, "Unexpected output report response\n"); + break; + } + fallthrough; + case SPI_HID_INPUT_REPORT_TYPE_GET_FEATURE_RESP: + case SPI_HID_INPUT_REPORT_TYPE_SET_FEATURE_RESP: + if (!shid->ready) { + dev_err(dev, + "Unexpected response report while not ready: 0x%x\n", + body.report_type); + break; + } + fallthrough; + case SPI_HID_INPUT_REPORT_TYPE_REPORT_DESC: + spi_hid_response_handler(shid, buf); + break; + /* + * FIXME: sending GET_INPUT and COMMAND reports not supported, thus + * throw away responses to those, they should never come. + */ + case SPI_HID_INPUT_REPORT_TYPE_GET_INPUT_REPORT_RESP: + case SPI_HID_INPUT_REPORT_TYPE_COMMAND_RESP: + dev_err(dev, "Not a supported report type: 0x%x\n", + body.report_type); + break; + default: + dev_err(dev, "Unknown input report: 0x%x\n", + body.report_type); + schedule_work(&shid->error_work); + break; + } +} + +static int spi_hid_bus_validate_header(struct spi_hid *shid, + struct spi_hid_input_header *header) +{ + struct device *dev = &shid->spi->dev; + + if (header->version != SPI_HID_INPUT_HEADER_VERSION) { + dev_err(dev, "Unknown input report version (v 0x%x)\n", + header->version); + return -EINVAL; + } + + if (shid->desc.max_input_length != 0 && + header->report_length > shid->desc.max_input_length) { + dev_err(dev, "Input report body size %u > max expected of %u\n", + header->report_length, + shid->desc.max_input_length); + return -EMSGSIZE; + } + + if (header->last_fragment_flag != 1) { + dev_err(dev, "Multi-fragment reports not supported\n"); + return -EOPNOTSUPP; + } + + if (header->sync_const != SPI_HID_INPUT_HEADER_SYNC_BYTE) { + dev_err(dev, "Invalid input report sync constant (0x%x)\n", + header->sync_const); + return -EINVAL; + } + + return 0; +} + +static int spi_hid_create_device(struct spi_hid *shid) +{ + struct hid_device *hid; + struct device *dev = &shid->spi->dev; + int ret; + + hid = hid_allocate_device(); + + if (IS_ERR(hid)) { + dev_err(dev, "Failed to allocate hid device: %ld\n", + PTR_ERR(hid)); + ret = PTR_ERR(hid); + return ret; + } + + hid->driver_data = shid->spi; + hid->ll_driver = &spi_hid_ll_driver; + hid->dev.parent = &shid->spi->dev; + hid->bus = BUS_SPI; + hid->version = shid->desc.hid_version; + hid->vendor = shid->desc.vendor_id; + hid->product = shid->desc.product_id; + + snprintf(hid->name, sizeof(hid->name), "spi %04hX:%04hX", + hid->vendor, hid->product); + strscpy(hid->phys, dev_name(&shid->spi->dev), sizeof(hid->phys)); + + shid->hid = hid; + + ret = hid_add_device(hid); + if (ret) { + dev_err(dev, "Failed to add hid device: %d\n", ret); + /* + * We likely got here because report descriptor request timed + * out. Let's disconnect and destroy the hid_device structure. + */ + hid = spi_hid_disconnect_hid(shid); + if (hid) + hid_destroy_device(hid); + return ret; + } + + return 0; +} + +static void spi_hid_create_device_work(struct work_struct *work) +{ + struct spi_hid *shid = + container_of(work, struct spi_hid, create_device_work); + struct device *dev = &shid->spi->dev; + u8 prev_state = shid->power_state; + int ret; + + trace_spi_hid_create_device_work(shid); + + mutex_lock(&shid->power_lock); + if (prev_state == SPI_HID_POWER_MODE_OFF) { + dev_err(dev, "%s: Powered off, returning", __func__); + goto out; + } + + ret = spi_hid_create_device(shid); + if (ret) { + dev_err(dev, "%s: Failed to create hid device\n", __func__); + goto out; + } + + spi_hid_suspend(shid); + +out: + mutex_unlock(&shid->power_lock); + + dev_dbg(dev, "%s: %s -> %s\n", __func__, + spi_hid_power_mode_string(prev_state), + spi_hid_power_mode_string(shid->power_state)); +} + +static void spi_hid_refresh_device_work(struct work_struct *work) +{ + struct spi_hid *shid = + container_of(work, struct spi_hid, refresh_device_work); + struct device *dev = &shid->spi->dev; + struct hid_device *hid; + int ret; + u32 new_crc32; + + trace_spi_hid_refresh_device_work(shid); + + mutex_lock(&shid->power_lock); + if (shid->power_state == SPI_HID_POWER_MODE_OFF) { + dev_err(dev, "%s: Powered off, returning", __func__); + goto out2; + } + + mutex_lock(&shid->output_lock); + ret = spi_hid_report_descriptor_request(shid); + mutex_unlock(&shid->output_lock); + if (ret < 0) { + dev_err(dev, + "Refresh: failed report descriptor request, error %d", + ret); + goto out2; + } + + new_crc32 = crc32_le(0, (unsigned char const *)shid->response.content, + (size_t)ret); + if (new_crc32 == shid->report_descriptor_crc32) + goto out1; + + shid->report_descriptor_crc32 = new_crc32; + shid->refresh_in_progress = true; + + hid = spi_hid_disconnect_hid(shid); + if (hid) + hid_destroy_device(hid); + + ret = spi_hid_create_device(shid); + if (ret) { + dev_err(dev, "%s: Failed to create hid device\n", __func__); + goto out2; + } + + shid->refresh_in_progress = false; + +out1: + if (completion_done(&shid->ready_done)) + dev_err(&shid->spi->dev, "Nobody waiting for ready_done\n"); + else + complete(&shid->ready_done); +out2: + mutex_unlock(&shid->power_lock); +} + +static int spi_hid_get_request(struct spi_hid *shid, u8 content_id) +{ + int ret; + struct device *dev = &shid->spi->dev; + struct spi_hid_output_report report = { + .report_type = SPI_HID_OUTPUT_REPORT_TYPE_HID_GET_FEATURE, + .content_length = 0, + .content_id = content_id, + .content = NULL, + }; + + ret = spi_hid_sync_request(shid, &report); + if (ret) { + dev_err(dev, + "Expected get request response not received! Error %d\n", + ret); + schedule_work(&shid->error_work); + } + + return ret; +} + +static int spi_hid_set_request(struct spi_hid *shid, + u8 *arg_buf, u16 arg_len, u8 content_id) +{ + struct spi_hid_output_report report = { + .report_type = SPI_HID_OUTPUT_REPORT_TYPE_HID_SET_FEATURE, + .content_length = arg_len, + .content_id = content_id, + .content = arg_buf, + }; + + return spi_hid_sync_request(shid, &report); +} + +static irqreturn_t spi_hid_dev_irq(int irq, void *_shid) +{ + struct spi_hid *shid = _shid; + struct device *dev = &shid->spi->dev; + struct spi_hid_input_header header; + int ret = 0; + + trace_spi_hid_dev_irq(shid, irq); + trace_spi_hid_header_transfer(shid); + + ret = spi_hid_input_sync(shid, shid->input.header, + sizeof(shid->input.header), true); + if (ret) { + dev_err(dev, "Failed to transfer header: %d\n", ret); + goto out; + } + + if (shid->power_state == SPI_HID_POWER_MODE_OFF) { + dev_warn(dev, "Device is off after header was received\n"); + goto out; + } + + trace_spi_hid_input_header_complete(shid, + shid->input_transfer[0].tx_buf, + shid->input_transfer[0].len, + shid->input_transfer[1].rx_buf, + shid->input_transfer[1].len, + shid->input_message.status); + + if (shid->input_message.status < 0) { + dev_warn(dev, "Error reading header: %d\n", + shid->input_message.status); + shid->bus_error_count++; + shid->bus_last_error = shid->input_message.status; + schedule_work(&shid->error_work); + goto out; + } + + spi_hid_populate_input_header(shid->input.header, &header); + + ret = spi_hid_bus_validate_header(shid, &header); + if (ret) { + dev_err(dev, "Failed to validate header: %d\n", ret); + print_hex_dump(KERN_ERR, "spi_hid: header buffer: ", + DUMP_PREFIX_NONE, 16, 1, + shid->input.header, + sizeof(shid->input.header), + false); + shid->bus_error_count++; + shid->bus_last_error = ret; + goto out; + } + + ret = spi_hid_input_sync(shid, shid->input.body, header.report_length, + false); + if (ret) + dev_err(dev, "Failed to transfer body: %d\n", ret); + + if (shid->power_state == SPI_HID_POWER_MODE_OFF) { + dev_warn(dev, "Device is off after body was received\n"); + goto out; + } + + trace_spi_hid_input_body_complete(shid, shid->input_transfer[0].tx_buf, + shid->input_transfer[0].len, + shid->input_transfer[1].rx_buf, + shid->input_transfer[1].len, + shid->input_message.status); + + if (shid->input_message.status < 0) { + dev_warn(dev, "Error reading body: %d\n", + shid->input_message.status); + shid->bus_error_count++; + shid->bus_last_error = shid->input_message.status; + schedule_work(&shid->error_work); + goto out; + } + + spi_hid_process_input_report(shid, &shid->input); + +out: + return IRQ_HANDLED; +} + +/* hid_ll_driver interface functions */ + +static int spi_hid_ll_start(struct hid_device *hid) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + + if (shid->desc.max_input_length < HID_MIN_BUFFER_SIZE) { + dev_err(&shid->spi->dev, + "HID_MIN_BUFFER_SIZE > max_input_length (%d)\n", + shid->desc.max_input_length); + return -EINVAL; + } + + return 0; +} + +static void spi_hid_ll_stop(struct hid_device *hid) +{ + hid->claimed = 0; +} + +static int spi_hid_ll_open(struct hid_device *hid) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + u8 prev_state = shid->power_state; + int ret; + + if (shid->refresh_in_progress) + return 0; + + spi_hid_resume(shid); + + dev_dbg(dev, "%s: %s -> %s\n", __func__, + spi_hid_power_mode_string(prev_state), + spi_hid_power_mode_string(shid->power_state)); + + reinit_completion(&shid->ready_done); + ret = wait_for_completion_interruptible_timeout(&shid->ready_done, + msecs_to_jiffies(1000)); + if (ret == 0) { + dev_err(dev, "Handshake timed out\n"); + return -EAGAIN; + } else { + dev_dbg(dev, "%s: ready\n", __func__); + shid->ready = true; + return 0; + } +} + +static void spi_hid_ll_close(struct hid_device *hid) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + u8 prev_state = shid->power_state; + + if (shid->refresh_in_progress) + return; + + mutex_lock(&shid->power_lock); + spi_hid_suspend(shid); + mutex_unlock(&shid->power_lock); + + shid->attempts = 0; + + dev_dbg(dev, "%s: %s -> %s\n", __func__, + spi_hid_power_mode_string(prev_state), + spi_hid_power_mode_string(shid->power_state)); +} + +static int spi_hid_ll_power(struct hid_device *hid, int level) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + int ret = 0; + + mutex_lock(&shid->output_lock); + if (!shid->hid) + ret = -ENODEV; + mutex_unlock(&shid->output_lock); + + return ret; +} + +static int spi_hid_ll_parse(struct hid_device *hid) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + int ret, len; + + mutex_lock(&shid->output_lock); + + len = spi_hid_report_descriptor_request(shid); + if (len < 0) { + dev_err(dev, "Report descriptor request failed, %d\n", len); + ret = len; + goto out; + } + + /* + * FIXME: below call returning 0 doesn't mean that the report descriptor + * is good. We might be caching a crc32 of a corrupted r. d. or who + * knows what the FW sent. Need to have a feedback loop about r. d. + * being ok and only then cache it. + */ + ret = hid_parse_report(hid, (u8 *)shid->response.content, len); + if (ret) + dev_err(dev, "failed parsing report: %d\n", ret); + else + shid->report_descriptor_crc32 = crc32_le(0, + (unsigned char const *)shid->response.content, + len); + +out: + mutex_unlock(&shid->output_lock); + + return ret; +} + +static int spi_hid_ll_raw_request(struct hid_device *hid, + unsigned char reportnum, u8 *buf, size_t len, + unsigned char rtype, int reqtype) +{ + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + int ret; + + if (!shid->ready) { + dev_err(&shid->spi->dev, "%s called in unready state\n", + __func__); + return -ENODEV; + } + + mutex_lock(&shid->output_lock); + + switch (reqtype) { + case HID_REQ_SET_REPORT: + if (buf[0] != reportnum) { + dev_err(dev, "report id mismatch\n"); + ret = -EINVAL; + break; + } + + ret = spi_hid_set_request(shid, &buf[1], len - 1, + reportnum); + if (ret) { + dev_err(dev, "failed to set report\n"); + break; + } + + ret = len; + break; + case HID_REQ_GET_REPORT: + ret = spi_hid_get_request(shid, reportnum); + if (ret) { + dev_err(dev, "failed to get report\n"); + break; + } + + ret = min_t(size_t, len, + shid->response.body[1] | (shid->response.body[2] << 8)); + memcpy(buf, &shid->response.content, ret); + break; + default: + dev_err(dev, "invalid request type\n"); + ret = -EIO; + } + + mutex_unlock(&shid->output_lock); + + return ret; +} + +static int spi_hid_ll_output_report(struct hid_device *hid, + u8 *buf, size_t len) +{ + int ret; + struct spi_device *spi = hid->driver_data; + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + struct spi_hid_output_report report = { + .report_type = SPI_HID_OUTPUT_REPORT_TYPE_HID_OUTPUT_REPORT, + .content_length = len - 1, + .content_id = buf[0], + .content = &buf[1], + }; + + mutex_lock(&shid->output_lock); + if (!shid->ready) { + dev_err(dev, "%s called in unready state\n", __func__); + ret = -ENODEV; + goto out; + } + + if (shid->desc.no_output_report_ack) + ret = spi_hid_send_output_report(shid, &report); + else + ret = spi_hid_sync_request(shid, &report); + + if (ret) + dev_err(dev, "failed to send output report\n"); + +out: + mutex_unlock(&shid->output_lock); + + if (ret > 0) + return -ret; + + if (ret < 0) + return ret; + + return len; +} + +static struct hid_ll_driver spi_hid_ll_driver = { + .start = spi_hid_ll_start, + .stop = spi_hid_ll_stop, + .open = spi_hid_ll_open, + .close = spi_hid_ll_close, + .power = spi_hid_ll_power, + .parse = spi_hid_ll_parse, + .output_report = spi_hid_ll_output_report, + .raw_request = spi_hid_ll_raw_request, +}; + +const struct of_device_id spi_hid_of_match[] = { + { .compatible = "hid-over-spi" }, + {}, +}; +MODULE_DEVICE_TABLE(of, spi_hid_of_match); + +static ssize_t bus_error_count_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct spi_hid *shid = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d (%d)\n", + shid->bus_error_count, shid->bus_last_error); +} +static DEVICE_ATTR_RO(bus_error_count); + +static ssize_t regulator_error_count_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct spi_hid *shid = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d (%d)\n", + shid->regulator_error_count, + shid->regulator_last_error); +} +static DEVICE_ATTR_RO(regulator_error_count); + +static ssize_t device_initiated_reset_count_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct spi_hid *shid = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", shid->dir_count); +} +static DEVICE_ATTR_RO(device_initiated_reset_count); + +static const struct attribute *const spi_hid_attributes[] = { + &dev_attr_bus_error_count.attr, + &dev_attr_regulator_error_count.attr, + &dev_attr_device_initiated_reset_count.attr, + NULL /* Terminator */ +}; + +static int spi_hid_probe(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + struct spi_hid *shid; + unsigned long irqflags; + int ret; + + if (spi->irq <= 0) { + dev_err(dev, "Missing IRQ\n"); + ret = spi->irq ?: -EINVAL; + goto err0; + } + + shid = devm_kzalloc(dev, sizeof(struct spi_hid), GFP_KERNEL); + if (!shid) { + ret = -ENOMEM; + goto err0; + } + + shid->spi = spi; + shid->power_state = SPI_HID_POWER_MODE_ON; + spi_set_drvdata(spi, shid); + + ret = sysfs_create_files(&dev->kobj, spi_hid_attributes); + if (ret) { + dev_err(dev, "Unable to create sysfs attributes\n"); + goto err0; + } + + ret = spi_hid_of_populate_config(&shid->conf, dev); + if (ret) { + dev_err(dev, "%s: unable to populate config data\n", __func__); + goto err1; + } + + /* Using now populated conf let's pre-calculate the read approvals */ + spi_hid_populate_read_approvals(&shid->conf, shid->read_approval_header, + shid->read_approval_body); + + mutex_init(&shid->output_lock); + mutex_init(&shid->power_lock); + init_completion(&shid->output_done); + init_completion(&shid->ready_done); + + INIT_WORK(&shid->reset_response_work, spi_hid_reset_response_work); + INIT_WORK(&shid->create_device_work, spi_hid_create_device_work); + INIT_WORK(&shid->refresh_device_work, spi_hid_refresh_device_work); + INIT_WORK(&shid->error_work, spi_hid_error_work); + + /* + * At the end of probe we initialize the device: + * 0) Default pinctrl in DT: assert reset, bias the interrupt line + * 1) sleep minimal reset delay + * 2) request IRQ + * 3) power up the device + * 4) deassert reset (high) + * After this we expect an IRQ with a reset response. + */ + + spi_hid_of_sleep_minimal_reset_delay(&shid->conf); + + irqflags = irq_get_trigger_type(spi->irq) | IRQF_ONESHOT; + ret = devm_request_threaded_irq(dev, spi->irq, NULL, spi_hid_dev_irq, + irqflags, dev_name(&spi->dev), shid); + if (ret) { + dev_err(dev, "%s: unable to request threaded IRQ\n", __func__); + goto err1; + } + shid->irq_enabled = true; + + ret = spi_hid_of_power_up(&shid->conf); + if (ret) { + dev_err(dev, "%s: could not power up\n", __func__); + shid->regulator_error_count++; + shid->regulator_last_error = ret; + goto err1; + } + + spi_hid_of_deassert_reset(&shid->conf); + + dev_dbg(dev, "%s: d3 -> %s\n", __func__, + spi_hid_power_mode_string(shid->power_state)); + + return 0; + +err1: + sysfs_remove_files(&dev->kobj, spi_hid_attributes); + +err0: + return ret; +} + +static int spi_hid_remove(struct spi_device *spi) +{ + struct spi_hid *shid = spi_get_drvdata(spi); + struct device *dev = &spi->dev; + int ret; + + spi_hid_of_assert_reset(&shid->conf); + ret = spi_hid_of_power_down(&shid->conf); + if (ret) { + dev_err(dev, "failed to disable regulator\n"); + shid->regulator_error_count++; + shid->regulator_last_error = ret; + } + sysfs_remove_files(&dev->kobj, spi_hid_attributes); + spi_hid_stop_hid(shid); + + return 0; +} + +static const struct spi_device_id spi_hid_id_table[] = { + { "hid", 0 }, + { "hid-over-spi", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(spi, spi_hid_id_table); + +static struct spi_driver spi_hid_driver = { + .driver = { + .name = "spi_hid", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(spi_hid_of_match), + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + }, + .probe = spi_hid_probe, + .remove = spi_hid_remove, + .id_table = spi_hid_id_table, +}; + +module_spi_driver(spi_hid_driver); + +MODULE_DESCRIPTION("HID over SPI transport driver"); +MODULE_AUTHOR("Dmitry Antipov "); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/spi-hid/spi-hid-core.h b/drivers/hid/spi-hid/spi-hid-core.h new file mode 100644 index 000000000000..45cf3fd2b369 --- /dev/null +++ b/drivers/hid/spi-hid/spi-hid-core.h @@ -0,0 +1,188 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021 Microsoft Corporation + */ + +#ifndef SPI_HID_CORE_H +#define SPI_HID_CORE_H + +#include +#include +#include +#include +#include + +#include "spi-hid-of.h" + +/* Protocol constants */ +#define SPI_HID_READ_APPROVAL_CONSTANT 0xff +#define SPI_HID_INPUT_HEADER_SYNC_BYTE 0x5a +#define SPI_HID_INPUT_HEADER_VERSION 0x03 +#define SPI_HID_SUPPORTED_VERSION 0x0300 + +/* Protocol message size constants */ +#define SPI_HID_READ_APPROVAL_LEN 5 +#define SPI_HID_INPUT_HEADER_LEN 4 +#define SPI_HID_INPUT_BODY_LEN 4 +#define SPI_HID_OUTPUT_HEADER_LEN 8 +#define SPI_HID_DEVICE_DESCRIPTOR_LENGTH 24 + +/* Protocol message type constants */ +#define SPI_HID_INPUT_REPORT_TYPE_DATA 0x01 +#define SPI_HID_INPUT_REPORT_TYPE_RESET_RESP 0x03 +#define SPI_HID_INPUT_REPORT_TYPE_COMMAND_RESP 0x04 +#define SPI_HID_INPUT_REPORT_TYPE_GET_FEATURE_RESP 0x05 +#define SPI_HID_INPUT_REPORT_TYPE_DEVICE_DESC 0x07 +#define SPI_HID_INPUT_REPORT_TYPE_REPORT_DESC 0x08 +#define SPI_HID_INPUT_REPORT_TYPE_SET_FEATURE_RESP 0x09 +#define SPI_HID_INPUT_REPORT_TYPE_SET_OUTPUT_REPORT_RESP 0x0a +#define SPI_HID_INPUT_REPORT_TYPE_GET_INPUT_REPORT_RESP 0x0b + +#define SPI_HID_OUTPUT_REPORT_TYPE_DEVICE_DESC_REQUEST 0x01 +#define SPI_HID_OUTPUT_REPORT_TYPE_REPORT_DESC_REQUEST 0x02 +#define SPI_HID_OUTPUT_REPORT_TYPE_HID_SET_FEATURE 0x03 +#define SPI_HID_OUTPUT_REPORT_TYPE_HID_GET_FEATURE 0x04 +#define SPI_HID_OUTPUT_REPORT_TYPE_HID_OUTPUT_REPORT 0x05 +#define SPI_HID_OUTPUT_REPORT_TYPE_INPUT_REPORT_REQUEST 0x06 +#define SPI_HID_OUTPUT_REPORT_TYPE_COMMAND 0x07 + +#define SPI_HID_OUTPUT_REPORT_CONTENT_ID_DESC_REQUEST 0x00 + +/* Power mode constants */ +#define SPI_HID_POWER_MODE_ON 0x01 +#define SPI_HID_POWER_MODE_SLEEP 0x02 +#define SPI_HID_POWER_MODE_OFF 0x03 +#define SPI_HID_POWER_MODE_WAKING_SLEEP 0x04 + +/* Raw input buffer with data from the bus */ +struct spi_hid_input_buf { + u8 header[SPI_HID_INPUT_HEADER_LEN]; + u8 body[SPI_HID_INPUT_BODY_LEN]; + u8 content[SZ_8K]; +}; + +/* Processed data from input report header */ +struct spi_hid_input_header { + u8 version; + u16 report_length; + u8 last_fragment_flag; + u8 sync_const; +}; + +/* Processed data from input report body, excluding the content */ +struct spi_hid_input_body { + u8 report_type; + u16 content_length; + u8 content_id; +}; + +/* Processed data from an input report */ +struct spi_hid_input_report { + u8 report_type; + u16 content_length; + u8 content_id; + u8 *content; +}; + +/* Raw output report buffer to be put on the bus */ +struct spi_hid_output_buf { + u8 header[SPI_HID_OUTPUT_HEADER_LEN]; + u8 content[SZ_8K]; +}; + +/* Data necessary to send an output report */ +struct spi_hid_output_report { + u8 report_type; + u16 content_length; + u8 content_id; + u8 *content; +}; + +/* Raw content in device descriptor */ +struct spi_hid_device_desc_raw { + __le16 wDeviceDescLength; + __le16 bcdVersion; + __le16 wReportDescLength; + __le16 wMaxInputLength; + __le16 wMaxOutputLength; + __le16 wMaxFragmentLength; + __le16 wVendorID; + __le16 wProductID; + __le16 wVersionID; + __le16 wFlags; + u8 reserved[4]; +} __packed; + +/* Processed data from a device descriptor */ +struct spi_hid_device_descriptor { + u16 hid_version; + u16 report_descriptor_length; + u16 max_input_length; + u16 max_output_length; + u16 max_fragment_length; + u16 vendor_id; + u16 product_id; + u16 version_id; + u8 no_output_report_ack; +}; + +/* Driver context */ +struct spi_hid { + struct spi_device *spi; + struct hid_device *hid; + + struct spi_transfer input_transfer[2]; + struct spi_transfer output_transfer; + struct spi_message input_message; + struct spi_message output_message; + + struct spi_hid_of_config conf; + struct spi_hid_device_descriptor desc; + struct spi_hid_output_buf output; + struct spi_hid_input_buf input; + struct spi_hid_input_buf response; + + u32 input_transfer_pending; + + u8 power_state; + + u8 attempts; + + /* + * ready flag indicates that the FW is ready to accept commands and + * requests. The FW becomes ready after sending the report descriptor. + */ + bool ready; + /* + * refresh_in_progress is set to true while the refresh_device worker + * thread is destroying and recreating the hidraw device. When this flag + * is set to true, the ll_close and ll_open functions will not cause + * power state changes. + */ + bool refresh_in_progress; + + bool irq_enabled; + + struct work_struct reset_response_work; + struct work_struct create_device_work; + struct work_struct refresh_device_work; + struct work_struct error_work; + + struct mutex output_lock; + struct mutex power_lock; + struct completion output_done; + struct completion ready_done; + + u8 read_approval_header[SPI_HID_READ_APPROVAL_LEN]; + u8 read_approval_body[SPI_HID_READ_APPROVAL_LEN]; + + u32 report_descriptor_crc32; + + u32 regulator_error_count; + int regulator_last_error; + u32 bus_error_count; + int bus_last_error; + u32 dir_count; +}; + +#endif diff --git a/drivers/hid/spi-hid/spi-hid-of.c b/drivers/hid/spi-hid/spi-hid-of.c new file mode 100644 index 000000000000..d8d1d134cf29 --- /dev/null +++ b/drivers/hid/spi-hid/spi-hid-of.c @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * HID over SPI protocol, Open Firmware related code + * + * Copyright (c) 2021 Microsoft Corporation + * + * This code was forked out of the HID over SPI core code, which is partially + * based on "HID over I2C protocol implementation: + * + * Copyright (c) 2012 Benjamin Tissoires + * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France + * Copyright (c) 2012 Red Hat, Inc + * + * which in turn is partially based on "USB HID support for Linux": + * + * Copyright (c) 1999 Andreas Gal + * Copyright (c) 2000-2005 Vojtech Pavlik + * Copyright (c) 2005 Michael Haboustak for Concept2, Inc + * Copyright (c) 2007-2008 Oliver Neukum + * Copyright (c) 2006-2010 Jiri Kosina + */ +#include +#include +#include +#include + +#include "spi-hid-core.h" + +int spi_hid_of_populate_config(struct spi_hid_of_config *conf, + struct device *dev) +{ + int ret; + u32 val; + + ret = device_property_read_u32(dev, "input-report-header-address", + &val); + if (ret) { + dev_err(dev, "Input report header address not provided\n"); + return -ENODEV; + } + conf->input_report_header_address = val; + + ret = device_property_read_u32(dev, "input-report-body-address", &val); + if (ret) { + dev_err(dev, "Input report body address not provided\n"); + return -ENODEV; + } + conf->input_report_body_address = val; + + ret = device_property_read_u32(dev, "output-report-address", &val); + if (ret) { + dev_err(dev, "Output report address not provided\n"); + return -ENODEV; + } + conf->output_report_address = val; + + ret = device_property_read_u32(dev, "read-opcode", &val); + if (ret) { + dev_err(dev, "Read opcode not provided\n"); + return -ENODEV; + } + conf->read_opcode = val; + + ret = device_property_read_u32(dev, "write-opcode", &val); + if (ret) { + dev_err(dev, "Write opcode not provided\n"); + return -ENODEV; + } + conf->write_opcode = val; + + ret = device_property_read_u32(dev, "post-power-on-delay-ms", &val); + if (ret) { + dev_err(dev, "post-power-on-delay-ms not provided, using 10\n"); + val = 10; + } + conf->post_power_on_delay_ms = val; + + ret = device_property_read_u32(dev, "minimal-reset-delay-ms", &val); + if (ret) { + dev_err(dev, "minimal-reset-delay-ms not provided, using 100\n"); + val = 100; + } + conf->minimal_reset_delay_ms = val; + + /* FIXME: not reading hid-over-spi-flags, multi-SPI not supported */ + + conf->supply = devm_regulator_get(dev, "vdd"); + if (IS_ERR(conf->supply)) { + if (PTR_ERR(conf->supply) != -EPROBE_DEFER) + dev_err(dev, "Failed to get regulator: %ld\n", + PTR_ERR(conf->supply)); + return PTR_ERR(conf->supply); + } + + conf->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(conf->reset_gpio)) { + dev_err(dev, "%s: error getting reset GPIO\n", __func__); + return PTR_ERR(conf->reset_gpio); + } + + return 0; +} + +int spi_hid_of_power_down(struct spi_hid_of_config *conf) +{ + if (regulator_is_enabled(conf->supply) == 0) + return 0; + + return regulator_disable(conf->supply); +} + +int spi_hid_of_power_up(struct spi_hid_of_config *conf) +{ + int ret; + + if (regulator_is_enabled(conf->supply) > 0) + return 0; + + ret = regulator_enable(conf->supply); + + usleep_range(1000 * conf->post_power_on_delay_ms, + 1000 * (conf->post_power_on_delay_ms + 1)); + + return ret; +} + +void spi_hid_of_assert_reset(struct spi_hid_of_config *conf) +{ + gpiod_set_value(conf->reset_gpio, 1); +} + +void spi_hid_of_deassert_reset(struct spi_hid_of_config *conf) +{ + gpiod_set_value(conf->reset_gpio, 0); +} + +void spi_hid_of_sleep_minimal_reset_delay(struct spi_hid_of_config *conf) +{ + usleep_range(1000 * conf->minimal_reset_delay_ms, + 1000 * (conf->minimal_reset_delay_ms + 1)); +} diff --git a/drivers/hid/spi-hid/spi-hid-of.h b/drivers/hid/spi-hid/spi-hid-of.h new file mode 100644 index 000000000000..48d9dfe44e95 --- /dev/null +++ b/drivers/hid/spi-hid/spi-hid-of.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021 Microsoft Corporation + */ + +#ifndef SPI_HID_OF_H +#define SPI_HID_OF_H + +/* Config structure is filled with data from Device Tree */ +struct spi_hid_of_config { + u32 input_report_header_address; + u32 input_report_body_address; + u32 output_report_address; + u8 read_opcode; + u8 write_opcode; + u32 post_power_on_delay_ms; + u32 minimal_reset_delay_ms; + struct gpio_desc *reset_gpio; + struct regulator *supply; +}; + +int spi_hid_of_populate_config(struct spi_hid_of_config *conf, + struct device *dev); +int spi_hid_of_power_down(struct spi_hid_of_config *conf); +int spi_hid_of_power_up(struct spi_hid_of_config *conf); +void spi_hid_of_assert_reset(struct spi_hid_of_config *conf); +void spi_hid_of_deassert_reset(struct spi_hid_of_config *conf); +void spi_hid_of_sleep_minimal_reset_delay(struct spi_hid_of_config *conf); + +#endif diff --git a/drivers/hid/spi-hid/spi-hid_trace.h b/drivers/hid/spi-hid/spi-hid_trace.h new file mode 100644 index 000000000000..23732ba493a0 --- /dev/null +++ b/drivers/hid/spi-hid/spi-hid_trace.h @@ -0,0 +1,194 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021 Microsoft Corporation + */ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM spi_hid + +#if !defined(_SPI_HID_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) +#define _SPI_HID_TRACE_H + +#include +#include +#include "spi-hid-core.h" + +DECLARE_EVENT_CLASS(spi_hid_transfer, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret), + + TP_STRUCT__entry( + __field(int, bus_num) + __field(int, chip_select) + __field(int, len) + __field(int, ret) + __dynamic_array(u8, rx_buf, rx_len) + __dynamic_array(u8, tx_buf, tx_len) + ), + + TP_fast_assign( + __entry->bus_num = shid->spi->controller->bus_num; + __entry->chip_select = shid->spi->chip_select; + __entry->len = rx_len + tx_len; + __entry->ret = ret; + + memcpy(__get_dynamic_array(tx_buf), tx_buf, tx_len); + memcpy(__get_dynamic_array(rx_buf), rx_buf, rx_len); + ), + + TP_printk("spi%d.%d: len=%d tx=[%*phD] rx=[%*phD] --> %d", + __entry->bus_num, __entry->chip_select, __entry->len, + __get_dynamic_array_len(tx_buf), __get_dynamic_array(tx_buf), + __get_dynamic_array_len(rx_buf), __get_dynamic_array(rx_buf), + __entry->ret) +); + +DEFINE_EVENT(spi_hid_transfer, spi_hid_input_sync, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret) +); + +DEFINE_EVENT(spi_hid_transfer, spi_hid_input_header_complete, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret) +); + +DEFINE_EVENT(spi_hid_transfer, spi_hid_input_body_complete, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret) +); + +DEFINE_EVENT(spi_hid_transfer, spi_hid_output_begin, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret) +); + +DEFINE_EVENT(spi_hid_transfer, spi_hid_output_end, + TP_PROTO(struct spi_hid *shid, const void *tx_buf, int tx_len, + const void *rx_buf, u16 rx_len, int ret), + TP_ARGS(shid, tx_buf, tx_len, rx_buf, rx_len, ret) +); + +DECLARE_EVENT_CLASS(spi_hid_irq, + TP_PROTO(struct spi_hid *shid, int irq), + + TP_ARGS(shid, irq), + + TP_STRUCT__entry( + __field(int, bus_num) + __field(int, chip_select) + __field(int, irq) + ), + + TP_fast_assign( + __entry->bus_num = shid->spi->controller->bus_num; + __entry->chip_select = shid->spi->chip_select; + __entry->irq = irq; + ), + + TP_printk("spi%d.%d: IRQ %d", + __entry->bus_num, __entry->chip_select, __entry->irq) +); + +DEFINE_EVENT(spi_hid_irq, spi_hid_dev_irq, + TP_PROTO(struct spi_hid *shid, int irq), + TP_ARGS(shid, irq) +); + +DECLARE_EVENT_CLASS(spi_hid, + TP_PROTO(struct spi_hid *shid), + + TP_ARGS(shid), + + TP_STRUCT__entry( + __field(int, bus_num) + __field(int, chip_select) + __field(int, power_state) + __field(bool, ready) + + __field(int, vendor_id) + __field(int, product_id) + __field(int, max_input_length) + __field(int, max_output_length) + __field(u16, hid_version) + __field(u16, report_descriptor_length) + __field(u16, version_id) + ), + + TP_fast_assign( + __entry->bus_num = shid->spi->controller->bus_num; + __entry->chip_select = shid->spi->chip_select; + __entry->power_state = shid->power_state; + __entry->ready = shid->ready; + + __entry->vendor_id = shid->desc.vendor_id; + __entry->product_id = shid->desc.product_id; + __entry->max_input_length = shid->desc.max_input_length; + __entry->max_output_length = shid->desc.max_output_length; + __entry->hid_version = shid->desc.hid_version; + __entry->report_descriptor_length = + shid->desc.report_descriptor_length; + __entry->version_id = shid->desc.version_id; + ), + + TP_printk("spi%d.%d: (%04x:%04x v%d) HID v%d.%d state i:%d p:%d len i:%d o:%d r:%d flags %c", + __entry->bus_num, __entry->chip_select, __entry->vendor_id, + __entry->product_id, __entry->version_id, + __entry->hid_version >> 8, __entry->hid_version & 0xff, + __entry->power_state, __entry->max_input_length, + __entry->max_output_length, __entry->report_descriptor_length, + __entry->ready ? 'R' : 'r') +); + +DEFINE_EVENT(spi_hid, spi_hid_header_transfer, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_process_input_report, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_input_report_handler, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_reset_response_work, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_create_device_work, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_refresh_device_work, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_response_handler, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +DEFINE_EVENT(spi_hid, spi_hid_error_work, + TP_PROTO(struct spi_hid *shid), + TP_ARGS(shid) +); + +#endif /* _SPI_HID_TRACE_H */ + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_FILE spi-hid_trace +#include diff --git a/drivers/hid/spi-hid/trace.c b/drivers/hid/spi-hid/trace.c new file mode 100644 index 000000000000..6cd686c9493e --- /dev/null +++ b/drivers/hid/spi-hid/trace.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2021 Microsoft Corporation + * + * Author: Felipe Balbi + */ + +#define CREATE_TRACE_POINTS +#include "spi-hid_trace.h" From patchwork Fri Feb 25 00:59:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 12759501 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF4F7C433EF for ; Fri, 25 Feb 2022 00:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236248AbiBYBA2 (ORCPT ); Thu, 24 Feb 2022 20:00:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235011AbiBYBA2 (ORCPT ); Thu, 24 Feb 2022 20:00:28 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4F6A2819A5; Thu, 24 Feb 2022 16:59:57 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id g7-20020a17090a708700b001bb78857ccdso7134568pjk.1; Thu, 24 Feb 2022 16:59:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6EWyaMMYxkR6QrMTTPuTdCMdFqQCShfK75s5KB/a8bE=; b=iYYYyzct1rtnaZpyXdDkdwkSaiIq3evKHmOH/5cvawQxAR7NXtzbuE+79MrNsEorq6 kxbt1/Gcba227rimkySrhpSRiGNBNNnsHzh6IIReC9X87nYWye5oBVxQMd4RlVszQmgf xxqhyOh2yIqz6yYsEHTQSmADgaVZyvu+78ebE2UpnaAr0u60Wn6YD3y9F6dPThNeXbiT yXmCM/7gM0LhSnpgg9HT9Z/gLypO/yNOPBk/h2IS3Om+SCXEDtAFoLhg3eoubR9NR1lv hmpTiGnuRydO9IQ57gZkTZPqDPb9XbnXUWqmnZgSNyF1okA5GRnRH4ctWoqqIGxazzkQ B6Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6EWyaMMYxkR6QrMTTPuTdCMdFqQCShfK75s5KB/a8bE=; b=0zXj1tS+TNZYRejowC//buQFTz1GuFV2aBdHy5h21mEaas2vzION1f5epPfG540T6N Si8jQ1GIL2pfc7vUmKVc/6u65fp/UbY0KvCX3BYrh318ttYS/MzkhqNm6zRTyWX6LCXo j2XYGwjvPfNwLMBIS2/tVZ6Lmy4HgAZt7nfPnuHHquYuaDDXkIXjwgisN1mtUt6rS3Lr RaAYOGOAamEqeU8MHQlHq0li612F6icbqP8om+jIp9OGYvLjpr4zGwsqGLUojnF05E9I Fqp+3B5267TwoTRp58LX/bOcVmUe5jbu1+9mzut+jkLTg3+QabDLrU85j2BRjVa7yHGS C2jA== X-Gm-Message-State: AOAM530gmgmZgkhaagRVTy04YmF0wLqaqaqYwu2YPoS95LXibUIz+diq YCH7FfWYi5cFejLgZSqUfQo= X-Google-Smtp-Source: ABdhPJzFh/y51RKbBE4tS0+AHOx5+Wqi0e85dya5bsiwNEplJof1+O5GnWW4yryTtinnJG3oiciE1A== X-Received: by 2002:a17:902:b692:b0:14c:935b:2b03 with SMTP id c18-20020a170902b69200b0014c935b2b03mr5291975pls.81.1645750797131; Thu, 24 Feb 2022 16:59:57 -0800 (PST) Received: from thelio.corp.microsoft.com ([2001:4898:80e8:36:37cd:6bd:2964:3d5e]) by smtp.gmail.com with ESMTPSA id w5-20020a056a0014c500b004f3a5535431sm742070pfu.4.2022.02.24.16.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 16:59:56 -0800 (PST) From: Dmitry Antipov X-Google-Original-From: Dmitry Antipov To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Rob Herring , Mark Brown , Felipe Balbi Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, Dmitry Antipov Subject: [PATCH v4 6/6] Defconfig: add CONFIG_SPI_HID=m Date: Thu, 24 Feb 2022 16:59:36 -0800 Message-Id: <20220225005936.3485405-7-dmanti@microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225005936.3485405-1-dmanti@microsoft.com> References: <20220225005936.3485405-1-dmanti@microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Dmitry Antipov This enables building drivers/hid/spi-hid as module. Signed-off-by: Dmitry Antipov --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f2e2b9bdd702..25249a4b0c8a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -805,6 +805,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_HID_MULTITOUCH=m CONFIG_I2C_HID_ACPI=m CONFIG_I2C_HID_OF=m +CONFIG_SPI_HID=m CONFIG_USB_CONN_GPIO=m CONFIG_USB=y CONFIG_USB_OTG=y