mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 12:09:58 +00:00
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJaeyokAAoJEH3vgQaq/DkOuEsP/3/YFuDLRu6EIcG5SzBN4mCi swPWnBDfYPacBhsyNGOrd5AkEgXTVB7tU0vhQPGBDRicGxGIGkwM03HROEkr7YUh 3jkj+qlCWii0XgzUaEYJ5dMWtFUcSh62v79ISXQIFH69CZhzFTmEm76flERAMaIr vaE2WWlst1G9ExOCDSX6C7b7Dyf35o0PCvLXjc4TQSBGQHMVjXGTFPxq8UjEGlx7 kHXCW47bUhM/f3+SUEykhxlRaLhLUdHb+ESLQq80atrWw2FStqK8zY2nMdJ1yUu8 KhoNFwW0hRFSlE6M+xilbYUAKfw5te17QXsFoXmeWrDOs33FNhSwjXyKiyRpcS07 f5lv4OFuq9X5gyfQy8yA1uM1Yr0cpjm8xTA75MvWk3R6cQylW8papvxtltYALeFE 4J3wcKtzYTiN6QHowrgHnrh/YKWaVrLmHv6/d1B6ZMtSxqqqYjJoeYNiQhBE8Yjc lO/MVCJ1UaFKCYo1BzCYGvGp/8knL5f8/yk/NVVoTazVxpmUyPqGlMgsPiN6IYgf CdvvMJnT1dxNHLLuzG+MQyeFx6G81awVosYXJut1s3InmkYwsQ1hbm7kzWqCcAq7 2oMbEWVx3gAoxiTthKFK4AfohlVHj6tTn8CZDzkxa929z7GJPEOfoBqOWYRezkhh 7yaKMC41mZaXsy2ue0OK =8QMh -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging # gpg: Signature made Wed 07 Feb 2018 16:32:36 GMT # gpg: using RSA key 7DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" # 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: ide-test: test trim requests Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
1e5caa0e23
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user