From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754631AbcDNOeQ (ORCPT ); Thu, 14 Apr 2016 10:34:16 -0400 Received: from smtprelay0047.hostedemail.com ([216.40.44.47]:59138 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751737AbcDNOeP (ORCPT ); Thu, 14 Apr 2016 10:34:15 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:69:355:379:541:599:800:960:966:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2828:2914:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3868:3870:3872:3874:4250:4321:4385:5007:6119:9592:10004:10400:10848:11026:11232:11473:11657:11658:11783:11889:11914:12043:12438:12517:12519:12555:12740:13439:13894:14181:14659:14721:21080:21094:21323:30046:30054:30091,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,LFtime:1,LUA_SUMMARY:none X-HE-Tag: note85_41c1a4d747c07 X-Filterd-Recvd-Size: 3000 Message-ID: <1460644444.19090.17.camel@perches.com> Subject: Re: [PATCH] drm/vmwgfx: use *_32_bits() macros From: Joe Perches To: Paul Bolle , David Airlie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Thu, 14 Apr 2016 07:34:04 -0700 In-Reply-To: <1460633540.2728.6.camel@tiscali.nl> References: <1457000770-2317-1-git-send-email-pebolle@tiscali.nl> <1460633540.2728.6.camel@tiscali.nl> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.2-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2016-04-14 at 13:32 +0200, Paul Bolle wrote: > On do, 2016-03-03 at 11:26 +0100, Paul Bolle wrote: > > > > Use the upper_32_bits() macro instead of the four line equivalent that > > triggers a GCC warning on 32 bits x86: > >     drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c: In function > > 'vmw_cmdbuf_header_submit': > >     drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c:297:25: warning: right > > shift count >= width of type [-Wshift-count-overflow] > >        val = (header->handle >> 32); > >                              ^ > > > > And use the lower_32_bits() macro instead of and-ing with a 32 bits > > mask. > > > > Signed-off-by: Paul Bolle > > --- > > Note: compile tested only (I don't use any of vmware's products). > The warning can still be seen on v4.6-rc3 for 32 bits x86. This patch > applies cleanly to that rc. > > Has anyone had a chance to look at this patch, and perhaps even test it? Test?  Nope.  Seems obviously correct. It might be clearer removing the temporary though: Maybe: ---  drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 15 +++++----------  1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c index 67cebb2..330794f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c @@ -291,17 +291,12 @@ void vmw_cmdbuf_header_free(struct vmw_cmdbuf_header *header)  static int vmw_cmdbuf_header_submit(struct vmw_cmdbuf_header *header)  {   struct vmw_cmdbuf_man *man = header->man; - u32 val;   - if (sizeof(header->handle) > 4) - val = (header->handle >> 32); - else - val = 0; - vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val); - - val = (header->handle & 0xFFFFFFFFULL); - val |= header->cb_context & SVGA_CB_CONTEXT_MASK; - vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val); + vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, +   upper_32_bits(header->handle)); + vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, +   lower_32_bits(header->handle) | +   (header->cb_context & SVGA_CB_CONTEXT_MASK));     return header->cb_header->status;  }