Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3036395ybt; Mon, 29 Jun 2020 13:32:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLRK6x9GsJhbSZxdb4ZtScZl9lrlpv2Tkf5KaTFsGy1Tcm9RbjpcIFf44bkPh8hNo2XtrN X-Received: by 2002:a17:906:1f4f:: with SMTP id d15mr15302093ejk.206.1593462772816; Mon, 29 Jun 2020 13:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462772; cv=none; d=google.com; s=arc-20160816; b=H4cCIYp4aVoUcq0TnG8PfNzcWTs3exZARRIJ/fEr3NQXxlSqVPBkxSh1iusFX9zTJa kY8dvVBk+5hkDaLps84YEuq/IID1/ZK1C/OsX0CP1cM6L58Z4/CGaKCrwI9zpvQfu/tK KlG8p5yomOSxRF9MFdhIepZO5E2PVfyZtoKO624iega8q4KZ/PK889JPw3Qh4ZDYT4c5 F62vHYPS1vQeAz82mlDGGqa8ByKSqAtOQoSFCJAzCXb+/xiKk1EvksX/5Xw+K/H0TZQd CpC8lrs2AE40TfLfZh7clE6TsZMOz69cEnZbrxXJme3joUDrjQtyqrVpg3IbFdr2BKq9 mqAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MrlSDQELr0hEEaRQ+VQFKBU4rNUsHapBjGlhukzOGRY=; b=RRpCsSCxkmxkC7pffoM1/FRVbhWTPy851o2h4/dY1sFG0u7GM4AFcZprPDkK9DTLhn d4lVVC01DbkubM9siXoQ+G/CoPrZ0UPLq/3P4YSSh8xfgsMhZVey4VeIQSglzYU7LTZM MPaOXLKgGWyN8NKs21dQwj3NgtD3Qrarmi7JShRcgSwe2VcXq46QusNPistlzJV6cUQv l/apWbV7SPh4+r8Q/G7CzGBihH0BXXBsSI/0bS0nreDqwTxElrj6vgXT123UTPIvttFe LbmYfuaY9YH+7qOgUduTKJNYoMcTTbeP50O+6TxhTJ9QyL539UEjVT7jtm4imeQ/WIUy zoLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=he6xZo3N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bw19si380012ejb.729.2020.06.29.13.32.29; Mon, 29 Jun 2020 13:32:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=he6xZo3N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731023AbgF2U3R (ORCPT + 99 others); Mon, 29 Jun 2020 16:29:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:37058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732440AbgF2TZW (ORCPT ); Mon, 29 Jun 2020 15:25:22 -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 22E802533C; Mon, 29 Jun 2020 15:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445179; bh=z9HC8fjtE91zDOgMhT+LLjIAS45FRJcu+53+IAN2WII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=he6xZo3N+1K3Z19hlNiaL1laJQNFGyPDDXTiFB9Oc/w2SWk0W5cHd41xQxlnwVlAn /JNq9Jyo1QboEK/o8i1jXdMM8LWhmWS2f4FdQvbLCudWv5SmcNPkaJ4mOd1Ci4BVRU etoXUie5poofX/9RFT2x9PCpE5eP5R/RYBDyZV5c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Denis Efremov , Alex Deucher , Greg Kroah-Hartman Subject: [PATCH 4.14 70/78] drm/radeon: fix fb_div check in ni_init_smc_spll_table() Date: Mon, 29 Jun 2020 11:37:58 -0400 Message-Id: <20200629153806.2494953-71-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153806.2494953-1-sashal@kernel.org> References: <20200629153806.2494953-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.186-rc1 X-KernelTest-Deadline: 2020-07-01T15:38+00:00 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: Denis Efremov commit 35f760b44b1b9cb16a306bdcc7220fbbf78c4789 upstream. clk_s is checked twice in a row in ni_init_smc_spll_table(). fb_div should be checked instead. Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)") Cc: stable@vger.kernel.org Signed-off-by: Denis Efremov Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 9416e72f86aaf..d491b3aa124f3 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -2126,7 +2126,7 @@ static int ni_init_smc_spll_table(struct radeon_device *rdev) if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT)) ret = -EINVAL; - if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT)) + if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT)) ret = -EINVAL; if (clk_v & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_SHIFT)) -- 2.25.1