From owner-svn-src-head@freebsd.org  Wed Jun 13 07:55:58 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7A011010437;
 Wed, 13 Jun 2018 07:55:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F7057295D;
 Wed, 13 Jun 2018 07:55:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5088E16A3B;
 Wed, 13 Jun 2018 07:55:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5D7tw1q063387;
 Wed, 13 Jun 2018 07:55:58 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5D7tw7L063386;
 Wed, 13 Jun 2018 07:55:58 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201806130755.w5D7tw7L063386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 13 Jun 2018 07:55:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335034 - head/sys/dev/liquidio
X-SVN-Group: head
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: head/sys/dev/liquidio
X-SVN-Commit-Revision: 335034
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2018 07:55:59 -0000

Author: dim
Date: Wed Jun 13 07:55:57 2018
New Revision: 335034
URL: https://svnweb.freebsd.org/changeset/base/335034

Log:
  Fix build of liquidio with base gcc on i386
  
  Some casts from pointers to uint64_t and back in lio_main.c cause base
  gcc on i386 to warn "cast from pointer to integer of different size",
  and vice versa.  Add additional casts to uintptr_t to suppress these.
  
  Reviewed by:	sbruno
  MFC after:	3 days
  Differential Revision: https://reviews.freebsd.org/D15754

Modified:
  head/sys/dev/liquidio/lio_main.c

Modified: head/sys/dev/liquidio/lio_main.c
==============================================================================
--- head/sys/dev/liquidio/lio_main.c	Wed Jun 13 07:17:10 2018	(r335033)
+++ head/sys/dev/liquidio/lio_main.c	Wed Jun 13 07:55:57 2018	(r335034)
@@ -1770,8 +1770,8 @@ lio_setup_glists(struct octeon_device *oct, struct lio
 			if (g == NULL)
 				break;
 
-			g->sg = (struct lio_sg_entry *)
-			    ((uint64_t)lio->glists_virt_base[i] +
+			g->sg = (struct lio_sg_entry *)(uintptr_t)
+			    ((uint64_t)(uintptr_t)lio->glists_virt_base[i] +
 			     (j * lio->glist_entry_size));
 			g->sg_dma_ptr = (uint64_t)lio->glists_dma_base[i] +
 				(j * lio->glist_entry_size);