| Message ID | 20230418172337.19207-3-dave@stgolabs.net |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cxl: Background commands and device Sanitation | expand |
On Tue, 18 Apr 2023 10:23:34 -0700 Davidlohr Bueso <dave@stgolabs.net> wrote: > Notify when the background operation is done. > > Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> A comment inline on an overall limitation of the qemu CXL code so far. Otherwise LGTM. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/cxl/cxl-device-utils.c | 10 +++++++++- > hw/cxl/cxl-mailbox-utils.c | 11 +++++++++++ > hw/mem/cxl_type3.c | 2 +- > include/hw/cxl/cxl_device.h | 1 + > 4 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/hw/cxl/cxl-device-utils.c b/hw/cxl/cxl-device-utils.c > index 4bb4e85dae19..b10ab390234c 100644 > --- a/hw/cxl/cxl-device-utils.c > +++ b/hw/cxl/cxl-device-utils.c > @@ -272,10 +272,18 @@ static void device_reg_init_common(CXLDeviceState *cxl_dstate) > > static void mailbox_reg_init_common(CXLDeviceState *cxl_dstate) > { > - /* 2048 payload size, with no interrupt */ > + const uint8_t msi_n = 11; Not expecting you to do it in this series, but note that the interrupt handling should allow for us not getting enough vectors and having to change the mapping on the fly. I've been meaning to tidy that up for a while. IT will mean this needs to be non const and not written just at init time. > + > + /* 2048 payload size */ > ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, > PAYLOAD_SIZE, CXL_MAILBOX_PAYLOAD_SHIFT); > cxl_dstate->payload_size = CXL_MAILBOX_MAX_PAYLOAD_SIZE; > + /* irq support */ > + ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, > + BG_INT_CAP, 1); > + ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, > + MSI_N, msi_n); > + cxl_dstate->mbox_msi_n = msi_n; > } > > static void memdev_reg_init_common(CXLDeviceState *cxl_dstate) { } > diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c > index 1a4480d42908..224bfdb4bfca 100644 > --- a/hw/cxl/cxl-mailbox-utils.c > +++ b/hw/cxl/cxl-mailbox-utils.c > @@ -8,6 +8,8 @@ > */ > > #include "qemu/osdep.h" > +#include "hw/pci/msi.h" > +#include "hw/pci/msix.h" > #include "hw/cxl/cxl.h" > #include "hw/cxl/cxl_events.h" > #include "hw/pci/pci.h" > @@ -980,9 +982,18 @@ static void bg_timercb(void *opaque) > cxl_dstate->mbox_reg_state64[R_CXL_DEV_BG_CMD_STS] = bg_status_reg; > > if (cxl_dstate->bg.complete_pct == 100) { > + CXLType3Dev *ct3d = container_of(cxl_dstate, CXLType3Dev, cxl_dstate); > + PCIDevice *pdev = PCI_DEVICE(ct3d); > + > cxl_dstate->bg.starttime = 0; > /* registers are updated, allow new bg-capable cmds */ > cxl_dstate->bg.runtime = 0; > + > + if (msix_enabled(pdev)) { > + msix_notify(pdev, cxl_dstate->mbox_msi_n); > + } else if (msi_enabled(pdev)) { > + msi_notify(pdev, cxl_dstate->mbox_msi_n); > + } > } > } > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index 63c28a1ed5d2..801f72c5fcae 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -777,7 +777,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp) > ComponentRegisters *regs = &cxl_cstate->crb; > MemoryRegion *mr = ®s->component_registers; > uint8_t *pci_conf = pci_dev->config; > - unsigned short msix_num = 10; > + unsigned short msix_num = 12; > int i, rc; > > QTAILQ_INIT(&ct3d->error_list); > diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h > index dbb8a955723b..f986651b6ead 100644 > --- a/include/hw/cxl/cxl_device.h > +++ b/include/hw/cxl/cxl_device.h > @@ -189,6 +189,7 @@ typedef struct cxl_device_state { > struct { > MemoryRegion mailbox; > uint16_t payload_size; > + uint8_t mbox_msi_n; > union { > uint8_t mbox_reg_state[CXL_MAILBOX_REGISTERS_LENGTH]; > uint16_t mbox_reg_state16[CXL_MAILBOX_REGISTERS_LENGTH / 2];
diff --git a/hw/cxl/cxl-device-utils.c b/hw/cxl/cxl-device-utils.c index 4bb4e85dae19..b10ab390234c 100644 --- a/hw/cxl/cxl-device-utils.c +++ b/hw/cxl/cxl-device-utils.c @@ -272,10 +272,18 @@ static void device_reg_init_common(CXLDeviceState *cxl_dstate) static void mailbox_reg_init_common(CXLDeviceState *cxl_dstate) { - /* 2048 payload size, with no interrupt */ + const uint8_t msi_n = 11; + + /* 2048 payload size */ ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, PAYLOAD_SIZE, CXL_MAILBOX_PAYLOAD_SHIFT); cxl_dstate->payload_size = CXL_MAILBOX_MAX_PAYLOAD_SIZE; + /* irq support */ + ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, + BG_INT_CAP, 1); + ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CAP, + MSI_N, msi_n); + cxl_dstate->mbox_msi_n = msi_n; } static void memdev_reg_init_common(CXLDeviceState *cxl_dstate) { } diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 1a4480d42908..224bfdb4bfca 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -8,6 +8,8 @@ */ #include "qemu/osdep.h" +#include "hw/pci/msi.h" +#include "hw/pci/msix.h" #include "hw/cxl/cxl.h" #include "hw/cxl/cxl_events.h" #include "hw/pci/pci.h" @@ -980,9 +982,18 @@ static void bg_timercb(void *opaque) cxl_dstate->mbox_reg_state64[R_CXL_DEV_BG_CMD_STS] = bg_status_reg; if (cxl_dstate->bg.complete_pct == 100) { + CXLType3Dev *ct3d = container_of(cxl_dstate, CXLType3Dev, cxl_dstate); + PCIDevice *pdev = PCI_DEVICE(ct3d); + cxl_dstate->bg.starttime = 0; /* registers are updated, allow new bg-capable cmds */ cxl_dstate->bg.runtime = 0; + + if (msix_enabled(pdev)) { + msix_notify(pdev, cxl_dstate->mbox_msi_n); + } else if (msi_enabled(pdev)) { + msi_notify(pdev, cxl_dstate->mbox_msi_n); + } } } diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 63c28a1ed5d2..801f72c5fcae 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -777,7 +777,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp) ComponentRegisters *regs = &cxl_cstate->crb; MemoryRegion *mr = ®s->component_registers; uint8_t *pci_conf = pci_dev->config; - unsigned short msix_num = 10; + unsigned short msix_num = 12; int i, rc; QTAILQ_INIT(&ct3d->error_list); diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index dbb8a955723b..f986651b6ead 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -189,6 +189,7 @@ typedef struct cxl_device_state { struct { MemoryRegion mailbox; uint16_t payload_size; + uint8_t mbox_msi_n; union { uint8_t mbox_reg_state[CXL_MAILBOX_REGISTERS_LENGTH]; uint16_t mbox_reg_state16[CXL_MAILBOX_REGISTERS_LENGTH / 2];
Notify when the background operation is done. Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> --- hw/cxl/cxl-device-utils.c | 10 +++++++++- hw/cxl/cxl-mailbox-utils.c | 11 +++++++++++ hw/mem/cxl_type3.c | 2 +- include/hw/cxl/cxl_device.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-)