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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 4B307C4360F for ; Thu, 28 Feb 2019 15:15:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11066218D8 for ; Thu, 28 Feb 2019 15:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551366934; bh=6BRDg+X4Yvl+FBpth0LCv74V41DNzX9MVlyneSEaR+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tklyEKm2c3A5LCFeFhLrJ5l+pY57BqaX7Fo/Pk8D6/RJpi3cFpopzUR/n6ej6an/I V7FnCqcuSquXTmp9k1JRX7R2amHd/YVSjQTAekfCmyNb3Qo6Axh8072hlCUFpA71D2 ANF3TWfi3RXEz6ocna83LUd+5n5PxfIf7XtGPIl4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388876AbfB1PPc (ORCPT ); Thu, 28 Feb 2019 10:15:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:51014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388843AbfB1PPZ (ORCPT ); Thu, 28 Feb 2019 10:15:25 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6842C218D3; Thu, 28 Feb 2019 15:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551366925; bh=6BRDg+X4Yvl+FBpth0LCv74V41DNzX9MVlyneSEaR+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TIUxvhJaekTPhIWuk6Vxz8/exijLH2ic2awHemRDMmpbwYXFtdgXKMBOKip2dLuV1 jDztmKasmLus+/4xv2wHcWvVR1VvxABAInrJZwAhIUHwtiJkfnUtM6TXQeA0jSU3J2 jxIw2gljd/D0e7s9MnkojZueNeVg6ANs9Vqj/wig= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lubomir Rintel , Marc Zyngier , Sasha Levin Subject: [PATCH AUTOSEL 4.9 05/19] irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable Date: Thu, 28 Feb 2019 10:15:01 -0500 Message-Id: <20190228151517.12705-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190228151517.12705-1-sashal@kernel.org> References: <20190228151517.12705-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lubomir Rintel [ 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 013fc9659a842..2fe2bcb63a711 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c @@ -34,6 +34,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; @@ -190,7 +193,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