From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0092D43D05; Wed, 20 Mar 2024 16:45:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 774F642EC7; Wed, 20 Mar 2024 16:39:44 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 83920427DD for ; Wed, 20 Mar 2024 16:38:39 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 6FCAD20B2000; Wed, 20 Mar 2024 08:38:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6FCAD20B2000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1710949105; bh=G/npDWzwqnGGy7BuotOfFMMT5K773xE3/q+ZxMAjmQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ceCm0kcVpzrQjWbs8PpRslPEqMdGiRY0rm20ztlnxG02+zqBsqaL16eLfY4ix/PNV UtPIwHl0zqY3H9CO39+IbbJTqSmVpXfBd5D+Qn2zka5LB/AUEcTWvghWaCiIvYGEIo FzSdcekEYTTsUi4k4gzspq168qTadYHfBPJgbX/A= From: Tyler Retzlaff To: dev@dpdk.org Cc: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , "Min Hu (Connor)" , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Abdullah Sevincer , Ajit Khaparde , Akhil Goyal , Alok Prasad , Amit Bernstein , Anatoly Burakov , Andrew Boyer , Andrew Rybchenko , Ankur Dwivedi , Anoob Joseph , Ashish Gupta , Ashwin Sekhar T K , Bruce Richardson , Byron Marohn , Chaoyong He , Chas Williams , Chenbo Xia , Chengwen Feng , Conor Walsh , Cristian Dumitrescu , Dariusz Sosnowski , David Hunt , Devendra Singh Rawat , Ed Czeck , Evgeny Schemeilin , Fan Zhang , Gagandeep Singh , Guoyang Zhou , Harman Kalra , Harry van Haaren , Hemant Agrawal , Honnappa Nagarahalli , Hyong Youb Kim , Jakub Grajciar , Jerin Jacob , Jian Wang , Jiawen Wu , Jie Hai , Jingjing Wu , John Daley , John Miller , Joyce Kong , Junfeng Guo , Kai Ji , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Lee Daly , Liang Ma , Liron Himi , Long Li , Maciej Czekaj , Matan Azrad , Matt Peters , Maxime Coquelin , Michael Shamis , Nagadheeraj Rottela , Nicolas Chautru , Nithin Dabilpuram , Ori Kam , Pablo de Lara , Pavan Nikhilesh , Peter Mccarthy , Radu Nicolau , Rahul Lakkireddy , Rakesh Kudurumalla , Raveendra Padasalagi , Reshma Pattan , Ron Beider , Ruifeng Wang , Sachin Saxena , Selwin Sebastian , Shai Brandes , Shepard Siegel , Shijith Thotton , Sivaprasad Tummala , Somnath Kotur , Srikanth Yalavarthi , Stephen Hemminger , Steven Webster , Suanming Mou , Sunil Kumar Kori , Sunil Uttarwar , Sunila Sahu , Tejasree Kondoj , Viacheslav Ovsiienko , Vikas Gupta , Volodymyr Fialko , Wajeeh Atrash , Wisam Jaddo , Xiaoyun Wang , Yipeng Wang , Yisen Zhuang , Yuying Zhang , Zhangfei Gao , Zhirun Yan , Ziyang Xuan , Tyler Retzlaff Subject: [PATCH 83/83] bus/dpaa: move alignment attribute on types Date: Wed, 20 Mar 2024 08:38:16 -0700 Message-Id: <1710949096-5786-84-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> References: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Move location of __rte_aligned(a) to new conventional location. The new placement between {struct,union} and the tag allows the desired alignment to be imparted on the type regardless of the toolchain being used for both C and C++. Additionally, it avoids confusion by Doxygen when generating documentation. Signed-off-by: Tyler Retzlaff --- drivers/bus/dpaa/base/qbman/qman.c | 3 +-- drivers/bus/dpaa/include/fsl_bman.h | 4 ++-- drivers/bus/dpaa/include/fsl_qman.h | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 83db0a5..6d2fbdc 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -95,8 +95,7 @@ struct qman_portal { * to 2 ** 10 to ensure DQRR index calculations based shadow copy * address (6 bits for address shift + 4 bits for the DQRR size). */ - struct qm_dqrr_entry shadow_dqrr[QM_DQRR_SIZE] - __rte_aligned(1024); + alignas(1024) struct qm_dqrr_entry shadow_dqrr[QM_DQRR_SIZE]; #endif }; diff --git a/drivers/bus/dpaa/include/fsl_bman.h b/drivers/bus/dpaa/include/fsl_bman.h index 6719a4e..34d7eb3 100644 --- a/drivers/bus/dpaa/include/fsl_bman.h +++ b/drivers/bus/dpaa/include/fsl_bman.h @@ -41,7 +41,7 @@ static inline void bman_depletion_fill(struct bman_depletion *c) * pool id specific to this buffer is needed (BM_RCR_VERB_CMD_BPID_MULTI, * BM_MCC_VERB_ACQUIRE), the 'bpid' field is used. */ -struct bm_buffer { +struct __rte_aligned(8) bm_buffer { union { struct { #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ @@ -67,7 +67,7 @@ struct bm_buffer { }; u64 opaque; }; -} __rte_aligned(8); +}; static inline u64 bm_buffer_get64(const struct bm_buffer *buf) { return buf->addr; diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h index 5953309..acdfb45 100644 --- a/drivers/bus/dpaa/include/fsl_qman.h +++ b/drivers/bus/dpaa/include/fsl_qman.h @@ -124,7 +124,7 @@ enum qm_fd_format { #define QM_FD_COMPOUND QM_FD_FORMAT_COMPOUND /* "Frame Descriptor (FD)" */ -struct qm_fd { +struct __rte_aligned(8) qm_fd { union { struct { #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ @@ -200,7 +200,7 @@ struct qm_fd { u32 cmd; u32 status; }; -} __rte_aligned(8); +}; #define QM_FD_DD_NULL 0x00 #define QM_FD_PID_MASK 0x3f static inline u64 qm_fd_addr_get64(const struct qm_fd *fd) @@ -330,9 +330,9 @@ struct __rte_aligned(8) qm_dqrr_entry { /* "ERN Message Response" */ /* "FQ State Change Notification" */ -struct qm_mr_entry { +struct __rte_aligned(8) qm_mr_entry { union { - struct { + alignas(8) struct { u8 verb; u8 dca; u16 seqnum; @@ -341,8 +341,8 @@ struct qm_mr_entry { u32 fqid; /* 24-bit */ u32 tag; struct qm_fd fd; /* this has alignment 8 */ - } __packed __rte_aligned(8) ern; - struct { + } __packed ern; + alignas(8) struct { u8 verb; #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ u8 colour:2; /* See QM_MR_DCERN_COLOUR_* */ @@ -359,18 +359,18 @@ struct qm_mr_entry { u32 fqid; /* 24-bit */ u32 tag; struct qm_fd fd; /* this has alignment 8 */ - } __packed __rte_aligned(8) dcern; - struct { + } __packed dcern; + alignas(8) struct { u8 verb; u8 fqs; /* Frame Queue Status */ u8 __reserved1[6]; u32 fqid; /* 24-bit */ u32 contextB; u8 __reserved2[16]; - } __packed __rte_aligned(8) fq; /* FQRN/FQRNI/FQRL/FQPN */ + } __packed fq; /* FQRN/FQRNI/FQRL/FQPN */ }; u8 __reserved2[32]; -} __packed __rte_aligned(8); +} __packed; #define QM_MR_VERB_VBIT 0x80 /* * ERNs originating from direct-connect portals ("dcern") use 0x20 as a verb -- 1.8.3.1