From patchwork Tue Mar 18 16:25:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 14021323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 738D8C282EC for ; Tue, 18 Mar 2025 16:41:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=82xqydvgKJEdTD6AS9zEoISi5ga6dIOMUMPwBL0TAWM=; b=iorDlfNCwN9Q78YD/U1H/et7Dw +gb1w4t3n9d7Rt99nAMnBx8+epfiBzzCGlaZo2OhkX3r0JMSYiJq7ZTpPrHah6Fn1V4lJ9PYQFsH7 KWR2zNdi5yZYIlUm/+wGTvtan3pMP/MlY1B9fjEjNTqo/J3Z62iZSMMveUtUnpH+jW7JFAIYfTjUI ufCy/1p32Dc9lQmOK3q29HbB8rFSa0A+NbGheAn/Udkn1IcInsEMmAMUCuywwMFFw4ydeu/X97bCZ cS8L9ihu8kN9X08sNc6Jlz7+VGL/MALUHs9KFl6J3V65JefDpVsJjdnYJMU+kDPfmp5DqkgmFrCAn ACymeNfA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tua0J-00000006ZSI-1XaB; Tue, 18 Mar 2025 16:41:23 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tuZkz-00000006WVH-1mEt for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2025 16:25:34 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-43ceb011ea5so22408315e9.2 for ; Tue, 18 Mar 2025 09:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315132; x=1742919932; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=82xqydvgKJEdTD6AS9zEoISi5ga6dIOMUMPwBL0TAWM=; b=D/wKpSCzTTwIYNf42vxxGrxZUdTSbyFXT03xccLz9asWP8lUSQFK5HG0CrB87kgULw YL4ISFwTww3m4J75tjE5L6zbcZyU/EWJFeAuvkX1dmnPLMTAB4vb+E4wb5+f6K70w82x X3vS6dwqcDjiiMG5T8mvNpK10xjy1bh2D6AfSmuE8AOt4V5fltr8pJQ4zOCDYVzXK8Tf 9wovb4Sp2afCllbbJpYsqjZJ3lTWxUn44TgshlfVzXDk7+1YZTwAcEeDh91HMyPpp2qm fbSrUcFGCVo5qBHyuFte0T7uafhq93NNXH+UP+sNEdmkTSXnofj47cqfZS5IMxd/Q3KR Lpsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315132; x=1742919932; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=82xqydvgKJEdTD6AS9zEoISi5ga6dIOMUMPwBL0TAWM=; b=CnwtqjX5gIGixJxKzQKB2bcCib8pC/rWTHeCwirEA706WxNTyEBQEjHBixqTowGrwD aY5IEnlGInkY1EMsRzSJxegoda7ublw3GsHr7x1DZdoO5M3iSsVkaWJdfXMwGrEaDRmt O7vntxKcL/LPXMKdEKmi16NWczgq+L54uhDBN0Oj8g4p0fKzgo+LG4ivPKzNeWDP/bxU Dum+uE4TAZwK9pSSXibZKG7JvsDQt2G7jpKs/4iUD3RXKhgCsPGLiHkfIfTYPjJTtMy2 M1y337nwtTW/UF2w5339EHR6mUyBbODY8QSSIGXUzWMmJxXNVE4WzmfhmY6A0s5BmHbN BogQ== X-Forwarded-Encrypted: i=1; AJvYcCUbeareTVrys4e0e6FkKPaq8wzwRlVTsFsnijBbte+91GHe7a4AQPZ+FoPYOOOa+h+TQ1xxpDlMkVW+cHh63Ptd@lists.infradead.org X-Gm-Message-State: AOJu0YyJdHMq/77PsWjydYerrDS6j8lUcjj+uYwMDxluF9ba3FMpzsmN ocfT6+Fmocfd+IybJKFbf93sHeMuLKeX1h0jQqdzt2tB6BgRxxU/Nu/WzAvtoq0i6F3I/RzkRjh 8l2ZQy1mpeFQyn5PfNeEHa1RhlA== X-Google-Smtp-Source: AGHT+IFqbXkqs2Mp4b7p4DEZXKXsbkJMcBqeeMGJEs4JUgbYXZRQtxNivjVbKfH+2JB9M7Bhly80ZxRnTmUFvY4cw9c= X-Received: from wmco3.prod.google.com ([2002:a05:600c:a303:b0:43c:eb09:3784]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c02:b0:43c:e7a7:1e76 with SMTP id 5b1f17b1804b1-43d3b951acamr22481225e9.1.1742315131880; Tue, 18 Mar 2025 09:25:31 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:08 +0000 In-Reply-To: <20250318162510.3280359-1-sebastianene@google.com> Mime-Version: 1.0 References: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-2-sebastianene@google.com> Subject: [PATCH v3 1/3] KVM: arm64: Use the static initializer for the version lock From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_092533_460688_13C7E68A X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace the definition of the hypervisor version lock with a static initializer. Signed-off-by: Sebastian Ene Acked-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/ffa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index e433dfab882a..6df6131f1107 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -69,7 +69,7 @@ static struct kvm_ffa_buffers hyp_buffers; static struct kvm_ffa_buffers host_buffers; static u32 hyp_ffa_version; static bool has_version_negotiated; -static hyp_spinlock_t version_lock; +static DEFINE_HYP_SPINLOCK(version_lock); static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno) { @@ -911,6 +911,5 @@ int hyp_ffa_init(void *pages) .lock = __HYP_SPIN_LOCK_UNLOCKED, }; - version_lock = __HYP_SPIN_LOCK_UNLOCKED; return 0; } From patchwork Tue Mar 18 16:25:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 14021324 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04CD2C282EC for ; Tue, 18 Mar 2025 16:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rDMdEEdy1VVckNvVv+9Uw4kcuPuHKQ0YP6w02i+CGWM=; b=tfGtxZB5fa2j/YeMQl86Y5ldp3 Z4PxtKVlFte/DA+X3a28atwEAF11DAMSnfWddU0RB+0XwzOFshzAMLe99i+eyEcWS8bcdxqMyZcWr Xc7KaxideZRo6aDSR26QIfP+DDJR1NIcwX0K8+qHnbwNWbGk26j0YVS9NwYqrMGNGIYtF/sSGb0Wy Hfxo926qEeI7wYVVLkKyG7BJvwKUevuuVQBb2R8nLb2PYNceMIQ2u9VX6UtDzYp6pfXX0CV6S4SfU 36cE4A0SBccGyYymRiK+CZaonkmQLD8XOwUwDQpQT16kCl50AoPtw+C8LFHp+nSGuaqQZCOuSqDvy p3VG71aw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tua1y-00000006Zhm-05tl; Tue, 18 Mar 2025 16:43:06 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tuZl2-00000006WW0-1aYY for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2025 16:25:37 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-43ce8f82e66so22104215e9.3 for ; Tue, 18 Mar 2025 09:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315134; x=1742919934; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rDMdEEdy1VVckNvVv+9Uw4kcuPuHKQ0YP6w02i+CGWM=; b=qGU9wf3JxJ5T1m+1ikOI6QjuiY/S3Vpn1zGm2nIpJZvZMxqRT4kXGGSDPyxnu/z52d KQuY5K9HZu+fo3aF9cPsZb+xYr/Ie1dnbfna95RC+19kDkV2hKsVggtKvIBLWkEihtqf VoE22+7bZrqHWZUNOBc6zAF1VE2nKNgsIFch+Cgvj+nS/+XQaw82gZampZFhyvNqbWP9 yPOWmDzknQepVbV5Y9DLNwHsYFtshOf0/Szk+uasXZd6eHUnaImEUoeHBDQ31FyF8orq aeWFTB/U4gFRSLTgSrC7AWb7TciEavsxRTgMt1et3mjrKbZgkDNARAIVneBGgw8euNVJ Bu2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315134; x=1742919934; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rDMdEEdy1VVckNvVv+9Uw4kcuPuHKQ0YP6w02i+CGWM=; b=byNRyYGpg4aXth6vOponRjfuEh/eLYTh9ayGZpvN9gFV+DO18cufSNiuONasmznqFA dgy2sxTOoBBLAeoNemmY8UcSXC1itkwwLbWJP41U0zSPs4AQEMgOKmatVufEPfhCcIat 0BQueOIlR2a3ZQvlzHM+d6yz6Qnsqf8ob7Q6IGtIrv+7coX2R/OHHed9ufWCUU9CIbVB gjfcF/5Bebu6ciNHRjYgD+BatoaWunLLSR7cR3W7bIGuf5gklGYLKRMsVQ22o5BMyqoQ t0zgcRQ5Ie4D/6icldS9WXCH6WOETTx+VDYCg7KUnHIxV4f6tiJzGPZNUnt7XJyiZlQM tCqQ== X-Forwarded-Encrypted: i=1; AJvYcCVchbQ8FpDWWaE9JJO1PnqeLoa49CdjaCD+xvgFchIcMvDSTPKsTIo+aIqM8vDqpyVKEzvnuU/D6V7cf+cK5MQ8@lists.infradead.org X-Gm-Message-State: AOJu0YxRZSgMxlEWumuxYxbWgE2MS778UT9KTYjReiIY9lzi1NBasF/i A3r0terfx9SPdim2OLxWYIq6vIDbL/dx+/CpMNQ9AgoneqMouWjwpnX3zWa0Oi8LxiUiC5ydVjt cZFZwePbQtxnqpgio5l9Kbmctog== X-Google-Smtp-Source: AGHT+IGrqCyZAj3WhiZpuq4EomsTyl0s1Z4lp12t9lZvwltIa9qDp+9pdQe/IpL9JiYdK9qni53p5x/BRGVpG+ks5V4= X-Received: from wmcn5.prod.google.com ([2002:a05:600c:c0c5:b0:43d:1db0:6628]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3584:b0:43c:fd72:f028 with SMTP id 5b1f17b1804b1-43d3ba27a69mr28607885e9.29.1742315134353; Tue, 18 Mar 2025 09:25:34 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:09 +0000 In-Reply-To: <20250318162510.3280359-1-sebastianene@google.com> Mime-Version: 1.0 References: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-3-sebastianene@google.com> Subject: [PATCH v3 2/3] firmware: arm_ffa: Move the ffa_to_linux definition to the ffa header From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_092536_417871_90527C06 X-CRM114-Status: GOOD ( 14.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Keep the ffa_to_linux error map in the header and move it away from the arm ffa driver to make it accessible for other components. Signed-off-by: Sebastian Ene Reviewed-by: Sudeep Holla --- drivers/firmware/arm_ffa/driver.c | 24 ------------------------ include/linux/arm_ffa.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 2c2ec3c35f15..b02b80f3dfe8 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -61,30 +61,6 @@ static ffa_fn *invoke_ffa_fn; -static const int ffa_linux_errmap[] = { - /* better than switch case as long as return value is continuous */ - 0, /* FFA_RET_SUCCESS */ - -EOPNOTSUPP, /* FFA_RET_NOT_SUPPORTED */ - -EINVAL, /* FFA_RET_INVALID_PARAMETERS */ - -ENOMEM, /* FFA_RET_NO_MEMORY */ - -EBUSY, /* FFA_RET_BUSY */ - -EINTR, /* FFA_RET_INTERRUPTED */ - -EACCES, /* FFA_RET_DENIED */ - -EAGAIN, /* FFA_RET_RETRY */ - -ECANCELED, /* FFA_RET_ABORTED */ - -ENODATA, /* FFA_RET_NO_DATA */ - -EAGAIN, /* FFA_RET_NOT_READY */ -}; - -static inline int ffa_to_linux_errno(int errno) -{ - int err_idx = -errno; - - if (err_idx >= 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap)) - return ffa_linux_errmap[err_idx]; - return -EINVAL; -} - struct ffa_pcpu_irq { struct ffa_drv_info *info; }; diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 74169dd0f659..850577edadbc 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -475,4 +475,28 @@ struct ffa_ops { const struct ffa_notifier_ops *notifier_ops; }; +static const int ffa_linux_errmap[] = { + /* better than switch case as long as return value is continuous */ + 0, /* FFA_RET_SUCCESS */ + -EOPNOTSUPP, /* FFA_RET_NOT_SUPPORTED */ + -EINVAL, /* FFA_RET_INVALID_PARAMETERS */ + -ENOMEM, /* FFA_RET_NO_MEMORY */ + -EBUSY, /* FFA_RET_BUSY */ + -EINTR, /* FFA_RET_INTERRUPTED */ + -EACCES, /* FFA_RET_DENIED */ + -EAGAIN, /* FFA_RET_RETRY */ + -ECANCELED, /* FFA_RET_ABORTED */ + -ENODATA, /* FFA_RET_NO_DATA */ + -EAGAIN, /* FFA_RET_NOT_READY */ +}; + +static inline int ffa_to_linux_errno(int errno) +{ + int err_idx = -errno; + + if (err_idx >= 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap)) + return ffa_linux_errmap[err_idx]; + return -EINVAL; +} + #endif /* _LINUX_ARM_FFA_H */ From patchwork Tue Mar 18 16:25:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 14021325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09D44C28B28 for ; Tue, 18 Mar 2025 16:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zO3ZzM+RurQ0HVvhTyBHJz7UiXcbKFmS1I/Hti/J8oU=; b=oVHvSquhDmb0thSAY8g/NgkxUc /lHKv07y2o0OAHDtBX3tXMfOwvGN2TNjN1V253B24f9P7+jgtSjuIuxxD579SvXm9MHY1PTZprAOg rYIRAl8EOYPNhh3KA1RsvFOaK8r6Ux5gHB4mb74XVEDSMgzZ5Z/x78zVNit35xLIHGXRT/bW/wy1S O5CQ0bQlLmoQqlkYsAhAetq5Wzb7M1VLag9vFD6nVXlMCZ4Y4infG7KiXDnKp+1OxQGj/C8AOAJU4 WWHApsNqGxC6hHSl5UMwYIN+meqmnXGCRUFKdh1Opdr7OzQxmZn44XbmAc77Itj/ukutqztyFDup5 SZ8C+kow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tua3c-00000006a3b-38nH; Tue, 18 Mar 2025 16:44:48 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tuZl4-00000006WXP-0WCg for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2025 16:25:39 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-43d025a52c2so25180195e9.0 for ; Tue, 18 Mar 2025 09:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315136; x=1742919936; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zO3ZzM+RurQ0HVvhTyBHJz7UiXcbKFmS1I/Hti/J8oU=; b=DdRKUCt7IbEVEsZtxH2/IsXmQLB9WOJbc+d2PjEzLJj8+P7CqFvidKASu+0r0jwWZd af+AAWZM6RZ4vYbenXJy28ClvUbhKsW4CH9kdPSatIkmhkKRH5urbexSeq9zl8H0jL5x 2k8GZ58NWRMSJxvd0W1yv5FX3eo++Alq/Ha7O0d9Yn2p0Ltd7cpNbcyVWyD+2eDI+g5B I2Z4c9lySIwLjqLPDvapwFeUnF9Gn+NQ9YfGBsanmRn5OAnwBDS06+8mgOLwlLEvcRRf XODhU9iVyV359WiWw7z6XLrZ3N7XxJBs/PJKy22y9EwsC/u7qWd6WfZiknSQmL8XZqrA Ej+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315136; x=1742919936; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zO3ZzM+RurQ0HVvhTyBHJz7UiXcbKFmS1I/Hti/J8oU=; b=wWSLCvLdXzYBB9tO4iB6bWTVw4Vs0Ty1S0wWDuKZdnuSipunfTK20G3frR4vuJrpJC TDyxcfqurprpIXyFwJeUSE/82oPnxUc7ReWd86YiguKY5thHlTRh5P1XiDg2XeIgdOap CnOmJQsGZdS1vtaAGKAgqJ/IEXEuniwlWQqdzwVmPfTffTFMVUNE0FN/+95AJUQg8nev N/vuucw7j57Q3h1KGk83XvnGyEUuDgjuKNAtNKRwYepaiJF8CEB2t+UX4e5LZCPk44Ck /686EgB45B2CKl4QJW0hb5hknb9YazzX/3k6rUbHEGi3ffFHwvXvabSaL7bQdF3qXpTj h6Tg== X-Forwarded-Encrypted: i=1; AJvYcCWcFOPopHU410L4E7v+L0E8XrP2nHXUgcTIDhaJouHdxJMzd3GBWsmbR2HfW/K9fykRNT3lSQMo+iC3M+IhnJW9@lists.infradead.org X-Gm-Message-State: AOJu0YwLCB3xr4rsoNG0K3WL3wrzyTsutnXgVDcyREOTGboiFUzJMU2B /KWOPhkLTc2BFqlR1ps4dvdEAMuNt35Y+lbjknq6clgzgo1DSztYml5o4uVyYMZvnSZdXwmz3c7 kUmWbp2JZNjne4RUTkAyEerMkWg== X-Google-Smtp-Source: AGHT+IHi1UgeMel0/A+rXKxvMkXf6AY2s0C2/6FsLbf6+yhSlW/MgJVCp1Jp/o/iLc/G34hYG7cfGijEvYJBHA3IS0U= X-Received: from wmbbd27.prod.google.com ([2002:a05:600c:1f1b:b0:43d:4055:98e3]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:470e:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-43d3b9dc569mr30076925e9.30.1742315136406; Tue, 18 Mar 2025 09:25:36 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:10 +0000 In-Reply-To: <20250318162510.3280359-1-sebastianene@google.com> Mime-Version: 1.0 References: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-4-sebastianene@google.com> Subject: [PATCH v3 3/3] KVM: arm64: Release the ownership of the hyp rx buffer to Trustzone From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Andrei Homescu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_092538_160124_B34919D4 X-CRM114-Status: GOOD ( 14.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce the release FF-A call to notify Trustzone that the hypervisor has finished copying the data from the buffer shared with Trustzone to the non-secure partition. Reported-by: Andrei Homescu Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 9 ++++++--- include/linux/arm_ffa.h | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 6df6131f1107..ac898ea6274a 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -749,6 +749,7 @@ static void do_ffa_part_get(struct arm_smccc_res *res, DECLARE_REG(u32, uuid3, ctxt, 4); DECLARE_REG(u32, flags, ctxt, 5); u32 count, partition_sz, copy_sz; + struct arm_smccc_res _res; hyp_spin_lock(&host_buffers.lock); if (!host_buffers.rx) { @@ -765,11 +766,11 @@ static void do_ffa_part_get(struct arm_smccc_res *res, count = res->a2; if (!count) - goto out_unlock; + goto release_rx; if (hyp_ffa_version > FFA_VERSION_1_0) { /* Get the number of partitions deployed in the system */ - if (flags & 0x1) + if (flags & PARTITION_INFO_GET_RETURN_COUNT_ONLY) goto out_unlock; partition_sz = res->a3; @@ -781,10 +782,12 @@ static void do_ffa_part_get(struct arm_smccc_res *res, copy_sz = partition_sz * count; if (copy_sz > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) { ffa_to_smccc_res(res, FFA_RET_ABORTED); - goto out_unlock; + goto release_rx; } memcpy(host_buffers.rx, hyp_buffers.rx, copy_sz); +release_rx: + ffa_rx_release(&_res); out_unlock: hyp_spin_unlock(&host_buffers.lock); } diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 850577edadbc..32e235a2bedf 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -223,6 +223,9 @@ extern const struct bus_type ffa_bus_type; /* The FF-A 1.0 partition structure lacks the uuid[4] */ #define FFA_1_0_PARTITON_INFO_SZ (8) +/* Return the count of partitions deployed in the system */ +#define PARTITION_INFO_GET_RETURN_COUNT_ONLY (1) + /* FFA transport related */ struct ffa_partition_info { u16 id;