From patchwork Fri Jun 16 10:04:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alexis_Lothor=C3=A9?= X-Patchwork-Id: 10886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1224414vqr; Fri, 16 Jun 2023 03:16:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6sz+T3vGlwLIp3cIzbx03mw75SzcE0AlG4obPBKVSV+pz87uRkEDotkZGuL2sqQgoOuCMx X-Received: by 2002:a17:90a:d90b:b0:25b:c91e:8bf2 with SMTP id c11-20020a17090ad90b00b0025bc91e8bf2mr849754pjv.49.1686910614718; Fri, 16 Jun 2023 03:16:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686910614; cv=none; d=google.com; s=arc-20160816; b=QjjtMgj6tfs1lsFL1OSB1AFmuq2zrGI7S/OVDpTgAtPreGhwjSHzTXx3gxxCv3/AqN OXi0lRgUouFjh/2k9XsEQ2WkE7H/trTH1/6E9oDfBzJ8Y39P9GYR8MtgnoVKfBG4OOJs Z5afOfQ2NeenA0NaqzPxm8wlkqr6PZTVyQl/3xG9pQId40zXtjBKau26sgjHuEZBdH5Y hX+IZwJIbsKeidXCoPndHMjUIuNOO0ZhmvRKbsrLK9sSBUEogNcMfVFu/ADorLskDQbs ndVop4vy6tYcgzEf/514hkus8XRTeFMIY+gp/xytbGnzHaZ8MTuoFoY1yyDw7sYHX2P3 Jy+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/bEp3l+mxj4OHOGsH5hIH6F032OIg4YoPj77OR1PVdg=; b=u7CR74Zf5OvET0GEc7BtxgEis0elFN93Ht7IfBCL7hSkl29aielxs39Ea301UZUy2q cWnWpwUR7FZJt01fYle54h+Dwpet8ugXIXs3yKymf8/r524eheJb/xJdkYiQecn7F0Kf 8wUBKfiVA3h/lPufDt5lLP4MFCVhv4lonVqLj5EoDMASPq7tYp5E+MiRSbXZMG3xEFui 9drHcUi8+VE1ow6dI79XAMKzXJS7tzpfouaaBHAmiA4aryDdmYUxJSl9nr4wacIsoH/q 2Pa5KQxgtPvKPP1D6jmM+88D4k+VItXmibKS8kJbvVO+J+5LqJbkpC8SPYSbigqPOQga 8EbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=CN6oOlMd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i22-20020a17090adc1600b0025983055d94si1236664pjv.97.2023.06.16.03.16.40; Fri, 16 Jun 2023 03:16:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=CN6oOlMd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbjFPKFg (ORCPT + 99 others); Fri, 16 Jun 2023 06:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbjFPKFd (ORCPT ); Fri, 16 Jun 2023 06:05:33 -0400 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E01D194; Fri, 16 Jun 2023 03:05:31 -0700 (PDT) X-GND-Sasl: alexis.lothore@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686909930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bEp3l+mxj4OHOGsH5hIH6F032OIg4YoPj77OR1PVdg=; b=CN6oOlMdpm4WJSEG9Jbl2Wjd46tk4pOqx3PJpvQUFS28VyPKOhJIzXXMAmdKxbZoDJBCBF JoQnBH/1OwhyK5EYtNKFAuTuYLn+wKnQdm5d3148b84eqOEbb2GqpStIXBULMgr/GqI3PW inIn+uWZzm9eOjKfFpWdkhjEkTwz6RwRoz6xQwCI+wz5YYweGyHzlPMVg8oKmCdbp64wbg b6lrf5upm8vJsR1FMAU5BV7kmFasB9rdxsrghFRdpDIF6FqNJx8qqNSfDk32ehYr9aCG1L 7aP1VRYxjRJChWBxI3Hw9YKDxnz9LKauQv0hEUHRIGdxJuC7TpCb6pEcFk/8iA== X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com X-GND-Sasl: alexis.lothore@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id ABFB320004; Fri, 16 Jun 2023 10:05:28 +0000 (UTC) From: alexis.lothore@bootlin.com To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Richard Cochran Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Thomas Petazzoni , Nicolas Carrier Subject: [PATCH net-next 0/8] net: stmmac: enable timestamp snapshots for DWMAC1000 Date: Fri, 16 Jun 2023 12:04:01 +0200 Message-ID: <20230616100409.164583-1-alexis.lothore@bootlin.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768853984701247884?= X-GMAIL-MSGID: =?utf-8?q?1768853984701247884?= From: Alexis Lothoré While trying to use the recently implemented auxiliary snapshot feature ([1]) on Cyclone V platform (embedding DWMAC1000 IP), I realized that some parts are too tightly coupled to GMAC4 version of the IP. For example, timestamp_interrupt function in stmmac_hwtstamp.c reads some timestamp status (GMAC_TIMESTAMP_STATUS), which offset is relevant for GMAC4 (ptpaddr + 0x20), but not for GMAC3 (which should be ptpaddr + 0x28). Another example is that auxiliary snapshot trigger configuration is done in a dedicated register for GMAC4, while it is in the general Timestamp control register for DWMAC1000. This series proposes to split those too specific parts in each IP variant file. DWMAC1000 mapping is based on Cyclone V HPS register map ([2]) while GMAC4 mapping has been checked based on some Elkhart Lake range processors mapping ([3]) One point I am not sure about is for all other variants: sun8i-dwmac, dwxgmac2 and dwmac100. I have no clue about registers layout for those platforms. I then had to possible approaches to enable feature on DWMAC1000: - ensure that current behaviour is preserved for dwxgmac2, sun8i-dwmac and dwmac100; keep auxiliary snapshot feature in stmmac_ptp.c and add dwmac1000 behaviour as an "exception" - assume auxiliary snaspshots controls are different for each, then move the controls in each IP version file (XXXX_core.c) I felt like stmmac_ptp.c should remain independant from the IP version, so I chose the second option, but since I do not know about other versions layout (and do not have the hardware), I did not wire "blindly" the feature on those platform. Please let me know if I am wrong and/or if I should come with a more conservative approach (ie first version) Tested on Cyclone V with testptp [1] https://lore.kernel.org/netdev/20210414001617.3490-1-vee.khee.wong@linux.intel.com/ [2] https://cdrdv2.intel.com/v1/dl/getContent/666962?fileName=cv_5v4-683126-666962.pdf [3] https://cdrdv2.intel.com/v1/dl/getContent/636722?fileName=636722_EHL+Datasheet+V2+Book+2_rev003.pdf Alexis Lothoré (8): net: stmmac: add IP-specific callbacks for auxiliary snapshot net: stmmac: populate dwmac4 callbacks for auxiliary snapshots net: stmmac: move PTP interrupt handling to IP-specific DWMAC file net: stmmac: move common defines in stmmac_ptp.h net: stmmac: set number of snapshot external triggers for GMAC3 net: stmmac: introduce setter/getter for timestamp configuration net: stmmac: do not overwrite other flags when writing timestamp control net: stmmac: enable timestamp external trigger for dwmac1000 .../ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 + .../net/ethernet/stmicro/stmmac/dwmac1000.h | 12 ++- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 83 ++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 29 +++++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 85 +++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 17 +++- .../ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 62 ++------------ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +-- .../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 29 ++----- .../net/ethernet/stmicro/stmmac/stmmac_ptp.h | 26 +----- 10 files changed, 246 insertions(+), 113 deletions(-)