Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Leo Li <leoyang.li@nxp.com>
To:     Ioana Ciornei <ioana.ciornei@nxp.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Youri Querry <youri.querry_1@nxp.com>
Subject: RE: [PATCH net] soc: fsl: dpio: properly compute the consumer index
Thread-Topic: [PATCH net] soc: fsl: dpio: properly compute the consumer index
Thread-Index: AQHWIxnvaBco/TscSUWgh5JBknwmZ6iZ71hA
Date:   Tue, 5 May 2020 20:28:19 +0000
Message-ID: <VE1PR04MB668714A83CC2EB638BC273208FA70@VE1PR04MB6687.eurprd04.prod.outlook.com>
References: <20200505201429.24360-1-ioana.ciornei@nxp.com>
In-Reply-To: <20200505201429.24360-1-ioana.ciornei@nxp.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fffcbc3d-d6b5-4c81-90c3-08d7f132d9dc
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2020 20:28:20.1004
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: L+ejT2aROeyRCw92keY5pu16gZO7MA5i4KMp6LooVeFX37Ip8BHzISC4CI6B23eEy6uJck0bKMALOHHJpXY6Qg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6349
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Ioana Ciornei <ioana.ciornei@nxp.com>
> Sent: Tuesday, May 5, 2020 3:14 PM
> To: davem@davemloft.net; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Cc: Youri Querry <youri.querry_1@nxp.com>; Leo Li <leoyang.li@nxp.com>;
> Ioana Ciornei <ioana.ciornei@nxp.com>
> Subject: [PATCH net] soc: fsl: dpio: properly compute the consumer index
>=20
> Mask the consumer index before using it. Without this, we would be writin=
g
> frame descriptors beyond the ring size supported by the QBMAN block.
>=20
> Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring
> mode enqueue")
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>

If you would like it go through net tree.

Acked-by: Li Yang <leoyang.li@nxp.com>

> ---
>=20
> I am sending this fix through the net tree since the bug manifests itself=
 only
> on net-next and not the soc trees. This way it would be easier to integra=
te
> this sooner rather than later.

Since the description of the patch says it fixes a patch included from soc =
tree, it is not very clear why this problem only exists on net-next.

>=20
>  drivers/soc/fsl/dpio/qbman-portal.c | 1 +
>  1 file changed, 1 insertion(+)
>=20
> diff --git a/drivers/soc/fsl/dpio/qbman-portal.c
> b/drivers/soc/fsl/dpio/qbman-portal.c
> index 804b8ba9bf5c..23a1377971f4 100644
> --- a/drivers/soc/fsl/dpio/qbman-portal.c
> +++ b/drivers/soc/fsl/dpio/qbman-portal.c
> @@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct
> qbman_swp *s,
>  		eqcr_ci =3D s->eqcr.ci;
>  		p =3D s->addr_cena + QBMAN_CENA_SWP_EQCR_CI;
>  		s->eqcr.ci =3D qbman_read_register(s,
> QBMAN_CINH_SWP_EQCR_CI);
> +		s->eqcr.ci &=3D full_mask;
>=20
>  		s->eqcr.available =3D qm_cyc_diff(s->eqcr.pi_ring_size,
>  					eqcr_ci, s->eqcr.ci);
> --
> 2.17.1