Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp2292040ybf; Mon, 2 Mar 2020 05:52:52 -0800 (PST) X-Google-Smtp-Source: ADFU+vtV3lRRKDxCZb6hNzk2/p09pzfumzHDwv6H7F9/Tu1z2SB0JFnBKJXXS05sjLyCJ1ssqjk4 X-Received: by 2002:a9d:6b04:: with SMTP id g4mr1494011otp.167.1583157172666; Mon, 02 Mar 2020 05:52:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583157172; cv=none; d=google.com; s=arc-20160816; b=BYCBsGT0idwsqEsErddDWL9wkiQomRCp3buzu4O2PYJi1Na/pJ1da+HU6kTSILc6e/ FynpRENKvGJmMMpmw5GZ+Dwd6LZNZWkc3F1Sf4VD5kBxjtTBcQXTZ8CPnq72K1wi5qGF mCSYW+NJNDKxg742fDNcwUxQYgoXd1jkHdZAokAep3tsGO0z9ranqHo9cpwLAr7Tvimd drmAASu6YvmAJC6hRwGMtWpZ86Uoz9B5UmuljM9v/AfP9XwmkS2sIAMYuxSe0A7aso90 r9+96OmjvXNWdmpxZtqFZoQv7xEFOYmrgbANau9VB3CgG/CIYwpFF9TTbxLlDFec8LpX OYow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=OniR4A38TlbDu0vyPO11NY3qXmfOa8ulyGuImR5VXtA=; b=d7m5spWcQZRUbxC6NRbOuoGFjYB67f1tByRabFCmlh/NVttsQJ3r/6OieyAxAiDwgi WEIyp3XKaar1HRO2Ld70Hn6JuljazhLgZhKxnfMam/nGo3HRv97g59Q2hS55aClYX4Mk IhmLLwKeCmJRmmL1dclVSw3Re5SLiNFJ8st8Q66ve/5X/N5DnJV6l1u8WmHw1TuB6DBW nOHAotFziipJtjqahzYxyjciW16uHmMGnl5blAFnPYk2icwV+3lqDC7Tl/uxwPFDz4YM MIX3dcerfz9Dcv9oTuw7SVZbawKIDP3pRzBGRZ78f2Q18UeUPBfXBK5n/xZ/CMthzVh/ ZNpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=RSD4snGV; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m13si1901819otk.236.2020.03.02.05.52.40; Mon, 02 Mar 2020 05:52:52 -0800 (PST) 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=@ti.com header.s=ti-com-17Q1 header.b=RSD4snGV; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727178AbgCBNwZ (ORCPT + 99 others); Mon, 2 Mar 2020 08:52:25 -0500 Received: from fllv0015.ext.ti.com ([198.47.19.141]:55030 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726890AbgCBNwW (ORCPT ); Mon, 2 Mar 2020 08:52:22 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 022DqLw2020144; Mon, 2 Mar 2020 07:52:21 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1583157141; bh=OniR4A38TlbDu0vyPO11NY3qXmfOa8ulyGuImR5VXtA=; h=From:To:CC:Subject:Date; b=RSD4snGVhzz43neG1Xf7P/dEGpStursTYKqif5GbaGWnFud6iAgXvRrgRPPT96lnd LjBbF4kqekPBdF6hg6JpzV8Hk6MNfjB8tE5Q41gdOH9c9xz+f91+EOm8/3ik9W1kw3 MGlZpViTAqJBDjsT9+LHsMC6sY8MafAOO4+AMcJ4= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 022DqLUL014751 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 2 Mar 2020 07:52:21 -0600 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Mon, 2 Mar 2020 07:52:21 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Mon, 2 Mar 2020 07:52:20 -0600 Received: from uda0869644b.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 022DqKgB014616; Mon, 2 Mar 2020 07:52:20 -0600 From: Benoit Parrot To: Hans Verkuil CC: , , , Tomi Valkeinen , Benoit Parrot , stable Subject: [Patch 1/1] media: ti-vpe: cal: fix disable_irqs to only the intended target Date: Mon, 2 Mar 2020 07:56:52 -0600 Message-ID: <20200302135652.9365-1-bparrot@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org disable_irqs() was mistakenly disabling all interrupts when called. This cause all port stream to stop even if only stopping one of them. Cc: stable Signed-off-by: Benoit Parrot --- drivers/media/platform/ti-vpe/cal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c index 6e009e479be3..6d4cbb8782ed 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -722,16 +722,16 @@ static void enable_irqs(struct cal_ctx *ctx) static void disable_irqs(struct cal_ctx *ctx) { + u32 val; + /* Disable IRQ_WDMA_END 0/1 */ - reg_write_field(ctx->dev, - CAL_HL_IRQENABLE_CLR(2), - CAL_HL_IRQ_CLEAR, - CAL_HL_IRQ_MASK(ctx->csi2_port)); + val = 0; + set_field(&val, CAL_HL_IRQ_CLEAR, CAL_HL_IRQ_MASK(ctx->csi2_port)); + reg_write(ctx->dev, CAL_HL_IRQENABLE_CLR(2), val); /* Disable IRQ_WDMA_START 0/1 */ - reg_write_field(ctx->dev, - CAL_HL_IRQENABLE_CLR(3), - CAL_HL_IRQ_CLEAR, - CAL_HL_IRQ_MASK(ctx->csi2_port)); + val = 0; + set_field(&val, CAL_HL_IRQ_CLEAR, CAL_HL_IRQ_MASK(ctx->csi2_port)); + reg_write(ctx->dev, CAL_HL_IRQENABLE_CLR(3), val); /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */ reg_write(ctx->dev, CAL_CSI2_VC_IRQENABLE(1), 0); } -- 2.17.1