| Message ID | 20221010085229.2431276-2-lkujaw@mailbox.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] hw/ide/core.c (cmd_read_native_max): Avoid limited device parameters | expand |
On 10/10/2022 10.52, Lev Kujawski wrote: > Verify that the ATA command READ NATIVE MAX ADDRESS returns the last > valid CHS tuple for the native device rather than any limit > established by INITIALIZE DEVICE PARAMETERS. > > Signed-off-by: Lev Kujawski <lkujaw@mailbox.org> > --- > tests/qtest/ide-test.c | 47 +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 46 insertions(+), 1 deletion(-) > > diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c > index dbe1563b23..c406e6752a 100644 > --- a/tests/qtest/ide-test.c > +++ b/tests/qtest/ide-test.c > @@ -37,7 +37,8 @@ > /* TODO actually test the results and get rid of this */ > #define qmp_discard_response(q, ...) qobject_unref(qtest_qmp(q, __VA_ARGS__)) > > -#define TEST_IMAGE_SIZE 64 * 1024 * 1024 > +/* Specified by ATA (physical) CHS geometry for ~64 MiB device. */ > +#define TEST_IMAGE_SIZE ((130 * 16 * 63) * 512) > > #define IDE_PCI_DEV 1 > #define IDE_PCI_FUNC 1 > @@ -91,11 +92,13 @@ enum { > enum { > CMD_DSM = 0x06, > CMD_DIAGNOSE = 0x90, > + CMD_INIT_DP = 0x91, /* INITIALIZE DEVICE PARAMETERS */ > CMD_READ_DMA = 0xc8, > CMD_WRITE_DMA = 0xca, > CMD_FLUSH_CACHE = 0xe7, > CMD_IDENTIFY = 0xec, > CMD_PACKET = 0xa0, > + CMD_READ_NATIVE = 0xf8, /* READ NATIVE MAX ADDRESS */ > > CMDF_ABORT = 0x100, > CMDF_NO_BM = 0x200, > @@ -562,6 +565,46 @@ static void string_cpu_to_be16(uint16_t *s, size_t bytes) > } > } > > +static void test_specify(void) > +{ > + QTestState *qts; > + QPCIDevice *dev; > + QPCIBar bmdma_bar, ide_bar; > + uint16_t cyls; > + uint8_t heads, spt; > + > + qts = ide_test_start( > + "-blockdev driver=file,node-name=hda,filename=%s " > + "-device ide-hd,drive=hda,bus=ide.0,unit=0 ", > + tmp_path[0]); > + > + dev = get_pci_device(qts, &bmdma_bar, &ide_bar); > + > + /* Initialize drive with zero sectors per track and one head. */ > + qpci_io_writeb(dev, ide_bar, reg_nsectors, 0); > + qpci_io_writeb(dev, ide_bar, reg_device, 0); > + qpci_io_writeb(dev, ide_bar, reg_command, CMD_INIT_DP); > + > + /* READ NATIVE MAX ADDRESS (CHS mode). */ > + qpci_io_writeb(dev, ide_bar, reg_device, 0xa0); > + qpci_io_writeb(dev, ide_bar, reg_command, CMD_READ_NATIVE); > + > + heads = qpci_io_readb(dev, ide_bar, reg_device) & 0xf; > + ++heads; > + g_assert_cmpint(heads, ==, 16); > + > + cyls = qpci_io_readb(dev, ide_bar, reg_lba_high) << 8; > + cyls |= qpci_io_readb(dev, ide_bar, reg_lba_middle); > + ++cyls; > + g_assert_cmpint(cyls, ==, 130); > + > + spt = qpci_io_readb(dev, ide_bar, reg_lba_low); > + g_assert_cmpint(spt, ==, 63); > + > + ide_test_quit(qts); > + free_pci_device(dev); > +} > + > static void test_identify(void) > { > QTestState *qts; > @@ -1079,6 +1122,8 @@ int main(int argc, char **argv) > /* Run the tests */ > g_test_init(&argc, &argv, NULL); > > + qtest_add_func("/ide/read_native", test_specify); > + > qtest_add_func("/ide/identify", test_identify); > > qtest_add_func("/ide/diagnostic", test_diagnostic); Acked-by: Thomas Huth <thuth@redhat.com>
On Mon, Oct 10, 2022 at 4:52 AM Lev Kujawski <lkujaw@mailbox.org> wrote: > > Verify that the ATA command READ NATIVE MAX ADDRESS returns the last > valid CHS tuple for the native device rather than any limit > established by INITIALIZE DEVICE PARAMETERS. > > Signed-off-by: Lev Kujawski <lkujaw@mailbox.org> Does this still need to be staged or merged? --js > --- > tests/qtest/ide-test.c | 47 +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 46 insertions(+), 1 deletion(-) > > diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c > index dbe1563b23..c406e6752a 100644 > --- a/tests/qtest/ide-test.c > +++ b/tests/qtest/ide-test.c > @@ -37,7 +37,8 @@ > /* TODO actually test the results and get rid of this */ > #define qmp_discard_response(q, ...) qobject_unref(qtest_qmp(q, __VA_ARGS__)) > > -#define TEST_IMAGE_SIZE 64 * 1024 * 1024 > +/* Specified by ATA (physical) CHS geometry for ~64 MiB device. */ > +#define TEST_IMAGE_SIZE ((130 * 16 * 63) * 512) > > #define IDE_PCI_DEV 1 > #define IDE_PCI_FUNC 1 > @@ -91,11 +92,13 @@ enum { > enum { > CMD_DSM = 0x06, > CMD_DIAGNOSE = 0x90, > + CMD_INIT_DP = 0x91, /* INITIALIZE DEVICE PARAMETERS */ > CMD_READ_DMA = 0xc8, > CMD_WRITE_DMA = 0xca, > CMD_FLUSH_CACHE = 0xe7, > CMD_IDENTIFY = 0xec, > CMD_PACKET = 0xa0, > + CMD_READ_NATIVE = 0xf8, /* READ NATIVE MAX ADDRESS */ > > CMDF_ABORT = 0x100, > CMDF_NO_BM = 0x200, > @@ -562,6 +565,46 @@ static void string_cpu_to_be16(uint16_t *s, size_t bytes) > } > } > > +static void test_specify(void) > +{ > + QTestState *qts; > + QPCIDevice *dev; > + QPCIBar bmdma_bar, ide_bar; > + uint16_t cyls; > + uint8_t heads, spt; > + > + qts = ide_test_start( > + "-blockdev driver=file,node-name=hda,filename=%s " > + "-device ide-hd,drive=hda,bus=ide.0,unit=0 ", > + tmp_path[0]); > + > + dev = get_pci_device(qts, &bmdma_bar, &ide_bar); > + > + /* Initialize drive with zero sectors per track and one head. */ > + qpci_io_writeb(dev, ide_bar, reg_nsectors, 0); > + qpci_io_writeb(dev, ide_bar, reg_device, 0); > + qpci_io_writeb(dev, ide_bar, reg_command, CMD_INIT_DP); > + > + /* READ NATIVE MAX ADDRESS (CHS mode). */ > + qpci_io_writeb(dev, ide_bar, reg_device, 0xa0); > + qpci_io_writeb(dev, ide_bar, reg_command, CMD_READ_NATIVE); > + > + heads = qpci_io_readb(dev, ide_bar, reg_device) & 0xf; > + ++heads; > + g_assert_cmpint(heads, ==, 16); > + > + cyls = qpci_io_readb(dev, ide_bar, reg_lba_high) << 8; > + cyls |= qpci_io_readb(dev, ide_bar, reg_lba_middle); > + ++cyls; > + g_assert_cmpint(cyls, ==, 130); > + > + spt = qpci_io_readb(dev, ide_bar, reg_lba_low); > + g_assert_cmpint(spt, ==, 63); > + > + ide_test_quit(qts); > + free_pci_device(dev); > +} > + > static void test_identify(void) > { > QTestState *qts; > @@ -1079,6 +1122,8 @@ int main(int argc, char **argv) > /* Run the tests */ > g_test_init(&argc, &argv, NULL); > > + qtest_add_func("/ide/read_native", test_specify); > + > qtest_add_func("/ide/identify", test_identify); > > qtest_add_func("/ide/diagnostic", test_diagnostic); > -- > 2.34.1 >
diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c index dbe1563b23..c406e6752a 100644 --- a/tests/qtest/ide-test.c +++ b/tests/qtest/ide-test.c @@ -37,7 +37,8 @@ /* TODO actually test the results and get rid of this */ #define qmp_discard_response(q, ...) qobject_unref(qtest_qmp(q, __VA_ARGS__)) -#define TEST_IMAGE_SIZE 64 * 1024 * 1024 +/* Specified by ATA (physical) CHS geometry for ~64 MiB device. */ +#define TEST_IMAGE_SIZE ((130 * 16 * 63) * 512) #define IDE_PCI_DEV 1 #define IDE_PCI_FUNC 1 @@ -91,11 +92,13 @@ enum { enum { CMD_DSM = 0x06, CMD_DIAGNOSE = 0x90, + CMD_INIT_DP = 0x91, /* INITIALIZE DEVICE PARAMETERS */ CMD_READ_DMA = 0xc8, CMD_WRITE_DMA = 0xca, CMD_FLUSH_CACHE = 0xe7, CMD_IDENTIFY = 0xec, CMD_PACKET = 0xa0, + CMD_READ_NATIVE = 0xf8, /* READ NATIVE MAX ADDRESS */ CMDF_ABORT = 0x100, CMDF_NO_BM = 0x200, @@ -562,6 +565,46 @@ static void string_cpu_to_be16(uint16_t *s, size_t bytes) } } +static void test_specify(void) +{ + QTestState *qts; + QPCIDevice *dev; + QPCIBar bmdma_bar, ide_bar; + uint16_t cyls; + uint8_t heads, spt; + + qts = ide_test_start( + "-blockdev driver=file,node-name=hda,filename=%s " + "-device ide-hd,drive=hda,bus=ide.0,unit=0 ", + tmp_path[0]); + + dev = get_pci_device(qts, &bmdma_bar, &ide_bar); + + /* Initialize drive with zero sectors per track and one head. */ + qpci_io_writeb(dev, ide_bar, reg_nsectors, 0); + qpci_io_writeb(dev, ide_bar, reg_device, 0); + qpci_io_writeb(dev, ide_bar, reg_command, CMD_INIT_DP); + + /* READ NATIVE MAX ADDRESS (CHS mode). */ + qpci_io_writeb(dev, ide_bar, reg_device, 0xa0); + qpci_io_writeb(dev, ide_bar, reg_command, CMD_READ_NATIVE); + + heads = qpci_io_readb(dev, ide_bar, reg_device) & 0xf; + ++heads; + g_assert_cmpint(heads, ==, 16); + + cyls = qpci_io_readb(dev, ide_bar, reg_lba_high) << 8; + cyls |= qpci_io_readb(dev, ide_bar, reg_lba_middle); + ++cyls; + g_assert_cmpint(cyls, ==, 130); + + spt = qpci_io_readb(dev, ide_bar, reg_lba_low); + g_assert_cmpint(spt, ==, 63); + + ide_test_quit(qts); + free_pci_device(dev); +} + static void test_identify(void) { QTestState *qts; @@ -1079,6 +1122,8 @@ int main(int argc, char **argv) /* Run the tests */ g_test_init(&argc, &argv, NULL); + qtest_add_func("/ide/read_native", test_specify); + qtest_add_func("/ide/identify", test_identify); qtest_add_func("/ide/diagnostic", test_diagnostic);
Verify that the ATA command READ NATIVE MAX ADDRESS returns the last valid CHS tuple for the native device rather than any limit established by INITIALIZE DEVICE PARAMETERS. Signed-off-by: Lev Kujawski <lkujaw@mailbox.org> --- tests/qtest/ide-test.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-)