Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
"Two arm64 fixes: one fixes a warning that started showing up with
gcc 16 and the other fixes a lockup in udelay() when running on a
vCPU loaded on a CPU with the new-fangled WFIT instruction:
- Fix compiler warning from huge_pte_clear() with GCC 16
- Fix hang in udelay() on systems with WFIT by consistently using the
virtual counter to calculate the delta"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: hugetlbpage: avoid unused-but-set-parameter warning (gcc-16)
arm64: Force the use of CNTVCT_EL0 in __delay()
+22
-6
+7
-2
arch/arm64/include/asm/pgtable.h
+7
-2
arch/arm64/include/asm/pgtable.h
···
144
144
__pte(__phys_to_pte_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
145
145
146
146
#define pte_none(pte) (!pte_val(pte))
147
-
#define __pte_clear(mm, addr, ptep) \
148
-
__set_pte(ptep, __pte(0))
149
147
#define pte_page(pte) (pfn_to_page(pte_pfn(pte)))
150
148
151
149
/*
···
1282
1284
/*
1283
1285
* Atomic pte/pmd modifications.
1284
1286
*/
1287
+
1288
+
static inline void __pte_clear(struct mm_struct *mm,
1289
+
unsigned long addr, pte_t *ptep)
1290
+
{
1291
+
__set_pte(ptep, __pte(0));
1292
+
}
1293
+
1285
1294
static inline int __ptep_test_and_clear_young(struct vm_area_struct *vma,
1286
1295
unsigned long address,
1287
1296
pte_t *ptep)
+15
-4
arch/arm64/lib/delay.c
+15
-4
arch/arm64/lib/delay.c
···
23
23
return (xloops * loops_per_jiffy * HZ) >> 32;
24
24
}
25
25
26
+
/*
27
+
* Force the use of CNTVCT_EL0 in order to have the same base as WFxT.
28
+
* This avoids some annoying issues when CNTVOFF_EL2 is not reset 0 on a
29
+
* KVM host running at EL1 until we do a vcpu_put() on the vcpu. When
30
+
* running at EL2, the effective offset is always 0.
31
+
*
32
+
* Note that userspace cannot change the offset behind our back either,
33
+
* as the vcpu mutex is held as long as KVM_RUN is in progress.
34
+
*/
35
+
#define __delay_cycles() __arch_counter_get_cntvct_stable()
36
+
26
37
void __delay(unsigned long cycles)
27
38
{
28
-
cycles_t start = get_cycles();
39
+
cycles_t start = __delay_cycles();
29
40
30
41
if (alternative_has_cap_unlikely(ARM64_HAS_WFXT)) {
31
42
u64 end = start + cycles;
···
46
35
* early, use a WFET loop to complete the delay.
47
36
*/
48
37
wfit(end);
49
-
while ((get_cycles() - start) < cycles)
38
+
while ((__delay_cycles() - start) < cycles)
50
39
wfet(end);
51
40
} else if (arch_timer_evtstrm_available()) {
52
41
const cycles_t timer_evt_period =
53
42
USECS_TO_CYCLES(ARCH_TIMER_EVT_STREAM_PERIOD_US);
54
43
55
-
while ((get_cycles() - start + timer_evt_period) < cycles)
44
+
while ((__delay_cycles() - start + timer_evt_period) < cycles)
56
45
wfe();
57
46
}
58
47
59
-
while ((get_cycles() - start) < cycles)
48
+
while ((__delay_cycles() - start) < cycles)
60
49
cpu_relax();
61
50
}
62
51
EXPORT_SYMBOL(__delay);