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 30E1BA0C57; Mon, 1 Nov 2021 09:52:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC15C41103; Mon, 1 Nov 2021 09:52:19 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20050.outbound.protection.outlook.com [40.107.2.50]) by mails.dpdk.org (Postfix) with ESMTP id 64845410FD for ; Mon, 1 Nov 2021 09:52:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SXIEfy9DVlX1IqSWEX68wilDOHAEff+vpnTVfHYvS9Y+/kNIVQiD0CKbuN+ZZ1vEV0AhEoTr9jioxIJR3G/nHa+OuJXVKKqaQKOPCIoE/FzpkZ5pihwAfliG1daZPFsg6BnJ9QW5xAiC/bZkuUbi2B8MO2NxLBmAgKwUvZRI55z2lylj1A+Ze9J1EUvSM+k/6SW4+/ids8RfUwFcUbuzr9wxzoE2D/EDmrEI7vh2VkZHzKCEBSKnvLjucrozQQp5vyxtt4KHF6AR0CItxjGR0/0IVx8SDEXUd6MbqgvxR4g69nUlPNJUStaJ2ps3KqgXunwiqpqBz34VztINaokLrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Yzlxrgqh3TPALwq5k296KcHjF4i2nefv9nc6rSBNCW8=; b=NNjHv7NabZVdgretxEFFtgcBxIxPspmhFFLwD3B2cmqi+cvfUswEpa4vvHYkRbcf07QlIt+xtrhw/t52AC3ICRPM94RKmi+184vCBy1h32XhESl8s0XJkEWRgxAEb6D9V2Pzc46yUyXdE92J+/J+3KV7AqP/LamnNHvrPMPG+c1XHSH9Pz/ePWJUO3nE3Tn9CpnUNEMdeqznLBoDZWyjDjznvCPlHbXuv/SXsas3dNrKbwk2hvGSsYEtGmQo7vEbFbEuxZYu9ZfHRvDKspFCgHSuCsuZV6J6R3f8L6yWMXRAzgPh2YqeQZDCFUKJW6YgpIdwMGQH089WkbgVyhpA7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yzlxrgqh3TPALwq5k296KcHjF4i2nefv9nc6rSBNCW8=; b=r2aIKRWydXVrcqPUeXf9oPM7UmdSnwgEYTXbMEJotlcoZVALLvuNauSsrgvvrEfhrsYy8OHTv/hUk2PBL7Ws9gQF0RBaujaJGjC+QR6j9/vXYiutHTmvtDuzm0SiTVRGgx6i3ODyzwnA8sZb3U52OpSzNtpdMleVhKAWvx+FSZI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VI1PR04MB5086.eurprd04.prod.outlook.com (2603:10a6:803:62::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Mon, 1 Nov 2021 08:52:17 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::11d9:6f32:90e:80c1]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::11d9:6f32:90e:80c1%7]) with mapi id 15.20.4649.019; Mon, 1 Nov 2021 08:52:17 +0000 From: Gagandeep Singh To: thomas@monjalon.net, dev@dpdk.org Cc: nipun.gupta@nxp.com, Gagandeep Singh Date: Mon, 1 Nov 2021 14:21:42 +0530 Message-Id: <20211101085143.2472241-6-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211101085143.2472241-1-g.singh@nxp.com> References: <20210909111500.3901706-1-g.singh@nxp.com> <20211101085143.2472241-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0092.apcprd02.prod.outlook.com (2603:1096:4:90::32) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR02CA0092.apcprd02.prod.outlook.com (2603:1096:4:90::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Mon, 1 Nov 2021 08:52:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e634c3f3-0163-4035-abf1-08d99d14e815 X-MS-TrafficTypeDiagnostic: VI1PR04MB5086: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 388c6DFgSDuB1bH7QquwmaFW/YNruY3rBI/faByjrTXtLwPUrYNRDEgwIIAKCsC1UjN/74OILrWgejEzzJcn/b16btIRpHRlgBBQCC6X6MU7JEvZFaJHGzelPPkX9gCDiKcCF2Gke2Zp29mR3ggc3J+U9gIAarbj0nW09pQa5LJ1pQ+9hvuDPrpYD4rHaxD/+dXuRXSePDBPpU12TqqZlyk17wt+Hke9vp4vlJ1AKnNVnYzxMg7U4/AHdVXcmkl6yP7mXE0bqeEWBEJrnfxr5/Zwfc1qvR+zxb0f4tZ+2TY90qbNREO2y3fe7KNHnsxidpyTFgZqkIxzRibhR7OA8dakcix4V3Cos/IdrEQVFog2Y+rInFMWvr/OtUQBL0cMnQsuZhmgf5W6KYj5d2kVQLZ78SMIzw+eutCqB25/uuSQFC/dTCbCZM6y360g4UvqobPyDo5+5LHyFo0SWii77qn17bPlwm5GNEfM7OgCHfB68oed1lJn43lUXDLORoZpPxZaGQCGxS12I2JFOPjghQISNbIiro8Aeh/nmxfbUAGHy7PV12LyO3yV4ybQM6EeE/lKGmmVKlNL2RZnXCpifemetDgornmm6lD0TKiQVxz8C/7zDGpSJO4q5reQp9oRxQa028qZLYiH0/RzHjkNbr5NC7sVbdQDMpo8B3wNkJRb8fF8y3sbbAx7OLQVekpoPc4zL321jXQ309fFx8PmgqhI5ppg87NA2ZNp09qzBss= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38350700002)(38100700002)(55236004)(6486002)(6666004)(186003)(1006002)(30864003)(4326008)(5660300002)(316002)(956004)(2616005)(86362001)(66556008)(7696005)(66476007)(26005)(36756003)(52116002)(8936002)(2906002)(66946007)(8676002)(83380400001)(508600001)(1076003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+y2+6F9IRZS0UJ2N40QIOutybejvXWOfnAy8rv3Fl6JlgYgvzhnkhBIyFMrc?= =?us-ascii?Q?4zu5DIgBwcyumg5GHNxq0oaoIwbd4k06JYUL7O61kNNCzp6htvX2uNS8N/U2?= =?us-ascii?Q?zIRURVeOFDE7hUindM3Xak/MpJoOjrjAtH40X4Oaop2K2oQzEgbXemD04h+R?= =?us-ascii?Q?8RZuiG3+5fuIy/NrCufLEHIBX1tc13TM6arw559HsPAoHZ6NVerJ9lxFouDT?= =?us-ascii?Q?8dpda3votqRi+cIrXn9jenjTHa58xGevT7e1w2GuoMeh7Derw6E/OafEaDx/?= =?us-ascii?Q?AuZN4P8ag8MoDKRAlNT8GlbOhrlbEtlKdmNXu1zvZe5ZbaDwZ0i1Hhrdh/kC?= =?us-ascii?Q?H1pjF2Wn1vFzJPjfa1YyrtCf35+rA4zOvTwqu6DdJrdBBx6HwyeIaSma8EXv?= =?us-ascii?Q?vjrT76korS5NmcQJ5oEQImMesg7ordUZ9lWyja9LbFWaV2SHEjJgdaduqq59?= =?us-ascii?Q?OhU5knjEyHUe7RVPYFsm0XLXp6o0VWJcFYwk8JovV8Ogkoq2lcr7itA2My42?= =?us-ascii?Q?QPQyrSAv/Fc76wVVL1jX7DP+aSNL5D+I9yrAHzAV4MbBeR4fXiqxEKplHUrd?= =?us-ascii?Q?JvTF2qYwPUaF32/vF7FAGQM0y8q5HrVYTHpXiYXoDCD2efHI4ABoqxSlGcom?= =?us-ascii?Q?1hyLPd3oTAnSfWVxdZyWR3fY+lder41lMyt5Nhyus/doXDQ1K3ktWKSGg1if?= =?us-ascii?Q?O4Pe0hfC1dKM5sbFnKp5AbJNlmbkRsDOaftKnX8G+mA4m4iHKxtwgCexazU6?= =?us-ascii?Q?WRS3sJnb3b/SEsSmNrd7tIl8xVpFvY1d/rAyYQpMXVpNUjbDJkyhhJZNZn28?= =?us-ascii?Q?N8DStagNVy7apM1nPx/Czwv/b1spt9kYH738LZCcsr4NAah0R98dr6Dy4tZC?= =?us-ascii?Q?ZjHL6hs65m2pCvQKlMMevFYmXeZo577dgM9GKbaY+dEtBi+Y0wYNXEALcTfy?= =?us-ascii?Q?GrhSI+bp6TLFAM/8mgHIz5LEwoFZ+5Fj5lzNEXGdqN2DgGf+mi5cuBoKaRez?= =?us-ascii?Q?n1QJNH3pcndX2bP1PoAtoNGlDUUfOZuEtgpRsxLFtNfn3CCwWX6HTKObgWJ0?= =?us-ascii?Q?D7OqS0xlTXbkiXpEHuHVGv6BwoNHqckQvB2q88j4h9Wvsn6WRbF7BA9WV0if?= =?us-ascii?Q?sBPr/TOZefqCsC49yppou0HaiR7EWzKWqR7jGqvHk5GPNESjk/kySVp7/a37?= =?us-ascii?Q?IY6AQ5hLkr55BlOp6lb/H6cvi/+586F6cZvp+vPtTlgut3I0uI2hebNRe0js?= =?us-ascii?Q?RyxNXLvz+mXAkdeFDCsUQ4v3AmSuGQQ/Cvd4AJcsyVe6jHF6wXY7U/a0b1Qg?= =?us-ascii?Q?ZXkq3QSSjBJ0Jq18KnsC8z35QhZ7PVXpAanzBejzhyw0wSqXm4w0KgcNr/nw?= =?us-ascii?Q?tuRBtrdKhunUYcC7FDRHrHrgbrokotU4W6I9hyR7RegDd8tO4rNw9AM7iC2L?= =?us-ascii?Q?mTfuUQYAAxgoUT0oxd7nm1l6Stx/KtvTRFNyoE05MQG5jY70b6OG6hGVQTZx?= =?us-ascii?Q?bsCF4MtZetsrJMEGJG7uGQdMMUwHvFGo58WDJ6K4zRKOF8RUMHIrLufpg9uo?= =?us-ascii?Q?EL9YbezRTTwXThw4ZVs=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e634c3f3-0163-4035-abf1-08d99d14e815 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2021 08:52:17.3036 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zmvuYZUHsLlb99aIy56DhxFomxdrPYkAYTxVhMX4JYqx5sqfywDq2IzlzC1Cy6vS X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5086 Subject: [dpdk-dev] [PATCH v2 5/6] dma/dpaa: support DMA operations 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 Sender: "dev" This patch support copy, submit, completed and completed status functionality of DMA driver. Signed-off-by: Gagandeep Singh --- drivers/dma/dpaa/dpaa_qdma.c | 344 +++++++++++++++++++++++++++++++++++ drivers/dma/dpaa/dpaa_qdma.h | 4 + 2 files changed, 348 insertions(+) diff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c index 0240f40907..a5973c22ae 100644 --- a/drivers/dma/dpaa/dpaa_qdma.c +++ b/drivers/dma/dpaa/dpaa_qdma.c @@ -15,11 +15,48 @@ qdma_desc_addr_set64(struct fsl_qdma_format *ccdf, u64 addr) ccdf->addr_lo = rte_cpu_to_le_32(lower_32_bits(addr)); } +static inline u64 +qdma_ccdf_get_queue(const struct fsl_qdma_format *ccdf) +{ + return ccdf->cfg8b_w1 & 0xff; +} + +static inline int +qdma_ccdf_get_offset(const struct fsl_qdma_format *ccdf) +{ + return (rte_le_to_cpu_32(ccdf->cfg) & QDMA_CCDF_MASK) + >> QDMA_CCDF_OFFSET; +} + +static inline void +qdma_ccdf_set_format(struct fsl_qdma_format *ccdf, int offset) +{ + ccdf->cfg = rte_cpu_to_le_32(QDMA_CCDF_FOTMAT | offset); +} + +static inline int +qdma_ccdf_get_status(const struct fsl_qdma_format *ccdf) +{ + return (rte_le_to_cpu_32(ccdf->status) & QDMA_CCDF_MASK) + >> QDMA_CCDF_STATUS; +} + +static inline void +qdma_ccdf_set_ser(struct fsl_qdma_format *ccdf, int status) +{ + ccdf->status = rte_cpu_to_le_32(QDMA_CCDF_SER | status); +} + static inline void qdma_csgf_set_len(struct fsl_qdma_format *csgf, int len) { csgf->cfg = rte_cpu_to_le_32(len & QDMA_SG_LEN_MASK); } +static inline void qdma_csgf_set_f(struct fsl_qdma_format *csgf, int len) +{ + csgf->cfg = rte_cpu_to_le_32(QDMA_SG_FIN | (len & QDMA_SG_LEN_MASK)); +} + static inline int ilog2(int x) { int log = 0; @@ -43,6 +80,16 @@ static void qdma_writel(u32 val, void *addr) QDMA_OUT(addr, val); } +static u32 qdma_readl_be(void *addr) +{ + return QDMA_IN_BE(addr); +} + +static void qdma_writel_be(u32 val, void *addr) +{ + QDMA_OUT_BE(addr, val); +} + static void *dma_pool_alloc(int size, int aligned, dma_addr_t *phy_addr) { void *virt_addr; @@ -97,6 +144,31 @@ static void fsl_qdma_free_chan_resources(struct fsl_qdma_chan *fsl_chan) fsl_qdma->desc_allocated--; } +static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp, + dma_addr_t dst, dma_addr_t src, u32 len) +{ + struct fsl_qdma_format *csgf_src, *csgf_dest; + + /* Note: command table (fsl_comp->virt_addr) is getting filled + * directly in cmd descriptors of queues while enqueuing the descriptor + * please refer fsl_qdma_enqueue_desc + * frame list table (virt_addr) + 1) and source, + * destination descriptor table + * (fsl_comp->desc_virt_addr and fsl_comp->desc_virt_addr+1) move to + * the control path to fsl_qdma_pre_request_enqueue_comp_sd_desc + */ + csgf_src = (struct fsl_qdma_format *)fsl_comp->virt_addr + 2; + csgf_dest = (struct fsl_qdma_format *)fsl_comp->virt_addr + 3; + + /* Status notification is enqueued to status queue. */ + qdma_desc_addr_set64(csgf_src, src); + qdma_csgf_set_len(csgf_src, len); + qdma_desc_addr_set64(csgf_dest, dst); + qdma_csgf_set_len(csgf_dest, len); + /* This entry is the last entry. */ + qdma_csgf_set_f(csgf_dest, len); +} + /* * Pre-request command descriptor and compound S/G for enqueue. */ @@ -153,6 +225,25 @@ static int fsl_qdma_pre_request_enqueue_comp_sd_desc( return 0; } +/* + * Request a command descriptor for enqueue. + */ +static struct fsl_qdma_comp * +fsl_qdma_request_enqueue_desc(struct fsl_qdma_chan *fsl_chan) +{ + struct fsl_qdma_queue *queue = fsl_chan->queue; + struct fsl_qdma_comp *comp_temp; + + if (!list_empty(&queue->comp_free)) { + comp_temp = list_first_entry(&queue->comp_free, + struct fsl_qdma_comp, + list); + list_del(&comp_temp->list); + return comp_temp; + } + + return NULL; +} static struct fsl_qdma_queue *fsl_qdma_alloc_queue_resources(struct fsl_qdma_engine *fsl_qdma) @@ -287,6 +378,54 @@ static int fsl_qdma_halt(struct fsl_qdma_engine *fsl_qdma) return 0; } +static int +fsl_qdma_queue_transfer_complete(struct fsl_qdma_engine *fsl_qdma, + void *block, int id, const uint16_t nb_cpls, + uint16_t *last_idx, + enum rte_dma_status_code *status) +{ + struct fsl_qdma_queue *fsl_queue = fsl_qdma->queue; + struct fsl_qdma_queue *fsl_status = fsl_qdma->status[id]; + struct fsl_qdma_queue *temp_queue; + struct fsl_qdma_format *status_addr; + struct fsl_qdma_comp *fsl_comp = NULL; + u32 reg, i; + int count = 0; + + while (count < nb_cpls) { + reg = qdma_readl_be(block + FSL_QDMA_BSQSR); + if (reg & FSL_QDMA_BSQSR_QE_BE) + return count; + + status_addr = fsl_status->virt_head; + + i = qdma_ccdf_get_queue(status_addr) + + id * fsl_qdma->n_queues; + temp_queue = fsl_queue + i; + fsl_comp = list_first_entry(&temp_queue->comp_used, + struct fsl_qdma_comp, + list); + list_del(&fsl_comp->list); + + reg = qdma_readl_be(block + FSL_QDMA_BSQMR); + reg |= FSL_QDMA_BSQMR_DI_BE; + + qdma_desc_addr_set64(status_addr, 0x0); + fsl_status->virt_head++; + if (fsl_status->virt_head == fsl_status->cq + fsl_status->n_cq) + fsl_status->virt_head = fsl_status->cq; + qdma_writel_be(reg, block + FSL_QDMA_BSQMR); + *last_idx = fsl_comp->index; + if (status != NULL) + status[count] = RTE_DMA_STATUS_SUCCESSFUL; + + list_add_tail(&fsl_comp->list, &temp_queue->comp_free); + count++; + + } + return count; +} + static int fsl_qdma_reg_init(struct fsl_qdma_engine *fsl_qdma) { struct fsl_qdma_queue *fsl_queue = fsl_qdma->queue; @@ -381,6 +520,65 @@ static int fsl_qdma_reg_init(struct fsl_qdma_engine *fsl_qdma) return 0; } +static void * +fsl_qdma_prep_memcpy(void *fsl_chan, dma_addr_t dst, + dma_addr_t src, size_t len, + void *call_back, + void *param) +{ + struct fsl_qdma_comp *fsl_comp; + + fsl_comp = + fsl_qdma_request_enqueue_desc((struct fsl_qdma_chan *)fsl_chan); + if (!fsl_comp) + return NULL; + + fsl_comp->qchan = fsl_chan; + fsl_comp->call_back_func = call_back; + fsl_comp->params = param; + + fsl_qdma_comp_fill_memcpy(fsl_comp, dst, src, len); + return (void *)fsl_comp; +} + +static int fsl_qdma_enqueue_desc(struct fsl_qdma_chan *fsl_chan, + struct fsl_qdma_comp *fsl_comp, + uint64_t flags) +{ + struct fsl_qdma_queue *fsl_queue = fsl_chan->queue; + void *block = fsl_queue->block_base; + struct fsl_qdma_format *ccdf; + u32 reg; + + /* retrieve and store the register value in big endian + * to avoid bits swap + */ + reg = qdma_readl_be(block + + FSL_QDMA_BCQSR(fsl_queue->id)); + if (reg & (FSL_QDMA_BCQSR_QF_XOFF_BE)) + return -1; + + /* filling descriptor command table */ + ccdf = (struct fsl_qdma_format *)fsl_queue->virt_head; + qdma_desc_addr_set64(ccdf, fsl_comp->bus_addr + 16); + qdma_ccdf_set_format(ccdf, qdma_ccdf_get_offset(fsl_comp->virt_addr)); + qdma_ccdf_set_ser(ccdf, qdma_ccdf_get_status(fsl_comp->virt_addr)); + fsl_comp->index = fsl_queue->virt_head - fsl_queue->cq; + fsl_queue->virt_head++; + + if (fsl_queue->virt_head == fsl_queue->cq + fsl_queue->n_cq) + fsl_queue->virt_head = fsl_queue->cq; + + list_add_tail(&fsl_comp->list, &fsl_queue->comp_used); + + if (flags == RTE_DMA_OP_FLAG_SUBMIT) { + reg = qdma_readl_be(block + FSL_QDMA_BCQMR(fsl_queue->id)); + reg |= FSL_QDMA_BCQMR_EI_BE; + qdma_writel_be(reg, block + FSL_QDMA_BCQMR(fsl_queue->id)); + } + return fsl_comp->index; +} + static int fsl_qdma_alloc_chan_resources(struct fsl_qdma_chan *fsl_chan) { struct fsl_qdma_queue *fsl_queue = fsl_chan->queue; @@ -492,6 +690,148 @@ dpaa_qdma_queue_setup(struct rte_dma_dev *dmadev, return dpaa_get_channel(fsl_qdma, vchan); } +static int +dpaa_qdma_submit(void *dev_private, uint16_t vchan) +{ + struct fsl_qdma_engine *fsl_qdma = (struct fsl_qdma_engine *)dev_private; + struct fsl_qdma_chan *fsl_chan = + &fsl_qdma->chans[fsl_qdma->vchan_map[vchan]]; + struct fsl_qdma_queue *fsl_queue = fsl_chan->queue; + void *block = fsl_queue->block_base; + u32 reg; + + reg = qdma_readl_be(block + FSL_QDMA_BCQMR(fsl_queue->id)); + reg |= FSL_QDMA_BCQMR_EI_BE; + qdma_writel_be(reg, block + FSL_QDMA_BCQMR(fsl_queue->id)); + + return 0; +} + +static int +dpaa_qdma_enqueue(void *dev_private, uint16_t vchan, + rte_iova_t src, rte_iova_t dst, + uint32_t length, uint64_t flags) +{ + struct fsl_qdma_engine *fsl_qdma = (struct fsl_qdma_engine *)dev_private; + struct fsl_qdma_chan *fsl_chan = + &fsl_qdma->chans[fsl_qdma->vchan_map[vchan]]; + int ret; + + void *fsl_comp = NULL; + + fsl_comp = fsl_qdma_prep_memcpy(fsl_chan, + (dma_addr_t)dst, (dma_addr_t)src, + length, NULL, NULL); + if (!fsl_comp) { + DPAA_QDMA_DP_DEBUG("fsl_comp is NULL\n"); + return -1; + } + ret = fsl_qdma_enqueue_desc(fsl_chan, fsl_comp, flags); + + return ret; +} + +static uint16_t +dpaa_qdma_dequeue_status(void *dev_private, uint16_t vchan, + const uint16_t nb_cpls, uint16_t *last_idx, + enum rte_dma_status_code *st) +{ + struct fsl_qdma_engine *fsl_qdma = (struct fsl_qdma_engine *)dev_private; + int id = (int)((fsl_qdma->vchan_map[vchan]) / QDMA_QUEUES); + void *block; + unsigned int reg; + int intr; + void *status = fsl_qdma->status_base; + + intr = qdma_readl_be(status + FSL_QDMA_DEDR); + if (intr) { + DPAA_QDMA_ERR("DMA transaction error! %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW0R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW0R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW1R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW1R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW2R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW2R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW3R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW3R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFQIDR); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFQIDR %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECBR); + DPAA_QDMA_INFO("reg FSL_QDMA_DECBR %x\n", intr); + qdma_writel(0xffffffff, + status + FSL_QDMA_DEDR); + intr = qdma_readl(status + FSL_QDMA_DEDR); + } + + block = fsl_qdma->block_base + + FSL_QDMA_BLOCK_BASE_OFFSET(fsl_qdma, id); + + intr = fsl_qdma_queue_transfer_complete(fsl_qdma, block, id, nb_cpls, + last_idx, st); + if (intr < 0) { + void *ctrl = fsl_qdma->ctrl_base; + + reg = qdma_readl(ctrl + FSL_QDMA_DMR); + reg |= FSL_QDMA_DMR_DQD; + qdma_writel(reg, ctrl + FSL_QDMA_DMR); + qdma_writel(0, block + FSL_QDMA_BCQIER(0)); + DPAA_QDMA_ERR("QDMA: status err!\n"); + } + + return intr; +} + + +static uint16_t +dpaa_qdma_dequeue(void *dev_private, + uint16_t vchan, const uint16_t nb_cpls, + uint16_t *last_idx, __rte_unused bool *has_error) +{ + struct fsl_qdma_engine *fsl_qdma = (struct fsl_qdma_engine *)dev_private; + int id = (int)((fsl_qdma->vchan_map[vchan]) / QDMA_QUEUES); + void *block; + unsigned int reg; + int intr; + void *status = fsl_qdma->status_base; + + intr = qdma_readl_be(status + FSL_QDMA_DEDR); + if (intr) { + DPAA_QDMA_ERR("DMA transaction error! %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW0R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW0R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW1R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW1R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW2R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW2R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFDW3R); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFDW3R %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECFQIDR); + DPAA_QDMA_INFO("reg FSL_QDMA_DECFQIDR %x\n", intr); + intr = qdma_readl(status + FSL_QDMA_DECBR); + DPAA_QDMA_INFO("reg FSL_QDMA_DECBR %x\n", intr); + qdma_writel(0xffffffff, + status + FSL_QDMA_DEDR); + intr = qdma_readl(status + FSL_QDMA_DEDR); + } + + block = fsl_qdma->block_base + + FSL_QDMA_BLOCK_BASE_OFFSET(fsl_qdma, id); + + intr = fsl_qdma_queue_transfer_complete(fsl_qdma, block, id, nb_cpls, + last_idx, NULL); + if (intr < 0) { + void *ctrl = fsl_qdma->ctrl_base; + + reg = qdma_readl(ctrl + FSL_QDMA_DMR); + reg |= FSL_QDMA_DMR_DQD; + qdma_writel(reg, ctrl + FSL_QDMA_DMR); + qdma_writel(0, block + FSL_QDMA_BCQIER(0)); + DPAA_QDMA_ERR("QDMA: status err!\n"); + } + + return intr; +} + static struct rte_dma_dev_ops dpaa_qdma_ops = { .dev_info_get = dpaa_info_get, .dev_configure = dpaa_qdma_configure, @@ -609,6 +949,10 @@ dpaa_qdma_probe(__rte_unused struct rte_dpaa_driver *dpaa_drv, dmadev->dev_ops = &dpaa_qdma_ops; dmadev->device = &dpaa_dev->device; dmadev->fp_obj->dev_private = dmadev->data->dev_private; + dmadev->fp_obj->copy = dpaa_qdma_enqueue; + dmadev->fp_obj->submit = dpaa_qdma_submit; + dmadev->fp_obj->completed = dpaa_qdma_dequeue; + dmadev->fp_obj->completed_status = dpaa_qdma_dequeue_status; /* Invoke PMD device initialization function */ ret = dpaa_qdma_init(dmadev); diff --git a/drivers/dma/dpaa/dpaa_qdma.h b/drivers/dma/dpaa/dpaa_qdma.h index f482b16334..ef3c37e3a8 100644 --- a/drivers/dma/dpaa/dpaa_qdma.h +++ b/drivers/dma/dpaa/dpaa_qdma.h @@ -5,6 +5,10 @@ #ifndef _DPAA_QDMA_H_ #define _DPAA_QDMA_H_ +#ifndef BIT +#define BIT(nr) (1UL << (nr)) +#endif + #define CORE_NUMBER 4 #define RETRIES 5 -- 2.25.1