Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp673040img; Fri, 22 Mar 2019 06:19:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyUHjwN1aRDhsQ3ag/aIMiaZYHxh/zKZeU6a/B6G4TFYMPRED+wFJ/54vcvPvROJApPeTei X-Received: by 2002:a65:6489:: with SMTP id e9mr8822221pgv.260.1553260793311; Fri, 22 Mar 2019 06:19:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260793; cv=none; d=google.com; s=arc-20160816; b=i48u40Iq1wWcynrp1ZYJyIzwAkyrwaHomcvAFuM0TkDiUYgn+g6DffQkCH2Q5YMYOb L6KclrqRex24+eaYTK0rQ9HtZyvS+afTYdLEIi+xFC/JW8he1xg+SmzRb88oMBgw04lc aAoDvTgOy3aT7llxh/g7iMGmiul41yZ0HfoN20iTWgpoO+LKN0oJ6bh3fZk2f1l/avyh mkAecjb/Yi9QnTogw1Gyrve6vwx1f9yy6it0J+wSzKdMauT47vqPBl+7IwY8uZOo19fs 4TRaRbx2Zqu56GgubPzT6coOor11xDONQex4CnxvvZ173eQMdkA0v2/NiwAxbt8tUcEp tm3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=t+NLa4vL7qLN6vwm5Ic/jzcAXxD9NZNxXKi0tjZD03E=; b=UfGcrNtiuvWA6G46T5PjoxZwYm07XpwuOifNmbAM/Z+SLwmpCttedK8Juk1D1AZxmj zVgXooiOIhTigDLfm3F18WIATrGM4c4usHmZSi17T1qPYW9WWmFsBwS3YM8dkKLlNPsS zYZZV5yoipPHPkL/bGrzIWWupo4UegfAWI+cyrZcWZo5xV8VkS+Epe3Hh8FpRnbEJH6G wHBlse0mlMk6oN/EpKuF2N8P4ZkfZ8vN6hkt4nFPU9Ikahj3M/yPZZGQ7RTZB55zAhRj cw9lhpdQ/UpGL2lTV7LckOa+eZ7VPpus8PlsefcRImcZ4TmUSiMIdqX9P+p7wf37Fhf0 Kkxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kl4rsVJd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l63si6544593pfj.53.2019.03.22.06.19.35; Fri, 22 Mar 2019 06:19:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kl4rsVJd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728317AbfCVLXP (ORCPT + 99 others); Fri, 22 Mar 2019 07:23:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:50086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728926AbfCVLXL (ORCPT ); Fri, 22 Mar 2019 07:23:11 -0400 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 C2C842190A; Fri, 22 Mar 2019 11:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253791; bh=OEiwyTvqnTK0AeyqlWbMq6xF5zutPimMEibCG/D4JII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kl4rsVJdSl811wS3TCriI/Oee9wQQue8nGC3e/jrbefDINIJY1I/OZQgT77x8SL1q NfMHYEIMpFo8m7Kc73u8+jC3d73eaLZc0jnAqdM/hrPCRn8w5EFJKag3+NfAuXejf/ N4Ynjz95Pei4tfRVItk/qdIyDZt+leME0Wa2VFf8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lubomir Rintel , Pavel Machek , Marc Zyngier , Sasha Levin Subject: [PATCH 3.18 073/134] irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable Date: Fri, 22 Mar 2019 12:14:46 +0100 Message-Id: <20190322111215.362827687@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2380a22b60ce6f995eac806e69c66e397b59d045 ] Resetting bit 4 disables the interrupt delivery to the "secure processor" core. This breaks the keyboard on a OLPC XO 1.75 laptop, where the firmware running on the "secure processor" bit-bangs the PS/2 protocol over the GPIO lines. It is not clear what the rest of the bits are and Marvell was unhelpful when asked for documentation. Aside from the SP bit, there are probably priority bits. Leaving the unknown bits as the firmware set them up seems to be a wiser course of action compared to just turning them off. Signed-off-by: Lubomir Rintel Acked-by: Pavel Machek [maz: fixed-up subject and commit message] Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- drivers/irqchip/irq-mmp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index c0da57bdb89d..7924d21c86ec 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c @@ -35,6 +35,9 @@ #define SEL_INT_PENDING (1 << 6) #define SEL_INT_NUM_MASK 0x3f +#define MMP2_ICU_INT_ROUTE_PJ4_IRQ (1 << 5) +#define MMP2_ICU_INT_ROUTE_PJ4_FIQ (1 << 6) + struct icu_chip_data { int nr_irqs; unsigned int virq_base; @@ -191,7 +194,8 @@ static struct mmp_intc_conf mmp_conf = { static struct mmp_intc_conf mmp2_conf = { .conf_enable = 0x20, .conf_disable = 0x0, - .conf_mask = 0x7f, + .conf_mask = MMP2_ICU_INT_ROUTE_PJ4_IRQ | + MMP2_ICU_INT_ROUTE_PJ4_FIQ, }; static void __exception_irq_entry mmp_handle_irq(struct pt_regs *regs) -- 2.19.1