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=unavailable 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 5A940C433FF for ; Tue, 6 Aug 2019 21:41:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FF41216F4 for ; Tue, 6 Aug 2019 21:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127687; bh=l9lNgHY2O3o2XR+hkENaOk5pAlN16gJqUbwHG1j/Euk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m/om1VOye15RTWlqoDg7jpLxFEEqC4iKLjg5ZW4N3g8HLZrlgdA5wFPkOqMI/M7S1 hoD/+RnqYPlGfYQqNIm0UBaJb9WSIbUWqxy9hts4/yqovPnQ0/1DgR/co3vxBn0Lv0 jjkcJjMxMLQwm2kcaxbSlONCnmTUBafHdz8LK12s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729400AbfHFVlZ (ORCPT ); Tue, 6 Aug 2019 17:41:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:54064 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728887AbfHFVgQ (ORCPT ); Tue, 6 Aug 2019 17:36:16 -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 BB00A21871; Tue, 6 Aug 2019 21:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127375; bh=l9lNgHY2O3o2XR+hkENaOk5pAlN16gJqUbwHG1j/Euk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xomnEifnu/s7IvJWZcqozrz45vbTOMICJnPNfVq1CnMyvRAS3h6A0p8P41druEvbZ qaOzTje5J1VjXAaNY4LYjzJeYkUIcC8tyHtg0cW0MmS/bO3TQ5p3KFTj2atg/r0X7m 7tu4cSUeTfZ3V/n1gFj1AHckz/y6HDPLzwNwAnlA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Colin Ian King , Inki Dae , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 28/32] drm/exynos: fix missing decrement of retry counter Date: Tue, 6 Aug 2019 17:35:16 -0400 Message-Id: <20190806213522.19859-28-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213522.19859-1-sashal@kernel.org> References: <20190806213522.19859-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: Colin Ian King [ Upstream commit 1bbbab097a05276e312dd2462791d32b21ceb1ee ] Currently the retry counter is not being decremented, leading to a potential infinite spin if the scalar_reads don't change state. Addresses-Coverity: ("Infinite loop") Fixes: 280e54c9f614 ("drm/exynos: scaler: Reset hardware before starting the operation") Signed-off-by: Colin Ian King Signed-off-by: Inki Dae Signed-off-by: Sasha Levin --- drivers/gpu/drm/exynos/exynos_drm_scaler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c index 0ddb6eec7b113..df228436a03d9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c @@ -108,12 +108,12 @@ static inline int scaler_reset(struct scaler_context *scaler) scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG); do { cpu_relax(); - } while (retry > 1 && + } while (--retry > 1 && scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET); do { cpu_relax(); scaler_write(1, SCALER_INT_EN); - } while (retry > 0 && scaler_read(SCALER_INT_EN) != 1); + } while (--retry > 0 && scaler_read(SCALER_INT_EN) != 1); return retry ? 0 : -EIO; } -- 2.20.1