On Tue, Jan 30, 2018 at 05:21:39PM -0700, Dave Jiang wrote:
> Adding NFIT platform capabilities sub table in nfit_test simulated ACPI
> NFIT table. Only the first NFIT table is added with the capability
> sub-table.
> 
> Signed-off-by: Dave Jiang <[email protected]>
> Reviewed-by: Ross Zwisler <[email protected]>
> ---
>  tools/testing/nvdimm/test/nfit.c |   14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/nvdimm/test/nfit.c 
> b/tools/testing/nvdimm/test/nfit.c
> index 7217b2b953b5..f4791e6e70cf 100644
> --- a/tools/testing/nvdimm/test/nfit.c
> +++ b/tools/testing/nvdimm/test/nfit.c
> @@ -881,7 +881,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);
> @@ -993,6 +994,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;
>  
>       /*
> @@ -1500,8 +1502,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 = BIT(2);

One last thing I noticed: I'm pretty sure this needs to be 
        pcap->highest_capability = 1;

The way I read the spec, this is the value of the highest bit index which is
valid.  We define bits 0 and 1, so this should be 1.  BIT(2) = 0x4, which
gives us a mask of 0x1f for bits 0, 1, 2, 3, and 4.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

Reply via email to