Page MenuHomeFreeBSD
Files F146015461

D33735.diff
No OneTemporary
Actions

D33735.diff
View Options

Index: sys/arm64/arm64/pmap.c
===================================================================
--- sys/arm64/arm64/pmap.c
+++ sys/arm64/arm64/pmap.c
@@ -6587,6 +6587,8 @@
mtx_unlock_spin(&set->asid_set_mutex);
}
+static uint64_t __read_mostly ttbr_flags;
+
/*
* Compute the value that should be stored in ttbr0 to activate the specified
* pmap. This value may change from time to time.
@@ -6594,10 +6596,66 @@
uint64_t
pmap_to_ttbr0(pmap_t pmap)
{
+ uint64_t ttbr;
+
+ ttbr = pmap->pm_ttbr;
+ ttbr |= ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie));
+ ttbr |= ttbr_flags;
+
+ return (ttbr);
+}
+
+static void
+pmap_set_cnp(void *arg)
+{
+ uint64_t ttbr0, ttbr1;
+ u_int cpuid;
+
+ cpuid = *(u_int *)arg;
+ if (cpuid == curcpu) {
+ /*
+ * Set the flags while all CPUs are handling the
+ * smp_rendezvous so will not call pmap_to_ttbr0. Any calls
+ * to pmap_to_ttbr0 after this will have the CnP flag set.
+ * The dsb after invalidating the TLB will act as a barrier
+ * to ensure all CPUs can observe this change.
+ */
+ ttbr_flags |= TTBR_CnP;
+ }
+
+ ttbr0 = READ_SPECIALREG(ttbr0_el1);
+ ttbr0 |= TTBR_CnP;
+
+ ttbr1 = READ_SPECIALREG(ttbr1_el1);
+ ttbr1 |= TTBR_CnP;
+
+ /* Update ttbr{0,1}_el1 with the CnP flag */
+ WRITE_SPECIALREG(ttbr0_el1, ttbr0);
+ WRITE_SPECIALREG(ttbr1_el1, ttbr1);
+ isb();
+ __asm __volatile("tlbi vmalle1is");
+ dsb(ish);
+ isb();
+}
+
+static void
+pmap_init_cnp(void *dummy __unused)
+{
+ uint64_t reg;
+ u_int cpuid;
+
+ if (!get_kernel_reg(ID_AA64MMFR2_EL1, &reg))
+ return;
+
+ if (ID_AA64MMFR2_CnP_VAL(reg) != ID_AA64MMFR2_CnP_NONE) {
+ if (bootverbose)
+ printf("Enabling CnP\n");
+ cpuid = curcpu;
+ smp_rendezvous(NULL, pmap_set_cnp, NULL, &cpuid);
+ }
- return (ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)) |
- pmap->pm_ttbr);
}
+SYSINIT(pmap_init_cnp, SI_SUB_SMP, SI_ORDER_ANY, pmap_init_cnp, NULL);
static bool
pmap_activate_int(pmap_t pmap)

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 28, 1:31 AM (12 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29046651
Default Alt Text
D33735.diff (1 KB)

Event Timeline