From nobody Mon Oct 21 15:05:20 2024 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 4XXJX04TtWz5ZNc2; Mon, 21 Oct 2024 15:05:20 +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 4XXJX02qNlz4fVn; Mon, 21 Oct 2024 15:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523120; 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=m2W4YmdXlgZMbUe4bLV1N7CvEjavrZvppzwhG9WB7rU=; b=lwOj4tnxcg8kSuMprbTCBsi4VSB8R8hoWcMU27STZ7lnnpyEWUhtEbL8uIyZeL2GeGLy37 LlIqCLCwP+uxgga/jyB4Nr8EsSc86DzGwGoXTuGzvkWjUOOAvouh1s7HHN9fEd2DEnDXjD HjpoyY3eWYKKp+E38WsEx33K69GyT1Z5M/bk6XlUlTjFp/55Rd00r20DhWlU3onMczdJMK /7J/RroxM+R3Bwr8NG64S+3pWX59W6mjFbED1ISQe3q+Duc433zsOmyrHQRWpXM0beGiQ1 5ieLxZ8EFpuFwzoza+b1gNKgxwcPmV73Ck3KgmNjYXNyX/XRvvxaq7IacIeqLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523120; 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=m2W4YmdXlgZMbUe4bLV1N7CvEjavrZvppzwhG9WB7rU=; b=gJq5nPkrIAYzXgaXpw1d4qFNvFeRhZNPcHYSwQk3Zkg7hKIPX83HTBbY8aQQnZLIfRy+9z Gy4DVT2EGU0A6ryZGYpvOuWtZc9ZKD25ss/s+uKLInzagrYOjXRmFsbopONhXo7WryeGA8 fmsIqIX/Drd4i7INb5ybYQ1kgAiAQtXdvdR5ufgwfa2bi6xNU8JJj8Akkg1NhPMJu6JGm4 DYR78geVNt9SDLQ5TDNnpQH1IdAHpyIQ6SUqSsF2abbK06vHF5X3cFTeXFSDR/wy5cW142 F/qvRs+3DGwpPmOk29n8YdLIbNVsAUi71e3Of4QNkpUGmjhKFT2Vi72qgbsDXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523120; a=rsa-sha256; cv=none; b=D1/0TqoASsW6t7R1BTsM5XR8uOqustKfP6blZtsoPvTtC6WsfRa4NoANJJvjaWfdGTWcvY VSrZ7fGNc48hv0N3V3HF609RdowKui7G6evBp2hAEWUT0/IbKjf/TGPGanpP9RiLNfr2qD MxmTpnzovZ18EMj1wviZPxiXa+FcdwKFK2UbZaPAZ1PRH6SaDK9GpGyWyhyaDeHwghLBgT 4lwohSiaj19lQ2s7YOmSnVKOt91+IVXDVDfxYpx22pOqc/Ldng9WG1ilhmrQrl9v0KPh6m J6wOKBZNHiSpqrKIxHx9kX5ION+nnwuh+aUZUM/+58cgRX3k6DuaRXhJ2ngwkQ== 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 4XXJX02L6Rzb1S; Mon, 21 Oct 2024 15:05:20 +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 49LF5KoG047403; Mon, 21 Oct 2024 15:05:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5KFV047400; Mon, 21 Oct 2024 15:05:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:20 GMT Message-Id: <202410211505.49LF5KFV047400@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: ce5a07a9d2c5 - stable/14 - arm64: Stop trashing x28 in savectx 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: ce5a07a9d2c58b65bbce5609834af63c5ff7e85d Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5a07a9d2c58b65bbce5609834af63c5ff7e85d commit ce5a07a9d2c58b65bbce5609834af63c5ff7e85d Author: Andrew Turner AuthorDate: 2024-10-15 08:30:17 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Stop trashing x28 in savectx While here make it return void, we don't set any useful return value and nothing checks for it. Sponsored by: Arm Ltd (cherry picked from commit a7c5c88cb29ff512467a6599f1b4d8e2b8817480) --- sys/arm64/arm64/swtch.S | 10 ++++------ sys/arm64/include/pcb.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 882bfd7cf05a..85752dd6fc86 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -265,13 +265,11 @@ ENTRY(savectx) mrs x6, tpidr_el0 stp x5, x6, [x0, #PCB_SP] - /* Store the VFP registers */ #ifdef VFP - mov x28, lr - bl vfp_save_state_savectx - mov lr, x28 -#endif - + /* Store the VFP registers */ + b vfp_save_state_savectx +#else ret +#endif END(savectx) diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index 273b53cdc6cf..c0feb1149cf5 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -85,7 +85,7 @@ struct pcb { #ifdef _KERNEL void makectx(struct trapframe *tf, struct pcb *pcb); -int savectx(struct pcb *pcb) __returns_twice; +void savectx(struct pcb *pcb) __returns_twice; #endif #endif /* !LOCORE */