From patchwork Mon Oct 24 11:27:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp439677wru; Mon, 24 Oct 2022 06:03:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM554bvTR7KOGlgj4TakYYSvUt7Fdf2qbNK4KNH+oFFuNDFLjGoCnwWApyoWcXnubPTQL7Uk X-Received: by 2002:a17:902:ce82:b0:185:47af:a0e8 with SMTP id f2-20020a170902ce8200b0018547afa0e8mr33355027plg.7.1666616576540; Mon, 24 Oct 2022 06:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616576; cv=none; d=google.com; s=arc-20160816; b=J0/VT/7EAMqbR0nEZOm7a2fToLKApq8cfq0/MCnifL7LsL4mFZaDrSYadJUHmXUVAg g/n1TeE4c1qYupIJE5/Knp95IHWOMPQcaVUXuFxRoAeuCNV21uP/gAVUR8eKv4j/OHl6 rToOBn2rIOE94u8mW2lPSzU7oYuA/Tp44bay1FHLVRCYIzqI+9q4GEWqhYo212nn2I1D E0Ye9CDYkdMOpfPJRUoiSs6NMx3pwXsaw3D1UdcG1QwJK194fvRgFG9shkUuwIqGl4k/ JkdbmbYdu3rWBkzHwi8KH2drZ3Hzs1vYCSB3Aiuza/dg7nUKm8f/UPvRIAlG3x47rtAy s8Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6VgLHC/wEZR+WddmuBG1tP244G257F35YW+WPA6PR4U=; b=Cup4AL/jz0yDNeI1BrZ8UK4N1ipZa8ZaNPq8H8GGrsoxzixdwDL35ioEvui7zRM1mP NvyaW7wlpI75ounG2KYxakeK4yz1t+xIG4ydsVPH3txiUv0hcqXK3XnaZg4w9jLv+PHg Y7RMwTMFdKth0sjiYH/WiKq8q4PnKfLAwHfwKSn48XOaZ+trMTHx7u9pme85DN0dASp3 tgUTUN2vkUAWhvbKMi/F4Suo6hjo3jbVd5Fa/2Bu9aD9g9Pt/Zw6Q3BcnCxdFfHHdpvQ H+3V9zjlHtUAIyjjqtwXQP2/XGDW/W33pvrENJR4xZ0Y6tO0fLD3joNXJU5XvInD2xRW c7lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gz6cl9D1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g20-20020a63dd54000000b0045d4e861cc8si32412723pgj.276.2022.10.24.06.02.38; Mon, 24 Oct 2022 06:02:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gz6cl9D1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234912AbiJXNB7 (ORCPT + 99 others); Mon, 24 Oct 2022 09:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235101AbiJXM7U (ORCPT ); Mon, 24 Oct 2022 08:59:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60C409AC12; Mon, 24 Oct 2022 05:18:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B6A6D61252; Mon, 24 Oct 2022 12:17:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7DA1C433C1; Mon, 24 Oct 2022 12:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613821; bh=Om7/WGg2QmwJwy/GGvtmo+GRr3hThQYF+KNt7roy7cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gz6cl9D1Qrb8NJGcgTIiRLRdRKhBHilgNfIIPpq0h+BHpjLoUGsvuH0UZxia/UylI wKCaqWe376n0sAc67z2L9xAJAayE/ffpfusyv76HzeMSts2ViJg2PAZ6v/0iJOHnl0 L99654ULRHYgfBPxqr6G5CqbZf14qGCRcKH0e9mk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Patryk Duda , Tzung-Bi Shih Subject: [PATCH 5.10 027/390] platform/chrome: cros_ec_proto: Update version on GET_NEXT_EVENT failure Date: Mon, 24 Oct 2022 13:27:04 +0200 Message-Id: <20221024113023.716713539@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574143661459794?= X-GMAIL-MSGID: =?utf-8?q?1747574143661459794?= From: Patryk Duda commit f74c7557ed0d321947e8bb4e9d47c1013f8b2227 upstream. Some EC based devices (e.g. Fingerpint MCU) can jump to RO part of the firmware (intentionally or due to device reboot). The RO part doesn't change during the device lifecycle, so it won't support newer version of EC_CMD_GET_NEXT_EVENT command. Function cros_ec_query_all() is responsible for finding maximum supported MKBP event version. It's usually called when the device is running RW part of the firmware, so the command version can be potentially higher than version supported by the RO. The problem was fixed by updating maximum supported version when the device returns EC_RES_INVALID_VERSION (mapped to -ENOPROTOOPT). That way the kernel will use highest common version supported by RO and RW. Fixes: 3300fdd630d4 ("platform/chrome: cros_ec: handle MKBP more events flag") Cc: # 5.10+ Reviewed-by: Guenter Roeck Signed-off-by: Patryk Duda Signed-off-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/20220802154128.21175-1-pdk@semihalf.com Signed-off-by: Greg Kroah-Hartman --- drivers/platform/chrome/cros_ec_proto.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -748,6 +748,7 @@ int cros_ec_get_next_event(struct cros_e u8 event_type; u32 host_event; int ret; + u32 ver_mask; /* * Default value for wake_event. @@ -769,6 +770,37 @@ int cros_ec_get_next_event(struct cros_e return get_keyboard_state_event(ec_dev); ret = get_next_event(ec_dev); + /* + * -ENOPROTOOPT is returned when EC returns EC_RES_INVALID_VERSION. + * This can occur when EC based device (e.g. Fingerprint MCU) jumps to + * the RO image which doesn't support newer version of the command. In + * this case we will attempt to update maximum supported version of the + * EC_CMD_GET_NEXT_EVENT. + */ + if (ret == -ENOPROTOOPT) { + dev_dbg(ec_dev->dev, + "GET_NEXT_EVENT returned invalid version error.\n"); + ret = cros_ec_get_host_command_version_mask(ec_dev, + EC_CMD_GET_NEXT_EVENT, + &ver_mask); + if (ret < 0 || ver_mask == 0) + /* + * Do not change the MKBP supported version if we can't + * obtain supported version correctly. Please note that + * calling EC_CMD_GET_NEXT_EVENT returned + * EC_RES_INVALID_VERSION which means that the command + * is present. + */ + return -ENOPROTOOPT; + + ec_dev->mkbp_event_supported = fls(ver_mask); + dev_dbg(ec_dev->dev, "MKBP support version changed to %u\n", + ec_dev->mkbp_event_supported - 1); + + /* Try to get next event with new MKBP support version set. */ + ret = get_next_event(ec_dev); + } + if (ret <= 0) return ret;