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.ji...@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.came...@huawei.com>
Reviewed-by: Fan Ni <fan...@samsung.com>
Reviewed-by: Li Ming <ming4...@intel.com>
Signed-off-by: Ira Weiny <ira.we...@intel.com>
---
 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 
8559b0eac011cadd49e67953b7560f49eedff94a..ac085a0b4881fc4f074d23f3606f9a3b7e70d05f
 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -742,6 +742,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)
 {
@@ -764,14 +779,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.47.0


Reply via email to