Commit 1526f9e2 authored by Ross Zwisler's avatar Ross Zwisler Committed by Dan Williams

nfit_test: prevent parsing error of nfit_test.0

When you load nfit_test you currently see the following error in dmesg:

 nfit_test nfit_test.0: found a zero length table '0' parsing nfit

This happens because when we parse the nfit_test.0 table via
acpi_nfit_init(), we specify a size of nfit_test->nfit_size.  For the first
pass through nfit_test.0 where (t->setup_hotplug == 0) this is the size of
the entire buffer we allocated, including space for the hot plug
structures, not the size that we've actually filled in.

Fix this by only trying to parse the size of the structures that we've
filled in.
Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 9741a559
...@@ -154,6 +154,7 @@ struct nfit_test { ...@@ -154,6 +154,7 @@ struct nfit_test {
void *nfit_buf; void *nfit_buf;
dma_addr_t nfit_dma; dma_addr_t nfit_dma;
size_t nfit_size; size_t nfit_size;
size_t nfit_filled;
int dcr_idx; int dcr_idx;
int num_dcr; int num_dcr;
int num_pm; int num_pm;
...@@ -2053,6 +2054,8 @@ static void nfit_test0_setup(struct nfit_test *t) ...@@ -2053,6 +2054,8 @@ static void nfit_test0_setup(struct nfit_test *t)
WARN_ON(offset != t->nfit_size); WARN_ON(offset != t->nfit_size);
} }
t->nfit_filled = offset;
post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0], post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0],
SPA0_SIZE); SPA0_SIZE);
...@@ -2172,6 +2175,8 @@ static void nfit_test1_setup(struct nfit_test *t) ...@@ -2172,6 +2175,8 @@ static void nfit_test1_setup(struct nfit_test *t)
/* sanity check to make sure we've filled the buffer */ /* sanity check to make sure we've filled the buffer */
WARN_ON(offset != t->nfit_size); WARN_ON(offset != t->nfit_size);
t->nfit_filled = offset;
post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0], post_ars_status(&t->ars_state, &t->badrange, t->spa_set_dma[0],
SPA2_SIZE); SPA2_SIZE);
...@@ -2529,7 +2534,7 @@ static int nfit_test_probe(struct platform_device *pdev) ...@@ -2529,7 +2534,7 @@ static int nfit_test_probe(struct platform_device *pdev)
nd_desc->ndctl = nfit_test_ctl; nd_desc->ndctl = nfit_test_ctl;
rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf, rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,
nfit_test->nfit_size); nfit_test->nfit_filled);
if (rc) if (rc)
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment