From nobody Mon Oct 21 15:04:59 2024 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 4XXJWc2GJqz5ZNr8; Mon, 21 Oct 2024 15:05:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWc0LRZz4dxg; Mon, 21 Oct 2024 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523100; 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=yobc1XS2/q2qmLbxS8VIAXuFgKcqR4Uz71Dvdc8kcDg=; b=aY4s+HMrR5cZJz5Ebv66wFxLMKU3GdsDNhqhyTiKZxKkJ4En1wPyEh3HCodb0BdfOY30x5 tzEM3ZzcZ6WDuHuZaYOr4GcNy5fwKnWY8uk+lOhMEWaP8iJgKft14OWtPD7kyxH0Dw/dfa Vw0Kg52PnrE82qrPM6iGfb7KpipH5/11XXFOtLa4MibCpBs8thNy3k5gICDxs0wNld9o5r yRxPtnIt9q7fIi7U9AXjGfofLwdVUB9mcCs6YAfDXwcYAtcSibr5KRiBOocDmSb2+9URya X8N/DHab2keULpH5tfdbTrmnjKsb0RA05ohJIPg5TsK/XuEc2wd0wYeUy/Ck7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523100; 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=yobc1XS2/q2qmLbxS8VIAXuFgKcqR4Uz71Dvdc8kcDg=; b=njipMMI42x+jUvUfMTWH1wu/wNBnYxGa2vS7SPIatJf4EynYiDEPaekeAE2BhFQ/+QqodO ZmwbK+qoyAUF/nYWO0tynUbWyB+MAOLxt15a7aqEAHYA2pvmE8Kgh4j6Dn66hP7LYjSPE0 ipHVyH1avc+1xUt/Xh8klpBMyE4pTfyI8pVQrRVRbOqC89AyhbOwllmOkak52RrkIWuBGn jayGRng8QDKZTQtvq9wVtSDxxiWVMPJuKCt5UF0T2NXcJr+fenpMXGFgt8e32htdFghYeM iJ5Qd7kunmSUku+52qwoRXIjLubxDnCHVq17U+XohY03ymfMIr2Lujfwjd5h3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523100; a=rsa-sha256; cv=none; b=bOKzY/JSivNiQBKUbktIBO8bwY6lXAXfLdRIzQZQe8T5c1HIq5tHd9dlIHFc/oa6H6DI5O /rpheOGKeTUCXSELgPZFc7g4Lv8LtHInSSIn8ZqPJ3ZlTmm14vkL30jgP+RnJ77QauE8ic kmjRoZUZzZ+eRUu+zww7BXOjhiYRh0AYy3zBVr+YBlF6xvy13qjZcIneNoreCbUucCw0ro DJROF/EEN4lq+dstIpDsd3paiZYUVPFmS8P1p8OMffHaBzjhaBEq96aN1K1PGiIjHyIHwz JCxMe2GaKHwscOjY2efh+yqPFecDoD5dBoVh06snUt+X87MqxDmjC57KmaSfFA== 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 4XXJWb718dzbDT; Mon, 21 Oct 2024 15:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF4xrw046464; Mon, 21 Oct 2024 15:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF4xHv046461; Mon, 21 Oct 2024 15:04:59 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:04:59 GMT Message-Id: <202410211504.49LF4xHv046461@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: 064adb4ba083 - stable/14 - armv8rng: Don't require toolchain to support FEAT_RNG 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 064adb4ba083d00747e3fae6b111545e557ebb1e Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=064adb4ba083d00747e3fae6b111545e557ebb1e commit 064adb4ba083d00747e3fae6b111545e557ebb1e Author: Jessica Clarke AuthorDate: 2023-12-01 23:59:07 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 armv8rng: Don't require toolchain to support FEAT_RNG We have the mechanism in place to support encoding system registers explicitly, so use that rather than requiring LLVM 13+, which breaks our current set of GitHub CI builds. Fixes: 9eecef052155 ("Add an Armv8 rndr random number provider") (cherry picked from commit 9560ac4b638edf688566f576adc65d3654f2240c) --- sys/arm64/include/armreg.h | 9 +++++++++ sys/dev/random/armv8rng.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b96d2223eb0b..e6b5d313a3cf 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2105,6 +2105,15 @@ #define PMXEVTYPER_EL0_CRm 13 #define PMXEVTYPER_EL0_op2 1 +/* RNDRRS */ +#define RNDRRS MRS_REG(RNDRRS) +#define RNDRRS_REG MRS_REG_ALT_NAME(RNDRRS) +#define RNDRRS_op0 3 +#define RNDRRS_op1 3 +#define RNDRRS_CRn 2 +#define RNDRRS_CRm 4 +#define RNDRRS_op2 1 + /* SCTLR_EL1 - System Control Register */ #define SCTLR_RES1 0x30d00800 /* Reserved ARMv8.0, write 1 */ #define SCTLR_M (UL(0x1) << 0) diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 3cca42a5bbf3..61698bfff820 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -59,10 +59,10 @@ random_rndr_read_one(u_long *buf) loop = 10; do { __asm __volatile( - ".arch_extension rng \n" - "mrs %0, rndrrs \n" /* Read the random number */ - "cset %w1, ne \n" /* 1 on success, 0 on failure */ - ".arch_extension norng \n" + /* Read the random number */ + "mrs %0, " __XSTRING(RNDRRS_REG) "\n" + /* 1 on success, 0 on failure */ + "cset %w1, ne\n" : "=&r" (val), "=&r"(ret) :: "cc"); } while (ret != 0 && --loop > 0);