* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
@ 2016-06-25 19:35 Matt Corallo
2016-06-27 5:50 ` Giuseppe CAVALLARO
2016-06-29 7:58 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Matt Corallo @ 2016-06-25 19:35 UTC (permalink / raw)
To: linus-amlogic
At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
this patch and the clock fixes, 1G ethernet works on ODROID-C2.
Signed-off-by: Matt Corallo <git@bluematt.me>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a473c18..e407126 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2804,7 +2804,7 @@ static irqreturn_t stmmac_interrupt(int irq, void
*dev_id)
priv->tx_path_in_lpi_mode = true;
if (status & CORE_IRQ_TX_PATH_EXIT_LPI_MODE)
priv->tx_path_in_lpi_mode = false;
- if (status & CORE_IRQ_MTL_RX_OVERFLOW)
+ if (status & CORE_IRQ_MTL_RX_OVERFLOW && priv->hw->dma->set_rx_tail_ptr)
priv->hw->dma->set_rx_tail_ptr(priv->ioaddr,
priv->rx_tail_addr,
STMMAC_CHAN0);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
2016-06-25 19:35 [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000 Matt Corallo
@ 2016-06-27 5:50 ` Giuseppe CAVALLARO
2016-06-29 7:58 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Giuseppe CAVALLARO @ 2016-06-27 5:50 UTC (permalink / raw)
To: linus-amlogic
Thanks Matt for the fix
On 6/25/2016 9:35 PM, Matt Corallo wrote:
> At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
> with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
> this patch and the clock fixes, 1G ethernet works on ODROID-C2.
>
> Signed-off-by: Matt Corallo <git@bluematt.me>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index a473c18..e407126 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -2804,7 +2804,7 @@ static irqreturn_t stmmac_interrupt(int irq, void
> *dev_id)
> priv->tx_path_in_lpi_mode = true;
> if (status & CORE_IRQ_TX_PATH_EXIT_LPI_MODE)
> priv->tx_path_in_lpi_mode = false;
> - if (status & CORE_IRQ_MTL_RX_OVERFLOW)
> + if (status & CORE_IRQ_MTL_RX_OVERFLOW && priv->hw->dma->set_rx_tail_ptr)
> priv->hw->dma->set_rx_tail_ptr(priv->ioaddr,
> priv->rx_tail_addr,
> STMMAC_CHAN0);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
2016-06-25 19:35 [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000 Matt Corallo
2016-06-27 5:50 ` Giuseppe CAVALLARO
@ 2016-06-29 7:58 ` David Miller
2016-06-30 19:48 ` Matt Corallo
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2016-06-29 7:58 UTC (permalink / raw)
To: linus-amlogic
From: Matt Corallo <linux@bluematt.me>
Date: Sat, 25 Jun 2016 19:35:03 +0000
> At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
> with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
> this patch and the clock fixes, 1G ethernet works on ODROID-C2.
>
> Signed-off-by: Matt Corallo <git@bluematt.me>
This patch does not apply without rejects to any of my trees.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
2016-06-29 7:58 ` David Miller
@ 2016-06-30 19:48 ` Matt Corallo
0 siblings, 0 replies; 6+ messages in thread
From: Matt Corallo @ 2016-06-30 19:48 UTC (permalink / raw)
To: linus-amlogic
Damn mail clients and their helpful corruption of patches...
Resent w/o the extran \n in the diff header.
On 06/29/16 07:58, David Miller wrote:
> From: Matt Corallo <linux@bluematt.me>
> Date: Sat, 25 Jun 2016 19:35:03 +0000
>
>> At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
>> with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
>> this patch and the clock fixes, 1G ethernet works on ODROID-C2.
>>
>> Signed-off-by: Matt Corallo <git@bluematt.me>
>
> This patch does not apply without rejects to any of my trees.
>
> _______________________________________________
> linux-amlogic mailing list
> linux-amlogic at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
@ 2016-06-30 19:46 Matt Corallo
2016-07-02 18:36 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Matt Corallo @ 2016-06-30 19:46 UTC (permalink / raw)
To: linus-amlogic
(resent due to overhelpful mail client corrupting patch)
At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
this patch and the clock fixes, 1G ethernet works on ODROID-C2.
Signed-off-by: Matt Corallo <git@bluematt.me>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a473c18..e407126 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2804,7 +2804,7 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
priv->tx_path_in_lpi_mode = true;
if (status & CORE_IRQ_TX_PATH_EXIT_LPI_MODE)
priv->tx_path_in_lpi_mode = false;
- if (status & CORE_IRQ_MTL_RX_OVERFLOW)
+ if (status & CORE_IRQ_MTL_RX_OVERFLOW && priv->hw->dma->set_rx_tail_ptr)
priv->hw->dma->set_rx_tail_ptr(priv->ioaddr,
priv->rx_tail_addr,
STMMAC_CHAN0);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000
2016-06-30 19:46 Matt Corallo
@ 2016-07-02 18:36 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-07-02 18:36 UTC (permalink / raw)
To: linus-amlogic
From: Matt Corallo <linux@bluematt.me>
Date: Thu, 30 Jun 2016 19:46:16 +0000
> (resent due to overhelpful mail client corrupting patch)
>
> At least on Meson GXBB, the CORE_IRQ_MTL_RX_OVERFLOW interrupt is thrown
> with the stmmac1000 driver, which does not support set_rx_tail_ptr. With
> this patch and the clock fixes, 1G ethernet works on ODROID-C2.
>
> Signed-off-by: Matt Corallo <git@bluematt.me>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-07-02 18:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-25 19:35 [PATCH] net: stmmac: Fix null-function call in ISR on stmmac1000 Matt Corallo
2016-06-27 5:50 ` Giuseppe CAVALLARO
2016-06-29 7:58 ` David Miller
2016-06-30 19:48 ` Matt Corallo
-- strict thread matches above, loose matches on Subject: below --
2016-06-30 19:46 Matt Corallo
2016-07-02 18:36 ` David Miller
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).