Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177658074
D44032.1794965578.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D44032.1794965578.diff
View Options
diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c
--- a/sys/arm64/arm64/gicv3_its.c
+++ b/sys/arm64/arm64/gicv3_its.c
@@ -291,8 +291,6 @@
vm_page_t ma; /* fake msi page */
};
-static void *conf_base;
-
typedef void (its_quirk_func_t)(device_t);
static its_quirk_func_t its_quirk_cavium_22375;
@@ -680,20 +678,26 @@
static void
gicv3_its_conftable_init(struct gicv3_its_softc *sc)
{
- void *conf_table;
-
- conf_table = atomic_load_ptr(&conf_base);
- if (conf_table == NULL) {
- conf_table = contigmalloc(LPI_CONFTAB_SIZE,
- M_GICV3_ITS, M_WAITOK, 0, LPI_CONFTAB_MAX_ADDR,
- LPI_CONFTAB_ALIGN, 0);
+ /* note: we assume the ITS children are serialized by the parent */
+ static void *conf_table;
- if (atomic_cmpset_ptr((uintptr_t *)&conf_base,
- (uintptr_t)NULL, (uintptr_t)conf_table) == 0) {
- contigfree(conf_table, LPI_CONFTAB_SIZE, M_GICV3_ITS);
- conf_table = atomic_load_ptr(&conf_base);
- }
+ /*
+ * The PROPBASER is a singleton in our parent. We only set it up the
+ * first time through. conf_table is effectively global to all the units
+ * and we rely on subr_bus to serialize probe/attach.
+ */
+ if (conf_table != NULL) {
+ sc->sc_conf_base = conf_table;
+ return;
}
+
+ /*
+ * Just allocate contiguous pages. We'll configure the PROPBASER
+ * register later in its_init_cpu_lpi().
+ */
+ conf_table = contigmalloc(LPI_CONFTAB_SIZE,
+ M_GICV3_ITS, M_WAITOK, 0, LPI_CONFTAB_MAX_ADDR,
+ LPI_CONFTAB_ALIGN, 0);
sc->sc_conf_base = conf_table;
/* Set the default configuration */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Nov 18, 1:32 AM (12 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41812415
Default Alt Text
D44032.1794965578.diff (1 KB)
Attached To
Mode
D44032: gicv3: Change how we initialize its children.
Attached
Detach File
Event Timeline