X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fark%2Fark_ddm.c;h=b16c739d50de1bbb9e590ef37674df143292cb22;hb=bf62fb769314572f7de9ea5ed38e540b91bdf8a4;hp=57026f8d12b20ef4cba016cf57ee2653f3c4f066;hpb=589876bff13400b7f30a2df570454720593e35e7;p=dpdk.git

diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c
index 57026f8d12..b16c739d50 100644
--- a/drivers/net/ark/ark_ddm.c
+++ b/drivers/net/ark/ark_ddm.c
@@ -7,30 +7,40 @@
 #include "ark_logs.h"
 #include "ark_ddm.h"
 
+static_assert(sizeof(union ark_tx_meta) == 8, "Unexpected struct size ark_tx_meta");
+
 /* ************************************************************************* */
 int
 ark_ddm_verify(struct ark_ddm_t *ddm)
 {
 	uint32_t hw_const;
 	if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) {
-		PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs %zd\n",
+		ARK_PMD_LOG(ERR, "DDM structure looks incorrect %d vs %zd\n",
 			    ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t));
 		return -1;
 	}
 
 	hw_const = ddm->cfg.const0;
+	if (hw_const == ARK_DDM_CONST3)
+		return 0;
+
 	if (hw_const == ARK_DDM_CONST1) {
-		PMD_DRV_LOG(ERR,
+		ARK_PMD_LOG(ERR,
 			    "ARK: DDM module is version 1, "
 			    "PMD expects version 2\n");
 		return -1;
-	} else if (hw_const != ARK_DDM_CONST2) {
-		PMD_DRV_LOG(ERR,
-			    "ARK: DDM module not found as expected 0x%08x\n",
-			    ddm->cfg.const0);
+	}
+
+	if (hw_const == ARK_DDM_CONST2) {
+		ARK_PMD_LOG(ERR,
+			    "ARK: DDM module is version 2, "
+			    "PMD expects version 3\n");
 		return -1;
 	}
-	return 0;
+	ARK_PMD_LOG(ERR,
+		    "ARK: DDM module not found as expected 0x%08x\n",
+		    ddm->cfg.const0);
+	return -1;
 }
 
 void
@@ -45,6 +55,7 @@ ark_ddm_stop(struct ark_ddm_t *ddm, const int wait)
 	int cnt = 0;
 
 	ddm->cfg.command = 2;
+	rte_wmb();
 	while (wait && (ddm->cfg.stop_flushed & 0x01) == 0) {
 		if (cnt++ > 1000)
 			return 1;
@@ -63,7 +74,7 @@ ark_ddm_reset(struct ark_ddm_t *ddm)
 	status = ark_ddm_stop(ddm, 1);
 
 	if (status != 0) {
-		PMD_DEBUG_LOG(INFO, "%s  stop failed  doing forced reset\n",
+		ARK_PMD_LOG(NOTICE, "%s  stop failed  doing forced reset\n",
 			      __func__);
 		ddm->cfg.command = 4;
 		usleep(10);
@@ -87,7 +98,7 @@ ark_ddm_stats_reset(struct ark_ddm_t *ddm)
 void
 ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg)
 {
-	PMD_FUNC_LOG(DEBUG, "%s Stopped: %d\n", msg,
+	ARK_PMD_LOG(DEBUG, "%s Stopped: %d\n", msg,
 		     ark_ddm_is_stopped(ddm)
 		     );
 }
@@ -97,7 +108,7 @@ ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg)
 {
 	struct ark_ddm_stats_t *stats = &ddm->stats;
 
-	PMD_STATS_LOG(INFO, "DDM Stats: %s"
+	ARK_PMD_LOG(INFO, "DDM Stats: %s"
 		      ARK_SU64 ARK_SU64 ARK_SU64
 		      "\n", msg,
 		      "Bytes:", stats->tx_byte_count,