Platform: Fix Musca-B1 eFlash driver issue
Changes the eFlash driver functions to only check the CMD_PENDING bit
of the status register, and ignore the ARBITRATION_LOCKED bit, before
proceeding. This prevents the functions from failing unnecessarily when
an AHB access is taking priority over any APB accesses.
Change-Id: I57290e04397ee1c8f2b79219feee47990d7b8747
Signed-off-by: Jamie Fox <jamie.fox@arm.com>
diff --git a/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c b/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c
index 65e22cd..b8bf522 100644
--- a/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c
+++ b/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c
@@ -288,10 +288,8 @@
return GFC100_ERROR_OUT_OF_RANGE;
}
- if (reg_map->status != 0) {
- /* Previous command is still pending,
- * or the arbitration is locked
- */
+ if (reg_map->status & GFC100_CMD_STAT_PENDING_MASK) {
+ /* Previous command is still pending */
return GFC100_ERROR_CMD_PENDING;
}
@@ -371,10 +369,8 @@
return GFC100_ERROR_OUT_OF_RANGE;
}
- if (reg_map->status != 0) {
- /* Previous command is still pending,
- * or the arbitration is locked
- */
+ if (reg_map->status & GFC100_CMD_STAT_PENDING_MASK) {
+ /* Previous command is still pending */
return GFC100_ERROR_CMD_PENDING;
}
@@ -423,10 +419,8 @@
return GFC100_ERROR_OUT_OF_RANGE;
}
- if (reg_map->status != 0U) {
- /* Previous command is still pending,
- * or the arbitration is locked
- */
+ if (reg_map->status & GFC100_CMD_STAT_PENDING_MASK) {
+ /* Previous command is still pending */
return GFC100_ERROR_CMD_PENDING;
}
@@ -493,10 +487,8 @@
return GFC100_ERROR_NOT_INITED;
}
- if (reg_map->status != 0) {
- /* Previous command is still pending,
- * or the arbitration is locked
- */
+ if (reg_map->status & GFC100_CMD_STAT_PENDING_MASK) {
+ /* Previous command is still pending */
return GFC100_ERROR_CMD_PENDING;
}
@@ -564,4 +556,3 @@
return (gfc100_proc_spec_get_error_cause(
dev->cfg->base + GFC100_PROCESS_SPEC_REG_MAP_OFF));
}
-