From nobody Wed Dec 17 12:19:15 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C5C61DDC0B for ; Wed, 26 Mar 2025 11:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989150; cv=none; b=LRDf1isBVJscZpqETU5KuT9z/F5Uox5VGmzjzrzV59nWAbQrOn8J2OjnzyLtPtr8cIdgau5NOKjnQ/8OBpCoVmXd5Bc1jgamhH+tgUhOPL3mkJU/oIc/00Jx5r+EU77fVgsSxKtvAvh2CGqdF2rW9/tbqTC2/dlL06t7o103FrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989150; c=relaxed/simple; bh=suNMKt6I15eicpIrRigEwbTXV0qPPOxVmXKEqjZInKo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mkP4jopD+Cj900pjURtou4jqsfe7wd6y0JlIWDToNvqeDuF0WjIAoVOkwfNkizGwTS+xeigEvwQ+1f74ecE7zCVHCrewRDS8TAPgp3M32G18Kr0H+BK080IZr5ymIiWCN9S6fmsYeplMMc5gbDvDBCWfpKtfw166UBOXm7OWSJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hArIpLSc; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hArIpLSc" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4394c489babso31344895e9.1 for ; Wed, 26 Mar 2025 04:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742989147; x=1743593947; darn=vger.kernel.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=GXpneY+J8yPscOLP7jhAaiNlTKvyhknsIBSzw8J5v1o=; b=hArIpLScYbFZ8BdkcuBEypEHlPDw+5Nkub8/7JUbl8tzJ+IS4xJU8rakGqw4HFv9yP 1ZYjDxVG0ChoVs4yqKmJ0XNN0Qhu8ykEKDb34jxR1erxpgodqIZBa0/HhF1g+Y5FWrTL 4VRU27xghfE9TNuhJMg/fMHzcpPptjMVoqOQgrwy8cxYNwkz2bVTtjJJ2Qhsu1zbYiZr 9kBptH3bODY/aHjk+A5bXuPXvsxyxOX6+pZpHeGNkmeSZIvDV3lnz2nBB/xUf0HlcgHT mM+TiaPnfcJOW75jf9TqWJ+n5KKJH0COOarh0n+PneaaaBX3vYpxrk4rgFnO4xn9dsbR XqUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742989147; x=1743593947; 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=GXpneY+J8yPscOLP7jhAaiNlTKvyhknsIBSzw8J5v1o=; b=CQBgkRQqqYl+kj6dB7bMAqksV07Pu+iP+9nxEl5b3hf4d51Ue2xTVrpqwU1IPVYS6I qm5aMo3RFmpzVlex1DduNtlBOztGagJWMd/uh5H6Rf9WZSiVaC4rRUcMuBRqbWdYktPr WkSnazNjmz2AYrPxn++ZC7eu6cC64wGv0C6DCPo7fmh0RHHVtKxR6t8bPX/X5YxJ0xJI MerOsoSccCsXi9d6USNy9J7OY0EIrbz33vpcaOEQl3E2otMRJi9vcQBVMy1Au1Ylm9Zv iVskKNAQNTAnEm0cLSCTgNY2g+Nsm6VidC22l4XV8CWHlKOLeksDOnBYY1T+YpEb1Evh Miiw== X-Forwarded-Encrypted: i=1; AJvYcCUlv1/BET7uJOKQxBrYNJYqZWE0yT7lgzQ1PNCKeDi9ucHsGMclPGBxpHlTRXRr/rDbkWI6xiircxPUFdw=@vger.kernel.org X-Gm-Message-State: AOJu0YxPS4s1QkiQ+P0aMo1nNsGVlsWARQxDS7PIP+kC4aPCyYNgDFS0 3rsuA30So28OFs5OxU6Ye2r5T7mVd1xihpBtGK4vTcsXi8gkPeHUji6FBd6CB3x/wbok4FZl3P/ ZM6ESR1ME9ovxwJNZ9iUOakoX+Q== X-Google-Smtp-Source: AGHT+IGmIIwQP0bm2M7IlxhsZXhvvis8SEyv8YAEqMxAp7vxQ4ixz0CF6DGy8JLA3pEu/5AAb31WyHaG1CNXPPwbNdA= X-Received: from wrxt15.prod.google.com ([2002:a05:6000:1cf:b0:39a:bf28:66d8]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:59a6:0:b0:390:f6aa:4e72 with SMTP id ffacd0b85a97d-3997f8fabdbmr17862518f8f.18.1742989146887; Wed, 26 Mar 2025 04:39:06 -0700 (PDT) Date: Wed, 26 Mar 2025 11:38:59 +0000 In-Reply-To: <20250326113901.3308804-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250326113901.3308804-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250326113901.3308804-2-sebastianene@google.com> Subject: [PATCH v4 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, qperret@google.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the definition of the hypervisor version lock with a static initializer. Signed-off-by: Sebastian Ene Acked-by: Will Deacon Reviewed-by: Quentin Perret --- 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); =20 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 =3D __HYP_SPIN_LOCK_UNLOCKED, }; =20 - version_lock =3D __HYP_SPIN_LOCK_UNLOCKED; return 0; } --=20 2.49.0.395.g12beb8f557-goog From nobody Wed Dec 17 12:19:15 2025 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C05B01E1DE1 for ; Wed, 26 Mar 2025 11:39:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989152; cv=none; b=Xh+VVdx5V+d2gHdLftwINqwXuZZbchsJsgJQKttBTzp9ZtSMOS6wX0sF3KpwLjdECjU7KU/hSTNGH20mztaYRxJg8DrmPp0L3uXOh/49zk7lNeeUC9i6KifeXpplNKdqMGFg4WotFCbBDNH6cUyfK7TlDe53S98/U3xzDYWjjuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989152; c=relaxed/simple; bh=UgBqeTaDk5nYZ0B//mFPRrazdUKQag+EQMWMdNe4gdk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pgERWUShD23aeAJfPUkJbYbZdAKFyrBt20SgEj/iMtR5k+j88ZiaSjSQj98dHXzMoHoaoVUhz0VfTciKEpuwje9uyVrnpf4L0ICiG0yRUXt+2EoEtKQKbihgHKObQ8E93+QD/4BiUNYdL429FBM9+0KRMuP2FGVln5uH+hXMbZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YY4rNBwU; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YY4rNBwU" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3914bc0cc4aso3442196f8f.3 for ; Wed, 26 Mar 2025 04:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742989149; x=1743593949; darn=vger.kernel.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=D8ajkpiQTqtR9VJRMGj5F4HjopRvHwcyjLs80bQ1Ix0=; b=YY4rNBwUGTPonl32KfSUZjIFbY/kVrgzUU87amtx9+y2hZZmQBv7pLLlg8SBBgHWoc 2ZB9beW0h4AZMk7gZxtbViSFPNBElhhXh73DKiapVLyRf8gKY66hCV+2R4NTbbMWRQEP Ia4TnPdEk4iPWledF0yIf7eNqkqlpFaufE0r8NfkobeRYZTkgN0yyqPm1cYwX5UT8ik2 Fm5y4Czd9MdDIEIFKknzUVc0xUWMqSp1zrY78cniLFWQSLX5cy/T9eikeolIIXxf/PRo yRRa817PtcNc3nSq10g14qJew74Tl2Wz+w5JMxydrlytFdcIZJZsG9FWAY1tpqQUqEnI hPYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742989149; x=1743593949; 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=D8ajkpiQTqtR9VJRMGj5F4HjopRvHwcyjLs80bQ1Ix0=; b=e0vtc5rF6ue9Qp0hQANyB5jsxf1/seFY/jJj1ojRuE9jool/pNOk3HEQTNQUomvuIn HVyNxlApTlWBjPzqZwNPJ5HIvhOModl0jqU0E2BTqlzxVtc8tKBIxXpJfeua4aOHOznp 8VZsZxOzggBDObJsPQd7Acmj55SGmPmiVLae3ogrAJXZIM8JBc04VUdAeixAA8rEIpCN /TdHXDd6F2tMCHIxz7zDaWJsIkW3odVqRFoKdT2ekmQVZl580OMVbwmemjcFo2cBu5An 4TigfC1fCQuef22B7H9QULM4KCIsbSYZHGbCnZjk1jf2HlYwfMM3TLvv1oWR4eek9n+6 9VdA== X-Forwarded-Encrypted: i=1; AJvYcCXHffdR7xLxq69f0fq1bfaYtrsD0HhLobln3fMgOGcHfsJ1SnGBm4IDMoXcqkZRBp7cszk2NV4wq3VHg8A=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/1hCiHy+rhis5nSH41aaJt8JMZtOeGn3RYr90kDdH5dPILmV/ HY64Q0mMWwCUo+WZ3jQRCg0ytg3WpGPYnWeRrBUcY+OU5BwzdX0derkrCTj6lAZsyd7aMm8o+A8 lviMUVsSbGLJ1TFbnJCRiwLx+fA== X-Google-Smtp-Source: AGHT+IGt24UV1F1gn3DBiJA89bM8xyxzcFBTUpe7uN0vVj4Q/IEqACUFIlVuS9cdYKWGLRea4OJ8IMRq4qWmWhdzPh4= X-Received: from wmqe22.prod.google.com ([2002:a05:600c:4e56:b0:43d:8f:dd29]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1882:b0:391:12a5:3c95 with SMTP id ffacd0b85a97d-3997f91202dmr20021811f8f.22.1742989149185; Wed, 26 Mar 2025 04:39:09 -0700 (PDT) Date: Wed, 26 Mar 2025 11:39:00 +0000 In-Reply-To: <20250326113901.3308804-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250326113901.3308804-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250326113901.3308804-3-sebastianene@google.com> Subject: [PATCH v4 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, qperret@google.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Quentin Perret --- drivers/firmware/arm_ffa/driver.c | 26 -------------------------- include/linux/arm_ffa.h | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/d= river.c index 2c2ec3c35f15..3f88509a15b7 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -61,30 +61,6 @@ =20 static ffa_fn *invoke_ffa_fn; =20 -static const int ffa_linux_errmap[] =3D { - /* 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 =3D -errno; - - if (err_idx >=3D 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; }; @@ -238,8 +214,6 @@ static int ffa_features(u32 func_feat_id, u32 input_pro= ps, return 0; } =20 -#define PARTITION_INFO_GET_RETURN_COUNT_ONLY BIT(0) - /* buffer must be sizeof(struct ffa_partition_info) * num_partitions */ static int __ffa_partition_info_get(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3, diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 74169dd0f659..cdaa162060f4 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) =20 +/* Return the count of partitions deployed in the system */ +#define PARTITION_INFO_GET_RETURN_COUNT_ONLY BIT(0) + /* FFA transport related */ struct ffa_partition_info { u16 id; @@ -475,4 +478,28 @@ struct ffa_ops { const struct ffa_notifier_ops *notifier_ops; }; =20 +static const int ffa_linux_errmap[] =3D { + /* 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 =3D -errno; + + if (err_idx >=3D 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap)) + return ffa_linux_errmap[err_idx]; + return -EINVAL; +} + #endif /* _LINUX_ARM_FFA_H */ --=20 2.49.0.395.g12beb8f557-goog From nobody Wed Dec 17 12:19:15 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA49B1E1E0A for ; Wed, 26 Mar 2025 11:39:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989154; cv=none; b=Urtc/RD3KFpzgq9Qjg7aR+zTdO0+zUX7/X4AEgNCoOyPqEfB8BkoXAfCmJdBsdcmetbkg4ZDXuhhmaqQSuYBRXTYvrdItXWPog83d86IqJY081/lM4X5K3FjUv/2p+nv9kKJEfO/Y1uxXcKcsgvFlVSCZzEGPlySZvVt0dbvpmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742989154; c=relaxed/simple; bh=gBk9lt7tJRLeaaZ+rHtlU9qDo0L2uhlfMTlwA/Ull7A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=j/FdqeMzr4RiCBbOMyjegRs2RlA+/Gfp8Hu8E9FBv+BLzoNvE+iQHUhvQCXH7GUKkvjBrsQSAzOiEVZ1id8pQgvc9wITeAcojwcwTiSJjzFCmTYmUZYTC9n3Ddi3uRbgWa6PYFDMiVA/XOOYPh5cj4mIlsv9WBCqnD5jmYK3h2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=oeBKjAaC; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oeBKjAaC" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cf3168b87so35350815e9.2 for ; Wed, 26 Mar 2025 04:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742989151; x=1743593951; darn=vger.kernel.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=GHf91QhT51iYy83lJisFmODA+pFXdAkAB/GuCBpC2zk=; b=oeBKjAaCQJTYZmnJxRxZdRbWE4dPgXv4VIXzrSf1cm/ILybF0ZsYNA4MBYW/5aagAr uARAPq1Rdxyi83S/ez50ReTyKYqCfuC8qgSbLj7nUtDS/DxDAd0AjKH10iLHy12qNfoq 7Fiw28K2FoIdGL3HhJhXISPoW+6R3vv8xkAZirmRIR7RN3nM3aPN2it5mvyDQJPHFsOK Z1uCsvaGESA+crST8tcdIE8PVJ6TDiDJKMtLANlq0Fs3fVgWkLCpkYqxwGgjBcu1YmRy F/z2HcaJIF7bIeP30glLZ4sHPzpALv7XBjWgxkRI/8So4C1dctDgvo/n3T0v7qF1y0rc 0XhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742989151; x=1743593951; 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=GHf91QhT51iYy83lJisFmODA+pFXdAkAB/GuCBpC2zk=; b=ItoZn9ByXs8xUH6QPYRIdycGGIAXjcyDXQ6gDOEBOZ3DrKsI0X5tIy5todl4nenQD4 6q8EQ0JiPCsgvLEsKNuv4ASxPZXKaeVc5G1R2CAsuPJWCi8tnI66nf2EOqihNRrWVSFy oyIDZ4QmGr+By4xC+unr37sUMJ7ne2/bDMWO9xvxjgOr4JKUBAQuIlq5xvf/JPrkdBY0 9WaLPXZr6utA0TAo6Ce+SrrVknfBFb3HrnsNePgsTTe2ks159kqqPR6cpAiMZzaMSKrW i1DU5LApfpOBaNoC75ghm6dSMx4CsAmdsKzHIWUVtecZn3i55g8aaIc1aYzHzd3MLw3x aRtQ== X-Forwarded-Encrypted: i=1; AJvYcCVgFvONAldkU8qn15E5mJ4/NcZwx7aShjW7lLvzd97Hqjr8AclwxOPc6VFIf2TP06NaWZGqNN9tV+YeV6M=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr6m6aVPPUbZgcdoTPGC3AJ4ZE5w2wm3HtmTiSGBLDr0ubuxpz VcnJMYks6mqb9AxUo1msvbqdmmuJ4iUle+B3yJBl+CRtFE/FH4kIeFELhkt9OjUcI9coZE5Z1fI T702cFqJb+s33QPanSMJm3agCpw== X-Google-Smtp-Source: AGHT+IHs0QnGDLw9n/4cRwsa7oyAsEcllQx68V0oWKnfOqB/3TAlLPJ14NKv8m2ojEKJA3YBjubucjAO0uNkMu+4Lz4= X-Received: from wrck14.prod.google.com ([2002:a5d:524e:0:b0:390:e325:456e]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:6c61:0:b0:390:f902:f973 with SMTP id ffacd0b85a97d-3997f8f5c08mr18860296f8f.8.1742989151526; Wed, 26 Mar 2025 04:39:11 -0700 (PDT) Date: Wed, 26 Mar 2025 11:39:01 +0000 In-Reply-To: <20250326113901.3308804-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250326113901.3308804-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250326113901.3308804-4-sebastianene@google.com> Subject: [PATCH v4 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, qperret@google.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Andrei Homescu Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 ++++++--- 1 file changed, 6 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; =20 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, =20 count =3D res->a2; if (!count) - goto out_unlock; + goto release_rx; =20 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; =20 partition_sz =3D res->a3; @@ -781,10 +782,12 @@ static void do_ffa_part_get(struct arm_smccc_res *res, copy_sz =3D 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; } =20 memcpy(host_buffers.rx, hyp_buffers.rx, copy_sz); +release_rx: + ffa_rx_release(&_res); out_unlock: hyp_spin_unlock(&host_buffers.lock); } --=20 2.49.0.395.g12beb8f557-goog