[PATCH v2 1/3] lib: utils/timer: Allow ACLINT MTIMER driver to setup quirks

[Inochi Amaoto]

The quirks checking will cause ACLINT step into a CLINT code path, this
is not expected when ACLINT needs a quirks.

Add more check to ensure the timer is CLINT before applying quirks.
And now apply the general quirks after applying CLINT specific quirks.

Signed-off-by: Inochi Amaoto <inochiama at outlook.com>
---
 lib/utils/timer/fdt_timer_mtimer.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/utils/timer/fdt_timer_mtimer.c b/lib/utils/timer/fdt_timer_mtimer.c
index 9eaa11d..fb5917f 100644
--- a/lib/utils/timer/fdt_timer_mtimer.c
+++ b/lib/utils/timer/fdt_timer_mtimer.c
@@ -29,6 +29,12 @@ static SBI_LIST_HEAD(mtn_list);
 
 static struct aclint_mtimer_data *mt_reference = NULL;
 
+static int clint_contains_timer(const void *data)
+{
+	const struct timer_mtimer_quirks *quirks = data;
+	return quirks && quirks->mtime_offset;
+}
+
 static int timer_mtimer_cold_init(void *fdt, int nodeoff,
 				  const struct fdt_match *match)
 {
@@ -58,7 +64,7 @@ static int timer_mtimer_cold_init(void *fdt, int nodeoff,
 		return rc;
 	}
 
-	if (match->data) { /* SiFive CLINT */
+	if (clint_contains_timer(match->data)) {
 		const struct timer_mtimer_quirks *quirks = match->data;
 
 		/* Set CLINT addresses */
@@ -74,8 +80,6 @@ static int timer_mtimer_cold_init(void *fdt, int nodeoff,
 			mt->mtime_addr = mt->mtime_size = 0;
 		}
 		mt->mtimecmp_addr += quirks->mtime_offset;
-		/* Apply additional CLINT quirks */
-		mt->has_64bit_mmio = quirks->has_64bit_mmio;
 	} else { /* RISC-V ACLINT MTIMER */
 		/* Set ACLINT MTIMER addresses */
 		mt->mtime_addr = addr[0];
@@ -84,6 +88,13 @@ static int timer_mtimer_cold_init(void *fdt, int nodeoff,
 		mt->mtimecmp_size = size[1];
 	}
 
+	/* Apply additional quirks for CLINT and ACLINT */
+	if (match->data) {
+		const struct timer_mtimer_quirks *quirks = match->data;
+
+		mt->has_64bit_mmio = quirks->has_64bit_mmio;
+	}
+
 	/* Check if MTIMER device has shared MTIME address */
 	if (mt->mtime_size) {
 		mt->has_shared_mtime = false;
-- 
2.42.0