[Qemu-devel] [PULL 0/1] Ide patches

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit 14e60aaece20a1cfc059a69f6491b0899f9257a8:

  hw/net/e1000: Don't use *_to_cpup() (2016-06-27 16:39:56 +0100)

are available in the git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to 0d0437aac6dc94bdc1601968bbb9e623e34bd3e7:

  macio: Use blk_drain instead of blk_drain_all (2016-06-27 14:28:31 -0400)

----------------------------------------------------------------

Just the one little patch.

----------------------------------------------------------------

Fam Zheng (1):
  macio: Use blk_drain instead of blk_drain_all

 hw/ide/macio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.4.11

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 27 June 2016 at 20:24, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 14e60aaece20a1cfc059a69f6491b0899f9257a8:
>
>   hw/net/e1000: Don't use *_to_cpup() (2016-06-27 16:39:56 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 0d0437aac6dc94bdc1601968bbb9e623e34bd3e7:
>
>   macio: Use blk_drain instead of blk_drain_all (2016-06-27 14:28:31 -0400)
>
> ----------------------------------------------------------------
>
> Just the one little patch.
>
> ----------------------------------------------------------------
>
> Fam Zheng (1):
>   macio: Use blk_drain instead of blk_drain_all
>
>  hw/ide/macio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit 21a21b853a1bb606358af61e738abfb9aecbd720:

  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-07-27 18:18:21 +0100)

