From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: [PATCH 02/11 V2] radeon: evergreen: Fix probable mask then right shift defect Date: Mon, 27 Oct 2014 07:14:57 -0700 Message-ID: <1414419297.8884.5.camel@perches.com> References: <88c64cce88264069e0e1637fc874e699e5b226f6.1414387334.git.joe@perches.com> <544E0D0E.6080206@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtprelay.hostedemail.com (smtprelay0161.hostedemail.com [216.40.44.161]) by gabe.freedesktop.org (Postfix) with ESMTP id E7CDF6E22C for ; Mon, 27 Oct 2014 07:15:03 -0700 (PDT) In-Reply-To: <544E0D0E.6080206@daenzer.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Michel =?ISO-8859-1?Q?D=E4nzer?= Cc: Alex Deucher , Christian =?ISO-8859-1?Q?K=F6nig?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org UHJlY2VkZW5jZSBvZiAmIGFuZCA+PiBpcyBub3QgdGhlIHNhbWUgYW5kIGlzIG5vdCBsZWZ0IHRv IHJpZ2h0LgpzaGlmdCBoYXMgaGlnaGVyIHByZWNlZGVuY2UgYW5kIHNob3VsZCBiZSBkb25lIGFm dGVyIHRoZSBtYXNrLgoKQWRkIHBhcmVudGhlc2VzIGFyb3VuZCB0aGUgbWFzay4KClVzZSB0aGUg YWxyZWFkeSAjZGVmaW5lZCB2YWx1ZXMgaW5zdGVhZCBvZiBoYXJkY29kaW5nLgoKU2lnbmVkLW9m Zi1ieTogSm9lIFBlcmNoZXMgPGpvZUBwZXJjaGVzLmNvbT4KLS0tCj4gSSB0aGluayB0aGlzIHNo b3VsZCBiZSBOVU1fU0hBREVSX0VOR0lORVNfU0hJRlQ/CgooSm9lIGNhbid0IHR5cGUpCgpleGFj dGx5IHJpZ2h0LCB0aGFua3MgTWljaGVsCgogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9ldmVyZ3Jl ZW4uYyB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9u KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9ldmVyZ3JlZW4uYyBiL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vZXZlcmdyZWVuLmMKaW5kZXggYTMxZjFjYS4uYTk3YTY4NSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9ldmVyZ3JlZW4uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL2V2ZXJncmVlbi5jCkBAIC0zMzAzLDcgKzMzMDMsOCBAQCBzdGF0 aWMgdm9pZCBldmVyZ3JlZW5fZ3B1X2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJ cmRldi0+Y29uZmlnLmV2ZXJncmVlbi50aWxlX2NvbmZpZyB8PQogCQkoKGdiX2FkZHJfY29uZmln ICYgMHgzMDAwMDAwMCkgPj4gMjgpIDw8IDEyOwogCi0JbnVtX3NoYWRlcl9lbmdpbmVzID0gKGdi X2FkZHJfY29uZmlnICYgTlVNX1NIQURFUl9FTkdJTkVTKDMpID4+IDEyKSArIDE7CisJbnVtX3No YWRlcl9lbmdpbmVzID0gKChnYl9hZGRyX2NvbmZpZyAmIE5VTV9TSEFERVJfRU5HSU5FU19NQVNL KQorCQkJICAgICAgPj4gTlVNX1NIQURFUl9FTkdJTkVTX1NISUZUKSArIDE7CiAKIAlpZiAoKHJk ZXYtPmZhbWlseSA+PSBDSElQX0NFREFSKSAmJiAocmRldi0+ZmFtaWx5IDw9IENISVBfSEVNTE9D SykpIHsKIAkJdTMyIGVmdXNlX3N0cmFwc180OwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187AbaJ0OPF (ORCPT ); Mon, 27 Oct 2014 10:15:05 -0400 Received: from smtprelay0092.hostedemail.com ([216.40.44.92]:58042 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752912AbaJ0OPD (ORCPT ); Mon, 27 Oct 2014 10:15:03 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3871:4321:4605:5007:6261:10004:10400:10848:11026:11232:11473:11657:11658:11914:12043:12296:12438:12517:12519:12555:13069:13311:13357:14096:14097:14394:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: baby26_2bd63b918ed27 X-Filterd-Recvd-Size: 2179 Message-ID: <1414419297.8884.5.camel@perches.com> Subject: [PATCH 02/11 V2] radeon: evergreen: Fix probable mask then right shift defect From: Joe Perches To: Michel =?ISO-8859-1?Q?D=E4nzer?= Cc: Alex Deucher , Christian =?ISO-8859-1?Q?K=F6nig?= , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Mon, 27 Oct 2014 07:14:57 -0700 In-Reply-To: <544E0D0E.6080206@daenzer.net> References: <88c64cce88264069e0e1637fc874e699e5b226f6.1414387334.git.joe@perches.com> <544E0D0E.6080206@daenzer.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.7-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Precedence of & and >> is not the same and is not left to right. shift has higher precedence and should be done after the mask. Add parentheses around the mask. Use the already #defined values instead of hardcoding. Signed-off-by: Joe Perches --- > I think this should be NUM_SHADER_ENGINES_SHIFT? (Joe can't type) exactly right, thanks Michel drivers/gpu/drm/radeon/evergreen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index a31f1ca..a97a685 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -3303,7 +3303,8 @@ static void evergreen_gpu_init(struct radeon_device *rdev) rdev->config.evergreen.tile_config |= ((gb_addr_config & 0x30000000) >> 28) << 12; - num_shader_engines = (gb_addr_config & NUM_SHADER_ENGINES(3) >> 12) + 1; + num_shader_engines = ((gb_addr_config & NUM_SHADER_ENGINES_MASK) + >> NUM_SHADER_ENGINES_SHIFT) + 1; if ((rdev->family >= CHIP_CEDAR) && (rdev->family <= CHIP_HEMLOCK)) { u32 efuse_straps_4;