X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fark%2Fark_udm.c;h=81b141ad0bd1f4ea6e263d086cb5b9c0db010e1e;hb=76d575612277996050c2f83c367c24b9cc8c60c3;hp=a740d36d43ffae9a4bb32292375b8505627d5da4;hpb=1502d443d8857fd473f474a170b81dc30809bdfd;p=dpdk.git

diff --git a/drivers/net/ark/ark_udm.c b/drivers/net/ark/ark_udm.c
index a740d36d43..81b141ad0b 100644
--- a/drivers/net/ark/ark_udm.c
+++ b/drivers/net/ark/ark_udm.c
@@ -7,9 +7,13 @@
 #include "ark_logs.h"
 #include "ark_udm.h"
 
+static_assert(sizeof(struct ark_rx_meta) == 32, "Unexpected struct size ark_rx_meta");
+
 int
 ark_udm_verify(struct ark_udm_t *udm)
 {
+	uint32_t idnum = udm->setup.idnum;
+	uint32_t vernum = udm->setup.vernum;
 	if (sizeof(struct ark_udm_t) != ARK_UDM_EXPECT_SIZE) {
 		ARK_PMD_LOG(ERR,
 			    "ARK: UDM structure looks incorrect %d vs %zd\n",
@@ -17,91 +21,30 @@ ark_udm_verify(struct ark_udm_t *udm)
 		return -1;
 	}
 
-	if (udm->setup.const0 != ARK_UDM_CONST) {
+	if (idnum != ARK_UDM_MODID || vernum != ARK_UDM_MODVER) {
 		ARK_PMD_LOG(ERR,
-			    "ARK: UDM module not found as expected 0x%08x\n",
-			    udm->setup.const0);
+			    "ARK: UDM module not found as expected 0x%08x 0x%08x\n",
+			    idnum, vernum);
 		return -1;
 	}
 	return 0;
 }
 
-int
-ark_udm_stop(struct ark_udm_t *udm, const int wait)
-{
-	int cnt = 0;
-
-	udm->cfg.command = 2;
-
-	while (wait && (udm->cfg.stop_flushed & 0x01) == 0) {
-		if (cnt++ > 1000)
-			return 1;
-
-		usleep(10);
-	}
-	return 0;
-}
-
-int
-ark_udm_reset(struct ark_udm_t *udm)
-{
-	int status;
-
-	status = ark_udm_stop(udm, 1);
-	if (status != 0) {
-		ARK_PMD_LOG(NOTICE, "%s  stop failed  doing forced reset\n",
-			      __func__);
-		udm->cfg.command = 4;
-		usleep(10);
-		udm->cfg.command = 3;
-		status = ark_udm_stop(udm, 0);
-		ARK_PMD_LOG(INFO, "%s  stop status %d post failure"
-			      " and forced reset\n",
-			      __func__, status);
-	} else {
-		udm->cfg.command = 3;
-	}
-
-	return status;
-}
-
-void
-ark_udm_start(struct ark_udm_t *udm)
-{
-	udm->cfg.command = 1;
-}
-
-void
-ark_udm_stats_reset(struct ark_udm_t *udm)
-{
-	udm->pcibp.pci_clear = 1;
-	udm->tlp_ps.tlp_clear = 1;
-}
-
 void
 ark_udm_configure(struct ark_udm_t *udm,
 		  uint32_t headroom,
-		  uint32_t dataroom,
-		  uint32_t write_interval_ns)
+		  uint32_t dataroom)
 {
 	/* headroom and data room are in DWords in the UDM */
 	udm->cfg.dataroom = dataroom / 4;
 	udm->cfg.headroom = headroom / 4;
-
-	/* 4 NS period ns */
-	udm->rt_cfg.write_interval = write_interval_ns / 4;
 }
 
 void
 ark_udm_write_addr(struct ark_udm_t *udm, rte_iova_t addr)
 {
 	udm->rt_cfg.hw_prod_addr = addr;
-}
-
-int
-ark_udm_is_flushed(struct ark_udm_t *udm)
-{
-	return (udm->cfg.stop_flushed & 0x01) != 0;
+	udm->rt_cfg.prod_idx = 0;
 }
 
 uint64_t
@@ -126,11 +69,10 @@ void
 ark_udm_dump_stats(struct ark_udm_t *udm, const char *msg)
 {
 	ARK_PMD_LOG(INFO, "UDM Stats: %s"
-		      ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 "\n",
+		      ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 "\n",
 		      msg,
 		      "Pkts Received", udm->stats.rx_packet_count,
 		      "Pkts Finalized", udm->stats.rx_sent_packets,
-		      "Pkts Dropped", udm->tlp.pkt_drop,
 		      "Bytes Count", udm->stats.rx_byte_count,
 		      "MBuf Count", udm->stats.rx_mbuf_count);
 }
@@ -150,13 +92,6 @@ ark_udm_dump_queue_stats(struct ark_udm_t *udm, const char *msg, uint16_t qid)
 		      "MBuf Count", udm->qstats.q_mbuf_count);
 }
 
-void
-ark_udm_dump(struct ark_udm_t *udm, const char *msg)
-{
-	ARK_PMD_LOG(DEBUG, "UDM Dump: %s Stopped: %d\n", msg,
-		      udm->cfg.stop_flushed);
-}
-
 void
 ark_udm_dump_setup(struct ark_udm_t *udm, uint16_t q_id)
 {
@@ -167,23 +102,6 @@ ark_udm_dump_setup(struct ark_udm_t *udm, uint16_t q_id)
 		      "prod_idx", udm->rt_cfg.prod_idx);
 }
 
-void
-ark_udm_dump_perf(struct ark_udm_t *udm, const char *msg)
-{
-	struct ark_udm_pcibp_t *bp = &udm->pcibp;
-
-	ARK_PMD_LOG(INFO, "UDM Performance %s"
-		      ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32
-		      "\n",
-		      msg,
-		      "PCI Empty", bp->pci_empty,
-		      "PCI Q1", bp->pci_q1,
-		      "PCI Q2", bp->pci_q2,
-		      "PCI Q3", bp->pci_q3,
-		      "PCI Q4", bp->pci_q4,
-		      "PCI Full", bp->pci_full);
-}
-
 void
 ark_udm_queue_stats_reset(struct ark_udm_t *udm)
 {