From nobody Sun Dec 19 11:23:20 2021 X-Original-To: dev-commits-src-main@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 419A518EC20C; Sun, 19 Dec 2021 11:23:21 +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 4JH0hT01rTz4W4R; Sun, 19 Dec 2021 11:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D55D221AB3; Sun, 19 Dec 2021 11:23:20 +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 1BJBNKlH006302; Sun, 19 Dec 2021 11:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJBNK5A006301; Sun, 19 Dec 2021 11:23:20 GMT (envelope-from git) Date: Sun, 19 Dec 2021 11:23:20 GMT Message-Id: <202112191123.1BJBNK5A006301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 516df1558204 - main - Implement suword16() for the 32-bit ARMv6/v7 architecture. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 516df155820471dd333a9cbc35bca3680d7b0051 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639913001; 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=BsosvTYbpHQx2Z74R9uSBnvb/6WTexGf1sO4eWc2rSQ=; b=BDjL/t3lObj04vkosWXQAjmcXAAoFFGt2Ekanbs3aF5GeOm1mdHzkGVNwPRZm45F+ZJltX v6Rh06ebeuxju+QJgmSSCb7j2lp/KfS2MaPinzLEOSB//hAgnWgsk2aBp4jKGzA/EkimGz p1YRTkqKI6pG8hhqoKrYPf2y0WZiDPUZbqylcHO/fwBSEOBabJ3vhyYERBWaehmhPHZY3+ xUPbYPmYCFbAHhdTgH/dsP4wNQQXlhEM8k315CTJieTyqgENcvUihHwEMn2r9FOiWY3D3K QMsiQYWifbwi/ealuHTAmL1nRsAzKVmQp4Pvq+60O/SQMhAKzmT6KeWGgu4gJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639913001; a=rsa-sha256; cv=none; b=HiaIA+x6Vs+QLJbz2Q5uKkIrQb7G8f7QkcTaHrMs81dOLs7kA9yKY/tUwQ1iw9/VtUD/wv JfUyjrIfGiOSLY8qp1zMAjStF0tIFBSpMZJ6fG3fmkiJMynyjt6LVjTTGmbW46WatHbMH7 SPKStY20HfioFZ3pOuZ9eY08NwvYcLQ5cHUmaG2Wi6B6tXk1thBugYmbbxdZOORVNXfx5a zX8xD34vYu0wlyngCYLZXU3pYLKUBGrj0kvR1vL+PPbHAaqx0L7ScHgPArXOjDwxL1Yu0S mvkPxfjT5tFX65Rvw8r4SuA8rnIM59MfeI9sC5TpLhggu3zviSn3egnBpPZaag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=516df155820471dd333a9cbc35bca3680d7b0051 commit 516df155820471dd333a9cbc35bca3680d7b0051 Author: Hans Petter Selasky AuthorDate: 2021-12-19 11:12:58 +0000 Commit: Hans Petter Selasky CommitDate: 2021-12-19 11:21:21 +0000 Implement suword16() for the 32-bit ARMv6/v7 architecture. This fixes compilation of usb(4) after 0ec590d24e415dd36e38648630a0b963412ad87e . MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/arm/arm/fusu.S | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S index 1a77377cb148..300ccb5f020f 100644 --- a/sys/arm/arm/fusu.S +++ b/sys/arm/arm/fusu.S @@ -212,6 +212,35 @@ fusupcbfaulttext: .align 2 #endif +/* + * suword16(caddr_t uaddr, int x); + * Store an uint16_t in the user's address space. + */ + +ENTRY(suword16) + ldr r3, =(VM_MAXUSER_ADDRESS-3) + cmp r0, r3 + mvncs r0, #0 + RETc(cs) + + GET_PCB(r2) + ldr r2, [r2] + +#ifdef DIAGNOSTIC + teq r2, #0x00000000 + beq .Lfusupcbfault +#endif + + adr r3, .Lfusufault + str r3, [r2, #PCB_ONFAULT] + + strht r1, [r0] + + mov r0, #0x00000000 + str r0, [r2, #PCB_ONFAULT] + RET +END(suword16) + /* * suword(caddr_t uaddr, int x); * Store an int in the user's address space.