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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 E1EB6C43603 for ; Wed, 11 Dec 2019 15:08:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2D152173E for ; Wed, 11 Dec 2019 15:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076920; bh=DNRLEQwGx0SZ8K49kFtmbV0zzL7Hid2GPvjtmHZSL5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bNpn9xQiRGEnbT0FeTy0Y475WGMZM2wXyLy87gWODCtd6leAvWWC1sOVRzBgRH5Jo Wxt7I0Q+7iaMMa/ubkvvt//oaZLFjGa75U6KmAFJRDzYTQwwGOe+pTmZHsby2z+JWU WurAx6mRIcjdB2lrBlJcgbj5jcu741LS5GH6g0vM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730428AbfLKPIj (ORCPT ); Wed, 11 Dec 2019 10:08:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:56246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730411AbfLKPIg (ORCPT ); Wed, 11 Dec 2019 10:08:36 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 442382173E; Wed, 11 Dec 2019 15:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076915; bh=DNRLEQwGx0SZ8K49kFtmbV0zzL7Hid2GPvjtmHZSL5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xSJqunou2x6BjsfDDXvsSdg+hcqHYZv0egtGelQ9IP57x40xLGsDZ4u9+0V+gI1hK WV9Zsg2fxE7nkOWZyQKE7TrxOYp6YsXCunmUDlclLSkcCZ0f6fFsJwEfagokB0s9AT LIMSCNMCDttpkW6oGm/jY8meGBWPnVDhA013gzBc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Dmitry Torokhov Subject: [PATCH 5.4 38/92] Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash Date: Wed, 11 Dec 2019 16:05:29 +0100 Message-Id: <20191211150239.001777958@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.977775294@linuxfoundation.org> References: <20191211150221.977775294@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lucas Stach commit 86bcd3a12999447faad60ec59c2d64d18d8e61ac upstream. F34 is a bit special as it reinitializes the device and related driver structs during the firmware update. This clears the fn_irq_mask which will then prevent F34 from receiving further interrupts, leading to timeouts during the firmware update. Make sure to reinitialize the IRQ enables at the appropriate times. The issue is in F34 code, but the commit in the fixes tag exposed the issue, as before this commit things would work by accident. Fixes: 363c53875aef (Input: synaptics-rmi4 - avoid processing unknown IRQs) Signed-off-by: Lucas Stach Link: https://lore.kernel.org/r/20191129133514.23224-1-l.stach@pengutronix.de Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/rmi4/rmi_f34v7.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/input/rmi4/rmi_f34v7.c +++ b/drivers/input/rmi4/rmi_f34v7.c @@ -1189,6 +1189,9 @@ int rmi_f34v7_do_reflash(struct f34_data { int ret; + f34->fn->rmi_dev->driver->set_irq_bits(f34->fn->rmi_dev, + f34->fn->irq_mask); + rmi_f34v7_read_queries_bl_version(f34); f34->v7.image = fw->data;