From patchwork Sat Aug 7 19:03:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 493808 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=-19.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MIME_HEADER_CTYPE_ONLY, SPF_HELO_NONE, SPF_PASS, T_TVD_MIME_NO_HEADERS, URIBL_BLOCKED, USER_AGENT_GIT 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 6BFFCC4338F for ; Sat, 7 Aug 2021 19:03:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46D9961078 for ; Sat, 7 Aug 2021 19:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229854AbhHGTED (ORCPT ); Sat, 7 Aug 2021 15:04:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229801AbhHGTEC (ORCPT ); Sat, 7 Aug 2021 15:04:02 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EF5CC0613CF for ; Sat, 7 Aug 2021 12:03:45 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id nh14so21644552pjb.2 for ; Sat, 07 Aug 2021 12:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=puil/UMrb0zhWnBpkSpeAY6GuUiwPFQp47/vjwrIkOc=; b=PcycGMvaynSL4U+iE3EO3011LmJva5TbNXDdoKBinBdTnYxrGWiLJZSLlwehC5gKfd auRHBrEQlaR6BWjpwyfgFzVGho5fkMDhp75k6TgzBA1w/bZU9sBLkhMjVUj9+C48X5gP SK9O7eNLASkA4eX7V6KgvYddgOyubqcOPBvVU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=puil/UMrb0zhWnBpkSpeAY6GuUiwPFQp47/vjwrIkOc=; b=XogIiusoocRq9gv6K+fOa/KBJ9Za9TxGgQOPko6ChLG4swbX61mkZldI01nhsgqg9S FY2zSv3GraGeWKcN94Tya4COuTGUXX+odsTPf45bCj783HV5e50YDCoGcDyNPnGnKN5c x/2BCqA/D6Hw7xsKTLJUMGW6deYLCVmiSPOLQc9Fnb7gjvgr1kQT4AWKCNiMrJNHu4Ij JtjRhPVewJ8b0TzM89HEQD/eCetg1u2zv2e+C6LbtQSI9o+gD9KgvLKiXO8BMrdXlviY +sqiZUZ42Az+PuRmcbxL7z7CLZKTEatlTrBBTDA5YeaqRznSv4BAiMxCb/E6VskGuMSj y82Q== X-Gm-Message-State: AOAM533zc0D1HgqrFHMVDBpuyNg4Bz1l1lJvFufQOySmLGlutusHcp6W 4xQSetGYokyRmDSWZ27E7dTugg== X-Google-Smtp-Source: ABdhPJyuXPc0SluNbWauEj10sSnYCF7ByjRrdxCimuXK1LC1wt+FssfW+JZ2lfwCSC1nwSV8Cn5CQw== X-Received: by 2002:a17:90a:d3d0:: with SMTP id d16mr11975091pjw.103.1628363024373; Sat, 07 Aug 2021 12:03:44 -0700 (PDT) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o18sm3378006pjp.1.2021.08.07.12.03.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Aug 2021 12:03:43 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, gospo@broadcom.com, richardcochran@gmail.com, pavan.chebbi@broadcom.com Subject: [PATCH net 3/3] bnxt_en: Use register window 6 instead of 5 to read the PHC Date: Sat, 7 Aug 2021 15:03:15 -0400 Message-Id: <1628362995-7938-4-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628362995-7938-1-git-send-email-michael.chan@broadcom.com> References: <1628362995-7938-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some older Broadcom debug tools use window 5 and may conflict, so switch to use window 6 instead. Fixes: 118612d519d8 ("bnxt_en: Add PTP clock APIs, ioctls, and ethtool methods") Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h index 57a8b9243a31..524f1c272054 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h @@ -10,8 +10,8 @@ #ifndef BNXT_PTP_H #define BNXT_PTP_H -#define BNXT_PTP_GRC_WIN 5 -#define BNXT_PTP_GRC_WIN_BASE 0x5000 +#define BNXT_PTP_GRC_WIN 6 +#define BNXT_PTP_GRC_WIN_BASE 0x6000 #define BNXT_MAX_PHC_DRIFT 31000000 #define BNXT_LO_TIMER_MASK 0x0000ffffffffUL