From patchwork Tue Mar 21 10:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Chebbi X-Patchwork-Id: 13182554 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59B60C6FD1D for ; Tue, 21 Mar 2023 10:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230297AbjCUKeB (ORCPT ); Tue, 21 Mar 2023 06:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjCUKeA (ORCPT ); Tue, 21 Mar 2023 06:34:00 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03ECF1557D for ; Tue, 21 Mar 2023 03:33:26 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id j3-20020a17090adc8300b0023d09aea4a6so19698649pjv.5 for ; Tue, 21 Mar 2023 03:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1679394801; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=4Ic3WM3REAXpT3zzCyF2Yvp86sf3ncEAH9eyMYMxGQg=; b=SDBFEmdZ/VnoeU7yXSA6inBz+vAdscUvt7rQtGy4pXIIwhdDBWfGn4IYEfeVSF24O3 eTEvzRpdyWlfDwLof/XFGsf59Rrv+AKB9RD0yTbGHoKo11xkgH1MDwFSXgn3ObG8Vcl3 g6heHAT1E8BtKk5UmiYXtsuRrsGmSFHJdnILc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679394801; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4Ic3WM3REAXpT3zzCyF2Yvp86sf3ncEAH9eyMYMxGQg=; b=4PwR61DEJyAzNJvKGPthCfRcUSDZ1FGgnuC5fUIJbngkM+ggNkTwiNQPItdT1yfqp4 sx2gbVxuC7B4h0DsAfefO8aoHnSTAbgMsCniZqr5ne3Dq6OVV3MmRjThCqjymstJ3x+i pvoNP30UWzyXiVYuTuea8iys/pFjwo92yWCIQ6eRgbRoVXnlk8LAvb3Y4CqwFGRcEzYy x527Ga0CnJee+6DbWQRixIJ4Jj9REggRGLX2LjrHKB2DrJl+VSkqJq3i7IMIgKIGIIAk NQ6ErFbks+jMuOhMveHTzOZnhJOQy2McTKVHOzdBBZQl16ylhdEK9K45HWybKBQb3Ics KEiQ== X-Gm-Message-State: AO0yUKXoXw+kdFQYXSMuScO4zABUKb6or35GQRwVK5gDg4KkctI+5Wzq 5bfEjkQlUJbqjbbJElji+hnXuw== X-Google-Smtp-Source: AK7set+MaIDb5K8gZ8a2kUaZzqka8Ti3440ZLUBruD6VtmCsMo0aAZuFAOw54e8dCnJwjJPExewFZg== X-Received: by 2002:a05:6a20:2a06:b0:d9:fb5c:e0de with SMTP id e6-20020a056a202a0600b000d9fb5ce0demr1685763pzh.38.1679394801576; Tue, 21 Mar 2023 03:33:21 -0700 (PDT) Received: from PC-MID-R740.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id t13-20020a62ea0d000000b005a87d636c70sm7888416pfh.130.2023.03.21.03.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 03:33:21 -0700 (PDT) From: Pavan Chebbi To: michael.chan@broadcom.com, kuba@kernel.org Cc: davem@davemloft.net, edumazet@google.com, gospo@broadcom.com, netdev@vger.kernel.org, pabeni@redhat.com, richardcochran@gmail.com, Pavan Chebbi Subject: [PATCH net-next 3/3] bnxt: Enforce PTP software freq adjustments only when in non-RTC mode Date: Tue, 21 Mar 2023 03:32:27 -0700 Message-Id: <20230321103227.12020-4-pavan.chebbi@broadcom.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230321103227.12020-1-pavan.chebbi@broadcom.com> References: <20230321103227.12020-1-pavan.chebbi@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Currently driver performs software based frequency adjustments when RTC capability is not discovered or when in shared PHC mode. But there may be some old firmware versions that still support hardware freq adjustments without RTC capability being exposed. In this situation driver will use non-realtime mode even on single host NICs. Hence enforce software frequency adjustments only when running in shared PHC mode. Make suitable changes for cyclecounter for the same. Signed-off-by: Pavan Chebbi Reviewed-by: Michael Chan Acked-by: Vadim Fedorenko --- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c index a3a3978a4d1c..b79a186f864c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c @@ -230,7 +230,7 @@ static int bnxt_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm) ptp_info); struct bnxt *bp = ptp->bp; - if (BNXT_PTP_USE_RTC(bp)) + if (!BNXT_MH(ptp->bp)) return bnxt_ptp_adjfine_rtc(bp, scaled_ppm); spin_lock_bh(&ptp->ptp_lock); @@ -861,9 +861,15 @@ static void bnxt_ptp_timecounter_init(struct bnxt *bp, bool init_tc) memset(&ptp->cc, 0, sizeof(ptp->cc)); ptp->cc.read = bnxt_cc_read; ptp->cc.mask = CYCLECOUNTER_MASK(48); - ptp->cc.shift = BNXT_CYCLES_SHIFT; - ptp->cc.mult = clocksource_khz2mult(BNXT_DEVCLK_FREQ, ptp->cc.shift); - ptp->cmult = ptp->cc.mult; + if (BNXT_MH(ptp->bp)) { + /* Use timecounter based non-real time mode */ + ptp->cc.shift = BNXT_CYCLES_SHIFT; + ptp->cc.mult = clocksource_khz2mult(BNXT_DEVCLK_FREQ, ptp->cc.shift); + ptp->cmult = ptp->cc.mult; + } else { + ptp->cc.shift = 0; + ptp->cc.mult = 1; + } ptp->next_overflow_check = jiffies + BNXT_PHC_OVERFLOW_PERIOD; } if (init_tc)