From: Sudeep Holla <sudeep.holla@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sudeep Holla <sudeep.holla@arm.com>, Marc Bonnici <marc.bonnici@arm.com>, Jens Wiklander <jens.wiklander@linaro.org>, Coboy Chen <coboy.chen@mediatek.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Olivier Deprez <olivier.deprez@arm.com> Subject: [PATCH v3 16/17] firmware: arm_ffa: Update memory descriptor to support v1.1 format Date: Fri, 29 Sep 2023 16:03:05 +0100 [thread overview] Message-ID: <20230929-ffa_v1-1_notif-v3-16-c8e4f15190c8@arm.com> (raw) In-Reply-To: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@arm.com> 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 updates 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 <sudeep.holla@arm.com> --- 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 ef7011c86d60..0168e69c495d 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -424,7 +424,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 (mdesc_v1) { + 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 7be240e37f36..f3adba0ef6c6 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, bool mem_desc_v1) { - 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 itself) + */ + if (mem_desc_v1) + offset += offsetof(struct ffa_mem_region, ep_mem_offset); + else + offset += sizeof(struct ffa_mem_region); + + return offset; } struct ffa_mem_ops_args { -- 2.42.0
WARNING: multiple messages have this Message-ID (diff)
From: Sudeep Holla <sudeep.holla@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sudeep Holla <sudeep.holla@arm.com>, Marc Bonnici <marc.bonnici@arm.com>, Jens Wiklander <jens.wiklander@linaro.org>, Coboy Chen <coboy.chen@mediatek.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Olivier Deprez <olivier.deprez@arm.com> Subject: [PATCH v3 16/17] firmware: arm_ffa: Update memory descriptor to support v1.1 format Date: Fri, 29 Sep 2023 16:03:05 +0100 [thread overview] Message-ID: <20230929-ffa_v1-1_notif-v3-16-c8e4f15190c8@arm.com> (raw) In-Reply-To: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@arm.com> 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 updates 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 <sudeep.holla@arm.com> --- 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 ef7011c86d60..0168e69c495d 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -424,7 +424,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 (mdesc_v1) { + 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 7be240e37f36..f3adba0ef6c6 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, bool mem_desc_v1) { - 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 itself) + */ + if (mem_desc_v1) + offset += offsetof(struct ffa_mem_region, ep_mem_offset); + else + offset += sizeof(struct ffa_mem_region); + + return offset; } struct ffa_mem_ops_args { -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-09-29 15:04 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-29 15:02 [PATCH v3 00/17] firmware: arm_ffa: Add FF-A v1.1 support(notification + new memory descriptor format) Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 01/17] firmware: arm_ffa: Update the FF-A command list with v1.1 additions Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 02/17] firmware: arm_ffa: Implement notification bitmap create and destroy interfaces Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 03/17] firmware: arm_ffa: Implement the notification bind and unbind interface Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-10-04 9:11 ` Jens Wiklander 2023-10-04 9:11 ` Jens Wiklander 2023-10-04 9:50 ` Olivier Deprez 2023-10-04 9:50 ` Olivier Deprez 2023-10-04 15:32 ` Sudeep Holla 2023-10-04 15:32 ` Sudeep Holla 2023-10-05 6:57 ` Jens Wiklander 2023-10-05 6:57 ` Jens Wiklander 2023-10-05 8:49 ` Sudeep Holla 2023-10-05 8:49 ` Sudeep Holla 2023-10-05 9:56 ` Jens Wiklander 2023-10-05 9:56 ` Jens Wiklander 2023-10-05 13:30 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 04/17] firmware: arm_ffa: Implement the FFA_RUN interface Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 05/17] firmware: arm_ffa: Implement the FFA_NOTIFICATION_SET interface Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 06/17] firmware: arm_ffa: Implement the FFA_NOTIFICATION_GET interface Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 07/17] firmware: arm_ffa: Implement the NOTIFICATION_INFO_GET interface Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-10-04 9:10 ` Jens Wiklander 2023-10-04 9:10 ` Jens Wiklander 2023-10-04 15:11 ` Sudeep Holla 2023-10-04 15:11 ` Sudeep Holla 2023-10-05 6:30 ` Jens Wiklander 2023-10-05 6:30 ` Jens Wiklander 2023-09-29 15:02 ` [PATCH v3 08/17] firmware: arm_ffa: Initial support for scheduler receiver interrupt Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 09/17] firmware: arm_ffa: Add schedule receiver callback mechanism Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:02 ` [PATCH v3 10/17] firmware: arm_ffa: Add interfaces to request notification callbacks Sudeep Holla 2023-09-29 15:02 ` Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 11/17] firmware: arm_ffa: Add interface to send a notification to a given partition Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 12/17] firmware: arm_ffa: Add notification handling mechanism Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 13/17] firmware: arm_ffa: Simplify the computation of transmit and fragment length Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 14/17] KVM: arm64: FFA: Remove access of endpoint memory access descriptor array Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla 2023-10-02 16:20 ` Sudeep Holla 2023-10-02 16:20 ` Sudeep Holla 2023-10-04 10:08 ` Marc Zyngier 2023-10-04 10:08 ` Marc Zyngier 2023-10-04 13:22 ` Sudeep Holla 2023-10-04 13:22 ` Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 15/17] firmware: arm_ffa: Switch to using ffa_mem_desc_offset() accessor Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla [this message] 2023-09-29 15:03 ` [PATCH v3 16/17] firmware: arm_ffa: Update memory descriptor to support v1.1 format Sudeep Holla 2023-09-29 15:03 ` [PATCH v3 17/17] firmware: arm_ffa: Upgrade the driver version to v1.1 Sudeep Holla 2023-09-29 15:03 ` Sudeep Holla
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230929-ffa_v1-1_notif-v3-16-c8e4f15190c8@arm.com \ --to=sudeep.holla@arm.com \ --cc=coboy.chen@mediatek.com \ --cc=jens.wiklander@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lpieralisi@kernel.org \ --cc=marc.bonnici@arm.com \ --cc=olivier.deprez@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.