From nobody Mon Feb 20 12:30:16 2023 X-Original-To: dev-commits-src-all@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 4PL1w91kphz3skL6; Mon, 20 Feb 2023 12:30:17 +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 4PL1w91Ht1z3RBG; Mon, 20 Feb 2023 12:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676896217; 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=oQTQzeOznnulg1LBZahYm+EHKLkk31nG+nLLPk2u/OI=; b=uNqtU8TEfBLwMbM+D/M/gIT+7jMsra+sCz3TVzfNQ9wtoPJzPJwb6ashPlv0lhX17iYj8k GuvfdD0g4l4wz07B6IGBwHCn+0tdemhCEQ9lzXXmlFrDHsheKD8iFWL9AwvqZt3kPrJY1D hc5FRjdEVqIM0/riao3+9DPbyK8c3WZ5vxYack+a3Bcp6Be0gX65L9hHvla3aII7leYSWe ubXpWbEbvgOfAsF5cv5v6u2ehcM5mWI41DbSgArSd7ZxjbuHV8rr47IpO/CTglsfwAJsdY U2AVqjRM1V4VnxFBiFtEWIGgy5QhdOHJfxtbRvRIcebRbm+1dzVL29Inv7N2QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676896217; 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=oQTQzeOznnulg1LBZahYm+EHKLkk31nG+nLLPk2u/OI=; b=SjfENFUdNCjFg2B+hTM7AIc+cev5c5umNRA9eSKKj+ntYugOxKkpWmvKTeAlcOXSLFhlw5 8CIyMvvxJfnIav2xEI6TjYzbyKgC8eivrlqa7gxjGb17jFxGklwgj9IC6ZG5thkRcBknda 3emMLuyNtaT7x1ri4MbyIwpxpkRAtPsRw+04Ep6pRN7PGpi7W+BLQZxBDnFX5npu3adhU+ gHR+9SJhF/MSeZP51m5+9y/VNnVBGzWh8OkNYZHigTX833ZzdKAi+FoS7319AY59//FsTh GcgL3HCe1U73Ws8/YiGqa4OiiCjw836KzYVJMaZ/uWgdTLKZNRxM1zrxM55Mag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676896217; a=rsa-sha256; cv=none; b=E6Q7C90RlS6N4RH9Y4xR7Hr/pGrfDNgp1S1IXOgKAFLWTWnxIeyr8Q8tuK5lmhSxz0VyBt XSGVZ/lYCiKWYRjSxBeFtcboVfEwKXb/2nX/pnrawzZuHd6ZP/SUXz1veQouvo8U5KwE7H gdgqQN+eogGXlbeSFHHukJ1b0MJ8ZZLR16R50+jJExFa+3pkLZlAlJyx3EJ3tyvqsvjVYr NPXA7FmPtMGS0jUSJoDnZ1aU4mIwgQxqwYZZ5wTEKP4BpayFJTAz5gcIee9sZJXTW/c2ox p2iZSopfKxEfNfqNIGL2g4zv5+rBmuP4gpalzDM/KvGl9LExX6FD+inZEuq7IA== 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 4PL1w90NRMzgnT; Mon, 20 Feb 2023 12:30:17 +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 31KCUGj5028869; Mon, 20 Feb 2023 12:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KCUGjZ028862; Mon, 20 Feb 2023 12:30:16 GMT (envelope-from git) Date: Mon, 20 Feb 2023 12:30:16 GMT Message-Id: <202302201230.31KCUGjZ028862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 24abb6b82102 - main - When saving a context on arm call the vfp handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 24abb6b82102eec577eff9bd8dd7726e8cab89f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=24abb6b82102eec577eff9bd8dd7726e8cab89f4 commit 24abb6b82102eec577eff9bd8dd7726e8cab89f4 Author: Andrew Turner AuthorDate: 2023-02-20 12:22:11 +0000 Commit: Andrew Turner CommitDate: 2023-02-20 12:29:56 +0000 When saving a context on arm call the vfp handler When adding kernel VFP support on arm a comparison instruction was removed, however the branch to vfp_save_state was still conditional. Remove the conditional check and always call into vfp_save_state as it could cause unexpected results otherwise. Sponsored by: Arm Ltd --- sys/arm/arm/swtch-v6.S | 2 +- sys/arm/arm/swtch.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/swtch-v6.S b/sys/arm/arm/swtch-v6.S index bff1bc8f3d35..b23fb2f7686f 100644 --- a/sys/arm/arm/swtch-v6.S +++ b/sys/arm/arm/swtch-v6.S @@ -325,7 +325,7 @@ ENTRY(cpu_switch) ldr r3, [r10, #(TD_PCB)] mov r1, r3 mov r0, r10 - blne _C_LABEL(vfp_save_state) + bl _C_LABEL(vfp_save_state) #endif /* diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S index f7c2beaf4f3e..1856f8b1e97c 100644 --- a/sys/arm/arm/swtch.S +++ b/sys/arm/arm/swtch.S @@ -101,7 +101,7 @@ ENTRY(savectx) #ifdef VFP mov r1, r0 mov r0, #0 - blne _C_LABEL(vfp_save_state) + bl _C_LABEL(vfp_save_state) #endif add sp, sp, #4; ldmfd sp!, {pc}