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 36153C433FF for ; Tue, 6 Aug 2019 21:42:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED6DC216F4 for ; Tue, 6 Aug 2019 21:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127776; bh=0/I9yaWwLfbVKWZtR4EeIsv5AWU4gyl+tYZMLtkaT/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mELsYGF88oq7sOX8sFhE+ggyxbg0tqja/Pme957mbV0ENFUJ4TcJcEHgkP0WvZ1aw 4o4QAj/CIrCAHqBGNlj7EjCgqf0e1cJqzX/wez6BsSqAEBFz2/a3KZFfJt9C0ZToEH KggRNkevY20YCKARfQdm8mt3fEohx4NKduOK8/aY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728513AbfHFVmy (ORCPT ); Tue, 6 Aug 2019 17:42:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:52796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728069AbfHFVfA (ORCPT ); Tue, 6 Aug 2019 17:35:00 -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 70A4C21874; Tue, 6 Aug 2019 21:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127300; bh=0/I9yaWwLfbVKWZtR4EeIsv5AWU4gyl+tYZMLtkaT/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y3eA7Ptb2ZX3rT3jh+daN44b6WbHR2C8pT0EDF1OjPDpy0fOw/Z/lLwfUjqd/0foG 0v6OerFKBZm0LSG6w8RYNaAewa/SxJnYcUnUC3GRqWHos9K7hxaFpoBZogDQeLPLpx IHm4RQ2btxo2qMxqToQvYFIbMP3xrfS9DhPQNDds= 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 5.2 51/59] drm/exynos: fix missing decrement of retry counter Date: Tue, 6 Aug 2019 17:33:11 -0400 Message-Id: <20190806213319.19203-51-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213319.19203-1-sashal@kernel.org> References: <20190806213319.19203-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 ec9c1b7d31033..8989f8af716b7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c @@ -94,12 +94,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 51/59] drm/exynos: fix missing decrement of retry counter Date: Tue, 6 Aug 2019 17:33:11 -0400 Message-ID: <20190806213319.19203-51-sashal@kernel.org> References: <20190806213319.19203-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E6DE6E56E for ; Tue, 6 Aug 2019 21:35:00 +0000 (UTC) In-Reply-To: <20190806213319.19203-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Colin Ian King , dri-devel@lists.freedesktop.org, Sasha Levin List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4KClsgVXBzdHJl YW0gY29tbWl0IDFiYmJhYjA5N2EwNTI3NmUzMTJkZDI0NjI3OTFkMzJiMjFjZWIxZWUgXQoKQ3Vy cmVudGx5IHRoZSByZXRyeSBjb3VudGVyIGlzIG5vdCBiZWluZyBkZWNyZW1lbnRlZCwgbGVhZGlu ZyB0byBhCnBvdGVudGlhbCBpbmZpbml0ZSBzcGluIGlmIHRoZSBzY2FsYXJfcmVhZHMgZG9uJ3Qg Y2hhbmdlIHN0YXRlLgoKQWRkcmVzc2VzLUNvdmVyaXR5OiAoIkluZmluaXRlIGxvb3AiKQpGaXhl czogMjgwZTU0YzlmNjE0ICgiZHJtL2V4eW5vczogc2NhbGVyOiBSZXNldCBoYXJkd2FyZSBiZWZv cmUgc3RhcnRpbmcgdGhlIG9wZXJhdGlvbiIpClNpZ25lZC1vZmYtYnk6IENvbGluIElhbiBLaW5n IDxjb2xpbi5raW5nQGNhbm9uaWNhbC5jb20+ClNpZ25lZC1vZmYtYnk6IElua2kgRGFlIDxpbmtp LmRhZUBzYW1zdW5nLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJu ZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9zY2FsZXIuYyB8 IDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fc2NhbGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fc2NhbGVyLmMKaW5kZXggZWM5YzFi N2QzMTAzMy4uODk4OWY4YWY3MTZiNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V4eW5v cy9leHlub3NfZHJtX3NjYWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9z X2RybV9zY2FsZXIuYwpAQCAtOTQsMTIgKzk0LDEyIEBAIHN0YXRpYyBpbmxpbmUgaW50IHNjYWxl cl9yZXNldChzdHJ1Y3Qgc2NhbGVyX2NvbnRleHQgKnNjYWxlcikKIAlzY2FsZXJfd3JpdGUoU0NB TEVSX0NGR19TT0ZUX1JFU0VULCBTQ0FMRVJfQ0ZHKTsKIAlkbyB7CiAJCWNwdV9yZWxheCgpOwot CX0gd2hpbGUgKHJldHJ5ID4gMSAmJgorCX0gd2hpbGUgKC0tcmV0cnkgPiAxICYmCiAJCSBzY2Fs ZXJfcmVhZChTQ0FMRVJfQ0ZHKSAmIFNDQUxFUl9DRkdfU09GVF9SRVNFVCk7CiAJZG8gewogCQlj cHVfcmVsYXgoKTsKIAkJc2NhbGVyX3dyaXRlKDEsIFNDQUxFUl9JTlRfRU4pOwotCX0gd2hpbGUg KHJldHJ5ID4gMCAmJiBzY2FsZXJfcmVhZChTQ0FMRVJfSU5UX0VOKSAhPSAxKTsKKwl9IHdoaWxl ICgtLXJldHJ5ID4gMCAmJiBzY2FsZXJfcmVhZChTQ0FMRVJfSU5UX0VOKSAhPSAxKTsKIAogCXJl dHVybiByZXRyeSA/IDAgOiAtRUlPOwogfQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=