[PATCH v3 net 0/2] dpaa2-eth: misc fixes

[PATCH v3 net 0/2] dpaa2-eth: misc fixes

[Ioana Ciornei]

This patch set adds a couple of fixes around updating configuration on MAC
change.  Depending on when MC connects the DPNI to a MAC, both the MAC
address and TX FQIDs should be updated everytime there is a change in
configuration.

Changes in v2:
 - used reverse christmas tree ordering in patch 2/2
Changes in v3:
 - add a missing new line
 - go back to FQ based enqueueing after a transient error

Florin Chiculita (1):
  dpaa2-eth: add irq for the dpmac connect/disconnect event

Ioana Radulescu (1):
  dpaa2-eth: Fix TX FQID values

 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 50 +++++++++++++++++++++++-
 drivers/net/ethernet/freescale/dpaa2/dpni.h      |  5 ++-
 2 files changed, 53 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac connect/disconnect event

[Ioana Ciornei]

From: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>

Add IRQ for the DPNI endpoint change event, resolving the issue
when a dynamically created DPNI gets a randomly generated hw address
when the endpoint is a DPMAC object.

Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
Changes in v2:
 - none
Changes in v3:
 - none

 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++++-
 drivers/net/ethernet/freescale/dpaa2/dpni.h      | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 162d7d8fb295..5acd734a216b 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -3306,6 +3306,9 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
 	if (status & DPNI_IRQ_EVENT_LINK_CHANGED)
 		link_state_update(netdev_priv(net_dev));
 
+	if (status & DPNI_IRQ_EVENT_ENDPOINT_CHANGED)
+		set_mac_addr(netdev_priv(net_dev));
+
 	return IRQ_HANDLED;
 }
 
