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 X-Spam-Level: X-Spam-Status: No, score=-11.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC7B4C10F26 for ; Sat, 7 Mar 2020 12:15:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95A782073D for ; Sat, 7 Mar 2020 12:15:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E+fljemj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726281AbgCGMPS (ORCPT ); Sat, 7 Mar 2020 07:15:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46562 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726267AbgCGMPS (ORCPT ); Sat, 7 Mar 2020 07:15:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583583316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IeX35ro3L3qLaaRbmmVjKgYMbo9pGR4L5TWmj0PdHRg=; b=E+fljemjrRji4CqtvyveO3TKEuZBhKXSCerkhGtfAk0J/zyKQ49mcZd2wazAitAEDjK8hz QsOxPhM9MjgLgkNLPtfVzYJKfGdTWemTLH0YVLO210lvjUf/YxNiE7Mr5oBD60iguiXNdo 9Gq07AYDsH4hJXP8ez8wQf2DLiMLyQg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-uaZ4Ml3FOU6nPC_EUiw_uw-1; Sat, 07 Mar 2020 07:15:11 -0500 X-MC-Unique: uaZ4Ml3FOU6nPC_EUiw_uw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1CC21107ACCA; Sat, 7 Mar 2020 12:15:10 +0000 (UTC) Received: from x1.localdomain.com (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00F497A411; Sat, 7 Mar 2020 12:15:08 +0000 (UTC) From: Hans de Goede To: Dmitry Torokhov , Bastien Nocera Cc: Hans de Goede , linux-input@vger.kernel.org, Dmitry Mastykin Subject: [PATCH v3 02/11] Input: goodix - Make loading the config from disk independent from the GPIO setup Date: Sat, 7 Mar 2020 13:14:56 +0100 Message-Id: <20200307121505.3707-2-hdegoede@redhat.com> In-Reply-To: <20200307121505.3707-1-hdegoede@redhat.com> References: <20200307121505.3707-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Content-Transfer-Encoding: quoted-printable Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org At least on X86 ACPI platforms it is not necessary to load the touchscree= n controller config from disk, if it needs to be loaded this has already be= en done by the BIOS / UEFI firmware. Even on other (e.g. devicetree) platforms the config-loading as currently done has the issue that the loaded cfg file is based on the controller model, but the actual cfg is device specific, so the cfg files are not part of linux-firmware and this can only work with a device specific OS image which includes the cfg file. And we do not need access to the GPIOs at all to load the config, if we do not have access we can still load the config. So all in all tying the decision to try to load the config from disk to being able to access the GPIOs is not desirable. This commit adds a new load_cfg_from_disk boolean to control the firmware loading instead. This commits sets the new bool to true when we set irq_pin_access_method to IRQ_PIN_ACCESS_GPIO, so there are no functional changes. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1786317 BugLink: https://github.com/nexus511/gpd-ubuntu-packages/issues/10 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=3D199207 Cc: Dmitry Mastykin Reviewed-by: Bastien Nocera Signed-off-by: Hans de Goede --- Changes in v3: - Move the wait_for_completion(&ts->firmware_loading_complete); in goodix_suspend() to above the early exit case for ts->irq_pin_access_method =3D=3D IRQ_PIN_ACCESS_NONE --- drivers/input/touchscreen/goodix.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscre= en/goodix.c index 9cfbcf3cbca8..95cac14369a8 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -56,6 +56,7 @@ struct goodix_ts_data { u16 id; u16 version; const char *cfg_name; + bool load_cfg_from_disk; struct completion firmware_loading_complete; unsigned long irq_flags; enum goodix_irq_pin_access_method irq_pin_access_method; @@ -654,8 +655,10 @@ static int goodix_get_gpio_config(struct goodix_ts_d= ata *ts) =20 ts->gpiod_rst =3D gpiod; =20 - if (ts->gpiod_int && ts->gpiod_rst) + if (ts->gpiod_int && ts->gpiod_rst) { + ts->load_cfg_from_disk =3D true; ts->irq_pin_access_method =3D IRQ_PIN_ACCESS_GPIO; + } =20 return 0; } @@ -952,7 +955,7 @@ static int goodix_ts_probe(struct i2c_client *client, =20 ts->chip =3D goodix_get_chip_data(ts->id); =20 - if (ts->irq_pin_access_method =3D=3D IRQ_PIN_ACCESS_GPIO) { + if (ts->load_cfg_from_disk) { /* update device config */ ts->cfg_name =3D devm_kasprintf(&client->dev, GFP_KERNEL, "goodix_%d_cfg.bin", ts->id); @@ -983,7 +986,7 @@ static int goodix_ts_remove(struct i2c_client *client= ) { struct goodix_ts_data *ts =3D i2c_get_clientdata(client); =20 - if (ts->irq_pin_access_method =3D=3D IRQ_PIN_ACCESS_GPIO) + if (ts->load_cfg_from_disk) wait_for_completion(&ts->firmware_loading_complete); =20 return 0; @@ -995,14 +998,15 @@ static int __maybe_unused goodix_suspend(struct dev= ice *dev) struct goodix_ts_data *ts =3D i2c_get_clientdata(client); int error; =20 + if (ts->load_cfg_from_disk) + wait_for_completion(&ts->firmware_loading_complete); + /* We need gpio pins to suspend/resume */ if (ts->irq_pin_access_method =3D=3D IRQ_PIN_ACCESS_NONE) { disable_irq(client->irq); return 0; } =20 - wait_for_completion(&ts->firmware_loading_complete); - /* Free IRQ as IRQ pin is used as output in the suspend sequence */ goodix_free_irq(ts); =20 --=20 2.25.1