From patchwork Thu Aug 24 18:32:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 13364567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D3D4C71153 for ; Thu, 24 Aug 2023 18:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Kra3t4uECcf1/wejT5kvBVmZhEnFtD0L7KY1FK+zXng=; b=Ft8oRHD+J6ZXIp czkYkdADVfzVjh09nmvpB9jRTzVDL7ZvgmxM53fg57k36hybzOHGbZ+LEwsqnvYhloiVf/43iy/hq ZF2tNCjmcjpOlefSe9s5HHfc4guII46GuOFjE3iICqfaryOJBOSFdYLD6a7OAf7J5cJ6HoEc8wwO9 aXX1f6zv1b8zcTrautHTBOqKvY584QtL7BU7cSLXIiabrLuZLO1xCH5jjU9xgutLgQMosuKJrKVXR yjg/iiEc0aXwE1hI0WfurGi7u3eNUMzowgxxF4UsfJGeQkbipJ6IrJWmFD1dGIbr9kex/hsjTDOXI Zf4UZwv17eKRCCqCzCOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qZF8s-003b4G-0L; Thu, 24 Aug 2023 18:33:14 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qZF8k-003azW-0I for linux-arm-kernel@lists.infradead.org; Thu, 24 Aug 2023 18:33:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692901985; 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: in-reply-to:in-reply-to:references:references; bh=6l23XMepM0Sh/iOcowpX76UCT+vWOCxLFJ6fQYXhTVo=; b=Dy13I8iJPaTM4lWWn+sbxKUR5XcbGONog4ORkwgbsjtaf39jkEA5stm0ttg1DM1oAx43zt rQwUHHq3eK79e5KFR/h66lXGkGq9GrgvVUzMzmyLdmzpdY8MeKrXWJ7LrEkIWaXya58ZPL TVGFgA/7wNmwp04se3AISQa52gyNCWc= Received: from mail-oa1-f69.google.com (mail-oa1-f69.google.com [209.85.160.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-HLo4HzyDMMqDdnXqOL1kYg-1; Thu, 24 Aug 2023 14:33:03 -0400 X-MC-Unique: HLo4HzyDMMqDdnXqOL1kYg-1 Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-1befca4fdfaso117739fac.2 for ; Thu, 24 Aug 2023 11:33:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692901983; x=1693506783; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6l23XMepM0Sh/iOcowpX76UCT+vWOCxLFJ6fQYXhTVo=; b=ekW0m4nKiHJ6mRu1wCXO0CUvYfFEAT/35GA3Ie9g+0hoH2hztmEvmB6O/EK6rrsyBZ EOelxi6/V/dmy5szhDgqqKVdIIv8GqUcT0WtaYsuw2UF8jI7W5V2oXZd9HRjJAZiW+O3 H2zSUayy+PUcfxf6zVdd308xFJh+JlFNTx8efREn755srfj7NgAyDsGSYRyq1MHKVT8N YciALfgsM5jr3fcNmYv3lKmc9pmHnsa2EHHKHgoiuBUtprC2VWAa8Op6drPJkZdzz/LE 47yia8FVj+VOK4Amge4kYp/BbqVDDM9quZgrLhP7Rl6gHHmm+Mj8od72tOHMmHefxw++ Ky3w== X-Gm-Message-State: AOJu0YyOScGeyhC+RnSdvGgUFWnSKDdFI/+qtt+oZBftpVZb2grvjb9t WsPeg0c4QU2oVruYe3563QtnHWRcfKupBzgdnWLyK0z/BzivVvhMLH0VhGeU7yJLwKYyTMp4oLQ xwCUpHZNuYvsRyk/+MpgTsfZcEMQvGxRHubA= X-Received: by 2002:a05:6870:e253:b0:1be:f8d9:7bdd with SMTP id d19-20020a056870e25300b001bef8d97bddmr627460oac.6.1692901983126; Thu, 24 Aug 2023 11:33:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHS3fEn/UFcZp7p1JhHHa0Wzb/ax2PIiQ32dL4ujO6wuTfaKPgzGkO+lp3kAWh66sAyZwY+xw== X-Received: by 2002:a05:6870:e253:b0:1be:f8d9:7bdd with SMTP id d19-20020a056870e25300b001bef8d97bddmr627359oac.6.1692901981225; Thu, 24 Aug 2023 11:33:01 -0700 (PDT) Received: from [192.168.1.165] ([2600:1700:1ff0:d0e0::37]) by smtp.gmail.com with ESMTPSA id j17-20020a0ceb11000000b0064f77d37798sm4209qvp.5.2023.08.24.11.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 11:33:00 -0700 (PDT) From: Andrew Halaney Date: Thu, 24 Aug 2023 13:32:54 -0500 Subject: [PATCH net-next 3/7] net: stmmac: Precede entire addend calculation with its comment MIME-Version: 1.0 Message-Id: <20230824-stmmac-subsecond-inc-cleanup-v1-3-e0b9f7c18b37@redhat.com> References: <20230824-stmmac-subsecond-inc-cleanup-v1-0-e0b9f7c18b37@redhat.com> In-Reply-To: <20230824-stmmac-subsecond-inc-cleanup-v1-0-e0b9f7c18b37@redhat.com> To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Richard Cochran Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Halaney X-Mailer: b4 0.12.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230824_113306_205646_6B1C74C9 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The addend calculation is currently split. The variable to be programmed is first altered, then a comment explaining the full calculation is seen, then the variable is altered further before the calculation is finished. Make the comment the first thing read. This makes the conversion of sub_second_increment from nanoseconds to hertz much easier to understand and reads logically. Signed-off-by: Andrew Halaney --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ba38ca284e26..f0e585e6ef76 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -849,7 +849,6 @@ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags) stmmac_config_sub_second_increment(priv, priv->ptpaddr, priv->plat->clk_ptp_rate, xmac, &sub_second_inc); - temp = div_u64(NSEC_PER_SEC, sub_second_inc); /* Store sub second increment for later use */ priv->sub_second_inc = sub_second_inc; @@ -859,6 +858,7 @@ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags) * addend = (2^32)/freq_div_ratio; * where, freq_div_ratio = 1e9ns/sub_second_inc */ + temp = div_u64(NSEC_PER_SEC, sub_second_inc); temp = (u64)(temp << 32); priv->default_addend = div_u64(temp, priv->plat->clk_ptp_rate); stmmac_config_addend(priv, priv->ptpaddr, priv->default_addend);