ras: PAL select common PFG error flow

  Move pseudo fault generation selection from RAS_ERR_IN_t to
  RAS_ERR_OUT_t so PAL setup can request the common VAL PFG path.

  Update VAL setup and injection to use out_param->is_pfg_check for
  PFG setup/injection, and update ras005 interrupt cleanup to use the
  PAL-selected mode. Remove stale test-side is_pfg_check initialization
  from RAS_ERR_IN_t users.

  Initialize the new output flag in PAL setup stubs and leave PAL inject
  from modifying the setup-selected state.

Signed-off-by: Rajat Goyal <rajat.goyal@arm.com>
Change-Id: If594ddf1682e09fb112576e6e3357b0a338f2fc7

Author: rajatgoyal47

pal/baremetal/base/include/pal_common_support.h

@@ -1000,17 +1000,22 @@ typedef enum {
     ERR_CRITICAL          /* Critical Error */
 } RAS_ERROR_TYPE;
 
+#define RAS_INTR_TYPE_FHI   0x0  /* Fault Handling Interrupt */
+#define RAS_INTR_TYPE_ERI   0x1  /* Error Recovery Interrupt */
+#define RAS_INTR_TYPE_NONE  0xFF /* No ERI/FHI selected */
+
 typedef struct {
    RAS_ERROR_TYPE ras_error_type;   /* Error Type */
    uint64_t error_pa;                 /* Error Phy Address */
    uint32_t rec_index;                /* Error Record Index */
    uint32_t node_index;               /* Error Node Index in Info table */
-   uint8_t is_pfg_check;              /* Pseudo Fault Check or not */
+   uint32_t intr_type;                /* Interrupt type used for common PFG setup */
 } RAS_ERR_IN_t;
 
 typedef struct {
    uint32_t intr_id;        /* Interrupt ID */
    uint32_t error_record;   /* Error Record Number */
+   uint8_t is_pfg_check;    /* Pseudo Fault Check or not */
 } RAS_ERR_OUT_t;
 
 void pal_ras_create_info_table(RAS_INFO_TABLE *ras_info_table);

pal/baremetal/target/RDN2/src/pal_sbsa.c

@@ -162,7 +162,9 @@ pal_ras_setup_error(RAS_ERR_IN_t in_param, RAS_ERR_OUT_t *out_param)
   /* Platform Defined way of setting up the Error Environment */
 
   (void) in_param;
-  (void) out_param;
+
+  if (out_param)
+    out_param->is_pfg_check = 0;
 
   pal_warn_not_implemented(__func__);
   return PAL_STATUS_NOT_IMPLEMENTED;

pal/baremetal/target/RDV3/src/pal_sbsa.c

@@ -163,7 +163,9 @@ pal_ras_setup_error(RAS_ERR_IN_t in_param, RAS_ERR_OUT_t *out_param)
   /* Platform Defined way of setting up the Error Environment */
 
   (void) in_param;
-  (void) out_param;
+
+  if (out_param)
+    out_param->is_pfg_check = 0;
 
   pal_warn_not_implemented(__func__);
   return PAL_STATUS_NOT_IMPLEMENTED;

pal/baremetal/target/RDV3CFG1/src/pal_sbsa.c

@@ -163,7 +163,9 @@ pal_ras_setup_error(RAS_ERR_IN_t in_param, RAS_ERR_OUT_t *out_param)
   /* Platform Defined way of setting up the Error Environment */
 
   (void) in_param;
-  (void) out_param;
+
+  if (out_param)
+    out_param->is_pfg_check = 0;
 
   pal_warn_not_implemented(__func__);
   return PAL_STATUS_NOT_IMPLEMENTED;

pal/uefi_acpi/include/pal_uefi.h

@@ -894,17 +894,22 @@ typedef enum {
     ERR_CONTAINABLE       /* Containable Error */
 } RAS_ERROR_TYPE;
 
+#define RAS_INTR_TYPE_FHI   0x0  /* Fault Handling Interrupt */
+#define RAS_INTR_TYPE_ERI   0x1  /* Error Recovery Interrupt */
+#define RAS_INTR_TYPE_NONE  0xFF /* No ERI/FHI selected */
+
 typedef struct {
    RAS_ERROR_TYPE ras_error_type;   /* Error Type */
    UINT64 error_pa;                 /* Error Phy Address */
    UINT32 rec_index;                /* Error Record Index */
    UINT32 node_index;               /* Error Node Index in Info table */
-   UINT8 is_pfg_check;              /* Pseudo Fault Check or not */
+   UINT32 intr_type;                /* Interrupt type used for common PFG setup */
 } RAS_ERR_IN_t;
 
 typedef struct {
    UINT32 intr_id;        /* Interrupt ID */
    UINT32 error_record;   /* Error Record Number */
+   UINT8 is_pfg_check;    /* Pseudo Fault Check or not */
 } RAS_ERR_OUT_t;
 
 void pal_ras_create_info_table(RAS_INFO_TABLE *ras_info_table);

