From nobody Mon Sep 23 13:03:43 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 4XC38b3h8Rz52FKW; Mon, 23 Sep 2024 13:03:43 +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 4XC38b1lQlz40NV; Mon, 23 Sep 2024 13:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096623; 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=9Ll8Es/HOa/sZ2qRF8WCnWeC3r5X6EHkDg/TmtoVB/I=; b=fwKCgVCBaR8IL19IL+EIebP3OA/LAY+oju6+5cAMllxk730liKySm+M5idBDBBbbt45fQr TNbcAu/MvyL+MONSdhX+6tkoT7PQdiRwy3/Rt9IGPAJ7FxCA+QfZsI4lhJswVDujWp0lkF FLx94ApN1rAWd1LWzO3VTWyFiRV+iIyJs6ua3M6hnBwftt1zjDBhQhiZYSLxUdhx3SlR+5 TMPHwVugRIzaXXSUWBdQePgJFhNlWwtUkIJ+0pd5ysMimJXBtwM3/RGYPpxbNCjcMxJGvW Lyx7YLZodgodnaEb/ko99tjNR46FAMUUKyIax4+IVGQQe5/ld+HcEzGJ+Mt9BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727096623; a=rsa-sha256; cv=none; b=hIOfQ9oboCgEwQaUnhrOd2/YkYX91cB6SoFBdqT2JaezB5PV0mgSnG8aUS+oXgOHoaiSb3 pKfagAwvq0rU1/QIg1tuuGiHc76dCwh716CavVQvVhw+OxOxTRcljtJabwrL/DJ+Vb9U6C T2u8L45QwP2LZw/oytD1OXEDXDoBjU/OoSLtiFTIwPiKsvE8TKLflkBXY9lJIBtLcSrdoh /1FyCoHar6gTATmIpdIFz7Cu6wrc/qyCNcV3ekq6dE+DCiW90idnWGkuhV6l3rMVRLe74N bcOzavdbIQUQ/Mnh2KgQa379X6Zs9vDcyaTpr1BKcyvXRee/fb0jFhqW95hQUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096623; 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=9Ll8Es/HOa/sZ2qRF8WCnWeC3r5X6EHkDg/TmtoVB/I=; b=ZVY48Si2j8ifEEjcq7ONLw2Yu/aqxCwTaeUFdadnB5zoNH4HrXuPoTOB9TewdMY4v+Twzf CYWYo4BkSsX1l/+NeCYfF2pB/iDYg/GyGZIh3hc60Fm+RCu5Wu1UjdesXN59vMWApPm/xk qbKf4m75zOzrAXascGbiPQHAKBBY0MJqpSn8Y05sH0I+4/3lUxm6wT5PTIOaPlRxb4l07f 8elK+Ww0Yuri6S3NZToencrdf7+AI2S4BQzbOfE9cVfSRxdyzggWXvKlj3pPJuqVEap3uB kZIIFAuWxBRIHg0Bt7KYwDWHFB009VAV78VAUjdfMNFuKap3FTCSaFXm0jLI2g== 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 4XC38b1M1jzmkM; Mon, 23 Sep 2024 13:03:43 +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 48ND3hTp007005; Mon, 23 Sep 2024 13:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ND3htw007002; Mon, 23 Sep 2024 13:03:43 GMT (envelope-from git) Date: Mon, 23 Sep 2024 13:03:43 GMT Message-Id: <202409231303.48ND3htw007002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7a1723912e4f - stable/14 - amd64 la57_trampoline: stop using %rdx to remember original %cr0 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a1723912e4fd97726c6fa55a9f86b7b4772af64 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1723912e4fd97726c6fa55a9f86b7b4772af64 commit 7a1723912e4fd97726c6fa55a9f86b7b4772af64 Author: Konstantin Belousov AuthorDate: 2024-09-11 00:35:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-23 13:03:06 +0000 amd64 la57_trampoline: stop using %rdx to remember original %cr0 (cherry picked from commit 9a49c98bafbea2a896f72defe7d9f2b65a474c41) --- sys/amd64/amd64/locore.S | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index a51e5047fe54..86db0f76b22b 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -93,9 +93,10 @@ ENTRY(btext) ENTRY(la57_trampoline) movq %rsp,%r11 movq %rbx,%r10 + movq %rbp,%r9 leaq la57_trampoline_end(%rip),%rsp - movq %cr0,%rdx + movq %cr0,%rbp lgdtq la57_trampoline_gdt_desc(%rip) pushq $(2<<3) @@ -109,7 +110,7 @@ ENTRY(la57_trampoline) l1: movl $(3<<3),%eax movl %eax,%ss - movl %edx,%eax + movl %ebp,%eax andl $~CR0_PG,%eax movl %eax,%cr0 @@ -118,7 +119,7 @@ l1: movl $(3<<3),%eax movl %eax,%cr4 movl %edi,%cr3 - movl %edx,%cr0 + movl %ebp,%cr0 jmp 1f 1: pushl $(1<<3) @@ -128,6 +129,7 @@ l1: movl $(3<<3),%eax l2: movq %r11,%rsp movq %r10,%rbx + movq %r9,%rbp retq .p2align 4,0 ENTRY(la57_trampoline_gdt_desc)