From bb4af4519f7b912bfc8baa95b20cbd1a9fd0f8b7 Mon Sep 17 00:00:00 2001 From: mw Date: Fri, 28 Jul 2017 11:51:55 +0000 Subject: [PATCH] Fix remapping VM attributes on Armada 38x pmap_remap_vm_attr() function requires indexes to pte2_attr_tab as the arguments (VM_MEMATTR_). Mistakenly, instead of them, actual values from the table were used (PTE2_ATTR_), when applying work-around for Marvell Armada 38x SoCs. Submitted by: Marcin Wojtas (mw@semihalf.com) Reported by: Rafal Kozik (rk@semihalf.com) Reviewed by: cognet (mentor) Approved by: cognet (mentor) Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D11704 --- sys/arm/mv/mv_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c index e161d912a533..4de77cdfa4cd 100644 --- a/sys/arm/mv/mv_machdep.c +++ b/sys/arm/mv/mv_machdep.c @@ -301,7 +301,7 @@ platform_late_init(void) * To avoid that, map all registers including PCIe IO * as strongly ordered instead of device memory. */ - pmap_remap_vm_attr(PTE2_ATTR_DEVICE, PTE2_ATTR_SO); + pmap_remap_vm_attr(VM_MEMATTR_DEVICE, VM_MEMATTR_SO); /* Set IO Sync Barrier bit for all Mbus devices */ if (armada38x_win_set_iosync_barrier() != 0)