are available in the git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to 87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f:

  ide: fix halted IO segfault at reset (2016-07-28 17:34:19 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

John Snow (1):
  ide: fix halted IO segfault at reset

 hw/ide/core.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.7.4

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 28 July 2016 at 23:50, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 21a21b853a1bb606358af61e738abfb9aecbd720:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-07-27 18:18:21 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f:
>
>   ide: fix halted IO segfault at reset (2016-07-28 17:34:19 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> John Snow (1):
>   ide: fix halted IO segfault at reset
>
>  hw/ide/core.c | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit ab861f3915e8667927cf18ad97f71cae7ccf8818:

  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2016-08-09 10:44:27 +0100)

are available in the git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to 7f951b2d7765f68ae1e563c2fed44071ca774790:

  atapi: fix halted DMA reset (2016-08-09 11:47:23 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

John Snow (1):
  atapi: fix halted DMA reset

 hw/ide/atapi.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.7.4

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 9 August 2016 at 16:50, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit ab861f3915e8667927cf18ad97f71cae7ccf8818:
>
>   Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2016-08-09 10:44:27 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 7f951b2d7765f68ae1e563c2fed44071ca774790:
>
>   atapi: fix halted DMA reset (2016-08-09 11:47:23 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> John Snow (1):
>   atapi: fix halted DMA reset
>
>  hw/ide/atapi.c | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit 61eedf7aec0e2395aabd628cc055096909a3ea15:

  tests/prom-env: Ease time-out problems on slow hosts (2017-02-10 15:44:53 +0000)

are available in the git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to 98cb5dccb192b0082626080890dac413473573c6:

  ahci: advertise HOST_CAP_64 (2017-02-10 11:47:11 -0500)

----------------------------------------------------------------

----------------------------------------------------------------

Ladi Prosek (1):
  ahci: advertise HOST_CAP_64

 hw/ide/ahci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.3

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 10 February 2017 at 16:48, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 61eedf7aec0e2395aabd628cc055096909a3ea15:
>
>   tests/prom-env: Ease time-out problems on slow hosts (2017-02-10 15:44:53 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 98cb5dccb192b0082626080890dac413473573c6:
>
>   ahci: advertise HOST_CAP_64 (2017-02-10 11:47:11 -0500)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

gpg: Signature made Fri 10 Feb 2017 16:47:54 GMT
gpg:                using RSA key 0x7DEF8106AAFC390E
gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
gpg: Note: This key has expired!
Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
     Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

...?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

On 02/10/2017 12:49 PM, Peter Maydell wrote:
> On 10 February 2017 at 16:48, John Snow <jsnow@redhat.com> wrote:
>> The following changes since commit 61eedf7aec0e2395aabd628cc055096909a3ea15:
>>
>>   tests/prom-env: Ease time-out problems on slow hosts (2017-02-10 15:44:53 +0000)
>>
>> are available in the git repository at:
>>
>>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>>
>> for you to fetch changes up to 98cb5dccb192b0082626080890dac413473573c6:
>>
>>   ahci: advertise HOST_CAP_64 (2017-02-10 11:47:11 -0500)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
> 
> gpg: Signature made Fri 10 Feb 2017 16:47:54 GMT
> gpg:                using RSA key 0x7DEF8106AAFC390E
> gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
> gpg: Note: This key has expired!
> Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
>      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
> 
> ...?
> 
> thanks
> -- PMM
> 

[Discussed on IRC, but for the benefit of list archives;]

My key expired after the holidays, but I've redone the expiry and
re-pushed to public keyservers. Please refresh from the public keys list
and let me know if you have further problems.

Thanks,
--John

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 10 February 2017 at 18:46, John Snow <jsnow@redhat.com> wrote:
>
>
> On 02/10/2017 12:49 PM, Peter Maydell wrote:
>> On 10 February 2017 at 16:48, John Snow <jsnow@redhat.com> wrote:
>>> The following changes since commit 61eedf7aec0e2395aabd628cc055096909a3ea15:
>>>
>>>   tests/prom-env: Ease time-out problems on slow hosts (2017-02-10 15:44:53 +0000)
>>>
>>> are available in the git repository at:
>>>
>>>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>>>
>>> for you to fetch changes up to 98cb5dccb192b0082626080890dac413473573c6:
>>>
>>>   ahci: advertise HOST_CAP_64 (2017-02-10 11:47:11 -0500)
>>>
>>> ----------------------------------------------------------------
>>>
>>> ----------------------------------------------------------------
>>
>> gpg: Signature made Fri 10 Feb 2017 16:47:54 GMT
>> gpg:                using RSA key 0x7DEF8106AAFC390E
>> gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
>> gpg: Note: This key has expired!
>> Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
>>      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
>>
>> ...?
>>
>> thanks
>> -- PMM
>>
>
> [Discussed on IRC, but for the benefit of list archives;]
>
> My key expired after the holidays, but I've redone the expiry and
> re-pushed to public keyservers. Please refresh from the public keys list
> and let me know if you have further problems.

Yep, I refreshed the key and have now applied this to master.

thanks
-- PMM

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit 0833df03f4206a6cf416fbb3d380fa95c8e61fba:

  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180206a' into staging (2018-02-07 12:07:23 +0000)

are available in the Git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to 29e1d473ccb0703044541959df443c175ea5f5da:

  ide-test: test trim requests (2018-02-07 11:25:22 -0500)

----------------------------------------------------------------

----------------------------------------------------------------

Anton Nefedov (1):
  ide-test: test trim requests

 tests/ide-test.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

-- 
2.14.3

[Qemu-devel] [PULL 1/1] ide-test: test trim requests

[John Snow]

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 1516611841-5526-1-git-send-email-anton.nefedov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/ide-test.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index aa9de065fc..be427e41d6 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -52,6 +52,7 @@
 enum {
     reg_data        = 0x0,
     reg_feature     = 0x1,
+    reg_error       = 0x1,
     reg_nsectors    = 0x2,
     reg_lba_low     = 0x3,
     reg_lba_middle  = 0x4,
@@ -69,6 +70,11 @@ enum {
     ERR     = 0x01,
 };
 
+/* Error field */
+enum {
+    ABRT    = 0x04,
+};
+
 enum {
     DEV     = 0x10,
     LBA     = 0x40,
@@ -81,6 +87,7 @@ enum {
 };
 
 enum {
+    CMD_DSM         = 0x06,
     CMD_READ_DMA    = 0xc8,
     CMD_WRITE_DMA   = 0xca,
     CMD_FLUSH_CACHE = 0xe7,
@@ -179,6 +186,12 @@ typedef struct PrdtEntry {
 #define assert_bit_set(data, mask) g_assert_cmphex((data) & (mask), ==, (mask))
 #define assert_bit_clear(data, mask) g_assert_cmphex((data) & (mask), ==, 0)
 
+static uint64_t trim_range_le(uint64_t sector, uint16_t count)
+{
+    /* 2-byte range, 6-byte LBA */
+    return cpu_to_le64(((uint64_t)count << 48) + sector);
+}
+
 static int send_dma_request(int cmd, uint64_t sector, int nb_sectors,
                             PrdtEntry *prdt, int prdt_entries,
                             void(*post_exec)(QPCIDevice *dev, QPCIBar ide_bar,
@@ -204,6 +217,7 @@ static int send_dma_request(int cmd, uint64_t sector, int nb_sectors,
          * the SCSI command being sent in the packet, too. */
         from_dev = true;
         break;
+    case CMD_DSM:
     case CMD_WRITE_DMA:
         from_dev = false;
         break;
@@ -234,6 +248,10 @@ static int send_dma_request(int cmd, uint64_t sector, int nb_sectors,
         /* Enables ATAPI DMA; otherwise PIO is attempted */
         qpci_io_writeb(dev, ide_bar, reg_feature, 0x01);
     } else {
+        if (cmd == CMD_DSM) {
+            /* trim bit */
+            qpci_io_writeb(dev, ide_bar, reg_feature, 0x01);
+        }
         qpci_io_writeb(dev, ide_bar, reg_nsectors, nb_sectors);
         qpci_io_writeb(dev, ide_bar, reg_lba_low,    sector & 0xff);
         qpci_io_writeb(dev, ide_bar, reg_lba_middle, (sector >> 8) & 0xff);
@@ -344,6 +362,58 @@ static void test_bmdma_simple_rw(void)
     g_free(cmpbuf);
 }
 
+static void test_bmdma_trim(void)
+{
+    QPCIDevice *dev;
+    QPCIBar bmdma_bar, ide_bar;
+    uint8_t status;
+    const uint64_t trim_range[] = { trim_range_le(0, 2),
+                                    trim_range_le(6, 8),
+                                    trim_range_le(10, 1),
+                                  };
+    const uint64_t bad_range = trim_range_le(TEST_IMAGE_SIZE / 512 - 1, 2);
+    size_t len = 512;
+    uint8_t *buf;
+    uintptr_t guest_buf = guest_alloc(guest_malloc, len);
+
+    PrdtEntry prdt[] = {
+        {
+            .addr = cpu_to_le32(guest_buf),
+            .size = cpu_to_le32(len | PRDT_EOT),
+        },
+    };
+
+    dev = get_pci_device(&bmdma_bar, &ide_bar);
+
+    buf = g_malloc(len);
+
+    /* Normal request */
+    *((uint64_t *)buf) = trim_range[0];
+    *((uint64_t *)buf + 1) = trim_range[1];
+
+    memwrite(guest_buf, buf, 2 * sizeof(uint64_t));
+
+    status = send_dma_request(CMD_DSM, 0, 1, prdt,
+                              ARRAY_SIZE(prdt), NULL);
+    g_assert_cmphex(status, ==, BM_STS_INTR);
+    assert_bit_clear(qpci_io_readb(dev, ide_bar, reg_status), DF | ERR);
+
+    /* Request contains invalid range */
+    *((uint64_t *)buf) = trim_range[2];
+    *((uint64_t *)buf + 1) = bad_range;
+
+    memwrite(guest_buf, buf, 2 * sizeof(uint64_t));
+
+    status = send_dma_request(CMD_DSM, 0, 1, prdt,
+                              ARRAY_SIZE(prdt), NULL);
+    g_assert_cmphex(status, ==, BM_STS_INTR);
+    assert_bit_set(qpci_io_readb(dev, ide_bar, reg_status), ERR);
+    assert_bit_set(qpci_io_readb(dev, ide_bar, reg_error), ABRT);
+
+    free_pci_device(dev);
+    g_free(buf);
+}
+
 static void test_bmdma_short_prdt(void)
 {
     QPCIDevice *dev;
@@ -963,6 +1033,7 @@ int main(int argc, char **argv)
 
     qtest_add_func("/ide/bmdma/setup", test_bmdma_setup);
     qtest_add_func("/ide/bmdma/simple_rw", test_bmdma_simple_rw);
+    qtest_add_func("/ide/bmdma/trim", test_bmdma_trim);
     qtest_add_func("/ide/bmdma/short_prdt", test_bmdma_short_prdt);
     qtest_add_func("/ide/bmdma/one_sector_short_prdt",
                    test_bmdma_one_sector_short_prdt);
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 7 February 2018 at 16:33, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 0833df03f4206a6cf416fbb3d380fa95c8e61fba:
>
>   Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180206a' into staging (2018-02-07 12:07:23 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 29e1d473ccb0703044541959df443c175ea5f5da:
>
>   ide-test: test trim requests (2018-02-07 11:25:22 -0500)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Anton Nefedov (1):
>   ide-test: test trim requests
>
>  tests/ide-test.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 71 insertions(+)
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/1] Ide patches

[John Snow]

The following changes since commit 35e238c9330669882487f9929e0aa97900431853:

  Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180625-pull-request' into staging (2018-06-25 15:25:26 +0100)

are available in the Git repository at:

  https://github.com/jnsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to ae79c2db150e17757ee1be080481be675a15ccea:

  ahci: fix FIS I bit and PIO Setup FIS interrupt (2018-06-25 16:50:48 -0400)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Paolo Bonzini (1):
  ahci: fix FIS I bit and PIO Setup FIS interrupt

 hw/ide/ahci.c          | 37 +++++++++++++++++++++++++------------
 hw/ide/ahci_internal.h |  2 +-
 tests/libqos/ahci.c    | 25 ++++++++++++++++---------
 tests/libqos/ahci.h    |  2 +-
 4 files changed, 43 insertions(+), 23 deletions(-)

-- 
2.14.4

Re: [Qemu-devel] [PULL 0/1] Ide patches

[Peter Maydell]

On 25 June 2018 at 22:11, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 35e238c9330669882487f9929e0aa97900431853:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180625-pull-request' into staging (2018-06-25 15:25:26 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to ae79c2db150e17757ee1be080481be675a15ccea:
>
>   ahci: fix FIS I bit and PIO Setup FIS interrupt (2018-06-25 16:50:48 -0400)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM