From patchwork Tue May 3 01:13:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12834954 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 27F62C433F5 for ; Tue, 3 May 2022 01:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbiECBRQ (ORCPT ); Mon, 2 May 2022 21:17:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230002AbiECBRE (ORCPT ); Mon, 2 May 2022 21:17:04 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C6C750473 for ; Mon, 2 May 2022 18:13:31 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id j8so13784561pll.11 for ; Mon, 02 May 2022 18:13:31 -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=iAX+z7Fsw/QyOlQK4J1/wswlMzMJSOKCKmYsxclry74=; b=Ux4ORijnL5rh94TsCGEF//Jfplbg/SqBTNFkPthdGBLlHZ0Xgy16+mm/W7XvFGIZvm e1BpniX+gmntMOpUCD9NXHxt1c4lHqK1KxIqzXv+g9//aPdEZywMxCw+1me0urLkfnze GDjXFgjzqsV5b3Tc4vlgNFpgS75SfGPJO3KTk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iAX+z7Fsw/QyOlQK4J1/wswlMzMJSOKCKmYsxclry74=; b=ndGzjvEyIXke7i6ZSZ6XFQ9yABvzatHifwUpcbcASi1Dv5i8anYgQK8lkWMTr5yG8c ZJ5wB2d92dzy+qMbXWlNPPn/O79IeZ9fZlXVeEhhZ5r+1w9rc3u6morlBl7h3WncGOXq BGfpkIeUDmeNjkC/6YV80jsqANMZ90Y0gy9w6EMwk3QhPjiISY4OAjUAyxHI4MSYIlA1 BmeVN6Ts9EQ1xrNXibBfZMzt0LnV+5UtqS356+M1H0uryykUfyJHd+9hdhxFZiyFL6qH 2gBR+vUcOzzFwr/oX/fshnNAnTgIf23cWbmaLzHWVJHiYkJ91XgVKtLqwQqiYItyENII kBjA== X-Gm-Message-State: AOAM530GH5PLa7bf3Ks7sKqrOVptu+jFFc3OxTcpVfhg4s3XUXnq4OHX 41VTR78sqfdwemnec0X8UaE70g== X-Google-Smtp-Source: ABdhPJxwoymwwnqw3R/ytk4Xr/LOkIcjM35pDDOisj5juemTlNgUrsrj/v1QNTSoY9XXtmDn1w3ydw== X-Received: by 2002:a17:902:9b92:b0:158:9b65:a78 with SMTP id y18-20020a1709029b9200b001589b650a78mr14670205plp.53.1651540410370; Mon, 02 May 2022 18:13:30 -0700 (PDT) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k23-20020a170902ba9700b0015e8d4eb1fesm5272169pls.72.2022.05.02.18.13.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 18:13:29 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, gospo@broadcom.com Subject: [PATCH net 2/3] bnxt_en: Initiallize bp->ptp_lock first before using it Date: Mon, 2 May 2022 21:13:11 -0400 Message-Id: <1651540392-2260-3-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1651540392-2260-1-git-send-email-michael.chan@broadcom.com> References: <1651540392-2260-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org bnxt_ptp_init() calls bnxt_ptp_init_rtc() which will acquire the ptp_lock spinlock. The spinlock is not initialized until later. Move the bnxt_ptp_init_rtc() call after the spinlock is initialized. Fixes: 24ac1ecd5240 ("bnxt_en: Add driver support to use Real Time Counter for PTP") Reviewed-by: Pavan Chebbi Reviewed-by: Saravanan Vajravel Reviewed-by: Andy Gospodarek Reviewed-by: Somnath Kotur Reviewed-by: Damodharam Ammepalli Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c index 9c2ad5e67a5d..00f2f80c0073 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c @@ -846,13 +846,6 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg) if (rc) return rc; - if (bp->fw_cap & BNXT_FW_CAP_PTP_RTC) { - bnxt_ptp_timecounter_init(bp, false); - rc = bnxt_ptp_init_rtc(bp, phc_cfg); - if (rc) - goto out; - } - if (ptp->ptp_clock && bnxt_pps_config_ok(bp)) return 0; @@ -861,8 +854,14 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg) atomic_set(&ptp->tx_avail, BNXT_MAX_TX_TS); spin_lock_init(&ptp->ptp_lock); - if (!(bp->fw_cap & BNXT_FW_CAP_PTP_RTC)) + if (bp->fw_cap & BNXT_FW_CAP_PTP_RTC) { + bnxt_ptp_timecounter_init(bp, false); + rc = bnxt_ptp_init_rtc(bp, phc_cfg); + if (rc) + goto out; + } else { bnxt_ptp_timecounter_init(bp, true); + } ptp->ptp_info = bnxt_ptp_caps; if ((bp->fw_cap & BNXT_FW_CAP_PTP_PPS)) {