From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC8681EB9EF; Wed, 19 Feb 2025 08:55:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739955342; cv=none; b=AaNgL3jn6yv5+DhcYXMVrEAqq6dazfSULoKmAISIk7NT9B0zzh/VL9sTI0s7hNO/smGIR2dFoxQ/SByt/GGE1U/dROfBKTPk/lmluULPrBrP7arjJM80O+kpGZQlkHqybuVhMZTVf5uWcGiQV65siBdG8TCexbDByGNoBdSFsg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739955342; c=relaxed/simple; bh=Lq7Pim6LIa+GUi4ulH2ABvvR0qFHsGt4mwWakS7Mapk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fLzdN//SYzfi1oyPx2Fw2TK6dfYBcRq/k5zO9zCAsfmvou7JHjGIRtx0BYUBD6BUJpF0fqGCPhhAfacjN1//Zx9Ng/eeCa/lbCFuxQqhFXfnrsrb1h8IMr1m/9BAgWKEIJTLkELVGFZv2DNjceOpgyrgdk3OOmK+TwQggNjfcrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oPFo57rK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oPFo57rK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF2FCC4CED1; Wed, 19 Feb 2025 08:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739955341; bh=Lq7Pim6LIa+GUi4ulH2ABvvR0qFHsGt4mwWakS7Mapk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPFo57rK2ZWWY9HvZIaErAyw4vL24VgR9b/64AMWadGGhb7e8x6tiv4+5rhSrj6Vt VMf0TDEjGH3tlNtF5EvUA6iZz0uRTTxpf1SsLPxkuKB90bbf+yClLSrQ9sa12d/ye7 Kfvhhh15nT/PEkknPD17sEDfsL4cLQh3pOa7dtXs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Devarsh Thakkar , Jonathan Cormier , Aradhya Bhatia , Tomi Valkeinen Subject: [PATCH 6.12 206/230] drm/tidss: Fix race condition while handling interrupt registers Date: Wed, 19 Feb 2025 09:28:43 +0100 Message-ID: <20250219082609.754470977@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082601.683263930@linuxfoundation.org> References: <20250219082601.683263930@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Devarsh Thakkar commit a9a73f2661e6f625d306c9b0ef082e4593f45a21 upstream. The driver has a spinlock for protecting the irq_masks field and irq enable registers. However, the driver misses protecting the irq status registers which can lead to races. Take the spinlock when accessing irqstatus too. Fixes: 32a1795f57ee ("drm/tidss: New driver for TI Keystone platform Display SubSystem") Cc: stable@vger.kernel.org Signed-off-by: Devarsh Thakkar [Tomi: updated the desc] Reviewed-by: Jonathan Cormier Tested-by: Jonathan Cormier Reviewed-by: Aradhya Bhatia Signed-off-by: Tomi Valkeinen Link: https://patchwork.freedesktop.org/patch/msgid/20241021-tidss-irq-fix-v1-6-82ddaec94e4a@ideasonboard.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/tidss/tidss_dispc.c | 4 ++++ drivers/gpu/drm/tidss/tidss_irq.c | 2 ++ 2 files changed, 6 insertions(+) --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -2763,8 +2763,12 @@ static void dispc_init_errata(struct dis */ static void dispc_softreset_k2g(struct dispc_device *dispc) { + unsigned long flags; + + spin_lock_irqsave(&dispc->tidss->wait_lock, flags); dispc_set_irqenable(dispc, 0); dispc_read_and_clear_irqstatus(dispc); + spin_unlock_irqrestore(&dispc->tidss->wait_lock, flags); for (unsigned int vp_idx = 0; vp_idx < dispc->feat->num_vps; ++vp_idx) VP_REG_FLD_MOD(dispc, vp_idx, DISPC_VP_CONTROL, 0, 0, 0); --- a/drivers/gpu/drm/tidss/tidss_irq.c +++ b/drivers/gpu/drm/tidss/tidss_irq.c @@ -60,7 +60,9 @@ static irqreturn_t tidss_irq_handler(int unsigned int id; dispc_irq_t irqstatus; + spin_lock(&tidss->wait_lock); irqstatus = dispc_read_and_clear_irqstatus(tidss->dispc); + spin_unlock(&tidss->wait_lock); for (id = 0; id < tidss->num_crtcs; id++) { struct drm_crtc *crtc = tidss->crtcs[id];