@@ -3331,7 +3334,8 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)
 	}
 
 	err = dpni_set_irq_mask(ls_dev->mc_io, 0, ls_dev->mc_handle,
-				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED);
+				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED |
+				DPNI_IRQ_EVENT_ENDPOINT_CHANGED);
 	if (err < 0) {
 		dev_err(&ls_dev->dev, "dpni_set_irq_mask(): %d\n", err);
 		goto free_irq;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h b/drivers/net/ethernet/freescale/dpaa2/dpni.h
index fd583911b6c0..ee0711d06b3a 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpni.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpni.h
@@ -133,9 +133,12 @@ int dpni_reset(struct fsl_mc_io	*mc_io,
  */
 #define DPNI_IRQ_INDEX				0
 /**
- * IRQ event - indicates a change in link state
+ * IRQ events:
+ *       indicates a change in link state
+ *       indicates a change in endpoint
  */
 #define DPNI_IRQ_EVENT_LINK_CHANGED		0x00000001
+#define DPNI_IRQ_EVENT_ENDPOINT_CHANGED		0x00000002
 
 int dpni_set_irq_enable(struct fsl_mc_io	*mc_io,
 			u32			cmd_flags,
-- 
1.9.1

[PATCH v3 net 2/2] dpaa2-eth: Fix TX FQID values

[Ioana Ciornei]

From: Ioana Radulescu <ruxandra.radulescu@nxp.com>

Depending on when MC connects the DPNI to a MAC, Tx FQIDs may
not be available during probe time.

Read the FQIDs each time the link goes up to avoid using invalid
values. In case an error occurs or an invalid value is retrieved,
fall back to QDID-based enqueueing.

Fixes: 1fa0f68c9255 ("dpaa2-eth: Use FQ-based DPIO enqueue API")
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
Changes in v2:
 - used reverse christmas tree ordering in update_tx_fqids
Changes in v3:
 - add a missing new line
 - go back to FQ based enqueueing after a transient error

 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 44 ++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 5acd734a216b..19379bae0144 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -1235,6 +1235,8 @@ static void dpaa2_eth_set_rx_taildrop(struct dpaa2_eth_priv *priv, bool enable)
 	priv->rx_td_enabled = enable;
 }
 
+static void update_tx_fqids(struct dpaa2_eth_priv *priv);
+
 static int link_state_update(struct dpaa2_eth_priv *priv)
 {
 	struct dpni_link_state state = {0};
@@ -1261,6 +1263,7 @@ static int link_state_update(struct dpaa2_eth_priv *priv)
 		goto out;
 
 	if (state.up) {
+		update_tx_fqids(priv);
 		netif_carrier_on(priv->net_dev);
 		netif_tx_start_all_queues(priv->net_dev);
 	} else {
@@ -2533,6 +2536,47 @@ static int set_pause(struct dpaa2_eth_priv *priv)
 	return 0;
 }
 
+static void update_tx_fqids(struct dpaa2_eth_priv *priv)
+{
+	struct dpni_queue_id qid = {0};
+	struct dpaa2_eth_fq *fq;
+	struct dpni_queue queue;
+	int i, j, err;
+
+	/* We only use Tx FQIDs for FQID-based enqueue, so check
+	 * if DPNI version supports it before updating FQIDs
+	 */
+	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_ENQUEUE_FQID_VER_MAJOR,
+				   DPNI_ENQUEUE_FQID_VER_MINOR) < 0)
+		return;
+
+	for (i = 0; i < priv->num_fqs; i++) {
+		fq = &priv->fq[i];
+		if (fq->type != DPAA2_TX_CONF_FQ)
+			continue;
+		for (j = 0; j < dpaa2_eth_tc_count(priv); j++) {
+			err = dpni_get_queue(priv->mc_io, 0, priv->mc_token,
+					     DPNI_QUEUE_TX, j, fq->flowid,
+					     &queue, &qid);
+			if (err)
+				goto out_err;
+
+			fq->tx_fqid[j] = qid.fqid;
+			if (fq->tx_fqid[j] == 0)
+				goto out_err;
+		}
+	}
+
+	priv->enqueue = dpaa2_eth_enqueue_fq;
+
+	return;
+
+out_err:
+	netdev_info(priv->net_dev,
+		    "Error reading Tx FQID, fallback to QDID-based enqueue\n");
+	priv->enqueue = dpaa2_eth_enqueue_qd;
+}
+
 /* Configure the DPNI object this interface is associated with */
 static int setup_dpni(struct fsl_mc_device *ls_dev)
 {
-- 
1.9.1

Re: [PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac connect/disconnect event

[Simon Horman]

On Wed, Oct 16, 2019 at 10:36:22AM +0300, Ioana Ciornei wrote:
> From: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> 
> Add IRQ for the DPNI endpoint change event, resolving the issue
> when a dynamically created DPNI gets a randomly generated hw address
> when the endpoint is a DPMAC object.
> 
> Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
> ---
> Changes in v2:
>  - none
> Changes in v3:
>  - none
> 
>  drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++++-
>  drivers/net/ethernet/freescale/dpaa2/dpni.h      | 5 ++++-
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> index 162d7d8fb295..5acd734a216b 100644
> --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> @@ -3306,6 +3306,9 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
>  	if (status & DPNI_IRQ_EVENT_LINK_CHANGED)
>  		link_state_update(netdev_priv(net_dev));
>  
> +	if (status & DPNI_IRQ_EVENT_ENDPOINT_CHANGED)
> +		set_mac_addr(netdev_priv(net_dev));
> +
>  	return IRQ_HANDLED;
>  }
>  
> @@ -3331,7 +3334,8 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)
>  	}
>  
>  	err = dpni_set_irq_mask(ls_dev->mc_io, 0, ls_dev->mc_handle,
> -				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED);
> +				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED |
> +				DPNI_IRQ_EVENT_ENDPOINT_CHANGED);
>  	if (err < 0) {
>  		dev_err(&ls_dev->dev, "dpni_set_irq_mask(): %d\n", err);
>  		goto free_irq;
> diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> index fd583911b6c0..ee0711d06b3a 100644
> --- a/drivers/net/ethernet/freescale/dpaa2/dpni.h
> +++ b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> @@ -133,9 +133,12 @@ int dpni_reset(struct fsl_mc_io	*mc_io,
>   */
>  #define DPNI_IRQ_INDEX				0
>  /**
> - * IRQ event - indicates a change in link state
> + * IRQ events:
> + *       indicates a change in link state
> + *       indicates a change in endpoint
>   */
>  #define DPNI_IRQ_EVENT_LINK_CHANGED		0x00000001
> +#define DPNI_IRQ_EVENT_ENDPOINT_CHANGED		0x00000002

Perhaps (as a follow-up?) this is a candidate for using the BIT() macro.

>  
>  int dpni_set_irq_enable(struct fsl_mc_io	*mc_io,
>  			u32			cmd_flags,
> -- 
> 1.9.1
> 

RE: [PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac connect/disconnect event

[Ioana Ciornei]

> Subject: Re: [PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac
> connect/disconnect event
> 
> On Wed, Oct 16, 2019 at 10:36:22AM +0300, Ioana Ciornei wrote:
> > From: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> >
> > Add IRQ for the DPNI endpoint change event, resolving the issue when a
> > dynamically created DPNI gets a randomly generated hw address when the
> > endpoint is a DPMAC object.
> >
> > Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> > Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
> > ---
> > Changes in v2:
> >  - none
> > Changes in v3:
> >  - none
> >
> >  drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++++-
> >  drivers/net/ethernet/freescale/dpaa2/dpni.h      | 5 ++++-
> >  2 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > index 162d7d8fb295..5acd734a216b 100644
> > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > @@ -3306,6 +3306,9 @@ static irqreturn_t dpni_irq0_handler_thread(int
> irq_num, void *arg)
> >  	if (status & DPNI_IRQ_EVENT_LINK_CHANGED)
> >  		link_state_update(netdev_priv(net_dev));
> >
> > +	if (status & DPNI_IRQ_EVENT_ENDPOINT_CHANGED)
> > +		set_mac_addr(netdev_priv(net_dev));
> > +
> >  	return IRQ_HANDLED;
> >  }
> >
> > @@ -3331,7 +3334,8 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)
> >  	}
> >
> >  	err = dpni_set_irq_mask(ls_dev->mc_io, 0, ls_dev->mc_handle,
> > -				DPNI_IRQ_INDEX,
> DPNI_IRQ_EVENT_LINK_CHANGED);
> > +				DPNI_IRQ_INDEX,
> DPNI_IRQ_EVENT_LINK_CHANGED |
> > +				DPNI_IRQ_EVENT_ENDPOINT_CHANGED);
> >  	if (err < 0) {
> >  		dev_err(&ls_dev->dev, "dpni_set_irq_mask(): %d\n", err);
> >  		goto free_irq;
> > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > index fd583911b6c0..ee0711d06b3a 100644
> > --- a/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > +++ b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > @@ -133,9 +133,12 @@ int dpni_reset(struct fsl_mc_io	*mc_io,
> >   */
> >  #define DPNI_IRQ_INDEX				0
> >  /**
> > - * IRQ event - indicates a change in link state
> > + * IRQ events:
> > + *       indicates a change in link state
> > + *       indicates a change in endpoint
> >   */
> >  #define DPNI_IRQ_EVENT_LINK_CHANGED		0x00000001
> > +#define DPNI_IRQ_EVENT_ENDPOINT_CHANGED		0x00000002
> 
> Perhaps (as a follow-up?) this is a candidate for using the BIT() macro.
> 

I wouldn't add another change to this patch set (targeting the net) but definitely will change this in net-next.

Thanks a lot,
Ioana

> >
> >  int dpni_set_irq_enable(struct fsl_mc_io	*mc_io,
> >  			u32			cmd_flags,
> > --
> > 1.9.1
> >

Re: [PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac connect/disconnect event

[Simon Horman]

On Wed, Oct 16, 2019 at 11:10:56AM +0000, Ioana Ciornei wrote:
> > Subject: Re: [PATCH v3 net 1/2] dpaa2-eth: add irq for the dpmac
> > connect/disconnect event
> > 
> > On Wed, Oct 16, 2019 at 10:36:22AM +0300, Ioana Ciornei wrote:
> > > From: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> > >
> > > Add IRQ for the DPNI endpoint change event, resolving the issue when a
> > > dynamically created DPNI gets a randomly generated hw address when the
> > > endpoint is a DPMAC object.
> > >
> > > Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
> > > Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
> > > ---
> > > Changes in v2:
> > >  - none
> > > Changes in v3:
> > >  - none
> > >
> > >  drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++++-
> > >  drivers/net/ethernet/freescale/dpaa2/dpni.h      | 5 ++++-
> > >  2 files changed, 9 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > > b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > > index 162d7d8fb295..5acd734a216b 100644
> > > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
> > > @@ -3306,6 +3306,9 @@ static irqreturn_t dpni_irq0_handler_thread(int
> > irq_num, void *arg)
> > >  	if (status & DPNI_IRQ_EVENT_LINK_CHANGED)
> > >  		link_state_update(netdev_priv(net_dev));
> > >
> > > +	if (status & DPNI_IRQ_EVENT_ENDPOINT_CHANGED)
> > > +		set_mac_addr(netdev_priv(net_dev));
> > > +
> > >  	return IRQ_HANDLED;
> > >  }
> > >
> > > @@ -3331,7 +3334,8 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)
> > >  	}
> > >
> > >  	err = dpni_set_irq_mask(ls_dev->mc_io, 0, ls_dev->mc_handle,
> > > -				DPNI_IRQ_INDEX,
> > DPNI_IRQ_EVENT_LINK_CHANGED);
> > > +				DPNI_IRQ_INDEX,
> > DPNI_IRQ_EVENT_LINK_CHANGED |
> > > +				DPNI_IRQ_EVENT_ENDPOINT_CHANGED);
> > >  	if (err < 0) {
> > >  		dev_err(&ls_dev->dev, "dpni_set_irq_mask(): %d\n", err);
> > >  		goto free_irq;
> > > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > > b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > > index fd583911b6c0..ee0711d06b3a 100644
> > > --- a/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > > +++ b/drivers/net/ethernet/freescale/dpaa2/dpni.h
> > > @@ -133,9 +133,12 @@ int dpni_reset(struct fsl_mc_io	*mc_io,
> > >   */
> > >  #define DPNI_IRQ_INDEX				0
> > >  /**
> > > - * IRQ event - indicates a change in link state
> > > + * IRQ events:
> > > + *       indicates a change in link state
> > > + *       indicates a change in endpoint
> > >   */
> > >  #define DPNI_IRQ_EVENT_LINK_CHANGED		0x00000001
> > > +#define DPNI_IRQ_EVENT_ENDPOINT_CHANGED		0x00000002
> > 
> > Perhaps (as a follow-up?) this is a candidate for using the BIT() macro.
> > 
> 
> I wouldn't add another change to this patch set (targeting the net) but definitely will change this in net-next.

Thanks, that's fine be me.

Re: [PATCH v3 net 0/2] dpaa2-eth: misc fixes

[Jakub Kicinski]

On Wed, 16 Oct 2019 10:36:21 +0300, Ioana Ciornei wrote:
> This patch set adds a couple of fixes around updating configuration on MAC
> change.  Depending on when MC connects the DPNI to a MAC, both the MAC
> address and TX FQIDs should be updated everytime there is a change in
> configuration.

Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>

Re: [PATCH v3 net 0/2] dpaa2-eth: misc fixes

[David Miller]

From: Ioana Ciornei <ioana.ciornei@nxp.com>
Date: Wed, 16 Oct 2019 10:36:21 +0300

> This patch set adds a couple of fixes around updating configuration on MAC
> change.  Depending on when MC connects the DPNI to a MAC, both the MAC
> address and TX FQIDs should be updated everytime there is a change in
> configuration.
> 
> Changes in v2:
>  - used reverse christmas tree ordering in patch 2/2
> Changes in v3:
>  - add a missing new line
>  - go back to FQ based enqueueing after a transient error

Series applied, thanks.