patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH 1/7] event/dpaa: fix include header
       [not found] <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com>
@ 2018-02-27 17:25 ` Hemant Agrawal
       [not found] ` <1519889597-5805-1-git-send-email-hemant.agrawal@nxp.com>
  1 sibling, 0 replies; 6+ messages in thread
From: Hemant Agrawal @ 2018-02-27 17:25 UTC (permalink / raw)
  To: dev, bruce.richardson; +Cc: thomas, shreyansh.jain, stable

rte_cycles.h shall be included instead of rte_cycles_64.h

dpaa_eventdev.c:32:27:
fatal error: rte_cycles_64.h: No such file or directory

Fixes: 9caac5dd1e7f ("event/dpaa: introduce PMD")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/event/dpaa/dpaa_eventdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 0006801..cd13d0c 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -29,7 +29,7 @@
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_dpaa_bus.h>
 #include <rte_dpaa_logs.h>
-#include <rte_cycles_64.h>
+#include <rte_cycles.h>
 
 #include <dpaa_ethdev.h>
 #include "dpaa_eventdev.h"
-- 
2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH v2 01/10] event/dpaa: fix include header
       [not found] ` <1519889597-5805-1-git-send-email-hemant.agrawal@nxp.com>
@ 2018-03-01  7:33   ` Hemant Agrawal
  2018-03-01  7:33   ` [dpdk-stable] [PATCH v2 02/10] bus/dpaa: fix the BE compilation issue Hemant Agrawal
       [not found]   ` <1521014166-3201-1-git-send-email-hemant.agrawal@nxp.com>
  2 siblings, 0 replies; 6+ messages in thread
From: Hemant Agrawal @ 2018-03-01  7:33 UTC (permalink / raw)
  To: dev, bruce.richardson; +Cc: thomas, stable

rte_cycles.h shall be included instead of rte_cycles_64.h

dpaa_eventdev.c:32:27:
fatal error: rte_cycles_64.h: No such file or directory

Fixes: 9caac5dd1e7f ("event/dpaa: introduce PMD")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/event/dpaa/dpaa_eventdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 0006801..cd13d0c 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -29,7 +29,7 @@
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_dpaa_bus.h>
 #include <rte_dpaa_logs.h>
-#include <rte_cycles_64.h>
+#include <rte_cycles.h>
 
 #include <dpaa_ethdev.h>
 #include "dpaa_eventdev.h"
-- 
2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH v2 02/10] bus/dpaa: fix the BE compilation issue
       [not found] ` <1519889597-5805-1-git-send-email-hemant.agrawal@nxp.com>
  2018-03-01  7:33   ` [dpdk-stable] [PATCH v2 01/10] " Hemant Agrawal
@ 2018-03-01  7:33   ` Hemant Agrawal
  2018-03-01 12:22     ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
       [not found]   ` <1521014166-3201-1-git-send-email-hemant.agrawal@nxp.com>
  2 siblings, 1 reply; 6+ messages in thread
From: Hemant Agrawal @ 2018-03-01  7:33 UTC (permalink / raw)
  To: dev, bruce.richardson; +Cc: thomas, stable

The array pointers were used without index.

Fixes: b9083ea5e084 ("net/dpaa: further push mode optimizations")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/base/qbman/qman.c        | 5 +++--
 drivers/bus/dpaa/base/qbman/qman_driver.c | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 2b97671..2810fdd 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -1087,7 +1087,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit,
 		shadow[rx_number]->fd.opaque =
 			be32_to_cpu(dq[rx_number]->fd.opaque);
 #else
-		shadow = dq;
+		shadow[rx_number] = dq[rx_number];
 #endif
 
 		/* SDQCR: context_b points to the FQ */
@@ -1095,7 +1095,8 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit,
 		fq[rx_number] = qman_fq_lookup_table[be32_to_cpu(
 						dq[rx_number]->contextB)];
 #else
-		fq[rx_number] = (void *)(uintptr_t)be32_to_cpu(dq->contextB);
+		fq[rx_number] = (void *)be32_to_cpu(
+						dq[rx_number]->contextB);
 #endif
 		fq[rx_number]->cb.dqrr_prepare(shadow[rx_number],
 						 &bufs[rx_number]);
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 7cfa8ee..66838d2 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -246,7 +246,6 @@ int fsl_qman_portal_destroy(struct qman_portal *qp)
 int qman_global_init(void)
 {
 	const struct device_node *dt_node;
-	int ret = 0;
 	size_t lenp;
 	const u32 *chanid;
 	static int ccsr_map_fd;
@@ -352,9 +351,7 @@ int qman_global_init(void)
 		qman_clk = be32_to_cpu(*clk);
 
 #ifdef CONFIG_FSL_QMAN_FQ_LOOKUP
-	ret = qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX);
-	if (ret)
-		return ret;
+	return qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX);
 #endif
 	return 0;
 }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v2 02/10] bus/dpaa: fix the BE compilation issue
  2018-03-01  7:33   ` [dpdk-stable] [PATCH v2 02/10] bus/dpaa: fix the BE compilation issue Hemant Agrawal
@ 2018-03-01 12:22     ` Shreyansh Jain
  0 siblings, 0 replies; 6+ messages in thread
