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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 679DBC2D0E4 for ; Tue, 24 Nov 2020 14:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1698D206FB for ; Tue, 24 Nov 2020 14:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388724AbgKXOPo (ORCPT ); Tue, 24 Nov 2020 09:15:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727207AbgKXOPm (ORCPT ); Tue, 24 Nov 2020 09:15:42 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DBFEC0613D6 for ; Tue, 24 Nov 2020 06:15:42 -0800 (PST) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1khZ6a-0007Kt-S4; Tue, 24 Nov 2020 15:15:40 +0100 Subject: Re: [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a To: Jakub Kicinski , Antonio Borneo Cc: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , netdev@vger.kernel.org, Maxime Coquelin , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pengutronix Kernel Team , has References: <20191007154306.95827-1-antonio.borneo@st.com> <20191007154306.95827-5-antonio.borneo@st.com> <20191009152618.33b45c2d@cakuba.netronome.com> From: Ahmad Fatoum Message-ID: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> Date: Tue, 24 Nov 2020 15:15:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20191009152618.33b45c2d@cakuba.netronome.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Jakub, On 10.10.19 00:26, Jakub Kicinski wrote: > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote: >> 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]. >> >> Reuse the same callback for dwmac 4.10a too. >> >> Tested on STM32MP15x, based on dwmac 4.10a. >> >> [1] DWC Ethernet QoS Databook 4.10a October 2014 >> [2] DWC Ethernet QoS Databook 5.00a September 2017 >> >> Signed-off-by: Antonio Borneo > > Applied to net-next. 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: @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = { The patch was applied mainline as 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead: @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = { 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. Cheers, Ahmad -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |