Merge branch 'for-4.16/nfit' into libnvdimm-for-next
[sfrench/cifs-2.6.git] / tools / testing / nvdimm / test / nfit.c
index 450b4cbba6b6813b444dffdb2ebc93831e33027d..620fa78b3b1b33ab7e87f20e076bc6323b68e41f 100644 (file)
@@ -1250,7 +1250,8 @@ static int nfit_test0_alloc(struct nfit_test *t)
                                        window_size) * NUM_DCR
                        + sizeof(struct acpi_nfit_data_region) * NUM_BDW
                        + (sizeof(struct acpi_nfit_flush_address)
-                                       + sizeof(u64) * NUM_HINTS) * NUM_DCR;
+                                       + sizeof(u64) * NUM_HINTS) * NUM_DCR
+                       + sizeof(struct acpi_nfit_capabilities);
        int i;
 
        t->nfit_buf = test_alloc(t, nfit_size, &t->nfit_dma);
@@ -1364,6 +1365,7 @@ static void nfit_test0_setup(struct nfit_test *t)
        struct acpi_nfit_control_region *dcr;
        struct acpi_nfit_data_region *bdw;
        struct acpi_nfit_flush_address *flush;
+       struct acpi_nfit_capabilities *pcap;
        unsigned int offset, i;
 
        /*
@@ -1871,8 +1873,16 @@ static void nfit_test0_setup(struct nfit_test *t)
        for (i = 0; i < NUM_HINTS; i++)
                flush->hint_address[i] = t->flush_dma[3] + i * sizeof(u64);
 
+       /* platform capabilities */
+       pcap = nfit_buf + offset + flush_hint_size * 4;
+       pcap->header.type = ACPI_NFIT_TYPE_CAPABILITIES;
+       pcap->header.length = sizeof(*pcap);
+       pcap->highest_capability = 1;
+       pcap->capabilities = ACPI_NFIT_CAPABILITY_CACHE_FLUSH |
+               ACPI_NFIT_CAPABILITY_MEM_FLUSH;
+
        if (t->setup_hotplug) {
-               offset = offset + flush_hint_size * 4;
+               offset = offset + flush_hint_size * 4 + sizeof(*pcap);
                /* dcr-descriptor4: blk */
                dcr = nfit_buf + offset;
                dcr->header.type = ACPI_NFIT_TYPE_CONTROL_REGION;