From: Shreyansh Jain @ 2018-03-01 12:22 UTC (permalink / raw)
  To: Hemant Agrawal; +Cc: dev, bruce.richardson, thomas, stable

On Thu, Mar 1, 2018 at 1:03 PM, Hemant Agrawal <hemant.agrawal@nxp.com> wrote:
>
> The array pointers were used without index.
>
> Fixes: b9083ea5e084 ("net/dpaa: further push mode optimizations")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---
>  drivers/bus/dpaa/base/qbman/qman.c        | 5 +++--
>  drivers/bus/dpaa/base/qbman/qman_driver.c | 5 +----
>  2 files changed, 4 insertions(+), 6 deletions(-)
>

Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH v3 01/10] event/dpaa: fix include header
       [not found]   ` <1521014166-3201-1-git-send-email-hemant.agrawal@nxp.com>
@ 2018-03-14  7:55     ` Hemant Agrawal
  2018-03-14  7:55     ` [dpdk-stable] [PATCH v3 02/10] bus/dpaa: fix the BE compilation issue Hemant Agrawal
  1 sibling, 0 replies; 6+ messages in thread
From: Hemant Agrawal @ 2018-03-14  7:55 UTC (permalink / raw)
  To: dev, bruce.richardson; +Cc: thomas, stable

rte_cycles.h shall be included instead of rte_cycles_64.h

dpaa_eventdev.c:32:27:
fatal error: rte_cycles_64.h: No such file or directory

Fixes: 9caac5dd1e7f ("event/dpaa: introduce PMD")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/event/dpaa/dpaa_eventdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 0006801..cd13d0c 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -29,7 +29,7 @@
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_dpaa_bus.h>
 #include <rte_dpaa_logs.h>
-#include <rte_cycles_64.h>
+#include <rte_cycles.h>
 
 #include <dpaa_ethdev.h>
 #include "dpaa_eventdev.h"
-- 
2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH v3 02/10] bus/dpaa: fix the BE compilation issue
       [not found]   ` <1521014166-3201-1-git-send-email-hemant.agrawal@nxp.com>
  2018-03-14  7:55     ` [dpdk-stable] [PATCH v3 01/10] event/dpaa: fix include header Hemant Agrawal
@ 2018-03-14  7:55     ` Hemant Agrawal
  1 sibling, 0 replies; 6+ messages in thread
From: Hemant Agrawal @ 2018-03-14  7:55 UTC (permalink / raw)
  To: dev, bruce.richardson; +Cc: thomas, stable

The array pointers were used without index.

Fixes: b9083ea5e084 ("net/dpaa: further push mode optimizations")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 drivers/bus/dpaa/base/qbman/qman.c        | 5 +++--
 drivers/bus/dpaa/base/qbman/qman_driver.c | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 2b97671..2810fdd 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -1087,7 +1087,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit,
 		shadow[rx_number]->fd.opaque =
 			be32_to_cpu(dq[rx_number]->fd.opaque);
 #else
-		shadow = dq;
+		shadow[rx_number] = dq[rx_number];
 #endif
 
 		/* SDQCR: context_b points to the FQ */
@@ -1095,7 +1095,8 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit,
 		fq[rx_number] = qman_fq_lookup_table[be32_to_cpu(
 						dq[rx_number]->contextB)];
 #else
-		fq[rx_number] = (void *)(uintptr_t)be32_to_cpu(dq->contextB);
+		fq[rx_number] = (void *)be32_to_cpu(
+						dq[rx_number]->contextB);
 #endif
 		fq[rx_number]->cb.dqrr_prepare(shadow[rx_number],
 						 &bufs[rx_number]);
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 7cfa8ee..66838d2 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -246,7 +246,6 @@ int fsl_qman_portal_destroy(struct qman_portal *qp)
 int qman_global_init(void)
 {
 	const struct device_node *dt_node;
-	int ret = 0;
 	size_t lenp;
 	const u32 *chanid;
 	static int ccsr_map_fd;
@@ -352,9 +351,7 @@ int qman_global_init(void)
 		qman_clk = be32_to_cpu(*clk);
 
 #ifdef CONFIG_FSL_QMAN_FQ_LOOKUP
-	ret = qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX);
-	if (ret)
-		return ret;
+	return qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX);
 #endif
 	return 0;
 }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-03-14  7:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com>
2018-02-27 17:25 ` [dpdk-stable] [PATCH 1/7] event/dpaa: fix include header Hemant Agrawal
     [not found] ` <1519889597-5805-1-git-send-email-hemant.agrawal@nxp.com>
2018-03-01  7:33   ` [dpdk-stable] [PATCH v2 01/10] " Hemant Agrawal
2018-03-01  7:33   ` [dpdk-stable] [PATCH v2 02/10] bus/dpaa: fix the BE compilation issue Hemant Agrawal
2018-03-01 12:22     ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
     [not found]   ` <1521014166-3201-1-git-send-email-hemant.agrawal@nxp.com>
2018-03-14  7:55     ` [dpdk-stable] [PATCH v3 01/10] event/dpaa: fix include header Hemant Agrawal
2018-03-14  7:55     ` [dpdk-stable] [PATCH v3 02/10] bus/dpaa: fix the BE compilation issue Hemant Agrawal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).