X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fbus%2Ffslmc%2Fqbman%2Fqbman_portal.c;h=f360760be33fea536cc2a52a14008c3cb845725b;hb=8b870905771bd6e97d3674640c305a193ce6440d;hp=dd62e9af3fff18375e9d903ab67dc95377e837cd;hpb=addaac42a0c3904ac6adde7d211e6ad8d43515d0;p=dpdk.git

diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index dd62e9af3f..f360760be3 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -480,8 +480,8 @@ static int qbman_swp_enqueue_array_mode(struct qbman_swp *s,
 		return -EBUSY;
 	p = qbman_cena_write_start_wo_shadow(&s->sys,
 			QBMAN_CENA_SWP_EQCR(EQAR_IDX(eqar)));
-	word_copy(&p[1], &cl[1], 7);
-	word_copy(&p[8], fd, sizeof(*fd) >> 2);
+	memcpy(&p[1], &cl[1], 28);
+	memcpy(&p[8], fd, sizeof(*fd));
 	/* Set the verb byte, have to substitute in the valid-bit */
 	lwsync();
 	p[0] = cl[0] | EQAR_VB(eqar);
@@ -512,8 +512,8 @@ static int qbman_swp_enqueue_ring_mode(struct qbman_swp *s,
 
 	p = qbman_cena_write_start_wo_shadow(&s->sys,
 		QBMAN_CENA_SWP_EQCR(s->eqcr.pi & 7));
-	word_copy(&p[1], &cl[1], 7);
-	word_copy(&p[8], fd, sizeof(*fd) >> 2);
+	memcpy(&p[1], &cl[1], 28);
+	memcpy(&p[8], fd, sizeof(*fd));
 	lwsync();
 	/* Set the verb byte, have to substitute in the valid-bit */
 	p[0] = cl[0] | s->eqcr.pi_vb;
@@ -549,9 +549,7 @@ int qbman_swp_fill_ring(struct qbman_swp *s,
 	}
 	p = qbman_cena_write_start_wo_shadow(&s->sys,
 		QBMAN_CENA_SWP_EQCR((s->eqcr.pi/* +burst_index */) & 7));
-	/* word_copy(&p[1], &cl[1], 7); */
 	memcpy(&p[1], &cl[1], 7 * 4);
-	/* word_copy(&p[8], fd, sizeof(*fd) >> 2); */
 	memcpy(&p[8], fd, sizeof(struct qbman_fd));
 
 	/* lwsync(); */
@@ -799,7 +797,7 @@ int qbman_swp_pull(struct qbman_swp *s, struct qbman_pull_desc *d)
 	 */
 	qb_attr_code_encode(&code_pull_token, cl, s->desc.idx + 1);
 	p = qbman_cena_write_start_wo_shadow(&s->sys, QBMAN_CENA_SWP_VDQCR);
-	word_copy(&p[1], &cl[1], 3);
+	memcpy(&p[1], &cl[1], 12);
 	/* Set the verb byte, have to substitute in the valid-bit */
 	lwsync();
 	p[0] = cl[0] | s->vdq.valid_bit;