From nobody Tue Apr 19 10:05:28 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E885B5D2850; Tue, 19 Apr 2022 10:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjKDm61dqz4tV3; Tue, 19 Apr 2022 10:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wj0sv3dzWhVaoOsXZM/c1is0CU/LNTE+/aqMz8Ts36A=; b=PIHZAGwOfhqYE0PH5orSDAlXFXkOUw5AISDQTwSpLvUcakaqU/WtPXkTFo/xLDDjPXhaoo kLhREEWPMGFDj/AoDT/BiSNN8d+RFj+/Bq6mom4FoOWgZjqF0PWzDmlKP5PPFEcuT2qNZJ tVM5QuJIyOKdBUFprK/X29YrIKDfnE1UXO3gYiKCPZSG76dCLt8N9euUHDzq5CNnHakORi yKJoZ6udcFRtVMWfVX4/AYcpYalzgegoE14eNBOLH1DL4Q1EEZyuQeKyV4/Xn9SCYTSj9g adP1UZ42ue5Hm0lFDFetECVPOMa2RPwAcaba0HK5p6PNw7k1ouYFq14nj9Tn/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA5822517C; Tue, 19 Apr 2022 10:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23JA5SSu012808; Tue, 19 Apr 2022 10:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JA5SCT012807; Tue, 19 Apr 2022 10:05:28 GMT (envelope-from git) Date: Tue, 19 Apr 2022 10:05:28 GMT Message-Id: <202204191005.23JA5SCT012807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: a0290386cf0d - stable/13 - Add support for arm64 nGnRE device memory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0290386cf0de2b3e9e36df9cd37f213b59ca628 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wj0sv3dzWhVaoOsXZM/c1is0CU/LNTE+/aqMz8Ts36A=; b=qIgcQ/ea2v67u97/EFMtcfe11U452ZW/GCc5vd5UfKigU62aDYjGS7ihO2zUmXKWcA4hEe 0b3aQUxOdeeaTQNJuzX47SVklYI7oLxsns2oT1oDYR3qQoeSJjrULjShNqMq9ciHfdG2Z3 Jj8Nf73D4JpoccxagLnaOSYWyNjpK2k7GcksFXEoRhvWTRNr3KHXMwMRvydSed4qofPmVD IZXRaNAwD5N+BhyVtiM2zeVMII1I8nCEkSGqY6h7VD/FVXC5Laxm74CMpEjTSyrXv5nOOf v+PKITljOpKGS+I8WsRrPVmyC8fMflZbHfvx+eKynCRSbn5qqvDcouxA7vP2RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650362728; a=rsa-sha256; cv=none; b=Qb7joBhWRUPK4J43CwGFUFpDsWSPJ/yPz6nzpAfBLbrQr/JzJBp9XB+/e1Yli2oUiFL5EF 1jpoma0ZvcWjV/XiY2mVWms9/LddT9RatQ99RAIIz8ozS5Rx3I0az6DLeOARluWR6IaeZh Gb5Gy491Jol1PG/LO3Q7VKlLtDvYAnCv6t31FsFbv/O6pjN4xCl86M5kKJIDY2ZW8/D6z8 Z+dzshyP81TPYsVYbP6wI9IBdwJPqllUvpZW2ADZ/1HwyNvGbOKJl73ZeOMYU4qSGN2nWh JVsVGamSLuiEuSYJ5Lmbczls/5LPASSImAo+myOqSk05Ew7vfFaMyKCTJNvfaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a0290386cf0de2b3e9e36df9cd37f213b59ca628 commit a0290386cf0de2b3e9e36df9cd37f213b59ca628 Author: Andrew Turner AuthorDate: 2021-02-05 10:50:29 +0000 Commit: Andrew Turner CommitDate: 2022-04-19 09:17:57 +0000 Add support for arm64 nGnRE device memory On arm64 we can select how strongly we order device memory. Currently we use the strongest type of non-Gathering, non-Reordering, no Early write acknowledgement. This is equivalent to VM_MEMATTR_SO in the 32-bit arm code. Create a new memory type to remove the no Early write acknowledgement option to create a memory attribute that is equivalent to the arm VM_MEMATTR_DEVICE. Keep the the old nGnRnE memory as what we provide for VM_MEMATTR_DEVICE until we can test nGnRE on more hardware. A method for dynamically switching back may be needed as at least one vendor is known to have broken nGnRE memory. Sponsored by: Innovate UK (cherry picked from commit 13ec5a6da04b14c4d40d3b37335dfaef7469aeb5) --- sys/arm64/arm64/locore.S | 5 +++-- sys/arm64/include/armreg.h | 1 + sys/arm64/include/vm.h | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 37483c321f48..cbc84a0efd52 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -748,10 +748,11 @@ LENTRY(start_mmu) .align 3 mair: - .quad MAIR_ATTR(MAIR_DEVICE_nGnRnE, VM_MEMATTR_DEVICE) | \ + .quad MAIR_ATTR(MAIR_DEVICE_nGnRnE, VM_MEMATTR_DEVICE_nGnRnE) | \ MAIR_ATTR(MAIR_NORMAL_NC, VM_MEMATTR_UNCACHEABLE) | \ MAIR_ATTR(MAIR_NORMAL_WB, VM_MEMATTR_WRITE_BACK) | \ - MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH) + MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH) | \ + MAIR_ATTR(MAIR_DEVICE_nGnRE, VM_MEMATTR_DEVICE_nGnRE) tcr: .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG1_4K | TCR_TG0_4K | \ TCR_CACHE_ATTRS | TCR_SMP_ATTRS) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index dcaab1375bf8..1b46d0833429 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1123,6 +1123,7 @@ #define MAIR_ATTR_MASK(idx) (0xff << ((n)* 8)) #define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) #define MAIR_DEVICE_nGnRnE 0x00 +#define MAIR_DEVICE_nGnRE 0x04 #define MAIR_NORMAL_NC 0x44 #define MAIR_NORMAL_WT 0xbb #define MAIR_NORMAL_WB 0xff diff --git a/sys/arm64/include/vm.h b/sys/arm64/include/vm.h index dac13980060e..3df3af24c010 100644 --- a/sys/arm64/include/vm.h +++ b/sys/arm64/include/vm.h @@ -30,10 +30,13 @@ #define _MACHINE_VM_H_ /* Memory attribute configuration. */ -#define VM_MEMATTR_DEVICE 0 +#define VM_MEMATTR_DEVICE_nGnRnE 0 #define VM_MEMATTR_UNCACHEABLE 1 #define VM_MEMATTR_WRITE_BACK 2 #define VM_MEMATTR_WRITE_THROUGH 3 +#define VM_MEMATTR_DEVICE_nGnRE 4 + +#define VM_MEMATTR_DEVICE VM_MEMATTR_DEVICE_nGnRnE #ifdef _KERNEL /* If defined vmstat will try to use both of these in a switch statement */