Merge remote-tracking branch 'remotes/xtensa/tags/20180122-xtensa' into staging

[qemu.git] / hw / ide / core.c

diff --git a/hw/ide/core.c b/hw/ide/core.c
index d63eb4a72eb044606b176835ff8d0508dc578005..5be72d41dccbf1379d3e4e64e19d82ab545a33b6 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,17 +24,16 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"

-#include "hw/i386/pc.h"

 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

+#include "sysemu/blockdev.h"

 #include "sysemu/dma.h"
 #include "hw/block/block.h"
 #include "sysemu/block-backend.h"
 #include "qemu/cutils.h"
 #include "sysemu/dma.h"
 #include "hw/block/block.h"
 #include "sysemu/block-backend.h"
 #include "qemu/cutils.h"

-#include "qemu/error-report.h"

 
 #include "hw/ide/internal.h"
 #include "trace.h"
 
 #include "hw/ide/internal.h"
 #include "trace.h"


@@ -208,6 +207,9 @@ static void ide_identify(IDEState *s)
     if (dev && dev->conf.discard_granularity) {
         put_le16(p + 169, 1); /* TRIM support */
     }
     if (dev && dev->conf.discard_granularity) {
         put_le16(p + 169, 1); /* TRIM support */
     }

+    if (dev) {
+        put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */
+    }

 
     ide_identify_size(s);
     s->identify_set = 1;
 
     ide_identify_size(s);
     s->identify_set = 1;


@@ -378,14 +380,27 @@ static void ide_set_signature(IDEState *s)
     }
 }
 
     }
 }
 

+static bool ide_sect_range_ok(IDEState *s,
+                              uint64_t sector, uint64_t nb_sectors)
+{
+    uint64_t total_sectors;
+
+    blk_get_geometry(s->blk, &total_sectors);
+    if (sector > total_sectors || nb_sectors > total_sectors - sector) {
+        return false;
+    }
+    return true;
+}
+

 typedef struct TrimAIOCB {
     BlockAIOCB common;
 typedef struct TrimAIOCB {
     BlockAIOCB common;

-    BlockBackend *blk;
+    IDEState *s;

     QEMUBH *bh;
     int ret;
     QEMUIOVector *qiov;
     BlockAIOCB *aiocb;
     int i, j;
     QEMUBH *bh;
     int ret;
     QEMUIOVector *qiov;
     BlockAIOCB *aiocb;
     int i, j;

+    bool is_invalid;

 } TrimAIOCB;
 
 static void trim_aio_cancel(BlockAIOCB *acb)
 } TrimAIOCB;
 
 static void trim_aio_cancel(BlockAIOCB *acb)


