From patchwork Thu Oct 5 14:45:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 13410167 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 B8376E92709 for ; Thu, 5 Oct 2023 14:46:03 +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:To:In-Reply-To:References:Message-Id: MIME-Version:Subject:Date:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZBFS/rJOlA7WbIuaTsfheNTXB0NDFHpg7ZPCZSSWBI8=; b=sJG3oN/+tD3JXz 8r3vDQACExRrR8ErL8Zilgi+aDpsDd77oHDXlK5EVklud+L5MomCjZx2K/n7XgSXpqLbzwlC7Jwv9 vXyDJPOAV+v459YY/KvH8yuOWkW5GppMm1ClcZNVxRTGZwZJbvfShcuV386DswQyMtnAEg6Qa6C3m 5G1PPwotWHOZojOlKq9aE0xdn7ncT602z5vWm2pP6UEEMnOCIace4vv/53Wide8Pi1EcHw0M25uoZ zGL9PABa7HDqdGKhnVTGpieDan4+iqwGY5BZCz3NqsHFozs/EYuHOzIb6dnTKqL1YbUB/+70omOCJ 2jtJOp4K8fqW1fMlyX1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qoPbh-003lxN-2W; Thu, 05 Oct 2023 14:45:41 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qoPbV-003lcW-0H for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2023 14:45:32 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 386CA1682; Thu, 5 Oct 2023 07:46:07 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 826DF3F641; Thu, 5 Oct 2023 07:45:27 -0700 (PDT) From: Sudeep Holla Date: Thu, 05 Oct 2023 15:45:09 +0100 Subject: [PATCH v4 16/17] firmware: arm_ffa: Update memory descriptor to support v1.1 format MIME-Version: 1.0 Message-Id: <20231005-ffa_v1-1_notif-v4-16-cddd3237809c@arm.com> References: <20231005-ffa_v1-1_notif-v4-0-cddd3237809c@arm.com> In-Reply-To: <20231005-ffa_v1-1_notif-v4-0-cddd3237809c@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sudeep Holla , Marc Bonnici , Jens Wiklander , Coboy Chen , Lorenzo Pieralisi , Olivier Deprez X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4145; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=AsgrCLkaUu1zLbCge8pt4uxFm41JF9MxE5C3AnabUNY=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBlHsvyF1KWLkS6mBQdJcATQCVZa74qTBlObPPJb RknDLHuEUqJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZR7L8gAKCRAAQbq8MX7i mIGTD/0ZOjx3MsHUpdw/U0qsG9hf76rA/Ja1Eax44lG4iDhpRJUPpBs8fMD+mqupQpKmB4YgHlk XwTP6t08kC0l6+zrg7gxxKUK1X4xEpLRTpjtCoQU7kTrtXNfLXop3zz/XksZQHrcdb1Z3YLsIkX YPlFklYloF/otyQfDlm0/CLyTbM4Td5igLAvLvHqsYob2ucq54i/IBlIe1bHpD6u0gdHuf+1icX NTDMhPmTWo8+kblRzR0bcDHub8St1Op0pKvJGXOdV+ZkiOE9xKc3F8y9n9lHVAbIw565HcSasOx ObaEXkiYXAhyz1+pzczao49bl0bCmTS7RYDB/3rNgH1M7rabqqrnmn0/Vtq0giGykAKFFZtpNb1 WJgur9MivEN2wjIJSkY/ISh6fWMuTJJUoTM++6+0tX1KG/mROO7iXvvVMRF911H0BOWeUhNxuD7 YqKaciz8soevmr7tn1okIpyXdBm+lDWHj+xy1pf0DmWX9vpKRDrX23Rz1PibW5G2Su5WylumCm+ BoGse61vKBGKBvu3tc6EhKqb8wap70gooIAQk8oam0Yp5dAauQHAQinNbPJIQoYuXhOHG8Pvxur t70nVoJCHYCoeNpQjXc0onTV2sC8gqSaXcDshJUS/fe7SA3tE3PwTGIdWD7gkDhHLsS7mhaxTra tlyc6hpKD//gnNw== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231005_074529_373082_283DE5C2 X-CRM114-Status: GOOD ( 17.36 ) 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 Update memory transaction descriptor structure to accommodate couple of new entries in v1.1 which were previously marked reserved and MBZ(must be zero). It also removes the flexible array member ep_mem_access in the memory transaction descriptor structure as it need not be at fixed offset. Also update ffa_mem_desc_offset() accessor to handle both old and new formats of memory transaction descriptors. The updated ffa_mem_region structure aligns with new format in v1.1 and hence the driver/user must take care not to use members beyond and including ep_mem_offset when using the old format. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_ffa/driver.c | 11 ++++++++--- include/linux/arm_ffa.h | 32 +++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 4de08ffce599..7b3db675454c 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -423,7 +423,7 @@ static u32 ffa_get_num_pages_sg(struct scatterlist *sg) return num_pages; } -static u8 ffa_memory_attributes_get(u32 func_id) +static u16 ffa_memory_attributes_get(u32 func_id) { /* * For the memory lend or donate operation, if the receiver is a PE or @@ -467,9 +467,14 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, ep_mem_access->reserved = 0; } mem_region->handle = 0; - mem_region->reserved_0 = 0; - mem_region->reserved_1 = 0; mem_region->ep_count = args->nattrs; + if (drv_info->version <= FFA_VERSION_1_0) { + mem_region->ep_mem_size = 0; + } else { + mem_region->ep_mem_size = sizeof(*ep_mem_access); + mem_region->ep_mem_offset = sizeof(*mem_region); + memset(mem_region->reserved, 0, 12); + } composite = buffer + composite_offset; composite->total_pg_cnt = ffa_get_num_pages_sg(args->sg); diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 2444d596b703..510fe78bff71 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -298,8 +298,8 @@ struct ffa_mem_region { #define FFA_MEM_NON_SHAREABLE (0) #define FFA_MEM_OUTER_SHAREABLE (2) #define FFA_MEM_INNER_SHAREABLE (3) - u8 attributes; - u8 reserved_0; + /* Memory region attributes, upper byte MBZ pre v1.1 */ + u16 attributes; /* * Clear memory region contents after unmapping it from the sender and * before mapping it for any receiver. @@ -337,30 +337,40 @@ struct ffa_mem_region { * memory region. */ u64 tag; - u32 reserved_1; + /* Size of each endpoint memory access descriptor, MBZ pre v1.1 */ + u32 ep_mem_size; /* * The number of `ffa_mem_region_attributes` entries included in this * transaction. */ u32 ep_count; /* - * An array of endpoint memory access descriptors. - * Each one specifies a memory region offset, an endpoint and the - * attributes with which this memory region should be mapped in that - * endpoint's page table. + * 16-byte aligned offset from the base address of this descriptor + * to the first element of the endpoint memory access descriptor array + * Valid only from v1.1 */ - struct ffa_mem_region_attributes ep_mem_access[]; + u32 ep_mem_offset; + /* MBZ, valid only from v1.1 */ + u32 reserved[3]; }; -#define COMPOSITE_OFFSET(x) \ - (offsetof(struct ffa_mem_region, ep_mem_access[x])) #define CONSTITUENTS_OFFSET(x) \ (offsetof(struct ffa_composite_mem_region, constituents[x])) static inline u32 ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, u32 ffa_version) { - return COMPOSITE_OFFSET(0); + u32 offset = count * sizeof(struct ffa_mem_region_attributes); + /* + * Earlier to v1.1, the endpoint memory descriptor array started at + * offset 32(i.e. offset of ep_mem_offset in the current structure) + */ + if (ffa_version <= FFA_VERSION_1_0) + offset += offsetof(struct ffa_mem_region, ep_mem_offset); + else + offset += sizeof(struct ffa_mem_region); + + return offset; } struct ffa_mem_ops_args {