From owner-svn-src-projects@freebsd.org Wed Oct 12 03:03:45 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 693E7C0E699 for ; Wed, 12 Oct 2016 03:03:45 +0000 (UTC) (envelope-from jhibbits@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 mx1.freebsd.org (Postfix) with ESMTPS id 1BF441445; Wed, 12 Oct 2016 03:03:45 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9C33ig8061624; Wed, 12 Oct 2016 03:03:44 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9C33ihv061622; Wed, 12 Oct 2016 03:03:44 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201610120303.u9C33ihv061622@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 12 Oct 2016 03:03:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r307090 - projects/powerpcspe/sys/cam/ctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2016 03:03:45 -0000 Author: jhibbits Date: Wed Oct 12 03:03:43 2016 New Revision: 307090 URL: https://svnweb.freebsd.org/changeset/base/307090 Log: Cast through uintptr_t, which is language-safe for casting between pointers and integers. This fixes ctl(4) module builds for PowerPC Book-E. Modified: projects/powerpcspe/sys/cam/ctl/ctl_frontend_cam_sim.c projects/powerpcspe/sys/cam/ctl/scsi_ctl.c Modified: projects/powerpcspe/sys/cam/ctl/ctl_frontend_cam_sim.c ============================================================================== --- projects/powerpcspe/sys/cam/ctl/ctl_frontend_cam_sim.c Wed Oct 12 03:03:05 2016 (r307089) +++ projects/powerpcspe/sys/cam/ctl/ctl_frontend_cam_sim.c Wed Oct 12 03:03:43 2016 (r307090) @@ -346,7 +346,7 @@ cfcs_datamove(union ctl_io *io) case CAM_DATA_VADDR: cam_sglist = &cam_sg_entry; cam_sglist[0].ds_len = ccb->csio.dxfer_len; - cam_sglist[0].ds_addr = (bus_addr_t)ccb->csio.data_ptr; + cam_sglist[0].ds_addr = (uintptr_t)ccb->csio.data_ptr; cam_sg_count = 1; cam_sg_start = 0; cam_sg_offset = io->scsiio.kern_rel_offset; @@ -375,7 +375,7 @@ cfcs_datamove(union ctl_io *io) len_to_copy = MIN(cam_sglist[i].ds_len - cam_watermark, ctl_sglist[j].len - ctl_watermark); - cam_ptr = (uint8_t *)cam_sglist[i].ds_addr; + cam_ptr = (uint8_t *)(uintptr_t)cam_sglist[i].ds_addr; cam_ptr = cam_ptr + cam_watermark; if (io->io_hdr.flags & CTL_FLAG_BUS_ADDR) { /* Modified: projects/powerpcspe/sys/cam/ctl/scsi_ctl.c ============================================================================== --- projects/powerpcspe/sys/cam/ctl/scsi_ctl.c Wed Oct 12 03:03:05 2016 (r307089) +++ projects/powerpcspe/sys/cam/ctl/scsi_ctl.c Wed Oct 12 03:03:43 2016 (r307090) @@ -741,7 +741,7 @@ ctlfedata(struct ctlfe_lun_softc *softc, cam_sglist = cmd_info->cam_sglist; *dxfer_len = 0; for (i = 0; i < io->scsiio.kern_sg_entries - idx; i++) { - cam_sglist[i].ds_addr = (bus_addr_t)ctl_sglist[i + idx].addr + off; + cam_sglist[i].ds_addr = (uintptr_t)ctl_sglist[i + idx].addr + off; if (ctl_sglist[i + idx].len - off <= bus_softc->maxio - *dxfer_len) { cam_sglist[i].ds_len = ctl_sglist[idx + i].len - off; *dxfer_len += cam_sglist[i].ds_len;