Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp713109pxb; Thu, 25 Feb 2021 13:08:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDmjh191YuWb7Pt5BJB8ZBflrlTpNz5UJVg6qqntTE2a8z7f6hlqrvH1nOpugqTR0Gvmaf X-Received: by 2002:a17:906:600f:: with SMTP id o15mr4747661ejj.76.1614287334817; Thu, 25 Feb 2021 13:08:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614287334; cv=none; d=google.com; s=arc-20160816; b=vFQl6c/l8K0dwX4FF17XimB/y/1LOSqANAYNpEvkg4rkSgdUfYA4pqX6mpZTCdPsD6 8U1VeQfckvOHIR5aGxerO+5venGh7d+kNQSg277lb/NGCIkBB8dv5y0ktjVM/1U3NtLS AOR+lH/b7p1fWdPdGxR29fKQ3wiO5VW/7fsyAh93RNb8DjjwIIIk5otYLu5SloWL9piL h8SAu34aVy+3c+8kluWE/D/nhiJHm9QKnFcFHDswn+yvneMTOPegvSkfr2AReh7DLskW g3Tc9MftBgrk2IDoRakTy1/y4IHvOUGI1jy/MG7kfpIkgug2zbbSRL7p82ashPiKMc1t hvOA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=gGeiCXi9fncQbgdOkein4PEFDuIaKN1LLJnxOvXBDMM=; b=NNPSlhg/IwBrkZjrBfKMZfNj0kN0ddtlgKc/RLKJyGbMI0smvOWjhE8dyPH1K5DDsg UtmSnyjugIxAFr43M4Zmwb13L5L6fZKeIFWC6vuYNILTnEVnzM/38l1nATSUhMa0Ez+s wYYuq3ShVgjQP1ZPhvNYeygDnYZx50QY2foLulw/7Eb4FRA8xqLSUlMtDP3ITX7Qkdd5 g3OOqo5Ew4o8J1kN77LzKaf6Acaf4pqKuLxYuyjJIK3IoANHFr1E0gcW3ydpVlYWDPIb /4PbXh3/IQKdFAefJnqA7xtzIEiRJwcgTpih7TCJ9KQr5QDENt/uJX8ZnlOkaaoZdB+e hUiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hC3k2bnI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cc10si4337996edb.153.2021.02.25.13.08.31; Thu, 25 Feb 2021 13:08:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hC3k2bnI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235067AbhBYVHx (ORCPT + 99 others); Thu, 25 Feb 2021 16:07:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235189AbhBYU4t (ORCPT ); Thu, 25 Feb 2021 15:56:49 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3655BC061756; Thu, 25 Feb 2021 12:55:44 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id d11so6570223wrj.7; Thu, 25 Feb 2021 12:55:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gGeiCXi9fncQbgdOkein4PEFDuIaKN1LLJnxOvXBDMM=; b=hC3k2bnILIbFDlmLQj6taWy3YqMFYqbx9MxWspc11zj06KDxmsAJzyTXNCmtheGN7c UgoHDLxyikxX7G4C/TvNP2k9zqFwdWFENMwpoPwayD1NCyjvMOk8nSrwMTqYiy7jjqLW 7lKKuISU7nhpABCglLY246MeGuzyEH6IU44w8GEBsExTO3PPCkPWp1J9WhPLVsQu7c9d xruEmzNuc1ZAZetLRpdGZJkBf5Mkpn8xvvuqMjCUfC84RsFLuvHvkoz65sRlD4fGYFVC 48LBowCgYbwHPDVNnlYVTOdqmwv9Th0QTlEA1TKwEqt/qD9lp5BZeAA3HyITzgw/+XEv tpmQ== 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:mime-version :content-transfer-encoding; bh=gGeiCXi9fncQbgdOkein4PEFDuIaKN1LLJnxOvXBDMM=; b=qDHlbCgh1x/JB+qpY6bx1Kvqr1cOHWyYffHJ3dBBY8koKVSiQVmqaHqTGweaoDJPMt oqWeAWDyr8XhX5tt7naLYVwxPGEHk8kGCQyn0Y2fZCn3hhwNU4kV25yerBQVd7QLZCHs 2bo5y9paRhrxfeD1EKYj4x4kzFYX/SWhTY6BoVQxkYwyHonob0t5xGNymcRSCof7TgTv ZT3Se1/1gfnnmLdKZnRq9XwtDJdMsRifu6G45MSvHAZ6ost3uNsUCe02Z8O0xvZVGX7t JmarT38hQRz9uBVKsbdNw3QUK9rWTgDtJdBcQBkp4obL/Amo3gijRZ39aJK93tzXF7hI jdzw== X-Gm-Message-State: AOAM533/Yut2m/ahfc7G/ayeuUEmVOUGY3p4w1qLrvMjXYyd/oznf2V/ FrZR7onH5mwyrUc1jfn2uBLiK3hJLTr3Tuex X-Received: by 2002:a5d:6152:: with SMTP id y18mr2133239wrt.381.1614286542701; Thu, 25 Feb 2021 12:55:42 -0800 (PST) Received: from hthiery.fritz.box (ip1f1322f8.dynamic.kabel-deutschland.de. [31.19.34.248]) by smtp.gmail.com with ESMTPSA id a21sm9948083wmb.5.2021.02.25.12.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 12:55:42 -0800 (PST) From: Heiko Thiery To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Fugang Duan , "David S . Miller" , Jakub Kicinski , Richard Cochran , Heiko Thiery Subject: [PATCH v2 1/1] net: fec: ptp: avoid register access when ipg clock is disabled Date: Thu, 25 Feb 2021 21:55:19 +0100 Message-Id: <20210225205518.16781-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When accessing the timecounter register on an i.MX8MQ the kernel hangs. This is only the case when the interface is down. This can be reproduced by reading with 'phc_ctrl eth0 get'. Like described in the change in 91c0d987a9788dcc5fe26baafd73bf9242b68900 the igp clock is disabled when the interface is down and leads to a system hang. So we check if the ptp clock status before reading the timecounter register. Signed-off-by: Heiko Thiery --- v2: - add mutex (thanks to Richard) drivers/net/ethernet/freescale/fec_ptp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 2e344aada4c6..22f5e800c2d7 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -377,9 +377,15 @@ static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) u64 ns; unsigned long flags; + mutex_lock(&fep->ptp_clk_mutex); + /* Check the ptp clock */ + if (!adapter->ptp_clk_on) + mutex_unlock(&fep->ptp_clk_mutex); + return -EINVAL; spin_lock_irqsave(&adapter->tmreg_lock, flags); ns = timecounter_read(&adapter->tc); spin_unlock_irqrestore(&adapter->tmreg_lock, flags); + mutex_unlock(&fep->ptp_clk_mutex); *ts = ns_to_timespec64(ns); -- 2.30.0