pal/uefi_acpi/src/pal_ras.c

@@ -61,6 +61,8 @@ pal_ras_setup_error(RAS_ERR_IN_t in_param, RAS_ERR_OUT_t *out_param)
   if (out_param == NULL)
     return PAL_STATUS_INVALID_PARAM;
 
+  out_param->is_pfg_check = 0;
+
   pal_warn_not_implemented(__func__);
   return PAL_STATUS_NOT_IMPLEMENTED;
 }

test_pool/ras/ras005.c

@@ -42,7 +42,7 @@ intr_handler(void)
   /* Clear the RAS source before the common IRQ wrapper EOIs the interrupt. */
   val_ras_clear_error_status(intr_node_index, intr_is_pfg_check);
 
-  val_print(TRACE, "\n       Received interrupt 0x%x", int_id);
+  val_print(TRACE, "\n       Received interrupt 0x%lx", int_id);
   val_gic_end_of_interrupt(int_id);
   return;
 }
@@ -123,9 +123,9 @@ payload()
       err_in_params.rec_index = rec_index;
       err_in_params.node_index = node_index;
       err_in_params.ras_error_type = ERR_CE;
-      err_in_params.is_pfg_check = 0;
+      /* Pass the selected interrupt type so common RAS setup can enable FHI or ERI. */
+      err_in_params.intr_type = (fhi_id) ? RAS_INTR_TYPE_FHI : RAS_INTR_TYPE_ERI;
       intr_node_index = node_index;
-      intr_is_pfg_check = err_in_params.is_pfg_check;
 
       /* Install handler for interrupt */
       val_gic_install_isr(int_id, intr_handler);
@@ -140,6 +140,8 @@ payload()
         fail_cnt++;
         break;
       }
+      /* Preserve PAL/VAL-selected PFG mode for interrupt-source cleanup. */
+      intr_is_pfg_check = err_out_params.is_pfg_check;
 
       /* Inject error in an implementation defined way */
       status = val_ras_inject_error(err_in_params, &err_out_params);

test_pool/ras/ras006.c

@@ -145,7 +145,7 @@ payload()
           err_in_params.ras_error_type = ERR_CE; /* correctable error */
           err_in_params.error_pa = err_inj_addr; /* address of the location where error
                                                     needs to be injected */
-          err_in_params.is_pfg_check = 0;        /* not a pseudo fault check */
+          err_in_params.intr_type = RAS_INTR_TYPE_NONE;
 
           /* Setup error in an implementation defined way */
           status = val_ras_setup_error(err_in_params, &err_out_params);

test_pool/ras/ras009.c

@@ -154,7 +154,7 @@ payload()
     err_in_params.ras_error_type = ERR_CONTAINABLE; /* containable error */
     err_in_params.error_pa = err_inj_addr; /* address of the location where error
                                               needs to be injected */
-    err_in_params.is_pfg_check = 0;        /* not a pseudo fault check */
+    err_in_params.intr_type = RAS_INTR_TYPE_NONE;
 
     /* Setup error in an implementation defined way */
     status = val_ras_setup_error(err_in_params, &err_out_params);

test_pool/ras/ras011.c

@@ -145,7 +145,7 @@ payload_poison_supported()
     err_in_params.rec_index = rec_index;
     err_in_params.node_index = node_index;
     err_in_params.ras_error_type = ERR_CE;
-    err_in_params.is_pfg_check = 0;
+    err_in_params.intr_type = RAS_INTR_TYPE_ERI;
 
     /* Get Interrupt details for this node */
     status = val_ras_get_info(RAS_INFO_ERI_ID, node_index, &int_id);
@@ -346,7 +346,7 @@ payload_poison_unsupported()
     err_in_params.rec_index = rec_index;
     err_in_params.node_index = node_index;
     err_in_params.ras_error_type = ERR_CE;
-    err_in_params.is_pfg_check = 0;
+    err_in_params.intr_type = RAS_INTR_TYPE_ERI;
 
     /* Get Interrupt details for this node */
     status = val_ras_get_info(RAS_INFO_ERI_ID, node_index, &int_id);