Changeset a38d504 in mainline

Timestamp:

2024-06-11T09:00:20Z (3 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9739b5a

Parents:

645d3832

git-author:

Jiri Svoboda <jiri@…> (2024-06-10 17:59:56)

git-committer:

Jiri Svoboda <jiri@…> (2024-06-11 09:00:20)

Message:

Limit I/O operations not to exceed DMA buffer size

Location:

uspace

Files:

• drv/block/pci-ide/pci-ide.c (modified) (1 diff)
• lib/ata/include/ata/ata.h (modified) (1 diff)
• lib/ata/src/ata.c (modified) (2 diffs)

uspace/drv/block/pci-ide/pci-ide.c

@@ -226 +226 @@
         params.have_irq = (chan->irq >= 0) ? true : false;
         params.use_dma = true;
+        params.max_dma_xfer = chan->dma_buf_size;
         params.write_data_16 = pci_ide_write_data_16;
         params.read_data_16 = pci_ide_read_data_16;

uspace/lib/ata/include/ata/ata.h

@@ -63 +63 @@
         /** Use DMA transfers */
         bool use_dma;
+        /** Maximum number of bytes that we can DMA in one I/O operation */
+        size_t max_dma_xfer;
         /** Read 16 bits from the data port */
         void (*write_data_16)(void *, uint16_t *, size_t);

uspace/lib/ata/src/ata.c

@@ -1419 +1419 @@
 {
         size_t maxnb;
+        size_t dma_maxnb;
 
         maxnb = 0;
@@ -1441 +1442 @@
          * exceed DMA buffer size.
          */
+        dma_maxnb = d->chan->params.max_dma_xfer / d->block_size;
+        if (dma_maxnb < maxnb)
+                maxnb = dma_maxnb;
+
         return maxnb;
 }