Re: [PATCH for-5.0 v3 3/9] tests: q35: MCH: add default SMBASE SMRAM lock test

[Laszlo Ersek]

On 12/09/19 14:46, Igor Mammedov wrote:
> test lockable SMRAM at default SMBASE feature, introduced by
> patch "q35: implement 128K SMRAM at default SMBASE address"
>
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> v3:
>  - a bunch of spelling fixes
>    (Christophe de Dinechin <address@hidden>)

Since I've run git-range-diff for this series anyway, I guess I can help
other reviewers with the changes (relative to the previous, fully
separate posting):

>  2:  f1a896f4dbc6 !  3:  092ec4a30289 tests: q35: MCH: add default SMBASE 
> SMRAM lock test
>     @@ -6,7 +6,7 @@
>          patch "q35: implement 128K SMRAM at default SMBASE address"
>
>          Signed-off-by: Igor Mammedov <address@hidden>
>     -    Message-Id: <address@hidden>
>     +    Message-Id: <address@hidden>
>
>      diff --git a/tests/q35-test.c b/tests/q35-test.c
>      --- a/tests/q35-test.c
>     @@ -40,7 +40,7 @@
>      +    qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
>      +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
>      +
>     -+    /* check that writinng junk to 0x9c before before negotiating is 
> ignorred */
>     ++    /* check that writing junk to 0x9c before before negotiating is 
> ignored */
>      +    for (i = 0; i < 0xff; i++) {
>      +        qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
>      +        g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 
> 0);
>     @@ -60,7 +60,7 @@
>      +        qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
>      +        g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 
> 0x02);
>      +
>     -+        /* RAM access should go inot black hole */
>     ++        /* RAM access should go into black hole */
>      +        qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
>      +        g_assert_cmpint(qtest_readb(qts, SMBASE), ==, 0xff);
>      +    }
>     @@ -98,7 +98,7 @@
>      +    pcidev = qpci_device_find(pcibus, 0);
>      +    g_assert(pcidev != NULL);
>      +
>     -+    /* check that RAM accessible */
>     ++    /* check that RAM is accessible */
>      +    qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
>      +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
>      +

Thanks,
Laszlo

On 12/09/19 14:46, Igor Mammedov wrote:
> ---
>  tests/q35-test.c | 105 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 105 insertions(+)
>
> diff --git a/tests/q35-test.c b/tests/q35-test.c
> index a68183d..c922d81 100644
> --- a/tests/q35-test.c
> +++ b/tests/q35-test.c
> @@ -186,6 +186,109 @@ static void test_tseg_size(const void *data)
>      qtest_quit(qts);
>  }
>
> +#define SMBASE 0x30000
> +#define SMRAM_TEST_PATTERN 0x32
> +#define SMRAM_TEST_RESET_PATTERN 0x23
> +
> +static void test_smram_smbase_lock(void)
> +{
> +    QPCIBus *pcibus;
> +    QPCIDevice *pcidev;
> +    QDict *response;
> +    QTestState *qts;
> +    int i;
> +
> +    qts = qtest_init("-M q35");
> +
> +    pcibus = qpci_new_pc(qts, NULL);
> +    g_assert(pcibus != NULL);
> +
> +    pcidev = qpci_device_find(pcibus, 0);
> +    g_assert(pcidev != NULL);
> +
> +    /* check that SMRAM is not enabled by default */
> +    g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 0);
> +    qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
> +
> +    /* check that writing junk to 0x9c before before negotiating is ignored 
> */
> +    for (i = 0; i < 0xff; i++) {
> +        qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
> +        g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 0);
> +    }
> +
> +    /* enable SMRAM at SMBASE */
> +    qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, 0xff);
> +    g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 0x01);
> +    /* lock SMRAM at SMBASE */
> +    qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, 0x02);
> +    g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 0x02);
> +
> +    /* check that SMRAM at SMBASE is locked and can't be unlocked */
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, 0xff);
> +    for (i = 0; i <= 0xff; i++) {
> +        /* make sure register is immutable */
> +        qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
> +        g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 
> 0x02);
> +
> +        /* RAM access should go into black hole */
> +        qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
> +        g_assert_cmpint(qtest_readb(qts, SMBASE), ==, 0xff);
> +    }
> +
> +    /* reset */
> +    response = qtest_qmp(qts, "{'execute': 'system_reset', 'arguments': {} 
> }");
> +    g_assert(response);
> +    g_assert(!qdict_haskey(response, "error"));
> +    qobject_unref(response);
> +
> +    /* check RAM at SMBASE is available after reset */
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
> +    g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == 0);
> +    qtest_writeb(qts, SMBASE, SMRAM_TEST_RESET_PATTERN);
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_RESET_PATTERN);
> +
> +    g_free(pcidev);
> +    qpci_free_pc(pcibus);
> +
> +    qtest_quit(qts);
> +}
> +
> +static void test_without_smram_base(void)
> +{
> +    QPCIBus *pcibus;
> +    QPCIDevice *pcidev;
> +    QTestState *qts;
> +    int i;
> +
> +    qts = qtest_init("-M pc-q35-4.1");
> +
> +    pcibus = qpci_new_pc(qts, NULL);
> +    g_assert(pcibus != NULL);
> +
> +    pcidev = qpci_device_find(pcibus, 0);
> +    g_assert(pcidev != NULL);
> +
> +    /* check that RAM is accessible */
> +    qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN);
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, SMRAM_TEST_PATTERN);
> +
> +    /* check that writing to 0x9c succeeds */
> +    for (i = 0; i <= 0xff; i++) {
> +        qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i);
> +        g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) == i);
> +    }
> +
> +    /* check that RAM is still accessible */
> +    qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN + 1);
> +    g_assert_cmpint(qtest_readb(qts, SMBASE), ==, (SMRAM_TEST_PATTERN + 1));
> +
> +    g_free(pcidev);
> +    qpci_free_pc(pcibus);
> +
> +    qtest_quit(qts);
> +}
> +
>  int main(int argc, char **argv)
>  {
>      g_test_init(&argc, &argv, NULL);
> @@ -197,5 +300,7 @@ int main(int argc, char **argv)
>      qtest_add_data_func("/q35/tseg-size/8mb", &tseg_8mb, test_tseg_size);
>      qtest_add_data_func("/q35/tseg-size/ext/16mb", &tseg_ext_16mb,
>                          test_tseg_size);
> +    qtest_add_func("/q35/smram/smbase_lock", test_smram_smbase_lock);
> +    qtest_add_func("/q35/smram/legacy_smbase", test_without_smram_base);
>      return g_test_run();
>  }
>