X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fark%2Fark_ddm.c;h=91d1179d88675076727549f7b3613dcb61d287ab;hb=c6ca05823c98346422b110730760ca3c070ff0b7;hp=eea388a1e63c5124e262b3f643daf24e6b4ea4bf;hpb=540914bc7ad88bae5ac5a4ea4acf4ddc5f4799e5;p=dpdk.git

diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c
index eea388a1e6..91d1179d88 100644
--- a/drivers/net/ark/ark_ddm.c
+++ b/drivers/net/ark/ark_ddm.c
@@ -11,14 +11,22 @@
 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;
 	}
 
-	if (ddm->cfg.const0 != ARK_DDM_CONST) {
-		PMD_DRV_LOG(ERR, "ARK: DDM module not found as expected 0x%08x\n",
+	hw_const = ddm->cfg.const0;
+	if (hw_const == ARK_DDM_CONST1) {
+		ARK_PMD_LOG(ERR,
+			    "ARK: DDM module is version 1, "
+			    "PMD expects version 2\n");
+		return -1;
+	} else if (hw_const != ARK_DDM_CONST2) {
+		ARK_PMD_LOG(ERR,
+			    "ARK: DDM module not found as expected 0x%08x\n",
 			    ddm->cfg.const0);
 		return -1;
 	}
@@ -55,7 +63,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);
@@ -79,7 +87,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)
 		     );
 }
@@ -89,7 +97,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,