From mboxrd@z Thu Jan 1 00:00:00 1970 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 25CBAC25B0E for ; Mon, 15 Aug 2022 11:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231730AbiHOLMt (ORCPT ); Mon, 15 Aug 2022 07:12:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbiHOLMq (ORCPT ); Mon, 15 Aug 2022 07:12:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 235CB18397 for ; Mon, 15 Aug 2022 04:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660561965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFp3W6BL3fPIATzoaIDjNSxNeokQf5MfvJg+UMifmfQ=; b=DAyg6OtzFg7jtTpwmRH8ixPfXLE085mLqmGzS6LBFbOcbEecavOtJnnWTNPyI59DmGjuCi nE+fu7q2QjN2lpVM4x2MtRDKctwYYWl7XCRRzAxq5ALDy9+NgXm+DunAavcn9XYneomKPG cpGKkjV4Ax9uzv86vuvK53re/khP8dM= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-384-dffWlYYqNTy4cVCGrR3ang-1; Mon, 15 Aug 2022 07:12:44 -0400 X-MC-Unique: dffWlYYqNTy4cVCGrR3ang-1 Received: by mail-ed1-f69.google.com with SMTP id z6-20020a05640240c600b0043e1d52fd98so4638220edb.22 for ; Mon, 15 Aug 2022 04:12:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=gFp3W6BL3fPIATzoaIDjNSxNeokQf5MfvJg+UMifmfQ=; b=x5gff/U/hnlRWqmN866WIM7m0dJ0xov2HPRFnwaR8vZb964cGaVjPZjypHb7nfkesX ZrwuRhgCLiYSDun+c18g6aVfP280jBv5+Drr43mQDCR4zN4hHL9R9PJ/cDd+SfcnILqq QJGY9KRDZmgsZfAR+HhMc3FvRs+CINmQzC+fhgcGQ+wYHlHRzEn0BE4ebVJfFPVzM4ZL 2iOTKS2PM5GwCptEzD+g+To2Wa08K08mkAXnl+OYzRzcZShwrzUpttq3IcUJ6z409Jz3 pJLp/wJh07sRRUb2LKV8gWJ2MBBlANIcZlc7TZoNFODrN93E7rEgwaCgyDvxUd1VANzp 67eQ== X-Gm-Message-State: ACgBeo1boxuXmKqFNqmtzUTiSqHZMsx8KSX7wFYKI1pdncwYsl/wxyfs 3l6YimVrXjABjDMx13JTuN3uAhAijwVzHrqZm31Z2rf3vcNI1Gw5fICvgX61KXYDA83lIitPDBF GRpnydj1+juUOeUWcu6NqNy/5 X-Received: by 2002:a17:907:2724:b0:730:da23:5b60 with SMTP id d4-20020a170907272400b00730da235b60mr10219809ejl.43.1660561962975; Mon, 15 Aug 2022 04:12:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR5wZ7w5+r9IApeEYMQulov2duZeNpGHgEyZKKfi0eNrzl7Psi9BgvjiUBlPBvjIdR6JoMDqBw== X-Received: by 2002:a17:907:2724:b0:730:da23:5b60 with SMTP id d4-20020a170907272400b00730da235b60mr10219800ejl.43.1660561962813; Mon, 15 Aug 2022 04:12:42 -0700 (PDT) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id s9-20020a056402014900b0043b7917b1a4sm6435934edu.43.2022.08.15.04.12.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Aug 2022 04:12:42 -0700 (PDT) Message-ID: <6b983378-a9f6-0514-89b1-7e79d58dc613@redhat.com> Date: Mon, 15 Aug 2022 13:12:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH V4] HID: HID-rmi - ignore to rmi_hid_read_block after system resumes. Content-Language: en-US To: margeyang , dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, benjamin.tissoires@redhat.com, dancarpenter@oracle.com Cc: marge.yang@tw.synaptics.com, derek.cheng@tw.synaptics.com, vincent.huang@tw.synaptics.com References: <1660559178-5323-1-git-send-email-marge.yang@synaptics.corp-partner.google.com> From: Hans de Goede In-Reply-To: <1660559178-5323-1-git-send-email-marge.yang@synaptics.corp-partner.google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 8/15/22 12:26, margeyang wrote: > From: Marge Yang > > The interrupt GPIO will be pulled down once > after RMI driver reads this command(Report ID:0x0A). > It will cause "Dark resume test fail" for chromebook device. > Hence, TP driver will ignore rmi_hid_read_block function once > after system resumes. > > Signed-off-by: Marge Yang Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/hid/hid-rmi.c | 14 +++++++++++++- > include/linux/rmi.h | 2 ++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c > index 311eee599ce9..45eacb0b8dae 100644 > --- a/drivers/hid/hid-rmi.c > +++ b/drivers/hid/hid-rmi.c > @@ -190,7 +190,7 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr, > { > struct rmi_data *data = container_of(xport, struct rmi_data, xport); > struct hid_device *hdev = data->hdev; > - int ret; > + int ret = 0; > int bytes_read; > int bytes_needed; > int retries; > @@ -204,6 +204,13 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr, > goto exit; > } > > + if (xport->ignoreonce == 1) { > + dev_err(&hdev->dev, > + "ignoreonce (%d)\n", > + xport->ignoreonce); > + xport->ignoreonce = 0; > + goto exit; > + } > for (retries = 5; retries > 0; retries--) { > data->writeReport[0] = RMI_READ_ADDR_REPORT_ID; > data->writeReport[1] = 0; /* old 1 byte read count */ > @@ -469,7 +476,12 @@ static int rmi_post_resume(struct hid_device *hdev) > if (ret) > return ret; > > + // Avoid to read rmi_hid_read_block once after system resumes. > + // The interrupt will be pulled down > + // after RMI Read command(Report ID:0x0A). > + data->xport.ignoreonce = 1; > ret = rmi_reset_attn_mode(hdev); > + data->xport.ignoreonce = 0; > if (ret) > goto out; > > diff --git a/include/linux/rmi.h b/include/linux/rmi.h > index ab7eea01ab42..24f63ad00970 100644 > --- a/include/linux/rmi.h > +++ b/include/linux/rmi.h > @@ -270,6 +270,8 @@ struct rmi_transport_dev { > struct rmi_device_platform_data pdata; > > struct input_dev *input; > + > + int ignoreonce; > }; > > /**