@@ -413,8 +428,11 @@ static void ide_trim_bh_cb(void *opaque)
 {
     TrimAIOCB *iocb = opaque;
 
 {
     TrimAIOCB *iocb = opaque;
 

-    iocb->common.cb(iocb->common.opaque, iocb->ret);
-
+    if (iocb->is_invalid) {
+        ide_dma_error(iocb->s);
+    } else {
+        iocb->common.cb(iocb->common.opaque, iocb->ret);
+    }

     qemu_bh_delete(iocb->bh);
     iocb->bh = NULL;
     qemu_aio_unref(iocb);
     qemu_bh_delete(iocb->bh);
     iocb->bh = NULL;
     qemu_aio_unref(iocb);


@@ -423,6 +441,8 @@ static void ide_trim_bh_cb(void *opaque)
 static void ide_issue_trim_cb(void *opaque, int ret)
 {
     TrimAIOCB *iocb = opaque;
 static void ide_issue_trim_cb(void *opaque, int ret)
 {
     TrimAIOCB *iocb = opaque;

+    IDEState *s = iocb->s;
+

     if (ret >= 0) {
         while (iocb->j < iocb->qiov->niov) {
             int j = iocb->j;
     if (ret >= 0) {
         while (iocb->j < iocb->qiov->niov) {
             int j = iocb->j;


@@ -439,8 +459,13 @@ static void ide_issue_trim_cb(void *opaque, int ret)
                     continue;
                 }
 
                     continue;
                 }
 

+                if (!ide_sect_range_ok(s, sector, count)) {
+                    iocb->is_invalid = true;
+                    goto done;
+                }
+

                 /* Got an entry! Submit and exit.  */
                 /* Got an entry! Submit and exit.  */

-                iocb->aiocb = blk_aio_pdiscard(iocb->blk,
+                iocb->aiocb = blk_aio_pdiscard(s->blk,

                                                sector << BDRV_SECTOR_BITS,
                                                count << BDRV_SECTOR_BITS,
                                                ide_issue_trim_cb, opaque);
                                                sector << BDRV_SECTOR_BITS,
                                                count << BDRV_SECTOR_BITS,
                                                ide_issue_trim_cb, opaque);


@@ -454,6 +479,7 @@ static void ide_issue_trim_cb(void *opaque, int ret)
         iocb->ret = ret;
     }
 
         iocb->ret = ret;
     }
 

+done:

     iocb->aiocb = NULL;
     if (iocb->bh) {
         qemu_bh_schedule(iocb->bh);
     iocb->aiocb = NULL;
     if (iocb->bh) {
         qemu_bh_schedule(iocb->bh);


@@ -464,16 +490,17 @@ BlockAIOCB *ide_issue_trim(
         int64_t offset, QEMUIOVector *qiov,
         BlockCompletionFunc *cb, void *cb_opaque, void *opaque)
 {
         int64_t offset, QEMUIOVector *qiov,
         BlockCompletionFunc *cb, void *cb_opaque, void *opaque)
 {

-    BlockBackend *blk = opaque;
+    IDEState *s = opaque;

     TrimAIOCB *iocb;
 
     TrimAIOCB *iocb;
 

-    iocb = blk_aio_get(&trim_aiocb_info, blk, cb, cb_opaque);
-    iocb->blk = blk;
+    iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
+    iocb->s = s;

     iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
     iocb->ret = 0;
     iocb->qiov = qiov;
     iocb->i = -1;
     iocb->j = 0;
     iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
     iocb->ret = 0;
     iocb->qiov = qiov;
     iocb->i = -1;
     iocb->j = 0;

+    iocb->is_invalid = false;

     ide_issue_trim_cb(iocb, 0);
     return &iocb->common;
 }
     ide_issue_trim_cb(iocb, 0);
     return &iocb->common;
 }


@@ -599,18 +626,6 @@ static void ide_rw_error(IDEState *s) {
     ide_set_irq(s->bus);
 }
 
     ide_set_irq(s->bus);
 }
 

-static bool ide_sect_range_ok(IDEState *s,
-                              uint64_t sector, uint64_t nb_sectors)
-{
-    uint64_t total_sectors;
-
-    blk_get_geometry(s->blk, &total_sectors);
-    if (sector > total_sectors || nb_sectors > total_sectors - sector) {
-        return false;
-    }
-    return true;
-}
-

 static void ide_buffered_readv_cb(void *opaque, int ret)
 {
     IDEBufferedRequest *req = opaque;
 static void ide_buffered_readv_cb(void *opaque, int ret)
 {
     IDEBufferedRequest *req = opaque;


@@ -898,7 +913,7 @@ static void ide_dma_cb(void *opaque, int ret)
     case IDE_DMA_TRIM:
         s->bus->dma->aiocb = dma_blk_io(blk_get_aio_context(s->blk),
                                         &s->sg, offset, BDRV_SECTOR_SIZE,
     case IDE_DMA_TRIM:
         s->bus->dma->aiocb = dma_blk_io(blk_get_aio_context(s->blk),
                                         &s->sg, offset, BDRV_SECTOR_SIZE,

-                                        ide_issue_trim, s->blk, ide_dma_cb, s,
+                                        ide_issue_trim, s, ide_dma_cb, s,

                                         DMA_DIRECTION_TO_DEVICE);
         break;
     default:
                                         DMA_DIRECTION_TO_DEVICE);
         break;
     default:


@@ -2752,7 +2767,7 @@ static int ide_drive_pio_post_load(void *opaque, int version_id)
     return 0;
 }
 
     return 0;
 }
 

-static void ide_drive_pio_pre_save(void *opaque)
+static int ide_drive_pio_pre_save(void *opaque)

 {
     IDEState *s = opaque;
     int idx;
 {
     IDEState *s = opaque;
     int idx;


@@ -2768,6 +2783,8 @@ static void ide_drive_pio_pre_save(void *opaque)
     } else {
         s->end_transfer_fn_idx = idx;
     }
     } else {
         s->end_transfer_fn_idx = idx;
     }

+
+    return 0;

 }
 
 static bool ide_drive_pio_state_needed(void *opaque)
 }
 
 static bool ide_drive_pio_state_needed(void *opaque)