Skip to content

Commit 8454c57

Browse files
rajatgoyal47chetan-rathore
authored andcommitted
ras: defer PFG countdown enable until injection
Avoid setting ERR<n>PFGCTL.CDNEN during RAS PFG setup by removing the CDNEN bit from ERR_PFGCTL_TRIGGER_ALL. This keeps setup from starting the pseudo-fault countdown before ras005 records the PAL-selected PFG cleanup mode. The countdown is now started only from val_ras_inject_error(), where ERR_PFGCTL_CDNEN_ENABLE is ORed into the existing PFGCTL value after ras005 has saved err_out_params.is_pfg_check for interrupt cleanup. Mark ras005 ISR-shared state as volatile. Signed-off-by: Rajat Goyal <rajat.goyal@arm.com> Change-Id: I60ac6b769e50085129c882ebda806a366d5b5276
1 parent 08996a3 commit 8454c57

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

test_pool/ras/ras005.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
#define IS_NOT_SPI_PPI(int_id) ((int_id < 16) || (int_id > 1019))
3030

31-
static uint64_t int_id;
32-
static uint32_t intr_pending = 1;
33-
static uint32_t intr_node_index;
34-
static uint8_t intr_is_pfg_check;
31+
static volatile uint64_t int_id;
32+
static volatile uint32_t intr_pending = 1;
33+
static volatile uint32_t intr_node_index;
34+
static volatile uint8_t intr_is_pfg_check;
3535

3636
static
3737
void

val/include/acs_ras.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define ERR_PFGCTL_CE_NON_ENABLE (0x1ull << 6)
5454
#define ERR_PFGCTL_CI_ENABLE (0x1ull << 8)
5555
#define ERR_PFGCTL_CDNEN_ENABLE (0x1ull << 31)
56-
#define ERR_PFGCTL_TRIGGER_ALL 0xC0001FFFULL /* Trigger all supported PFG classes */
56+
#define ERR_PFGCTL_TRIGGER_ALL 0x40001FFFULL /* Trigger all supported PFG classes */
5757

5858
#define ERR_FR_OFFSET 0x000
5959
#define ERR_CTLR_OFFSET 0x008

0 commit comments

Comments
 (0)