Commit a1bc040d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging 



# gpg: Signature made Mon Jul 20 19:27:04 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# 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

* remotes/jnsnow/tags/ide-pull-request:
  tests: Fix broken targets check-report-qtest-*
  ahci: Force ICC bits in PxCMD to zero
  qtest/ide: add another short PRDT test flavor

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bd03a38f 47c71996

hw/ide/ahci.c

+7 −2
Original line number Diff line number Diff line
@@ -279,8 +279,13 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) 
            break;

        case PORT_CMD:

            /* Block any Read-only fields from being set;

             * including LIST_ON and FIS_ON. */

            pr->cmd = (pr->cmd & PORT_CMD_RO_MASK) | (val & ~PORT_CMD_RO_MASK);

             * including LIST_ON and FIS_ON.

             * The spec requires to set ICC bits to zero after the ICC change

             * is done. We don't support ICC state changes, therefore always

             * force the ICC bits to zero.

             */

            pr->cmd = (pr->cmd & PORT_CMD_RO_MASK) |

                      (val & ~(PORT_CMD_RO_MASK|PORT_CMD_ICC_MASK));



            /* Check FIS RX and CLB engines, allow transition to false: */

            ahci_cond_start_engines(&s->dev[port], true);

tests/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ $(patsubst %, check-%, $(check-unit-y)): check-%: % 


$(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y)

	$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \

		QTEST_QEMU_IMG=qemu-img$(EXESUF) \

	  gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")



check-report-unit.xml: $(check-unit-y)

tests/ide-test.c

+27 −0
Original line number Diff line number Diff line
@@ -339,6 +339,31 @@ static void test_bmdma_short_prdt(void) 
    assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR);

}



static void test_bmdma_one_sector_short_prdt(void)

{

    uint8_t status;



    /* Read 2 sectors but only give 1 sector in PRDT */

    PrdtEntry prdt[] = {

        {

            .addr = 0,

            .size = cpu_to_le32(0x200 | PRDT_EOT),

        },

    };



    /* Normal request */

    status = send_dma_request(CMD_READ_DMA, 0, 2,

                              prdt, ARRAY_SIZE(prdt));

    g_assert_cmphex(status, ==, 0);

    assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR);



    /* Abort the request before it completes */

    status = send_dma_request(CMD_READ_DMA | CMDF_ABORT, 0, 2,

                              prdt, ARRAY_SIZE(prdt));

    g_assert_cmphex(status, ==, 0);

    assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR);

}



static void test_bmdma_long_prdt(void)

{

    uint8_t status;
@@ -592,6 +617,8 @@ 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/short_prdt", test_bmdma_short_prdt);

    qtest_add_func("/ide/bmdma/one_sector_short_prdt",

                   test_bmdma_one_sector_short_prdt);

    qtest_add_func("/ide/bmdma/long_prdt", test_bmdma_long_prdt);

    qtest_add_func("/ide/bmdma/no_busmaster", test_bmdma_no_busmaster);

    qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown);