From mboxrd@z Thu Jan  1 00:00:00 1970
From: Niklas Cassel <niklas.cassel@linaro.org>
Subject: Re: [PATCH net 0/2] net: stmmac: Coalesce and tail addr fixes
Date: Wed, 19 Dec 2018 13:02:45 +0100
Message-ID: <20181219120245.GA5205@centauri.lan>
References: <cover.1537171752.git.joabreu@synopsys.com>
 <20180918.194846.1887226614778546543.davem@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Jose.Abreu@synopsys.com, netdev@vger.kernel.org,
        f.fainelli@gmail.com, narmstrong@baylibre.com,
        jbrunet@baylibre.com, martin.blumenstingl@googlemail.com,
        Joao.Pinto@synopsys.com, peppe.cavallaro@st.com,
        alexandre.torgue@st.com, vinod.koul@linaro.org
To: David Miller <davem@redhat.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-lj1-f196.google.com ([209.85.208.196]:43486 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728292AbeLSMCv (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 19 Dec 2018 07:02:51 -0500
Received: by mail-lj1-f196.google.com with SMTP id q2-v6so6031237lji.10
        for <netdev@vger.kernel.org>; Wed, 19 Dec 2018 04:02:49 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <20180918.194846.1887226614778546543.davem@redhat.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Tue, Sep 18, 2018 at 07:48:46PM -0700, David Miller wrote:
> 
> From: Jose Abreu <Jose.Abreu@synopsys.com>
> Date: Mon, 17 Sep 2018 09:22:55 +0100
> 
> > The fix for coalesce timer and a fix in tail address setting that impacts
> > XGMAC2 operation.
> > 
> > The series is:
> > 	Tested-by: Jerome Brunet <jbrunet@baylibre.com>
> > 	on a113 s400 board (single queue)
> 
> Series applied and queued up for -stable.

Hello David, Jose,

While it says that the series was queued up for -stable, only patch 2/2:
0431100b3d82 ("net: stmmac: Fixup the tail addr setting in xmit path")
was queued up for 4.14 stable.

patch 1/2:
8fce33317023 ("net: stmmac: Rework coalesce timer and fix multi-queue races")
is missing in 4.14 stable, even though the fixes tag refers to a commit
that was first included in v4.12.

Patch 1/2 does not apply without conflicts.
However, since this fixes multi-queue races, and appears to fix the irq
coalescing implementation that has been giving us problems in the past:
https://lkml.org/lkml/2016/11/24/571
I suggest that we try to get this backported.
If the conflicts are non-trivial, perhaps Jose can help with the backport
to 4.14 stable?


Kind regards,
Niklas