tools/testing/cxl: Resolve auto-region decoder targets like real HW
PATCH RESEND 1/1 tools/testing/cxl: Resolve auto-region decoder targets like real HW
The mock auto-region created at module load wrote switch and host-bridge decoder target[] directly, in addition to target_map[]. Real HW programs only target_map[] and resolves target[] as dports enumerate, via update_decoder_targets(). Region replay already follows that ordering, the initial auto-region did not.
Drop the direct target[] writes and call cxl_port_update_decoder_targets() so target[] is resolved the same way as real HW and region replay, exercising more of the auto-region driver path.
This is inspired by the discussion [1] below:
[1]: https://lore.kernel.org/all/[email protected]/
---cxl_mock_mem didn't load together when I manually modprobe cxl_test module, should we make them loaded together automatically for better user experience?
Best regards,
Richard Cheng.
--- tools/testing/cxl/test/cxl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
tools/testing/cxl/test/cxl.c +12 -6
@@ -1181,15 +1181,11 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxlsd =to_cxl_switch_decoder (dev);if (i ==0 ) {/* put cxl_mem.4 second in the decode order */ -if (pdev->id ==4 ) { - cxlsd->target[1 ] = dport; +if (pdev->id ==4 ) cxlsd->cxld.target_map[1 ] = dport->port_id; - }else { - cxlsd->target[0 ] = dport; +else cxlsd->cxld.target_map[0 ] = dport->port_id; - } }else { - cxlsd->target[0 ] = dport; cxlsd->cxld.target_map[0 ] = dport->port_id; } cxld = &cxlsd->cxld;
@@ -1212,6 +1208,16 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxld->commit = mock_decoder_commit; cxld->reset = mock_decoder_reset; +/* +* Only target_map[] is programmed above, mimicking +* firmware. On real hardware target[] is populated as +* dports enumerate, via update_decoder_targets(). The +* mock's dports are already bound by now, so fire that +* resolution explicitly here rather than stamping +* target[] directly. +*/ +cxl_port_update_decoder_targets (iter, dport); +cxld_registry_update (cxld);put_device (dev); }
Signature · 1 line
2.43.0
Quoted 11 lines · Richard Cheng
The mock auto-region created at module load wrote switch and host-bridge decoder target[] directly, in addition to target_map[]. Real HW programs only target_map[] and resolves target[] as dports enumerate, via
update_decoder_targets(). Region replay already follows that ordering, the initial auto-region did not.Drop the direct target[] writes and call
cxl_port_update_decoder_targets()so target[] is resolved the same way as real HW and region replay, exercising more of the auto-region driver path.
Quoted 5 lines
This is inspired by the discussion [1] below:
[1]: https://lore.kernel.org/all/[email protected]/
Suggested-by Alison Schofield <[email protected]>Signed-off-by Richard Cheng <[email protected]>
Quoted 50 lines
---
cxl_mock_memdidn't load together when I manually modprobecxl_testmodule, should we make them loaded together automatically for better user experience?Best regards,
Richard Cheng.--- tools/testing/cxl/test/cxl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)tools/testing/cxl/test/cxl.c +12
-6@@ -1181,15 +1181,11 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxlsd =to_cxl_switch_decoder (dev);if (i ==0 ) {/* put cxl_mem.4 second in the decode order */ -if (pdev->id ==4 ) { - cxlsd->target[1 ] = dport; +if (pdev->id ==4 ) cxlsd->cxld.target_map[1 ] = dport->port_id; - }else { - cxlsd->target[0 ] = dport; +else cxlsd->cxld.target_map[0 ] = dport->port_id; - } }else { - cxlsd->target[0 ] = dport; cxlsd->cxld.target_map[0 ] = dport->port_id; } cxld = &cxlsd->cxld;@@ -1212,6 +1208,16 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxld->commit = mock_decoder_commit; cxld->reset = mock_decoder_reset; +/* +* Only target_map[] is programmed above, mimicking +* firmware. On real hardware target[] is populated as +* dports enumerate, via update_decoder_targets(). The +* mock's dports are already bound by now, so fire that +* resolution explicitly here rather than stamping +* target[] directly. +*/ +cxl_port_update_decoder_targets (iter, dport); +cxld_registry_update (cxld);put_device (dev); }
Quoted 10 lines · Richard Cheng
The mock auto-region created at module load wrote switch and host-bridge decoder target[] directly, in addition to target_map[]. Real HW programs only target_map[] and resolves target[] as dports enumerate, via
update_decoder_targets(). Region replay already follows that ordering, the initial auto-region did not.Drop the direct target[] writes and call
cxl_port_update_decoder_targets()so target[] is resolved the same way as real HW and region replay, exercising more of the auto-region driver path.
Quoted 10 lines
This is inspired by the discussion [1] below:
[1]: https://lore.kernel.org/all/[email protected]/
Suggested-by Alison Schofield <[email protected]>Signed-off-by Richard Cheng <[email protected]>---
cxl_mock_memdidn't load together when I manually modprobecxl_testmodule, should we make them loaded together automatically for better user experience?
Is this a documentation issue w cxl-test?
There's an autoload path. cxl_mock_mem has a MODULE_DEVICE_TABLE for the cxl_mem/cxl_rcd platform devices that cxl_test registers, so udev should modprobe it automatically. That only works if the modules are installed and depmod'd, though. Did you make modules_install && depmod -a or are you insmod-ing from the build tree?
Are you thinking of a MODULE_SOFTDEP? I think that would be harmless in our cxl-test suite loads.
Maybe explain more of the environment for me.
-- Alison
Quoted 49 lines
Best regards,
Richard Cheng.--- tools/testing/cxl/test/cxl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)tools/testing/cxl/test/cxl.c +12
-6@@ -1181,15 +1181,11 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxlsd =to_cxl_switch_decoder (dev);if (i ==0 ) {/* put cxl_mem.4 second in the decode order */ -if (pdev->id ==4 ) { - cxlsd->target[1 ] = dport; +if (pdev->id ==4 ) cxlsd->cxld.target_map[1 ] = dport->port_id; - }else { - cxlsd->target[0 ] = dport; +else cxlsd->cxld.target_map[0 ] = dport->port_id; - } }else { - cxlsd->target[0 ] = dport; cxlsd->cxld.target_map[0 ] = dport->port_id; } cxld = &cxlsd->cxld;@@ -1212,6 +1208,16 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxld->commit = mock_decoder_commit; cxld->reset = mock_decoder_reset; +/* +* Only target_map[] is programmed above, mimicking +* firmware. On real hardware target[] is populated as +* dports enumerate, via update_decoder_targets(). The +* mock's dports are already bound by now, so fire that +* resolution explicitly here rather than stamping +* target[] directly. +*/ +cxl_port_update_decoder_targets (iter, dport); +cxld_registry_update (cxld);put_device (dev); }Signature · 1 line
2.43.0
Quoted 11 lines · Richard Cheng
The mock auto-region created at module load wrote switch and host-bridge decoder target[] directly, in addition to target_map[]. Real HW programs only target_map[] and resolves target[] as dports enumerate, via
update_decoder_targets(). Region replay already follows that ordering, the initial auto-region did not.Drop the direct target[] writes and call
cxl_port_update_decoder_targets()so target[] is resolved the same way as real HW and region replay, exercising more of the auto-region driver path.
Quoted 5 lines
This is inspired by the discussion [1] below:
[1]: https://lore.kernel.org/all/[email protected]/
Suggested-by Alison Schofield <[email protected]>Signed-off-by Richard Cheng <[email protected]>
Applied to cxl/next769f0b350c81
Quoted 50 lines
---
cxl_mock_memdidn't load together when I manually modprobecxl_testmodule, should we make them loaded together automatically for better user experience?Best regards,
Richard Cheng.--- tools/testing/cxl/test/cxl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)tools/testing/cxl/test/cxl.c +12
-6@@ -1181,15 +1181,11 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxlsd =to_cxl_switch_decoder (dev);if (i ==0 ) {/* put cxl_mem.4 second in the decode order */ -if (pdev->id ==4 ) { - cxlsd->target[1 ] = dport; +if (pdev->id ==4 ) cxlsd->cxld.target_map[1 ] = dport->port_id; - }else { - cxlsd->target[0 ] = dport; +else cxlsd->cxld.target_map[0 ] = dport->port_id; - } }else { - cxlsd->target[0 ] = dport; cxlsd->cxld.target_map[0 ] = dport->port_id; } cxld = &cxlsd->cxld;@@ -1212,6 +1208,16 @@ static bool mock_init_hdm_decoder(struct cxl_decoder *cxld) cxld->commit = mock_decoder_commit; cxld->reset = mock_decoder_reset; +/* +* Only target_map[] is programmed above, mimicking +* firmware. On real hardware target[] is populated as +* dports enumerate, via update_decoder_targets(). The +* mock's dports are already bound by now, so fire that +* resolution explicitly here rather than stamping +* target[] directly. +*/ +cxl_port_update_decoder_targets (iter, dport); +cxld_registry_update (cxld);put_device (dev); }