Date: Wed, 11 Nov 2015 18:54:58 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290679 - in head/sys/dev/ntb: if_ntb ntb_hw Message-ID: <201511111854.tABIswqH007813@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Wed Nov 11 18:54:58 2015 New Revision: 290679 URL: https://svnweb.freebsd.org/changeset/base/290679 Log: ntb: Use caddr_t to simplify pointer arithmetic Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/if_ntb/if_ntb.c head/sys/dev/ntb/ntb_hw/ntb_hw.c head/sys/dev/ntb/ntb_hw/ntb_hw.h Modified: head/sys/dev/ntb/if_ntb/if_ntb.c ============================================================================== --- head/sys/dev/ntb/if_ntb/if_ntb.c Wed Nov 11 18:54:49 2015 (r290678) +++ head/sys/dev/ntb/if_ntb/if_ntb.c Wed Nov 11 18:54:58 2015 (r290679) @@ -143,7 +143,7 @@ struct ntb_transport_qp { void *data, int len); struct ntb_queue_list tx_free_q; struct mtx ntb_tx_free_q_lock; - void *tx_mw; + caddr_t tx_mw; bus_addr_t tx_mw_phys; ntb_q_idx_t tx_index; ntb_q_idx_t tx_max_entry; @@ -158,7 +158,7 @@ struct ntb_transport_qp { struct mtx ntb_rx_q_lock; struct task rx_completion_task; struct task rxc_db_work; - void *rx_buff; + caddr_t rx_buff; ntb_q_idx_t rx_index; ntb_q_idx_t rx_max_entry; uint64_t rx_max_frame; @@ -197,11 +197,11 @@ struct ntb_transport_mw { size_t xlat_align; size_t xlat_align_size; /* Tx buff is off vbase / phys_addr */ - void *vbase; + caddr_t vbase; size_t xlat_size; size_t buff_size; /* Rx buff is off virt_addr / dma_addr */ - void *virt_addr; + caddr_t virt_addr; bus_addr_t dma_addr; }; @@ -560,7 +560,7 @@ ntb_transport_init(struct ntb_softc *ntb mw->buff_size = 0; mw->xlat_size = 0; - mw->virt_addr = 0; + mw->virt_addr = NULL; mw->dma_addr = 0; } @@ -665,7 +665,7 @@ ntb_transport_init_queue(struct ntb_tran tx_size = mw_size / num_qps_mw; qp_offset = tx_size * qp_num / mw_count; - qp->tx_mw = (char *)mw->vbase + qp_offset; + qp->tx_mw = mw->vbase + qp_offset; KASSERT(qp->tx_mw != NULL, ("uh oh?")); /* XXX Assumes that a vm_paddr_t is equivalent to bus_addr_t */ @@ -673,7 +673,7 @@ ntb_transport_init_queue(struct ntb_tran KASSERT(qp->tx_mw_phys != 0, ("uh oh?")); tx_size -= sizeof(struct ntb_rx_info); - qp->rx_info = (void *)((char *)qp->tx_mw + tx_size); + qp->rx_info = (void *)(qp->tx_mw + tx_size); /* Due to house-keeping, there must be at least 2 buffs */ qp->tx_max_frame = qmin(tx_size / 2, @@ -1356,10 +1356,10 @@ ntb_transport_setup_qp_mw(struct ntb_tra num_qps_mw = nt->qp_count / mw_count; rx_size = mw->xlat_size / num_qps_mw; - qp->rx_buff = (char *)mw->virt_addr + rx_size * qp_num / mw_count; + qp->rx_buff = mw->virt_addr + rx_size * qp_num / mw_count; rx_size -= sizeof(struct ntb_rx_info); - qp->remote_rx_info = (void*)((char *)qp->rx_buff + rx_size); + qp->remote_rx_info = (void*)(qp->rx_buff + rx_size); /* Due to house-keeping, there must be at least 2 buffs */ qp->rx_max_frame = qmin(rx_size / 2, @@ -1371,8 +1371,7 @@ ntb_transport_setup_qp_mw(struct ntb_tra /* Set up the hdr offsets with 0s */ for (i = 0; i < qp->rx_max_entry; i++) { - offset = (void *)((uint8_t *)qp->rx_buff + - qp->rx_max_frame * (i + 1) - + offset = (void *)(qp->rx_buff + qp->rx_max_frame * (i + 1) - sizeof(struct ntb_payload_header)); memset(offset, 0, sizeof(struct ntb_payload_header)); } Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:54:49 2015 (r290678) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:54:58 2015 (r290679) @@ -111,8 +111,8 @@ struct ntb_pci_bar_info { int pci_resource_id; struct resource *pci_resource; vm_paddr_t pbase; - void *vbase; - u_long size; + caddr_t vbase; + vm_size_t size; /* Configuration register offsets */ uint32_t psz_off; @@ -2404,7 +2404,7 @@ ntb_peer_spad_read(struct ntb_softc *ntb */ int ntb_mw_get_range(struct ntb_softc *ntb, unsigned mw_idx, vm_paddr_t *base, - void **vbase, size_t *size, size_t *align, size_t *align_size) + caddr_t *vbase, size_t *size, size_t *align, size_t *align_size) { struct ntb_pci_bar_info *bar; size_t bar_b2b_off; @@ -2423,7 +2423,7 @@ ntb_mw_get_range(struct ntb_softc *ntb, if (base != NULL) *base = bar->pbase + bar_b2b_off; if (vbase != NULL) - *vbase = (char *)bar->vbase + bar_b2b_off; + *vbase = bar->vbase + bar_b2b_off; if (size != NULL) *size = bar->size - bar_b2b_off; if (align != NULL) Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.h ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.h Wed Nov 11 18:54:49 2015 (r290678) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.h Wed Nov 11 18:54:58 2015 (r290679) @@ -77,7 +77,7 @@ void ntb_clear_ctx(struct ntb_softc *); uint8_t ntb_mw_count(struct ntb_softc *); int ntb_mw_get_range(struct ntb_softc *, unsigned mw_idx, vm_paddr_t *base, - void **vbase, size_t *size, size_t *align, size_t *align_size); + caddr_t *vbase, size_t *size, size_t *align, size_t *align_size); int ntb_mw_set_trans(struct ntb_softc *, unsigned mw_idx, bus_addr_t, size_t); int ntb_mw_clear_trans(struct ntb_softc *, unsigned mw_idx);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511111854.tABIswqH007813>