From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4338C4345F for ; Thu, 18 Apr 2024 16:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GCKoqhSVCtwxU8nmzjl4yohU+uvdE1I0H7fgDzQo4R4=; b=1Cv+pZaZt1r0h4GQhwN2JG4hOY vgT0UAbJhid5udd3DNBKhxmWzIBpHFeCKmwE8Av0xZYiWCE99/1s0tUnG9+JMa90ADPp30IoxveJc HAfDJfpq7OvWYIRYeiNrp3ize5iolPG2LKrWYSOqIW02R5TYSn8YMo0Z3TIHYRafkWqvuoGKiy9a1 FqsaajI0HuxoPDd5PaaQl4/avAkPyOMMdTh4ieNC1POf/osNJpb4wPGkrFEo4dyGjpRIr3oBAo5oK uzpro5jV24Y2lNIvKeLE1V7XGG4NICa4I/fDlogMtI+3fw5O8pUFrWNnfyrPSxiy5uBbBZSKZw5u2 f1jM8KLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUg4-0000000317c-2bUM; Thu, 18 Apr 2024 16:32:00 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUfx-0000000312U-0V64 for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 16:31:55 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-de45d8ec875so2148744276.3 for ; Thu, 18 Apr 2024 09:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713457912; x=1714062712; 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=o/WdHir/Mi2mSDEW62XszsH6Iho8VZ+3enjU3uPIcDs=; b=0QOOrZ2rUyHZH7P8uvXEKQzQq9rvps1J+l38rltE0lVmi7oTFUeHgDrczac+T9E2hD vq6qaUmXZ6sNqcdOTYxr+IKkJHOuBBjr0rsDfuAgO9f5cZgXReGtNQeNT6qwxNtSckMg NXWGQ07CYJEf5aWcNrnZxX/D6gdgN8jyK4RnxCnbzvOeaNPYZXRas36jv6GFQ2iDjh2a 5MlqSxdNK4ne3AKTDtwvw0scn9UHFpBEANKmeCZQu3sWn81FJOyFh9DAH0H+kYA06gld b2mGyVuGeVxZlt4JWl6QrJ3YN3xQ63XKPV04PKALueBB/az11dfQ4ANbnmWTsDWqKWP7 rjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713457912; x=1714062712; 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=o/WdHir/Mi2mSDEW62XszsH6Iho8VZ+3enjU3uPIcDs=; b=I4rreK7tlJIUYnAERPQdowdV841t7WJD7/rMFSIvoDtdwWT6Cpq08e62cT6ALkKfTJ BsXFzTyqd0FnybIxxfRUmxfqQ33VPEfNoReqv6CmLEOUB7kmBQPwdYS0c4qpJEKJHtEO yHDNlSKTvgW9bCQCD13qifaXlk4XT12eXculQ+tiKv29lzql6CVdOI40S0dwtI8yJaPC 5SCzVGiUzYb8oXxfdMyf4OvxYLlHU9FWqg4vwP/LRRJ/wPSdcr7k8ZT1RspS3wx2r+3k xe7MKj0HTsH2XbLZj06KHSzrOZdTwPoCk+zK9GxQAD+1omcqGM2co22jHQWRHoJ9jWdU i9QQ== X-Forwarded-Encrypted: i=1; AJvYcCXQF+ui+Van1PrPiw2t15PgRd8HYbOeFWFgpTQL9ECVk3foIIsxZcLUL3kUSvOrC0jNh7PPX04WQERgNnVcwLX08wxKouIM4K0Ol7/dfPvx7OXzyOk= X-Gm-Message-State: AOJu0Yys/QxX8DCRduAEk8WEmKiW4EvZeukSQd7sdhbKQhBYLMs7OPPp DaD8lQKmi5kKQ1JlMZ5+HL3duHtaMzyZjMShBkYvzNlkQHeK3MNRUpo8w65B5mXV2pJIIifq6Hl y/2epWI+QrGlLpcI9ABsQh6k3KA== X-Google-Smtp-Source: AGHT+IFU3gG7mhRXP799oGDxBlPxLgFLfF8KRo1VK5xtAu+Ns8G5jem0y2bESQeN8vefdLLSBSCfbA/Pv4M4UuLpEoo= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6902:2b8e:b0:dc6:cd85:bcd7 with SMTP id fj14-20020a0569022b8e00b00dc6cd85bcd7mr831056ybb.3.1713457911701; Thu, 18 Apr 2024 09:31:51 -0700 (PDT) Date: Thu, 18 Apr 2024 16:30:26 +0000 In-Reply-To: <20240418163025.1193763-2-sebastianene@google.com> Mime-Version: 1.0 References: <20240418163025.1193763-2-sebastianene@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418163025.1193763-6-sebastianene@google.com> Subject: [PATCH 4/4] KVM: arm64: Use FF-A 1.1 with pKVM From: Sebastian Ene To: catalin.marinas@arm.com, james.morse@arm.com, jean-philippe@linaro.org, maz@kernel.org, oliver.upton@linux.dev, qperret@google.com, qwandor@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, tabba@google.com, will@kernel.org, yuzenghui@huawei.com, lpieralisi@kernel.org Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Sebastian Ene X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_093153_403914_10B1D366 X-CRM114-Status: GOOD ( 14.65 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that the layout of the structures is compatible with 1.1 it is time to probe the 1.1 version of the FF-A protocol inside the hypervisor. If the TEE doesn't support it, it should return the minimum supported version. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index d53f50c73acb..8633c8e0b09b 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -455,7 +455,7 @@ static __always_inline void do_ffa_mem_xfer(const u64 func_id, memcpy(buf, host_buffers.tx, fraglen); ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); + ffa_mem_desc_offset(buf, 0, host_buffers.ffa_version); offset = ep_mem_access->composite_off; if (!offset || buf->ep_count != 1 || buf->sender_id != HOST_FFA_ID) { ret = FFA_RET_INVALID_PARAMETERS; @@ -534,7 +534,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *res, fraglen = res->a2; ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); + ffa_mem_desc_offset(buf, 0, host_buffers.ffa_version); offset = ep_mem_access->composite_off; /* * We can trust the SPMD to get this right, but let's at least @@ -789,7 +789,7 @@ int hyp_ffa_init(void *pages) if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_2) return 0; - arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_0, 0, 0, 0, 0, 0, 0, &res); + arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_1, 0, 0, 0, 0, 0, 0, &res); if (res.a0 == FFA_RET_NOT_SUPPORTED) return 0; -- 2.44.0.769.g3c40516874-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel