| Message ID | 20240124124100.8218-6-Jonathan.Cameron@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | CXL emulation fixes and minor cleanup. | expand |
On Wed, Jan 24, 2024 at 12:40:53PM +0000, Jonathan Cameron wrote: > From: Davidlohr Bueso <dave@stgolabs.net> > > Two functions were reported to have dead code, remove the bogus > branches altogether, as well as a misplaced qemu_log call. > > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni <fan.ni@samsung.com> > --- > hw/cxl/cxl-mailbox-utils.c | 43 +++++++++++++------------------------- > 1 file changed, 15 insertions(+), 28 deletions(-) > > diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c > index 6eff56fb1b..dc42850767 100644 > --- a/hw/cxl/cxl-mailbox-utils.c > +++ b/hw/cxl/cxl-mailbox-utils.c > @@ -1001,15 +1001,8 @@ static CXLRetCode cmd_sanitize_overwrite(const struct cxl_cmd *cmd, > > cxl_dev_disable_media(&ct3d->cxl_dstate); > > - if (secs > 2) { > - /* sanitize when done */ > - return CXL_MBOX_BG_STARTED; > - } else { > - __do_sanitization(ct3d); > - cxl_dev_enable_media(&ct3d->cxl_dstate); > - > - return CXL_MBOX_SUCCESS; > - } > + /* sanitize when done */ > + return CXL_MBOX_BG_STARTED; > } > > static CXLRetCode cmd_get_security_state(const struct cxl_cmd *cmd, > @@ -1387,27 +1380,21 @@ static void bg_timercb(void *opaque) > > cci->bg.complete_pct = 100; > cci->bg.ret_code = ret; > - if (ret == CXL_MBOX_SUCCESS) { > - switch (cci->bg.opcode) { > - case 0x4400: /* sanitize */ > - { > - CXLType3Dev *ct3d = CXL_TYPE3(cci->d); > - > - __do_sanitization(ct3d); > - cxl_dev_enable_media(&ct3d->cxl_dstate); > - } > + switch (cci->bg.opcode) { > + case 0x4400: /* sanitize */ > + { > + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); > + > + __do_sanitization(ct3d); > + cxl_dev_enable_media(&ct3d->cxl_dstate); > + } > + break; > + case 0x4304: /* TODO: scan media */ > + break; > + default: > + __builtin_unreachable(); > break; > - case 0x4304: /* TODO: scan media */ > - break; > - default: > - __builtin_unreachable(); > - break; > - } > } > - > - qemu_log("Background command %04xh finished: %s\n", > - cci->bg.opcode, > - ret == CXL_MBOX_SUCCESS ? "success" : "aborted"); > } else { > /* estimate only */ > cci->bg.complete_pct = 100 * now / total_time; > -- > 2.39.2 >
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 6eff56fb1b..dc42850767 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -1001,15 +1001,8 @@ static CXLRetCode cmd_sanitize_overwrite(const struct cxl_cmd *cmd, cxl_dev_disable_media(&ct3d->cxl_dstate); - if (secs > 2) { - /* sanitize when done */ - return CXL_MBOX_BG_STARTED; - } else { - __do_sanitization(ct3d); - cxl_dev_enable_media(&ct3d->cxl_dstate); - - return CXL_MBOX_SUCCESS; - } + /* sanitize when done */ + return CXL_MBOX_BG_STARTED; } static CXLRetCode cmd_get_security_state(const struct cxl_cmd *cmd, @@ -1387,27 +1380,21 @@ static void bg_timercb(void *opaque) cci->bg.complete_pct = 100; cci->bg.ret_code = ret; - if (ret == CXL_MBOX_SUCCESS) { - switch (cci->bg.opcode) { - case 0x4400: /* sanitize */ - { - CXLType3Dev *ct3d = CXL_TYPE3(cci->d); - - __do_sanitization(ct3d); - cxl_dev_enable_media(&ct3d->cxl_dstate); - } + switch (cci->bg.opcode) { + case 0x4400: /* sanitize */ + { + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); + + __do_sanitization(ct3d); + cxl_dev_enable_media(&ct3d->cxl_dstate); + } + break; + case 0x4304: /* TODO: scan media */ + break; + default: + __builtin_unreachable(); break; - case 0x4304: /* TODO: scan media */ - break; - default: - __builtin_unreachable(); - break; - } } - - qemu_log("Background command %04xh finished: %s\n", - cci->bg.opcode, - ret == CXL_MBOX_SUCCESS ? "success" : "aborted"); } else { /* estimate only */ cci->bg.complete_pct = 100 * now / total_time;