Re: [PATCH net-next 3/3] net: stmmac: Convert to phylink and remove phylib logic
From: Jon Hunter
Date: Tue Jun 18 2019 - 11:25:42 EST
On 18/06/2019 11:18, Jon Hunter wrote:
>
> On 18/06/2019 10:46, Jose Abreu wrote:
>> From: Jon Hunter <jonathanh@xxxxxxxxxx>
>>
>>> I am not certain but I don't believe so. We are using a static IP address
>>> and mounting the root file-system via NFS when we see this ...
>>
>> Can you please add a call to napi_synchronize() before every
>> napi_disable() calls, like this:
>>
>> if (queue < rx_queues_cnt) {
>> napi_synchronize(&ch->rx_napi);
>> napi_disable(&ch->rx_napi);
>> }
>>
>> if (queue < tx_queues_cnt) {
>> napi_synchronize(&ch->tx_napi);
>> napi_disable(&ch->tx_napi);
>> }
>>
>> [ I can send you a patch if you prefer ]
>
> Yes I can try this and for completeness you mean ...
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 4ca46289a742..d4a12cb64d8e 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -146,10 +146,15 @@ static void stmmac_disable_all_queues(struct stmmac_priv *priv)
> for (queue = 0; queue < maxq; queue++) {
> struct stmmac_channel *ch = &priv->channel[queue];
>
> - if (queue < rx_queues_cnt)
> + if (queue < rx_queues_cnt) {
> + napi_synchronize(&ch->rx_napi);
> napi_disable(&ch->rx_napi);
> - if (queue < tx_queues_cnt)
> + }
> +
> + if (queue < tx_queues_cnt) {
> + napi_synchronize(&ch->tx_napi);
> napi_disable(&ch->tx_napi);
> + }
> }
> }
So good news and bad news ...
The good news is that the above change does fix the initial crash
I am seeing. However, even with this change applied on top of
-next, it is still dying somewhere else and so there appears to
be a second issue.
On a successful boot I see ...
[ 6.150419] dwc-eth-dwmac 2490000.ethernet: Cannot get CSR clock
[ 6.156441] dwc-eth-dwmac 2490000.ethernet: no reset control found
[ 6.175866] dwc-eth-dwmac 2490000.ethernet: User ID: 0x10, Synopsys ID: 0x41
[ 6.182912] dwc-eth-dwmac 2490000.ethernet: DWMAC4/5
[ 6.187961] dwc-eth-dwmac 2490000.ethernet: DMA HW capability register supported
[ 6.195351] dwc-eth-dwmac 2490000.ethernet: RX Checksum Offload Engine supported
[ 6.202735] dwc-eth-dwmac 2490000.ethernet: TX Checksum insertion supported
[ 6.209685] dwc-eth-dwmac 2490000.ethernet: Wake-Up On Lan supported
[ 6.216041] dwc-eth-dwmac 2490000.ethernet: TSO supported
[ 6.221433] dwc-eth-dwmac 2490000.ethernet: Enable RX Mitigation via HW Watchdog Timer
[ 6.229342] dwc-eth-dwmac 2490000.ethernet: device MAC address 9a:9b:49:6f:a5:ee
[ 6.236727] dwc-eth-dwmac 2490000.ethernet: TSO feature enabled
[ 6.242689] libphy: stmmac: probed
On the latest -next with the patch applied I see ...
[ 6.043529] dwc-eth-dwmac 2490000.ethernet: Cannot get CSR clock
[ 6.049546] dwc-eth-dwmac 2490000.ethernet: no reset control found
[ 6.068895] dwc-eth-dwmac 2490000.ethernet: User ID: 0x10, Synopsys ID: 0x41
[ 6.075941] dwc-eth-dwmac 2490000.ethernet: DWMAC4/5
[ 6.080989] dwc-eth-dwmac 2490000.ethernet: DMA HW capability register supported
[ 6.088373] dwc-eth-dwmac 2490000.ethernet: RX Checksum Offload Engine supported
[ 6.095756] dwc-eth-dwmac 2490000.ethernet: TX Checksum insertion supported
[ 6.102708] dwc-eth-dwmac 2490000.ethernet: Wake-Up On Lan supported
[ 6.109074] dwc-eth-dwmac 2490000.ethernet: TSO supported
[ 6.114465] dwc-eth-dwmac 2490000.ethernet: Enable RX Mitigation via HW Watchdog Timer
[ 6.122373] dwc-eth-dwmac 2490000.ethernet: device MAC address ee:3a:9a:b0:7e:34
[ 6.129756] dwc-eth-dwmac 2490000.ethernet: TSO feature enabled
And it dies here. No more output is seen. I will try to figure
out which commit is causing this issue.
Cheers
Jon
--
nvpublic