From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13073C2D0E4 for ; Tue, 24 Nov 2020 18:56:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E5EE208CA for ; Tue, 24 Nov 2020 18:56:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="VJZaXlBJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390964AbgKXS44 (ORCPT ); Tue, 24 Nov 2020 13:56:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:35468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390919AbgKXS4z (ORCPT ); Tue, 24 Nov 2020 13:56:55 -0500 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 585E2208B8; Tue, 24 Nov 2020 18:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606244215; bh=9EeXvYxhc+xygm951jAEsP8Q6mZuaqaa24L32cHPcPc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=VJZaXlBJHkMCoewgWb8aXdZ1RrA1dJX7Zg1ZTsrOfUsQXQhXL/f+tq6i/n3Xv+sDy yhlkpL7F/7iM2hyfE1vn+ugehJ4gaLx95i8+BaYcWglq9PM9Pno+w8Z6pmM87NokLY hXLVqiFYs6LQnVhEyu8qqbSkssb9l82omiO/pxwk= Date: Tue, 24 Nov 2020 10:56:53 -0800 From: Jakub Kicinski To: Antonio Borneo Cc: Ahmad Fatoum , Giuseppe Cavallaro , Alexandre Torgue , "Jose Abreu" , "David S. Miller" , , Maxime Coquelin , , , , Pengutronix Kernel Team , has Subject: Re: [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a Message-ID: <20201124105653.40426fe7@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <4a53794f1a0cea5eb009fce0b4b4c4846771f8be.camel@st.com> References: <20191007154306.95827-1-antonio.borneo@st.com> <20191007154306.95827-5-antonio.borneo@st.com> <20191009152618.33b45c2d@cakuba.netronome.com> <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> <20201124102022.1a6e6085@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> <4a53794f1a0cea5eb009fce0b4b4c4846771f8be.camel@st.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 24 Nov 2020 19:27:03 +0100 Antonio Borneo wrote: > On Tue, 2020-11-24 at 10:20 -0800, Jakub Kicinski wrote: > > On Tue, 24 Nov 2020 15:23:27 +0100 Antonio Borneo wrote: =20 > > > On Tue, 2020-11-24 at 15:15 +0100, Ahmad Fatoum wrote: =20 > > > > On 10.10.19 00:26, Jakub Kicinski wrote: =20 > > > > > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote: =20 > > > > > > All the registers and the functionalities used in the callback > > > > > > dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and > > > > > > 5.00a [2]. > > > > > >=20 > > > > > > Reuse the same callback for dwmac 4.10a too. > > > > > >=20 > > > > > > Tested on STM32MP15x, based on dwmac 4.10a. > > > > > >=20 > > > > > > [1] DWC Ethernet QoS Databook 4.10a October 2014 > > > > > > [2] DWC Ethernet QoS Databook 5.00a September 2017 > > > > > >=20 > > > > > > Signed-off-by: Antonio Borneo =20 > > > > >=20 > > > > > Applied to net-next. =20 > > > >=20 > > > > This patch seems to have been fuzzily applied at the wrong location. > > > > The diff describes extension of dwmac 4.10a and so does the @@ line: > > > >=20 > > > > =C2=A0=C2=A0@@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_op= s =3D { > > > >=20 > > > > The patch was applied mainline as 757926247836 ("net: stmmac: add > > > > flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead: > > > >=20 > > > > =C2=A0=C2=A0@@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = =3D { > > > >=20 > > > > I don't know if dwmac4 actually supports FlexPPS, so I think it's > > > > better to be on the safe side and revert 757926247836 and add the > > > > change for the correct variant. =20 > > >=20 > > > Agree, > > > the patch get applied to the wrong place! =20 > >=20 > > :-o > >=20 > > This happens sometimes with stable backports but I've never seen it > > happen working on "current" branches. > >=20 > > Sorry about that! > >=20 > > Would you mind sending the appropriate patches? I can do the revert if > > you prefer, but since you need to send the fix anyway.. =20 >=20 > You mean sending two patches one for revert and one to re-apply the code? > Or a single patch for the fix? Either way is fine by me. If I was doing it - I'd probably send just one patch, but if you prefer to revert first - nothing wrong with that.