| Message ID | 169657721157.1491153.10282227094664408585.stgit@dwillia2-xfh.jf.intel.com |
|---|---|
| State | Accepted |
| Commit | 501b3d9fb036d58e88da434bc6473cec5f75644c |
| Headers | show |
| Series | cxl/mem: Fix shutdown order | expand |
Dan Williams wrote: > Move @mds out of the event specific 'struct mock_event_store' and into > the base 'struct cxl_mockmem_data' directly. This is in preparation for > enabling cxl_test to exercise the notifier flow for 'sanitize' operation > completion. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com>
On 10/6/23 00:26, Dan Williams wrote: > Move @mds out of the event specific 'struct mock_event_store' and into > the base 'struct cxl_mockmem_data' directly. This is in preparation for > enabling cxl_test to exercise the notifier flow for 'sanitize' operation > completion. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > tools/testing/cxl/test/mem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 68118c37f0b5..ab311b59899a 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -133,7 +133,6 @@ struct mock_event_log { > }; > > struct mock_event_store { > - struct cxl_memdev_state *mds; > struct mock_event_log mock_logs[CXL_EVENT_TYPE_MAX]; > u32 ev_status; > }; > @@ -150,6 +149,7 @@ struct cxl_mockmem_data { > int user_limit; > int master_limit; > struct mock_event_store mes; > + struct cxl_memdev_state *mds; > u8 event_buf[SZ_4K]; > u64 timestamp; > }; > @@ -326,7 +326,7 @@ static void cxl_mock_event_trigger(struct device *dev) > event_reset_log(log); > } > > - cxl_mem_get_event_records(mes->mds, mes->ev_status); > + cxl_mem_get_event_records(mdata->mds, mes->ev_status); > } > > struct cxl_event_record_raw maint_needed = { > @@ -1415,6 +1415,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > if (IS_ERR(mds)) > return PTR_ERR(mds); > > + mdata->mds = mds; > mds->mbox_send = cxl_mock_mbox_send; > mds->payload_size = SZ_4K; > mds->event.buf = (struct cxl_get_event_payload *) mdata->event_buf; > @@ -1447,7 +1448,6 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > if (rc) > return rc; > > - mdata->mes.mds = mds; > cxl_mock_add_event_logs(&mdata->mes); > > cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > >
diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 68118c37f0b5..ab311b59899a 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -133,7 +133,6 @@ struct mock_event_log { }; struct mock_event_store { - struct cxl_memdev_state *mds; struct mock_event_log mock_logs[CXL_EVENT_TYPE_MAX]; u32 ev_status; }; @@ -150,6 +149,7 @@ struct cxl_mockmem_data { int user_limit; int master_limit; struct mock_event_store mes; + struct cxl_memdev_state *mds; u8 event_buf[SZ_4K]; u64 timestamp; }; @@ -326,7 +326,7 @@ static void cxl_mock_event_trigger(struct device *dev) event_reset_log(log); } - cxl_mem_get_event_records(mes->mds, mes->ev_status); + cxl_mem_get_event_records(mdata->mds, mes->ev_status); } struct cxl_event_record_raw maint_needed = { @@ -1415,6 +1415,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) if (IS_ERR(mds)) return PTR_ERR(mds); + mdata->mds = mds; mds->mbox_send = cxl_mock_mbox_send; mds->payload_size = SZ_4K; mds->event.buf = (struct cxl_get_event_payload *) mdata->event_buf; @@ -1447,7 +1448,6 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) if (rc) return rc; - mdata->mes.mds = mds; cxl_mock_add_event_logs(&mdata->mes); cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);
Move @mds out of the event specific 'struct mock_event_store' and into the base 'struct cxl_mockmem_data' directly. This is in preparation for enabling cxl_test to exercise the notifier flow for 'sanitize' operation completion. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- tools/testing/cxl/test/mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)