| Message ID | 20240816-dcd-type2-upstream-v3-14-7c9b96cba6d7@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | DCD: Add support for Dynamic Capacity Devices (DCD) | expand |
On 8/16/24 7:44 AM, Ira Weiny wrote: > Dynamic Capacity Devices (DCD) require event interrupts to process > memory addition or removal. BIOS may have control over non-DCD event > processing. DCD interrupt configuration needs to be separate from > memory event interrupt configuration. > > Split cxl_event_config_msgnums() from irq setup in preparation for > separate DCD interrupts configuration. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/cxl/pci.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index f7f03599bc83..17bea49bbf4d 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -698,35 +698,31 @@ static int cxl_event_config_msgnums(struct cxl_memdev_state *mds, > return cxl_event_get_int_policy(mds, policy); > } > > -static int cxl_event_irqsetup(struct cxl_memdev_state *mds) > +static int cxl_event_irqsetup(struct cxl_memdev_state *mds, > + struct cxl_event_interrupt_policy *policy) > { > struct cxl_dev_state *cxlds = &mds->cxlds; > - struct cxl_event_interrupt_policy policy; > int rc; > > - rc = cxl_event_config_msgnums(mds, &policy); > - if (rc) > - return rc; > - > - rc = cxl_event_req_irq(cxlds, policy.info_settings); > + rc = cxl_event_req_irq(cxlds, policy->info_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Info log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.warn_settings); > + rc = cxl_event_req_irq(cxlds, policy->warn_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Warn log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.failure_settings); > + rc = cxl_event_req_irq(cxlds, policy->failure_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Failure log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.fatal_settings); > + rc = cxl_event_req_irq(cxlds, policy->fatal_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Fatal log\n"); > return rc; > @@ -745,7 +741,7 @@ static bool cxl_event_int_is_fw(u8 setting) > static int cxl_event_config(struct pci_host_bridge *host_bridge, > struct cxl_memdev_state *mds, bool irq_avail) > { > - struct cxl_event_interrupt_policy policy; > + struct cxl_event_interrupt_policy policy = { 0 }; > int rc; > > /* > @@ -773,11 +769,15 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, > return -EBUSY; > } > > + rc = cxl_event_config_msgnums(mds, &policy); > + if (rc) > + return rc; > + > rc = cxl_mem_alloc_event_buf(mds); > if (rc) > return rc; > > - rc = cxl_event_irqsetup(mds); > + rc = cxl_event_irqsetup(mds, &policy); > if (rc) > return rc; > >
On Fri, Aug 16, 2024 at 09:44:22AM -0500, Ira Weiny wrote: > Dynamic Capacity Devices (DCD) require event interrupts to process > memory addition or removal. BIOS may have control over non-DCD event > processing. DCD interrupt configuration needs to be separate from > memory event interrupt configuration. > > Split cxl_event_config_msgnums() from irq setup in preparation for > separate DCD interrupts configuration. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > --- Reviewed-by: Fan Ni <fan.ni@samsung.com> > drivers/cxl/pci.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index f7f03599bc83..17bea49bbf4d 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -698,35 +698,31 @@ static int cxl_event_config_msgnums(struct cxl_memdev_state *mds, > return cxl_event_get_int_policy(mds, policy); > } > > -static int cxl_event_irqsetup(struct cxl_memdev_state *mds) > +static int cxl_event_irqsetup(struct cxl_memdev_state *mds, > + struct cxl_event_interrupt_policy *policy) > { > struct cxl_dev_state *cxlds = &mds->cxlds; > - struct cxl_event_interrupt_policy policy; > int rc; > > - rc = cxl_event_config_msgnums(mds, &policy); > - if (rc) > - return rc; > - > - rc = cxl_event_req_irq(cxlds, policy.info_settings); > + rc = cxl_event_req_irq(cxlds, policy->info_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Info log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.warn_settings); > + rc = cxl_event_req_irq(cxlds, policy->warn_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Warn log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.failure_settings); > + rc = cxl_event_req_irq(cxlds, policy->failure_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Failure log\n"); > return rc; > } > > - rc = cxl_event_req_irq(cxlds, policy.fatal_settings); > + rc = cxl_event_req_irq(cxlds, policy->fatal_settings); > if (rc) { > dev_err(cxlds->dev, "Failed to get interrupt for event Fatal log\n"); > return rc; > @@ -745,7 +741,7 @@ static bool cxl_event_int_is_fw(u8 setting) > static int cxl_event_config(struct pci_host_bridge *host_bridge, > struct cxl_memdev_state *mds, bool irq_avail) > { > - struct cxl_event_interrupt_policy policy; > + struct cxl_event_interrupt_policy policy = { 0 }; > int rc; > > /* > @@ -773,11 +769,15 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, > return -EBUSY; > } > > + rc = cxl_event_config_msgnums(mds, &policy); > + if (rc) > + return rc; > + > rc = cxl_mem_alloc_event_buf(mds); > if (rc) > return rc; > > - rc = cxl_event_irqsetup(mds); > + rc = cxl_event_irqsetup(mds, &policy); > if (rc) > return rc; > > > -- > 2.45.2 >
On Fri, 16 Aug 2024 09:44:22 -0500 Ira Weiny <ira.weiny@intel.com> wrote: > Dynamic Capacity Devices (DCD) require event interrupts to process > memory addition or removal. BIOS may have control over non-DCD event > processing. DCD interrupt configuration needs to be separate from > memory event interrupt configuration. > > Split cxl_event_config_msgnums() from irq setup in preparation for > separate DCD interrupts configuration. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On 8/16/2024 10:44 PM, Ira Weiny wrote: > Dynamic Capacity Devices (DCD) require event interrupts to process > memory addition or removal. BIOS may have control over non-DCD event > processing. DCD interrupt configuration needs to be separate from > memory event interrupt configuration. > > Split cxl_event_config_msgnums() from irq setup in preparation for > separate DCD interrupts configuration. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Li Ming <ming4.li@intel.com>
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index f7f03599bc83..17bea49bbf4d 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -698,35 +698,31 @@ static int cxl_event_config_msgnums(struct cxl_memdev_state *mds, return cxl_event_get_int_policy(mds, policy); } -static int cxl_event_irqsetup(struct cxl_memdev_state *mds) +static int cxl_event_irqsetup(struct cxl_memdev_state *mds, + struct cxl_event_interrupt_policy *policy) { struct cxl_dev_state *cxlds = &mds->cxlds; - struct cxl_event_interrupt_policy policy; int rc; - rc = cxl_event_config_msgnums(mds, &policy); - if (rc) - return rc; - - rc = cxl_event_req_irq(cxlds, policy.info_settings); + rc = cxl_event_req_irq(cxlds, policy->info_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Info log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.warn_settings); + rc = cxl_event_req_irq(cxlds, policy->warn_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Warn log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.failure_settings); + rc = cxl_event_req_irq(cxlds, policy->failure_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Failure log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.fatal_settings); + rc = cxl_event_req_irq(cxlds, policy->fatal_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Fatal log\n"); return rc; @@ -745,7 +741,7 @@ static bool cxl_event_int_is_fw(u8 setting) static int cxl_event_config(struct pci_host_bridge *host_bridge, struct cxl_memdev_state *mds, bool irq_avail) { - struct cxl_event_interrupt_policy policy; + struct cxl_event_interrupt_policy policy = { 0 }; int rc; /* @@ -773,11 +769,15 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, return -EBUSY; } + rc = cxl_event_config_msgnums(mds, &policy); + if (rc) + return rc; + rc = cxl_mem_alloc_event_buf(mds); if (rc) return rc; - rc = cxl_event_irqsetup(mds); + rc = cxl_event_irqsetup(mds, &policy); if (rc) return rc;
Dynamic Capacity Devices (DCD) require event interrupts to process memory addition or removal. BIOS may have control over non-DCD event processing. DCD interrupt configuration needs to be separate from memory event interrupt configuration. Split cxl_event_config_msgnums() from irq setup in preparation for separate DCD interrupts configuration. Signed-off-by: Ira Weiny <ira.weiny@intel.com> --- drivers/cxl/pci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)