arm: gic: Don't assume the GIC base addresses are within 4G range.
There are systems out where the GIC registers (but not only) are
memory-mapped to addresses above the 4G range, eg. 0x80_0000_0000
to 0xFF_FFFF_FFFF. After following a flat (one to one) mapping a 32-bit
unsigned int isn't big enough for the 40-bit addresses. Change that to
uintptr_t.
Signed-off-by: Marek Bykowski <marek.bykowski@gmail.com>
Change-Id: Ida47495e9b2d6f4f93cbfc6eb2e497d449d6a208
diff --git a/drivers/arm/gic/gic_common.c b/drivers/arm/gic/gic_common.c
index d9c9fce..e16b213 100644
--- a/drivers/arm/gic/gic_common.c
+++ b/drivers/arm/gic/gic_common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -15,49 +15,49 @@
* GIC Distributor interface accessors for reading entire registers
******************************************************************************/
-unsigned int gicd_read_isenabler(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_isenabler(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ISENABLER_SHIFT;
return mmio_read_32(base + GICD_ISENABLER + (n << 2));
}
-unsigned int gicd_read_icenabler(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_icenabler(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ICENABLER_SHIFT;
return mmio_read_32(base + GICD_ICENABLER + (n << 2));
}
-unsigned int gicd_read_ispendr(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_ispendr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ISPENDR_SHIFT;
return mmio_read_32(base + GICD_ISPENDR + (n << 2));
}
-unsigned int gicd_read_icpendr(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_icpendr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ICPENDR_SHIFT;
return mmio_read_32(base + GICD_ICPENDR + (n << 2));
}
-unsigned int gicd_read_isactiver(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_isactiver(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ISACTIVER_SHIFT;
return mmio_read_32(base + GICD_ISACTIVER + (n << 2));
}
-unsigned int gicd_read_icactiver(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_icactiver(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ICACTIVER_SHIFT;
return mmio_read_32(base + GICD_ICACTIVER + (n << 2));
}
-unsigned int gicd_read_ipriorityr(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_ipriorityr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> IPRIORITYR_SHIFT;
return mmio_read_32(base + GICD_IPRIORITYR + (n << 2));
}
-unsigned int gicd_read_icfgr(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_read_icfgr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int n = interrupt_id >> ICFGR_SHIFT;
return mmio_read_32(base + GICD_ICFGR + (n << 2));
@@ -67,56 +67,56 @@
* GIC Distributor interface accessors for writing entire registers
******************************************************************************/
-void gicd_write_isenabler(unsigned int base,
+void gicd_write_isenabler(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ISENABLER_SHIFT;
mmio_write_32(base + GICD_ISENABLER + (n << 2), val);
}
-void gicd_write_icenabler(unsigned int base,
+void gicd_write_icenabler(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ICENABLER_SHIFT;
mmio_write_32(base + GICD_ICENABLER + (n << 2), val);
}
-void gicd_write_ispendr(unsigned int base,
+void gicd_write_ispendr(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ISPENDR_SHIFT;
mmio_write_32(base + GICD_ISPENDR + (n << 2), val);
}
-void gicd_write_icpendr(unsigned int base,
+void gicd_write_icpendr(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ICPENDR_SHIFT;
mmio_write_32(base + GICD_ICPENDR + (n << 2), val);
}
-void gicd_write_isactiver(unsigned int base,
+void gicd_write_isactiver(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ISACTIVER_SHIFT;
mmio_write_32(base + GICD_ISACTIVER + (n << 2), val);
}
-void gicd_write_icactiver(unsigned int base,
+void gicd_write_icactiver(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ICACTIVER_SHIFT;
mmio_write_32(base + GICD_ICACTIVER + (n << 2), val);
}
-void gicd_write_ipriorityr(unsigned int base,
+void gicd_write_ipriorityr(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> IPRIORITYR_SHIFT;
mmio_write_32(base + GICD_IPRIORITYR + (n << 2), val);
}
-void gicd_write_icfgr(unsigned int base,
+void gicd_write_icfgr(uintptr_t base,
unsigned int interrupt_id, unsigned int val)
{
unsigned int n = interrupt_id >> ICFGR_SHIFT;
@@ -126,61 +126,61 @@
/*******************************************************************************
* GIC Distributor interface accessors for individual interrupt manipulation
******************************************************************************/
-unsigned int gicd_get_isenabler(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_get_isenabler(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ISENABLER_SHIFT) - 1);
return gicd_read_isenabler(base, interrupt_id) & (1 << bit_num);
}
-void gicd_set_isenabler(unsigned int base, unsigned int interrupt_id)
+void gicd_set_isenabler(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ISENABLER_SHIFT) - 1);
gicd_write_isenabler(base, interrupt_id, (1 << bit_num));
}
-void gicd_set_icenabler(unsigned int base, unsigned int interrupt_id)
+void gicd_set_icenabler(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ICENABLER_SHIFT) - 1);
gicd_write_icenabler(base, interrupt_id, (1 << bit_num));
}
-void gicd_set_ispendr(unsigned int base, unsigned int interrupt_id)
+void gicd_set_ispendr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ISPENDR_SHIFT) - 1);
gicd_write_ispendr(base, interrupt_id, (1 << bit_num));
}
-void gicd_set_icpendr(unsigned int base, unsigned int interrupt_id)
+void gicd_set_icpendr(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ICPENDR_SHIFT) - 1);
gicd_write_icpendr(base, interrupt_id, (1 << bit_num));
}
-void gicd_set_isactiver(unsigned int base, unsigned int interrupt_id)
+void gicd_set_isactiver(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ISACTIVER_SHIFT) - 1);
gicd_write_isactiver(base, interrupt_id, (1 << bit_num));
}
-void gicd_set_icactiver(unsigned int base, unsigned int interrupt_id)
+void gicd_set_icactiver(uintptr_t base, unsigned int interrupt_id)
{
unsigned int bit_num = interrupt_id & ((1 << ICACTIVER_SHIFT) - 1);
gicd_write_icactiver(base, interrupt_id, (1 << bit_num));
}
-unsigned int gicd_get_ipriorityr(unsigned int base, unsigned int interrupt_id)
+unsigned int gicd_get_ipriorityr(uintptr_t base, unsigned int interrupt_id)
{
return gicd_read_ipriorityr(base, interrupt_id) & GIC_PRI_MASK;
}
-void gicd_set_ipriorityr(unsigned int base, unsigned int interrupt_id,
+void gicd_set_ipriorityr(uintptr_t base, unsigned int interrupt_id,
unsigned int priority)
{
mmio_write_8(base + GICD_IPRIORITYR + interrupt_id,
diff --git a/drivers/arm/gic/gic_v3.c b/drivers/arm/gic/gic_v3.c
index 5a777cb..ea66159 100644
--- a/drivers/arm/gic/gic_v3.c
+++ b/drivers/arm/gic/gic_v3.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -57,7 +57,7 @@
/******************************************************************************
* GIC Distributor interface accessors for writing entire registers
*****************************************************************************/
-static void gicd_write_irouter(unsigned int base,
+static void gicd_write_irouter(uintptr_t base,
unsigned int interrupt_id,
unsigned long long route)
{
@@ -68,17 +68,17 @@
/******************************************************************************
* GIC Re-distributor interface accessors for writing entire registers
*****************************************************************************/
-static void gicr_write_isenabler0(unsigned int base, unsigned int val)
+static void gicr_write_isenabler0(uintptr_t base, unsigned int val)
{
mmio_write_32(base + GICR_ISENABLER0, val);
}
-static void gicr_write_icenabler0(unsigned int base, unsigned int val)
+static void gicr_write_icenabler0(uintptr_t base, unsigned int val)
{
mmio_write_32(base + GICR_ICENABLER0, val);
}
-static void gicr_write_icpendr0(unsigned int base, unsigned int val)
+static void gicr_write_icpendr0(uintptr_t base, unsigned int val)
{
mmio_write_32(base + GICR_ICPENDR0, val);
}
@@ -107,7 +107,7 @@
return mmio_read_32(base + GICR_ICFGR1);
}
-static unsigned int gicr_read_isenabler0(unsigned int base)
+static unsigned int gicr_read_isenabler0(uintptr_t base)
{
return mmio_read_32(base + GICR_ISENABLER0);
}
@@ -118,7 +118,7 @@
return mmio_read_32(base + GICR_IPRIORITYR + (n << 2));
}
-static unsigned int gicr_read_ispendr0(unsigned int base)
+static unsigned int gicr_read_ispendr0(uintptr_t base)
{
return mmio_read_32(base + GICR_ISPENDR0);
}
@@ -127,26 +127,26 @@
* GIC Re-distributor interface accessors for individual interrupt
* manipulation
*****************************************************************************/
-static unsigned int gicr_get_isenabler0(unsigned int base,
+static unsigned int gicr_get_isenabler0(uintptr_t base,
unsigned int interrupt_id)
{
unsigned bit_num = interrupt_id & ((1 << ISENABLER_SHIFT) - 1);
return gicr_read_isenabler0(base) & (1 << bit_num);
}
-static void gicr_set_isenabler0(unsigned int base, unsigned int interrupt_id)
+static void gicr_set_isenabler0(uintptr_t base, unsigned int interrupt_id)
{
unsigned bit_num = interrupt_id & ((1 << ISENABLER_SHIFT) - 1);
gicr_write_isenabler0(base, (1 << bit_num));
}
-static void gicr_set_icenabler0(unsigned int base, unsigned int interrupt_id)
+static void gicr_set_icenabler0(uintptr_t base, unsigned int interrupt_id)
{
unsigned bit_num = interrupt_id & ((1 << ISENABLER_SHIFT) - 1);
gicr_write_icenabler0(base, (1 << bit_num));
}
-static void gicr_set_icpendr0(unsigned int base, unsigned int interrupt_id)
+static void gicr_set_icpendr0(uintptr_t base, unsigned int interrupt_id)
{
unsigned bit_num = interrupt_id & ((1 << ICPENDR_SHIFT) - 1);
gicr_write_icpendr0(base, (1 << bit_num));
diff --git a/include/drivers/arm/gic_common.h b/include/drivers/arm/gic_common.h
index ea0340c..71387f6 100644
--- a/include/drivers/arm/gic_common.h
+++ b/include/drivers/arm/gic_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -54,56 +54,56 @@
/*******************************************************************************
* Private GIC Distributor function prototypes for use by GIC drivers
******************************************************************************/
-unsigned int gicd_read_isenabler(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_icenabler(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_ispendr(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_icpendr(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_isactiver(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_icactiver(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_ipriorityr(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_get_ipriorityr(unsigned int base, unsigned int interrupt_id);
-unsigned int gicd_read_icfgr(unsigned int base, unsigned int interrupt_id);
-void gicd_write_isenabler(unsigned int base, unsigned int interrupt_id,
+unsigned int gicd_read_isenabler(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_icenabler(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_ispendr(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_icpendr(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_isactiver(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_icactiver(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_ipriorityr(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_get_ipriorityr(uintptr_t base, unsigned int interrupt_id);
+unsigned int gicd_read_icfgr(uintptr_t base, unsigned int interrupt_id);
+void gicd_write_isenabler(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_icenabler(unsigned int base, unsigned int interrupt_id,
+void gicd_write_icenabler(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_ispendr(unsigned int base, unsigned int interrupt_id,
+void gicd_write_ispendr(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_icpendr(unsigned int base, unsigned int interrupt_id,
+void gicd_write_icpendr(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_isactiver(unsigned int base, unsigned int interrupt_id,
+void gicd_write_isactiver(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_icactiver(unsigned int base, unsigned int interrupt_id,
+void gicd_write_icactiver(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_ipriorityr(unsigned int base, unsigned int interrupt_id,
+void gicd_write_ipriorityr(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-void gicd_write_icfgr(unsigned int base, unsigned int interrupt_id,
+void gicd_write_icfgr(uintptr_t base, unsigned int interrupt_id,
unsigned int val);
-unsigned int gicd_get_isenabler(unsigned int base, unsigned int interrupt_id);
-void gicd_set_isenabler(unsigned int base, unsigned int interrupt_id);
-void gicd_set_icenabler(unsigned int base, unsigned int interrupt_id);
-void gicd_set_ispendr(unsigned int base, unsigned int interrupt_id);
-void gicd_set_icpendr(unsigned int base, unsigned int interrupt_id);
-void gicd_set_isactiver(unsigned int base, unsigned int interrupt_id);
-void gicd_set_icactiver(unsigned int base, unsigned int interrupt_id);
-void gicd_set_ipriorityr(unsigned int base, unsigned int interrupt_id,
+unsigned int gicd_get_isenabler(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_isenabler(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_icenabler(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_ispendr(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_icpendr(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_isactiver(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_icactiver(uintptr_t base, unsigned int interrupt_id);
+void gicd_set_ipriorityr(uintptr_t base, unsigned int interrupt_id,
unsigned int priority);
/*******************************************************************************
* Private GIC Distributor interface accessors for reading and writing
* entire registers
******************************************************************************/
-static inline unsigned int gicd_read_ctlr(unsigned int base)
+static inline unsigned int gicd_read_ctlr(uintptr_t base)
{
return mmio_read_32(base + GICD_CTLR);
}
-static inline unsigned int gicd_read_typer(unsigned int base)
+static inline unsigned int gicd_read_typer(uintptr_t base)
{
return mmio_read_32(base + GICD_TYPER);
}
-static inline void gicd_write_ctlr(unsigned int base, unsigned int val)
+static inline void gicd_write_ctlr(uintptr_t base, unsigned int val)
{
mmio_write_32(base + GICD_CTLR, val);
}