Author: kib
Date: Mon Jan 14 07:21:43 2019
New Revision: 343013
URL: https://svnweb.freebsd.org/changeset/base/343013
Log:
MFC r342826:
Fix use of busdma(9) KPI in ahci(4).
Modified:
stable/12/sys/dev/ahci/ahci.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/ahci/ahci.c
==============================================================================
--- stable/12/sys/dev/ahci/ahci.c Mon Jan 14 06:57:39 2019
(r343012)
+++ stable/12/sys/dev/ahci/ahci.c Mon Jan 14 07:21:43 2019
(r343013)
@@ -940,18 +940,22 @@ ahci_dmainit(device_t dev)
struct ahci_channel *ch = device_get_softc(dev);
struct ahci_dc_cb_args dcba;
size_t rfsize;
+ int error;
/* Command area. */
- if (bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), 1024, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL, AHCI_WORK_SIZE, 1, AHCI_WORK_SIZE,
- 0, NULL, NULL, &ch->dma.work_tag))
+ 0, NULL, NULL, &ch->dma.work_tag);
+ if (error != 0)
goto error;
- if (bus_dmamem_alloc(ch->dma.work_tag, (void **)&ch->dma.work,
- BUS_DMA_ZERO, &ch->dma.work_map))
+ error = bus_dmamem_alloc(ch->dma.work_tag, (void **)&ch->dma.work,
+ BUS_DMA_ZERO, &ch->dma.work_map);
+ if (error != 0)
goto error;
- if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map, ch->dma.work,
- AHCI_WORK_SIZE, ahci_dmasetupc_cb, &dcba, 0) || dcba.error) {
+ error = bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map,
ch->dma.work,
+ AHCI_WORK_SIZE, ahci_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT);
+ if (error != 0 || (error = dcba.error) != 0) {
bus_dmamem_free(ch->dma.work_tag, ch->dma.work,
ch->dma.work_map);
goto error;
}
@@ -961,33 +965,37 @@ ahci_dmainit(device_t dev)
rfsize = 4096;
else
rfsize = 256;
- if (bus_dma_tag_create(bus_get_dma_tag(dev), rfsize, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), rfsize, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL, rfsize, 1, rfsize,
- 0, NULL, NULL, &ch->dma.rfis_tag))
+ 0, NULL, NULL, &ch->dma.rfis_tag);
+ if (error != 0)
goto error;
- if (bus_dmamem_alloc(ch->dma.rfis_tag, (void **)&ch->dma.rfis, 0,
- &ch->dma.rfis_map))
+ error = bus_dmamem_alloc(ch->dma.rfis_tag, (void **)&ch->dma.rfis, 0,
+ &ch->dma.rfis_map);
+ if (error != 0)
goto error;
- if (bus_dmamap_load(ch->dma.rfis_tag, ch->dma.rfis_map, ch->dma.rfis,
- rfsize, ahci_dmasetupc_cb, &dcba, 0) || dcba.error) {
+ error = bus_dmamap_load(ch->dma.rfis_tag, ch->dma.rfis_map,
ch->dma.rfis,
+ rfsize, ahci_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT);
+ if (error != 0 || (error = dcba.error) != 0) {
bus_dmamem_free(ch->dma.rfis_tag, ch->dma.rfis,
ch->dma.rfis_map);
goto error;
}
ch->dma.rfis_bus = dcba.maddr;
/* Data area. */
- if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0,
BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
NULL, NULL,
AHCI_SG_ENTRIES * PAGE_SIZE * ch->numslots,
AHCI_SG_ENTRIES, AHCI_PRD_MAX,
- 0, busdma_lock_mutex, &ch->mtx, &ch->dma.data_tag)) {
+ 0, busdma_lock_mutex, &ch->mtx, &ch->dma.data_tag);
+ if (error != 0)
goto error;
- }
return;
error:
- device_printf(dev, "WARNING - DMA initialization failed\n");
+ device_printf(dev, "WARNING - DMA initialization failed, error %d\n",
+ error);
ahci_dmafini(dev);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
