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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 4E034C56201 for ; Tue, 24 Nov 2020 14:28:14 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABD69205CB for ; Tue, 24 Nov 2020 14:28:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="svYpOUyv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABD69205CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:References: To:From:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1cm7gqjxhduzeq5/bvwfI2Nn5B2MNdBIDaFa17v05Co=; b=svYpOUyvkDsjVnhIlvtD5qQvj VWeGbQ7SGVHVQZEeoB7kioi2zgP0qlAUnt3nTXV0zSzVO1721SwT0GorDGG/pvpXKspcNm02RB7wB KDc+RuLBBNxU8yU84+Y9BcGUbVOKd1Ft7VT9NZWr3DklLjTVRZX1QC7GBF0VJaoaCwFE4v82VN3WR EHoFNvyfdGU4cByHIUxzxkWkCaSrNivDoqZncPtq/50NYC9ZhKkwzUz1sVptNCl1MwUsNbrJ00uQI LgN2wV4Ut67lIH74VPU3NW+reQwerqlWvNRedNPKRGSLBl+nUeEtEn+0VMb7Uo00d+otJ9obzfOyK RI59JTvtw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khZIA-0008WC-8B; Tue, 24 Nov 2020 14:27:38 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khZHo-0008MC-7s for linux-arm-kernel@lists.infradead.org; Tue, 24 Nov 2020 14:27:17 +0000 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 1khZHm-00012a-Hb; Tue, 24 Nov 2020 15:27:14 +0100 Subject: Re: [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a From: Ahmad Fatoum To: Antonio Borneo , Jakub Kicinski 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> Message-ID: <6d314a48-8d01-5a31-63de-8159e68d665e@pengutronix.de> Date: Tue, 24 Nov 2020 15:27:12 +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: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> Content-Language: en-US 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201124_092716_522016_ADABE486 X-CRM114-Status: GOOD ( 21.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Coquelin , has , Alexandre Torgue , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Jose Abreu , Pengutronix Kernel Team , Giuseppe Cavallaro , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org To += Jakub's new address On 24.11.20 15:15, Ahmad Fatoum wrote: > 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 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel