D32691.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32691.diff
View Options

	Index: sys/arm/arm/gic_common.h
	===================================================================
	--- sys/arm/arm/gic_common.h
	+++ sys/arm/arm/gic_common.h
	@@ -50,7 +50,24 @@
	#define GIC_FIRST_PPI 16 /* Irqs 16-31 are private (per */
	#define GIC_LAST_PPI 31 /* core) peripheral interrupts. */
	/* Shared Peripheral Interrupts */
	-#define GIC_FIRST_SPI 32 /* Irqs 32+ are shared peripherals. */
	+#define GIC_FIRST_SPI 32
	+#define GIC_LAST_SPI 1019
	+/* Special interrupt number */
	+#define GIC_FIRST_SPECIAL 1020
	+#define GIC_LAST_SPECIAL 1023
	+/* Extended PPI */
	+#define GIC_FIRST_EPPI 1056
	+#define GIC_LAST_EPPI 1119
	+/* Extended SPI */
	+#define GIC_FIRST_ESPI 4096
	+#define GIC_LAST_ESPI 5119
	+/* Local peripheral interrupts. */
	+#define GIC_FIRST_LPI 8192
	+
	+#define GIC_IS_SPI(id) ((((id) >= GIC_FIRST_SPI) && \
	+ ((id) <= GIC_LAST_SPI)) \|\| \
	+ (((id) >= GIC_FIRST_ESPI) && \
	+ ((id) <= GIC_LAST_ESPI)))

	/* Common register values */
	#define GICD_CTLR 0x0000 /* v1 ICDDCR */
	Index: sys/arm64/arm64/gic_v3_reg.h
	===================================================================
	--- sys/arm64/arm64/gic_v3_reg.h
	+++ sys/arm64/arm64/gic_v3_reg.h
	@@ -43,11 +43,6 @@
	/* Upper value is determined by LPI max priority */
	#define GIC_PRIORITY_MIN (0xFCUL)

	-/* Numbers for shared peripheral interrupts */
	-#define GIC_LAST_SPI (1019)
	-/* Numbers for local peripheral interrupts */
	-#define GIC_FIRST_LPI (8192)
	-
	/*
	* Registers (v2/v3)
	*/