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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 7B303C7618B for ; Fri, 26 Jul 2019 14:00:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5111720449 for ; Fri, 26 Jul 2019 14:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564149639; bh=y7wvvjWfhthkYbvXrbQ5U8OjVUEJsmODjPMSeo6TFcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OGnvyPti+XZRTxmelAuVOvMuBUNCcnkPWINujo07OAHJ2UVW0BNWwEP6Va2tZGwNt 4k5w80orD6aYLXtUCgj44LqZJ7TAiynAoivxJxAxhb/38V11B0pL8gtxsy8rjCfZ0x +eieuhKiKJaLcCgcADcCRSaLm1UYbHsfsq4Cs8Mo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727631AbfGZNkO (ORCPT ); Fri, 26 Jul 2019 09:40:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:46122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727604AbfGZNkL (ORCPT ); Fri, 26 Jul 2019 09:40:11 -0400 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 A368222BE8; Fri, 26 Jul 2019 13:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148410; bh=y7wvvjWfhthkYbvXrbQ5U8OjVUEJsmODjPMSeo6TFcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zLZT7Zv+qgdrOvMwY0/n86AluX7Uz2u9c/I8R9N7///rqh8+fOOHxrKkNy+bLbBOa C0zrXHTa3jkDkUC0QrGTsCy95+OMsR+MCStVOleL/F8ZdCsknO/883/2CaequjiFVR jNodIwSQkGue7wRPl2JMR2kNxBF5uZoDC2GbeIO8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petr Cvek , Paul Burton , hauke@hauke-m.de, john@phrozen.org, linux-mips@vger.kernel.org, openwrt-devel@lists.openwrt.org, pakahmar@hotmail.com, Sasha Levin Subject: [PATCH AUTOSEL 5.2 19/85] MIPS: lantiq: Fix bitfield masking Date: Fri, 26 Jul 2019 09:38:29 -0400 Message-Id: <20190726133936.11177-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726133936.11177-1-sashal@kernel.org> References: <20190726133936.11177-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Petr Cvek [ Upstream commit ba1bc0fcdeaf3bf583c1517bd2e3e29cf223c969 ] The modification of EXIN register doesn't clean the bitfield before the writing of a new value. After a few modifications the bitfield would accumulate only '1's. Signed-off-by: Petr Cvek Signed-off-by: Paul Burton Cc: hauke@hauke-m.de Cc: john@phrozen.org Cc: linux-mips@vger.kernel.org Cc: openwrt-devel@lists.openwrt.org Cc: pakahmar@hotmail.com Signed-off-by: Sasha Levin --- arch/mips/lantiq/irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index cfd87e662fcf..9c95097557c7 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -154,8 +154,9 @@ static int ltq_eiu_settype(struct irq_data *d, unsigned int type) if (edge) irq_set_handler(d->hwirq, handle_edge_irq); - ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) | - (val << (i * 4)), LTQ_EIU_EXIN_C); + ltq_eiu_w32((ltq_eiu_r32(LTQ_EIU_EXIN_C) & + (~(7 << (i * 4)))) | (val << (i * 4)), + LTQ_EIU_EXIN_C); } } -- 2.20.1