Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3413951rwa; Tue, 23 Aug 2022 04:30:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR7i+Lp2CfrPFBReqYFxnrqzxqlWVGG/Bc29nhe1k7YWvBiqfHD1dswrdS1TZrpSR6L2EkA0 X-Received: by 2002:a17:906:794b:b0:73d:7627:ddfc with SMTP id l11-20020a170906794b00b0073d7627ddfcmr7616769ejo.204.1661254210303; Tue, 23 Aug 2022 04:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254210; cv=none; d=google.com; s=arc-20160816; b=dAE0bDnQhemT5il0SPvg4Z0HZrlGJNoKhNtYTGzqygjdkHqDZZaXTvnuE32Krm6b/U NVe5YTxohbB5Gez19osJ8yUnwEMeHMig2JWuFBWYLKQpPuAn+VxnseOPyHDFW3ngDHYO WUaZn6XAY8MjU+l+NZZyQAo7j6vbuI1EE3oPHNtHkZS9bCr3mUi0HH4q/V8NsYU3+9xi eTkoumWDu+6I7iKW2EbVQa1sIMNh4f80TT9GgLeIGUjWnAqyXFD2APi8uglzdiBracXB HGujdB4ETGw+t/I5j/UlIEc5FkZ2LJabp9B1K8GosDORMHvJ4fLED4jgSP8bEf0EbCUl WZag== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HVDyjAH9dFJCOZPE/3kFXQiQRm3BhR3zAmTusuFgVck=; b=AxT4t0sqmyI88WPgaImTQOJDIFFJKngTTwUQynN1KIeFNXR9FxEM3ZIEHl2V/d55R0 GoI0u721/6w9+OGPdYScPZoQza17Ra4PqzPGUIb9BSt1kGiYVLgPw1Y8cn/HM0zRMx+Y B/dX3jTdxjORSIoRpZChfZrgT4taGIGGmv06iFLBoHYbA07xpmEzd7R30grCzH1lnLK0 awHrcVzJnD4ZpF9r3bqg+JTZVo7CigWyo8Z2Tc1Ki+kAs49lv8Y3DhtKpfKwLVjBDQtU FDYgQbbYyCjBrO2h9QpsQkvxehbRx6LnzAX2IoULdute9kRL85fvwDOEC4zyjXf8TXy9 azdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uEuoz5sb; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m23-20020a509317000000b0043d556dd041si1852993eda.446.2022.08.23.04.29.44; Tue, 23 Aug 2022 04:30:10 -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=@linuxfoundation.org header.s=korg header.b=uEuoz5sb; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348453AbiHWJNq (ORCPT + 99 others); Tue, 23 Aug 2022 05:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348829AbiHWJKy (ORCPT ); Tue, 23 Aug 2022 05:10:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AF866CF45; Tue, 23 Aug 2022 01:30:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 80324B81C55; Tue, 23 Aug 2022 08:30:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF467C433C1; Tue, 23 Aug 2022 08:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243401; bh=igjXdeTIh2J1dyo+c5h+Sq4//E/O3Py4lY+Fsmj/teA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uEuoz5sb+YLAn/z+hb3hz5ed75twLpXXuRJQh8vcWNtMBHdxmpTaN2tv+QrR2SC5c ihT37oPkdynPjj7NQ0V3z11XwMEobR/OfRYjLjRKDH/NhVCrxkQpIba/eNhXSh67mw Ag35KfCo3sY2qJZWBiUwK1PHJ3J5he1Cp8D7dUgM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Cs=C3=B3k=C3=A1s=20Bence?= , Jakub Kicinski Subject: [PATCH 5.19 235/365] fec: Fix timer capture timing in `fec_ptp_enable_pps()` Date: Tue, 23 Aug 2022 10:02:16 +0200 Message-Id: <20220823080128.069830194@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Csókás Bence commit 61d5e2a251fb20c2c5e998c3f1d52ed6d5360319 upstream. Code reimplements functionality already in `fec_ptp_read()`, but misses check for FEC_QUIRK_BUG_CAPTURE. Replace with function call. Fixes: 28b5f058cf1d ("net: fec: ptp: fix convergence issue to support LinuxPTP stack") Signed-off-by: Csókás Bence Link: https://lore.kernel.org/r/20220811101348.13755-1-csokas.bence@prolan.hu Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/fec_ptp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -135,11 +135,7 @@ static int fec_ptp_enable_pps(struct fec * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds * to current timer would be next second. */ - tempval = readl(fep->hwp + FEC_ATIME_CTRL); - tempval |= FEC_T_CTRL_CAPTURE; - writel(tempval, fep->hwp + FEC_ATIME_CTRL); - - tempval = readl(fep->hwp + FEC_ATIME); + tempval = fep->cc.read(&fep->cc); /* Convert the ptp local counter to 1588 timestamp */ ns = timecounter_cyc2time(&fep->tc, tempval); ts = ns_to_timespec64(ns);