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 D2242A00C2; Thu, 5 May 2022 17:37:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E5E34014F; Thu, 5 May 2022 17:37:59 +0200 (CEST) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mails.dpdk.org (Postfix) with ESMTP id A28CB40042 for ; Thu, 5 May 2022 17:37:57 +0200 (CEST) Received: by mail-qk1-f170.google.com with SMTP id b20so3417830qkc.6 for ; Thu, 05 May 2022 08:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2WjmXnRQ/yhcxfxQBeL8LMUegrSsK588dy9IEbffrhU=; b=we2xSj/xWR0rDHWNHP+XQlP2JM1F7x+TRxCx197Yw9IbFHPKOIHxARiVP0IHPrwdyo rICHIqKuL11hmozBjJdKguOJwbJgBQLwjsIeyBPGsxhhd1cdjWoI2XWAGG2xgBxJsYGP OfvOvQTAhugtxIWeZ4onQxRO2UK80j1R4+KsGPTXxe54OYOozSJ2phUuOK3jSMoCMdn9 EYQHlbc4ErSwYiLlkFBteMqOvq/iD0EHCsNfhQz2wUZUGKEhi2Dwn3C98c+usE0Sl9Jb a6dt0CiKuWPNgW7yxJWXLl+lxloV1BLMhOnNIKvpl15huwCPeDoP7eTBuUd+9i529fcc wG0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2WjmXnRQ/yhcxfxQBeL8LMUegrSsK588dy9IEbffrhU=; b=VBZHJdGYyPAhhgjT3qwssdZ9jZkHXLLKatDsebj+9ImyL3Q6sNkHxX7PFGdWwvQ7aJ aw910jlYnCSvZXQVjcWsWmxqXAvFQii12vT/qhIvrhZBw2pxaGLc3w+tOxNtqmmUUzcD RRNxSA63/fCgyNb0I4m7ZolxRRgO0qxh8YEXRbVzH1mnfCOTrpWiOwWjOD9BJyEt6iZl ymrfyLXOxPE/8swveZKznBBsoVwrL6K61wWkui+PKf+I6X6oa9QTCGTq79GG4RxjTLfB eTRWGlnDgz3GlBlTuwrCjbvqLly/CuMsz2f70yeUVmgG+Zds6tYHV+koEpMu+MoCfm2o Qo/g== X-Gm-Message-State: AOAM5324GMQ3rsdDjaWJ09f0wrrb1cXCdGkNOv+l3m8N9oESR+EcvhGm LM2oYv87xq2MiPaW0sm4rRkLEWKv7Zfd/FAh X-Google-Smtp-Source: ABdhPJw9y046Tq6gSYX/dtK4C6ZK8OpvGI0RJgD7egM1lzLW0EMxscaQzoUFgddA2ILS/w2cQHYbIA== X-Received: by 2002:a37:4d4:0:b0:69f:cc67:6f89 with SMTP id 203-20020a3704d4000000b0069fcc676f89mr17689845qke.61.1651765076665; Thu, 05 May 2022 08:37:56 -0700 (PDT) Received: from z170.czeck.local (pool-173-48-102-189.bstnma.fios.verizon.net. [173.48.102.189]) by smtp.gmail.com with ESMTPSA id r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:37:56 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 1/5] net/ark: update mpu code to match current hardware version Date: Thu, 5 May 2022 11:37:24 -0400 Message-Id: <20220505153728.22636-1-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220502212232.1283-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.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 new version code remove device-level global operations remove ark_mpu_reset_stats function Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev.c | 2 -- drivers/net/ark/ark_ethdev_rx.c | 4 ---- drivers/net/ark/ark_mpu.c | 21 ++++----------------- drivers/net/ark/ark_mpu.h | 29 ++--------------------------- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 76b88c62d0..c0578b85ce 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -524,7 +524,6 @@ ark_config_device(struct rte_eth_dev *dev) num_q = ark_api_num_queues(mpu); ark->rx_queues = num_q; for (i = 0; i < num_q; i++) { - ark_mpu_reset(mpu); mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } @@ -536,7 +535,6 @@ ark_config_device(struct rte_eth_dev *dev) num_q = ark_api_num_queues(mpu); ark->tx_queues = num_q; for (i = 0; i < num_q; i++) { - ark_mpu_reset(mpu); mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 0fbb2603db..85e34d0bb8 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -91,9 +91,6 @@ eth_ark_rx_hw_setup(struct rte_eth_dev *dev, ark_udm_write_addr(queue->udm, phys_addr_prod_index); - /* advance the valid pointer, but don't start until the queue starts */ - ark_mpu_reset_stats(queue->mpu); - /* The seed is the producer index for the HW */ ark_mpu_set_producer(queue->mpu, queue->seed_index); dev->data->rx_queue_state[rx_queue_idx] = RTE_ETH_QUEUE_STATE_STOPPED; @@ -589,7 +586,6 @@ eth_rx_queue_stats_reset(void *vqueue) if (queue == 0) return; - ark_mpu_reset_stats(queue->mpu); ark_udm_queue_stats_reset(queue->udm); } diff --git a/drivers/net/ark/ark_mpu.c b/drivers/net/ark/ark_mpu.c index b8e94b6ed3..9d5ee7841b 100644 --- a/drivers/net/ark/ark_mpu.c +++ b/drivers/net/ark/ark_mpu.c @@ -24,10 +24,10 @@ ark_mpu_verify(struct ark_mpu_t *mpu, uint32_t obj_size) { uint32_t version; - version = mpu->id.vernum & 0x0000fF00; - if ((mpu->id.idnum != 0x2055504d) || - (mpu->hw.obj_size != obj_size) || - (version != 0x00003100)) { + version = mpu->id.vernum; + if (mpu->id.idnum != ARK_MPU_MODID || + version != ARK_MPU_MODVER || + mpu->hw.obj_size != obj_size) { ARK_PMD_LOG(ERR, " MPU module not found as expected %08x" " \"%c%c%c%c %c%c%c%c\"\n", @@ -79,16 +79,9 @@ ark_mpu_reset(struct ark_mpu_t *mpu) mpu->cfg.command = MPU_CMD_FORCE_RESET; usleep(10); } - ark_mpu_reset_stats(mpu); return mpu->cfg.command != MPU_CMD_IDLE; } -void -ark_mpu_reset_stats(struct ark_mpu_t *mpu) -{ - mpu->stats.pci_request = 1; /* reset stats */ -} - int ark_mpu_configure(struct ark_mpu_t *mpu, rte_iova_t ring, uint32_t ring_size, int is_tx) @@ -118,12 +111,6 @@ ark_mpu_dump(struct ark_mpu_t *mpu, const char *code, uint16_t qid) ARK_PMD_LOG(DEBUG, "MPU: %s Q: %3u sw_prod %u, hw_cons: %u\n", code, qid, mpu->cfg.sw_prod_index, mpu->cfg.hw_cons_index); - ARK_PMD_LOG(DEBUG, "MPU: %s state: %d count %d, reserved %d" - "\n", - code, - mpu->debug.state, mpu->debug.count, - mpu->debug.reserved - ); } void diff --git a/drivers/net/ark/ark_mpu.h b/drivers/net/ark/ark_mpu.h index 92c3e67c86..9d2b70d35f 100644 --- a/drivers/net/ark/ark_mpu.h +++ b/drivers/net/ark/ark_mpu.h @@ -15,6 +15,8 @@ * there is minimal documentation. */ +#define ARK_MPU_MODID 0x2055504d +#define ARK_MPU_MODVER 0x37313232 /* * MPU hardware structures * These are overlay structures to a memory mapped FPGA device. These @@ -64,26 +66,6 @@ enum ARK_MPU_COMMAND { MPU_COMMAND_LIMIT = 0xfFFFFFFF }; -#define ARK_MPU_STATS 0x080 -struct ark_mpu_stats_t { - volatile uint64_t pci_request; - volatile uint64_t q_empty; - volatile uint64_t q_q1; - volatile uint64_t q_q2; - volatile uint64_t q_q3; - volatile uint64_t q_q4; - volatile uint64_t q_full; -}; - -#define ARK_MPU_DEBUG 0x0C0 -struct ark_mpu_debug_t { - volatile uint32_t state; - uint32_t reserved; - volatile uint32_t count; - volatile uint32_t take; - volatile uint32_t peek[4]; -}; - /* Consolidated structure */ struct ark_mpu_t { struct ark_mpu_id_t id; @@ -93,12 +75,6 @@ struct ark_mpu_t { uint8_t reserved1[(ARK_MPU_CFG - ARK_MPU_HW) - sizeof(struct ark_mpu_hw_t)]; struct ark_mpu_cfg_t cfg; - uint8_t reserved2[(ARK_MPU_STATS - ARK_MPU_CFG) - - sizeof(struct ark_mpu_cfg_t)]; - struct ark_mpu_stats_t stats; - uint8_t reserved3[(ARK_MPU_DEBUG - ARK_MPU_STATS) - - sizeof(struct ark_mpu_stats_t)]; - struct ark_mpu_debug_t debug; }; uint16_t ark_api_num_queues(struct ark_mpu_t *mpu); @@ -113,7 +89,6 @@ int ark_mpu_configure(struct ark_mpu_t *mpu, rte_iova_t ring, void ark_mpu_dump(struct ark_mpu_t *mpu, const char *msg, uint16_t idx); void ark_mpu_dump_setup(struct ark_mpu_t *mpu, uint16_t qid); -void ark_mpu_reset_stats(struct ark_mpu_t *mpu); /* this action is in a performance critical path */ static inline void -- 2.17.1