Module Name: src Committed By: skrll Date: Sun May 17 08:35:15 UTC 2020
Modified Files: src/sys/dev/usb: ehci.c Log Message: Use BUS_ADDR_{LO,HI}32. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/ehci.c diff -u src/sys/dev/usb/ehci.c:1.279 src/sys/dev/usb/ehci.c:1.280 --- src/sys/dev/usb/ehci.c:1.279 Fri May 15 06:15:42 2020 +++ src/sys/dev/usb/ehci.c Sun May 17 08:35:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.279 2020/05/15 06:15:42 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.280 2020/05/17 08:35:15 skrll Exp $ */ /* * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.279 2020/05/15 06:15:42 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.280 2020/05/17 08:35:15 skrll Exp $"); #include "ohci.h" #include "uhci.h" @@ -3038,11 +3038,10 @@ ehci_reset_sqtd_chain(ehci_softc_t *sc, KASSERT(pages <= EHCI_QTD_NBUFFERS); size_t pageoffs = EHCI_PAGE(curoffs); for (size_t i = 0; i < pages; i++) { - paddr_t a = DMAADDR(dma, - pageoffs + i * EHCI_PAGE_SIZE); - sqtd->qtd.qtd_buffer[i] = htole32(EHCI_PAGE(a)); - /* Cast up to avoid compiler warnings */ - sqtd->qtd.qtd_buffer_hi[i] = htole32((uint64_t)a >> 32); + paddr_t a = EHCI_PAGE(DMAADDR(dma, + pageoffs + i * EHCI_PAGE_SIZE)); + sqtd->qtd.qtd_buffer[i] = htole32(BUS_ADDR_LO32(a)); + sqtd->qtd.qtd_buffer_hi[i] = htole32(BUS_ADDR_HI32(a)); DPRINTF(" buffer[%jd/%jd] 0x%08jx 0x%08jx", i, pages, le32toh(sqtd->qtd.qtd_buffer_hi[i]), @@ -3496,8 +3495,10 @@ ehci_device_ctrl_init(struct usbd_xfer * EHCI_QTD_SET_TOGGLE(0) | EHCI_QTD_SET_BYTES(sizeof(*req)) ); - setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->ctrl.reqdma, 0)); - setup->qtd.qtd_buffer_hi[0] = 0; + + const bus_addr_t ba = DMAADDR(&epipe->ctrl.reqdma, 0); + setup->qtd.qtd_buffer[0] = htole32(BUS_ADDR_LO32(ba)); + setup->qtd.qtd_buffer_hi[0] = htole32(BUS_ADDR_HI32(ba)); setup->qtd.qtd_next = setup->qtd.qtd_altnext = htole32(next->physaddr); setup->nextqtd = next; setup->xfer = xfer; @@ -3622,8 +3623,10 @@ ehci_device_ctrl_start(struct usbd_xfer EHCI_QTD_SET_TOGGLE(0) | EHCI_QTD_SET_BYTES(sizeof(*req)) ); - setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->ctrl.reqdma, 0)); - setup->qtd.qtd_buffer_hi[0] = 0; + + const bus_addr_t ba = DMAADDR(&epipe->ctrl.reqdma, 0); + setup->qtd.qtd_buffer[0] = htole32(BUS_ADDR_LO32(ba)); + setup->qtd.qtd_buffer_hi[0] = htole32(BUS_ADDR_HI32(ba)); next = status; status->qtd.qtd_status &= ~htole32(