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 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 3EA73C35656 for ; Fri, 21 Feb 2020 16:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 158582067D for ; Fri, 21 Feb 2020 16:48:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QeuChMcR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727263AbgBUQsG (ORCPT ); Fri, 21 Feb 2020 11:48:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22118 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726955AbgBUQsG (ORCPT ); Fri, 21 Feb 2020 11:48:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582303685; 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=J0gL/pn5e8SFXhq4zcFmd3QMN0hRvKdSVqGLx6G1YAQ=; b=QeuChMcRo6YsAnzv9Rh9TJd/sBla2J3lxfe4eCjt5mqnm1KqprV+dRnrYlQnN33ry2f61+ vMHxtxml1Xwm/xYrdaNuSH9O2XsD+zjh43O5SA9pa7VGRI6RySUbUz4AXi8OUffGE2f0FQ 2Hh1iF/RUubbiFKKvkLdQXT8ZyFqhzA= 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-289-yisD43OQMKWSIQTunS_ymA-1; Fri, 21 Feb 2020 11:48:01 -0500 X-MC-Unique: yisD43OQMKWSIQTunS_ymA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C458113786A; Fri, 21 Feb 2020 16:48:00 +0000 (UTC) Received: from x1.localdomain.com (ovpn-116-191.ams2.redhat.com [10.36.116.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10A6B6B49A; Fri, 21 Feb 2020 16:47:58 +0000 (UTC) From: Hans de Goede To: Dmitry Torokhov , Bastien Nocera Cc: Hans de Goede , linux-input@vger.kernel.org, Dmitry Mastykin Subject: [PATCH resend 08/10] Input: goodix - Save a copy of the config from goodix_read_config() Date: Fri, 21 Feb 2020 17:47:33 +0100 Message-Id: <20200221164735.508324-8-hdegoede@redhat.com> In-Reply-To: <20200221164735.508324-1-hdegoede@redhat.com> References: <20200221164735.508324-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Save a copy of the config in goodix_read_config(), this is a preparation patch for restoring the config if it was lost after a supend/resume cycle= . 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 Signed-off-by: Hans de Goede --- drivers/input/touchscreen/goodix.c | 51 ++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscre= en/goodix.c index 66d6bb74507d..21be33384d14 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -72,6 +72,7 @@ struct goodix_chip_data { u16 config_addr; int config_len; int (*check_config)(struct goodix_ts_data *, const struct firmware *); + void (*fix_config)(struct goodix_ts_data *ts); }; =20 struct goodix_ts_data { @@ -96,35 +97,42 @@ struct goodix_ts_data { unsigned long irq_flags; enum goodix_irq_pin_access_method irq_pin_access_method; unsigned int contact_size; + u8 config[GOODIX_CONFIG_MAX_LENGTH]; }; =20 static int goodix_check_cfg_8(struct goodix_ts_data *ts, const struct firmware *cfg); static int goodix_check_cfg_16(struct goodix_ts_data *ts, const struct firmware *cfg); +static void goodix_fix_cfg_8(struct goodix_ts_data *ts); +static void goodix_fix_cfg_16(struct goodix_ts_data *ts); =20 static const struct goodix_chip_data gt1x_chip_data =3D { .config_addr =3D GOODIX_GT1X_REG_CONFIG_DATA, .config_len =3D GOODIX_CONFIG_MAX_LENGTH, .check_config =3D goodix_check_cfg_16, + .fix_config =3D goodix_fix_cfg_16, }; =20 static const struct goodix_chip_data gt911_chip_data =3D { .config_addr =3D GOODIX_GT9X_REG_CONFIG_DATA, .config_len =3D GOODIX_CONFIG_911_LENGTH, .check_config =3D goodix_check_cfg_8, + .fix_config =3D goodix_fix_cfg_8, }; =20 static const struct goodix_chip_data gt967_chip_data =3D { .config_addr =3D GOODIX_GT9X_REG_CONFIG_DATA, .config_len =3D GOODIX_CONFIG_967_LENGTH, .check_config =3D goodix_check_cfg_8, + .fix_config =3D goodix_fix_cfg_8, }; =20 static const struct goodix_chip_data gt9x_chip_data =3D { .config_addr =3D GOODIX_GT9X_REG_CONFIG_DATA, .config_len =3D GOODIX_CONFIG_MAX_LENGTH, .check_config =3D goodix_check_cfg_8, + .fix_config =3D goodix_fix_cfg_8, }; =20 static const unsigned long goodix_irq_flags[] =3D { @@ -442,6 +450,19 @@ static int goodix_check_cfg_8(struct goodix_ts_data = *ts, return 0; } =20 +static void goodix_fix_cfg_8(struct goodix_ts_data *ts) +{ + int i, raw_cfg_len =3D ts->chip->config_len - 2; + u8 check_sum =3D 0; + + for (i =3D 0; i < raw_cfg_len; i++) + check_sum +=3D ts->config[i]; + check_sum =3D (~check_sum) + 1; + + ts->config[raw_cfg_len] =3D check_sum; + ts->config[raw_cfg_len + 1] =3D 1; +} + static int goodix_check_cfg_16(struct goodix_ts_data *ts, const struct firmware *cfg) { @@ -466,6 +487,19 @@ static int goodix_check_cfg_16(struct goodix_ts_data= *ts, return 0; } =20 +static void goodix_fix_cfg_16(struct goodix_ts_data *ts) +{ + int i, raw_cfg_len =3D ts->chip->config_len - 3; + u16 check_sum =3D 0; + + for (i =3D 0; i < raw_cfg_len; i +=3D 2) + check_sum +=3D get_unaligned_be16(&ts->config[i]); + check_sum =3D (~check_sum) + 1; + + put_unaligned_be16(check_sum, &ts->config[raw_cfg_len]); + ts->config[raw_cfg_len + 2] =3D 1; +} + /** * goodix_check_cfg - Checks if config fw is valid * @@ -828,12 +862,11 @@ static int goodix_get_gpio_config(struct goodix_ts_= data *ts) */ static void goodix_read_config(struct goodix_ts_data *ts) { - u8 config[GOODIX_CONFIG_MAX_LENGTH]; int x_max, y_max; int error; =20 error =3D goodix_i2c_read(ts->client, ts->chip->config_addr, - config, ts->chip->config_len); + ts->config, ts->chip->config_len); if (error) { dev_warn(&ts->client->dev, "Error reading config: %d\n", error); @@ -842,15 +875,21 @@ static void goodix_read_config(struct goodix_ts_dat= a *ts) return; } =20 - ts->int_trigger_type =3D config[TRIGGER_LOC] & 0x03; - ts->max_touch_num =3D config[MAX_CONTACTS_LOC] & 0x0f; + ts->int_trigger_type =3D ts->config[TRIGGER_LOC] & 0x03; + ts->max_touch_num =3D ts->config[MAX_CONTACTS_LOC] & 0x0f; =20 - x_max =3D get_unaligned_le16(&config[RESOLUTION_LOC]); - y_max =3D get_unaligned_le16(&config[RESOLUTION_LOC + 2]); + x_max =3D get_unaligned_le16(&ts->config[RESOLUTION_LOC]); + y_max =3D get_unaligned_le16(&ts->config[RESOLUTION_LOC + 2]); if (x_max && y_max) { input_abs_set_max(ts->input_dev, ABS_MT_POSITION_X, x_max - 1); input_abs_set_max(ts->input_dev, ABS_MT_POSITION_Y, y_max - 1); } + + /* + * Ensure valid checksum and config_fresh bit being set for possible + * re-upload of config after suspend/resume. + */ + ts->chip->fix_config(ts); } =20 /** --=20 2.25.0