From nobody Wed Feb 01 21:54:36 2023 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 4P6bL43pmmz3c7WB; Wed, 1 Feb 2023 21:54:36 +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 4P6bL43N36z4C9b; Wed, 1 Feb 2023 21:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675288476; 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=ub48WpkBAtvdzuadcrhy488d/MhJ3ZEpF2WDLhUtGKs=; b=P4dmvkO2rHyYKsSinIX6jNmrcIgvls2TdEtaxA33lTc1ExVVcKYlKJfxnjkG35gb8mnA70 Vp9IIQ5cZiYxcFWLssw36TpSLF2MQY39we5FJazxkI3fLoSJ05IJmOD2aUEgx5yq+9O82e IOfowrItjogQ6wyGWCIjwEJFQc5kFXAH5MsDRAHc0LDWBF0IdCLHXmq8WWj/ZKnAMnSK0w TUjxC7JHmzVupgImLYt92dFvbQb9cafDyKQH6fpsnPxpY8SnroTyAYS8gRKeBEBUHcrMbO xdnVfrAblaB6eQO9pfzb8RQTpNkHiBOlQquhGigfgKRCCBv61vfxQab1E779JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675288476; 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=ub48WpkBAtvdzuadcrhy488d/MhJ3ZEpF2WDLhUtGKs=; b=B1H9gpz9MwTIyZ/OSJzgCTCu+kmOW0V0dHjo290rsKnlDCy5ZjQmJogCeuDH9QTovQHvjd E8pAyaQClzDFQ3FxC0WPh89FPuekDiJydss/pD8LC7NpOqi8t4e3LeJD+UG1OkkDM30fY3 87hbHrr6uwc7VwyJnWaKxg5nzTFPKP2bjdgN0oP369A95xsKm1yCG47f+FHrUGbcEM3fdf ClZDiJlsSSxZz6BHCIE1scZKikAVRSIRFMPtDc516RkYEVWE01uSa3mcBt7IDpUvQeFzNz UQzUmlT4DQlEa63LF2TkuwsS6BNbft2tYkiDz+CHJsP9EWubDZ78wXveQGc6NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675288476; a=rsa-sha256; cv=none; b=UFEMM1dw0tv6T01zDipDDanXGPUcL9iD2YN+tP39dR4qmaTG2VI3EEa4j+GQE+li287UZJ R3OckWgdLnOway9QgltOHrO4RCqxh9HM5nLvKth9Mebo3Kc8wmRNMzuvBW6qn9O+OxnY2o nWqDuK3xTJfHnKyYYP8UZISmpjLDA4DpY/Soq2TWTdD7YwScMZ6mYWVBLVuN/11dMOi6QI wrbt4zZbDWtZ7MTtOQ7A33lM7po6hFaM4xnxGgkeZ3tZz97mrZIsn4xXtlAibHGI+OBhMZ LZEPz/lTDUciJKAAez18G01FZzq4XnKKz6QIiknpW28LAcbpbybogCChgQzs+g== 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 4P6bL42NbNzVs3; Wed, 1 Feb 2023 21:54:36 +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 311Lsa30028475; Wed, 1 Feb 2023 21:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311LsaJx028474; Wed, 1 Feb 2023 21:54:36 GMT (envelope-from git) Date: Wed, 1 Feb 2023 21:54:36 GMT Message-Id: <202302012154.311LsaJx028474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6cc52efa13ed - main - arm_smcc_1_2_*: Don't trash SP and X19 if no return value structure. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cc52efa13ed180c35232b833d38cf288679b2db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6cc52efa13ed180c35232b833d38cf288679b2db commit 6cc52efa13ed180c35232b833d38cf288679b2db Author: John Baldwin AuthorDate: 2023-02-01 21:54:09 +0000 Commit: John Baldwin CommitDate: 2023-02-01 21:54:09 +0000 arm_smcc_1_2_*: Don't trash SP and X19 if no return value structure. Jumping direct to ret was not restoring the saved value of x19 and was also not adjusting sp to discard the two saved registers. Reviewed by: andrew Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D37922 --- sys/dev/psci/smccc_arm64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/psci/smccc_arm64.S b/sys/dev/psci/smccc_arm64.S index 41e602563222..1d05855acdf3 100644 --- a/sys/dev/psci/smccc_arm64.S +++ b/sys/dev/psci/smccc_arm64.S @@ -77,8 +77,8 @@ ENTRY(arm_smccc_1_2_\insn) stp x12, x13, [x19, #16 * 6] stp x14, x15, [x19, #16 * 7] stp x16, x17, [x19, #16 * 8] - ldp xzr, x19, [sp], #16 -1: ret +1: ldp xzr, x19, [sp], #16 + ret END(arm_smccc_1_2\insn) .endm /* int arm_smccc_1_2_*(const struct arm_smccc_1_2_regs *args,