| Message ID | 20240816-dcd-type2-upstream-v3-15-7c9b96cba6d7@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | DCD: Add support for Dynamic Capacity Devices (DCD) | expand |
On Fri, Aug 16, 2024 at 09:44:23AM -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. > > Factor out event interrupt setting validation. > > Reviewed-by: Dave Jiang <dave.jiang@intel.com> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > Reviewed-by: Fan Ni <fan.ni@samsung.com> > --- > Changes: > [iweiny: reword commit message] > [iweiny: keep review tags on simple patch] > --- > drivers/cxl/pci.c | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index 17bea49bbf4d..370c74eae323 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -738,6 +738,21 @@ static bool cxl_event_int_is_fw(u8 setting) > return mode == CXL_INT_FW; > } > > +static bool cxl_event_validate_mem_policy(struct cxl_memdev_state *mds, > + struct cxl_event_interrupt_policy *policy) > +{ > + if (cxl_event_int_is_fw(policy->info_settings) || > + cxl_event_int_is_fw(policy->warn_settings) || > + cxl_event_int_is_fw(policy->failure_settings) || > + cxl_event_int_is_fw(policy->fatal_settings)) { > + dev_err(mds->cxlds.dev, > + "FW still in control of Event Logs despite _OSC settings\n"); > + return false; > + } > + > + return true; > +} > + > static int cxl_event_config(struct pci_host_bridge *host_bridge, > struct cxl_memdev_state *mds, bool irq_avail) > { > @@ -760,14 +775,8 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, > if (rc) > return rc; > > - if (cxl_event_int_is_fw(policy.info_settings) || > - cxl_event_int_is_fw(policy.warn_settings) || > - cxl_event_int_is_fw(policy.failure_settings) || > - cxl_event_int_is_fw(policy.fatal_settings)) { > - dev_err(mds->cxlds.dev, > - "FW still in control of Event Logs despite _OSC settings\n"); > + if (!cxl_event_validate_mem_policy(mds, &policy)) > return -EBUSY; > - } > > rc = cxl_event_config_msgnums(mds, &policy); > if (rc) > > -- > 2.45.2 >
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. > > Factor out event interrupt setting validation. > > Reviewed-by: Dave Jiang <dave.jiang@intel.com> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > 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 17bea49bbf4d..370c74eae323 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -738,6 +738,21 @@ static bool cxl_event_int_is_fw(u8 setting) return mode == CXL_INT_FW; } +static bool cxl_event_validate_mem_policy(struct cxl_memdev_state *mds, + struct cxl_event_interrupt_policy *policy) +{ + if (cxl_event_int_is_fw(policy->info_settings) || + cxl_event_int_is_fw(policy->warn_settings) || + cxl_event_int_is_fw(policy->failure_settings) || + cxl_event_int_is_fw(policy->fatal_settings)) { + dev_err(mds->cxlds.dev, + "FW still in control of Event Logs despite _OSC settings\n"); + return false; + } + + return true; +} + static int cxl_event_config(struct pci_host_bridge *host_bridge, struct cxl_memdev_state *mds, bool irq_avail) { @@ -760,14 +775,8 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, if (rc) return rc; - if (cxl_event_int_is_fw(policy.info_settings) || - cxl_event_int_is_fw(policy.warn_settings) || - cxl_event_int_is_fw(policy.failure_settings) || - cxl_event_int_is_fw(policy.fatal_settings)) { - dev_err(mds->cxlds.dev, - "FW still in control of Event Logs despite _OSC settings\n"); + if (!cxl_event_validate_mem_policy(mds, &policy)) return -EBUSY; - } rc = cxl_event_config_msgnums(mds, &policy); if (rc)