| Message ID | 3b8aeab69d2987db68c74f48a3ac13c7241e1542.1490118934.git.jpinto@synopsys.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 03/21/2017 11:02 AM, Joao Pinto wrote: > This patch fixes a bug introduced in: > commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple > queues") So even though this is against net-next which is the only tree so far having the offending commit, it is nice to see this appear later in the commit messages as: Fixes: 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple queues") Also, your subject for this patch should be: net: stmmac: fix dma operation mode config for older versions > > The dma operation mode configuration routine was wrongly moved to a > function (stmmac_mtl_configuration) that is only executed if the > core version is >= 4.00. > > Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> > Signed-off-by: Joao Pinto <jpinto@synopsys.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index d3a2151..225a3a3 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -1945,9 +1945,6 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) > /* Enable MAC RX Queues */ > if (rx_queues_count > 1 && priv->hw->mac->rx_queue_enable) > stmmac_mac_enable_rx_queues(priv); > - > - /* Set the HW DMA mode and the COE */ > - stmmac_dma_operation_mode(priv); > } > > /** > @@ -2014,6 +2011,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) > else > stmmac_set_mac(priv->ioaddr, true); > > + /* Set the HW DMA mode and the COE */ > + stmmac_dma_operation_mode(priv); > + > stmmac_mmc_setup(priv); > > if (init_ptp) { >
On Tue, Mar 21, 2017 at 06:00:53PM +0000, Joao Pinto wrote: > This patch fixes a bug introduced in: > commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple > queues") > > The dma operation mode configuration routine was wrongly moved to a > function (stmmac_mtl_configuration) that is only executed if the > core version is >= 4.00. > > Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> > Signed-off-by: Joao Pinto <jpinto@synopsys.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) With Florian's comments addressed, this is: Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Resending with Sergei's proper email address. On Tue, Mar 21, 2017 at 06:02:36PM +0000, Joao Pinto wrote: > This patch fixes a bug introduced in: > commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple > queues") > > The dma operation mode configuration routine was wrongly moved to a > function (stmmac_mtl_configuration) that is only executed if the > core version is >= 4.00. > > Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> > Signed-off-by: Joao Pinto <jpinto@synopsys.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) With Florian's comments addressed, this is: Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Às 6:56 PM de 3/21/2017, Florian Fainelli escreveu: > On 03/21/2017 11:02 AM, Joao Pinto wrote: >> This patch fixes a bug introduced in: >> commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple >> queues") > > So even though this is against net-next which is the only tree so far > having the offending commit, it is nice to see this appear later in the > commit messages as: > > Fixes: 6deee2221e11 ("net: stmmac: prepare dma op mode config for > multiple queues") > > Also, your subject for this patch should be: > > net: stmmac: fix dma operation mode config for older versions Ok, I will do that! Thanks. > >> >> The dma operation mode configuration routine was wrongly moved to a >> function (stmmac_mtl_configuration) that is only executed if the >> core version is >= 4.00. >> >> Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> >> Signed-off-by: Joao Pinto <jpinto@synopsys.com> >> --- >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> index d3a2151..225a3a3 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> @@ -1945,9 +1945,6 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) >> /* Enable MAC RX Queues */ >> if (rx_queues_count > 1 && priv->hw->mac->rx_queue_enable) >> stmmac_mac_enable_rx_queues(priv); >> - >> - /* Set the HW DMA mode and the COE */ >> - stmmac_dma_operation_mode(priv); >> } >> >> /** >> @@ -2014,6 +2011,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) >> else >> stmmac_set_mac(priv->ioaddr, true); >> >> + /* Set the HW DMA mode and the COE */ >> + stmmac_dma_operation_mode(priv); >> + >> stmmac_mmc_setup(priv); >> >> if (init_ptp) { >> > >
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d3a2151..225a3a3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1945,9 +1945,6 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) /* Enable MAC RX Queues */ if (rx_queues_count > 1 && priv->hw->mac->rx_queue_enable) stmmac_mac_enable_rx_queues(priv); - - /* Set the HW DMA mode and the COE */ - stmmac_dma_operation_mode(priv); } /** @@ -2014,6 +2011,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) else stmmac_set_mac(priv->ioaddr, true); + /* Set the HW DMA mode and the COE */ + stmmac_dma_operation_mode(priv); + stmmac_mmc_setup(priv); if (init_ptp) {
This patch fixes a bug introduced in: commit 6deee2221e11 ("net: stmmac: prepare dma op mode config for multiple queues") The dma operation mode configuration routine was wrongly moved to a function (stmmac_mtl_configuration) that is only executed if the core version is >= 4.00. Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Joao Pinto <jpinto@synopsys.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)