From owner-svn-src-head@freebsd.org Fri Jul 28 11:51:57 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34E92DC440D; Fri, 28 Jul 2017 11:51:57 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9A6282759; Fri, 28 Jul 2017 11:51:56 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6SBpukH042638; Fri, 28 Jul 2017 11:51:56 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6SBpukb042637; Fri, 28 Jul 2017 11:51:56 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201707281151.v6SBpukb042637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Fri, 28 Jul 2017 11:51:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r321651 - head/sys/arm/mv X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/arm/mv X-SVN-Commit-Revision: 321651 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2017 11:51:57 -0000 Author: mw Date: Fri Jul 28 11:51:55 2017 New Revision: 321651 URL: https://svnweb.freebsd.org/changeset/base/321651 Log: 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 Modified: head/sys/arm/mv/mv_machdep.c Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Fri Jul 28 10:30:59 2017 (r321650) +++ head/sys/arm/mv/mv_machdep.c Fri Jul 28 11:51:55 2017 (r321651) @@ -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)