From patchwork Fri Sep 29 15:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 13404508 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 13B51E71D45 for ; Fri, 29 Sep 2023 15:04:18 +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=s5qOxtx/syVkGqU0Bfj9ijfJyhHbHwELb/qQQ2pECCQ=; b=udlp5ocaBda7Vx pqRWvNEh3dP+xIjNkaKQ3IZzqVeI6sbDYtDmW5epZ1fKd8Znk4hYios1iJyuNEuV6e2UstzCGyV6u hKoiIvZ50bTwmFFHE/2VjZxJvJjnU8wkV7Zwjldv6h6pfSciCDRueTybHdUCNqVoL0TEKnQlENzUK JnJbVf2TZ6ZrZylb6lBYkP7qFISmmT3uqFqo49sZm5OseLkDjjZlb29ZsWEDXTbnvJCFde0n+wQDB qMIeKjFQyCp4b6rp0ZTrR21+Ujd3GkYK2ktkbYNGNesMj3WCBLP4l1htd7TCV/FbkKs8mGjdqxRb3 7wXTwrx20nq6dildZZkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmF1v-0088XF-1C; Fri, 29 Sep 2023 15:03:47 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmF1h-0088Gh-0z for linux-arm-kernel@lists.infradead.org; Fri, 29 Sep 2023 15:03:36 +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 521B612FC; Fri, 29 Sep 2023 08:04:11 -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 EF78B3F5A1; Fri, 29 Sep 2023 08:03:31 -0700 (PDT) From: Sudeep Holla Date: Fri, 29 Sep 2023 16:03:04 +0100 Subject: [PATCH v3 15/17] firmware: arm_ffa: Switch to using ffa_mem_desc_offset() accessor MIME-Version: 1.0 Message-Id: <20230929-ffa_v1-1_notif-v3-15-c8e4f15190c8@arm.com> References: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@arm.com> In-Reply-To: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@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=1661; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=WKIYZxRqRXASwTfRhZK26/hbt/X8NbiSbXFTeLJ2R0A=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBlFucwmwQnsz2nnr94GhK0TUe/Jk8JcvkQITM0z Ety5uzdjVuJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZRbnMAAKCRAAQbq8MX7i mPPID/9yCTj2U/sG/SGPGXZX1PRqK0TYhMUirlq7o4A+AUsh/+lnTThpYGVyeFIPhEbfEuwJ3r4 xJZKlx/dAhwN/F5D9Yx9D11CaqffpLne3jbRUm/swWw9ZiwTxZy4vYdp3gavKxqmWZchb/+IZY5 GvLHTwwmZs3tTmS8AO4vs6s9wAsr53vz044AqXOxcGBArDFSRVoDMq8GevIwwosL+KwolPqBD34 NQ6PzM0VNF3JEsLAIB6aP14BTMuyg0b3SLIZuFof8jNXGV8t7v9joYR2KU4bIVpI6ovEe+3ZY9b x2jbLM3K99PaCKNOTWc/LzSIs8tjrRpGAtes85HZpZ9iRJb5q+kBVI68xH1UuM7C3ULi9bYKPQU XFfp2FqKzMU9mKNI2JyYDE1rX6OVQKn7bnQ1+ha8ZL0eOQB+Bj/XJ8plh+DsfgownGTs7oNyjIF knjtTxRZq0msn/kVdG5ohwumM3OAMhRRJsi48kLZLHLMEyv/HGHY8v8MeGn337swMn2MRUv4Epk s+cmPCIEkscIGZdteeJoEns6miKAcJjytJRUMJoTb9h3d7664+OwYhG4WBw1EnnuTyK757xV3DY 7BBZnkc+2xVdd0QNPQy3Wk5+1a4qeQPDwsd9G6zVKUb04gYVHGDWeBvd97wmvklKWSIdBD6Ud4/ QSorGiA03tjiZWA== 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-20230929_080333_390656_C4885781 X-CRM114-Status: GOOD ( 11.62 ) 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 In preparation to add support to the new memory transaction descriptor, the ep_mem_access member needs to be removed and hence even the macro COMPOSITE_OFFSET(). Let us switch to using the new ffa_mem_desc_offset() accessor in ffa_setup_and_transmit(). This will enable adding the support for new format transparently without any changes here again. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_ffa/driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index d9ff3ec4f1eb..ef7011c86d60 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -449,14 +449,15 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, struct ffa_composite_mem_region *composite; struct ffa_mem_region_addr_range *constituents; struct ffa_mem_region_attributes *ep_mem_access; + bool mdesc_v1 = drv_info->version <= FFA_VERSION_1_0; u32 idx, frag_len, length, buf_sz = 0, num_entries = sg_nents(args->sg); mem_region->tag = args->tag; mem_region->flags = args->flags; mem_region->sender_id = drv_info->vm_id; mem_region->attributes = ffa_memory_attributes_get(func_id); - ep_mem_access = buffer + COMPOSITE_OFFSET(0); - composite_offset = COMPOSITE_OFFSET(args->nattrs); + ep_mem_access = buffer + ffa_mem_desc_offset(buffer, 0, mdesc_v1); + composite_offset = ffa_mem_desc_offset(buffer, args->nattrs, mdesc_v1); for (idx = 0; idx < args->nattrs; idx++, ep_mem_access++) { ep_mem_access->receiver = args->attrs[idx].receiver;