Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp718072pxb; Thu, 25 Feb 2021 13:17:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlA3BklWKh0D/CItitEDCcWQktg4Qdp7kp7rbge6l9FH1VTkVGa6mpMcok1LOZeYa/qN9f X-Received: by 2002:a17:906:254e:: with SMTP id j14mr4689377ejb.452.1614287843325; Thu, 25 Feb 2021 13:17:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614287843; cv=none; d=google.com; s=arc-20160816; b=PEFB59kF+ZKjdk3ibhjCFiBfsqGXl4qo8tuMRDuKrPA/o7PxuGpbHCtv7zGH8+Kw8l pzwkKiqeQcvR7vHxSqH6jrHqvOGTSKmFiM2kayjh/RqtSGa861CumthD+zKu7lCmYjgL eOZGrCjOqIiRjbQuPtMKQKzu+0LXl/vbHLBK2WlAwOgtY2EK7GDFNgfryrZ2fL/J5W7U OAXY/Gf83Xwvr7F/GEbjhGyURuzmjXoqLQxv3z33zCbyRs75kCOOE3PskGVOt1OP2NkW +1Vg8/7v2FZG6qeiGq70nmFgT5lQJjJIzFX7s3ZnOtUfnEJ/Y++j7anJ1PFFxdoB5fEf YoPg== 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=pOO48CRVDwuK4MdBDmN0ZaayDswN2bcw5RsSh3NXzK4=; b=Dp50nyYRmXxxvR0zCTk30wIH53URUagCtRhHfJNUhnZn2Iz7VZeKDh1euFZb+SOjVK m0M0fczlO/VTk1dugDFgEYIUyd/OGz/rrgvKbisgYrucAIviFLGcCdohAZZmWPsnHPoI 8TPvcHdXe+Tcj7GopoCIIgLmniTHqbmC98yrlYTTnNxcT6j7tBhLSI7j1gO4Z/EkP8yI x5Dx0aOMo+G+JzhZ0JZPbTYymTNoq1drSCfvNf+MIRdA6I+16PVVpMWNINEXxpJzz5u/ oMLn2Rr1mg4rs43HtHtHaj1Cq9H7DWE3M9Vc0TgUhfizGvOja4UvrfW/lyWh69U5nDE7 ogGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=H50sSvw9; 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 du11si4680777ejc.473.2021.02.25.13.17.00; Thu, 25 Feb 2021 13:17:23 -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=H50sSvw9; 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 S233403AbhBYVQX (ORCPT + 99 others); Thu, 25 Feb 2021 16:16:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbhBYVQV (ORCPT ); Thu, 25 Feb 2021 16:16:21 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB375C06174A; Thu, 25 Feb 2021 13:15:40 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id a11so2515415wmd.5; Thu, 25 Feb 2021 13:15:40 -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=pOO48CRVDwuK4MdBDmN0ZaayDswN2bcw5RsSh3NXzK4=; b=H50sSvw9F8zkWIzdOX+9Q/1CIiSrcErSJudYopuz3opDJ+GKFS4T1VZNHrzsvuu26+ jKxCxB2Nlxxr3s13+aKQwU/zAIoESDMuzV9X/41WMEEA76KxPRZngAmBRsJECJyXyF1l v1By6iya2G5cPQ/gyAkJFMMXyXt9WEz5geGKRPBei8uH/axjY2WQVkz+h2iced85vA7q SLO6XOmztohvkl+rC781l2jXCvtAExWFRgcZ1sXVOQbpBl6ITUlonF4dGefZFAwo1w1v AlknttOPWpdIWgAaUF1DSYcDVEn1DfvWNYIUhlO0UioOeVKAwUEKwWOs2kpWwrHHEfcX itWg== 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=pOO48CRVDwuK4MdBDmN0ZaayDswN2bcw5RsSh3NXzK4=; b=Xx0REBX0rtqe5hHzMlAXxKSn2ck1K1SG5gLg48MEIlnBIktp5CWrEMBuUmH9UlomPd Nl3Uzc133d9EKf+rJJbpdfiNaZeVYhuuGa9qDWIXJb/NiJQmeZYk1CUxTotv7CnblGl+ pmV8Vz3DOab1w4sUomjPyyw2bDbkqa7Ie9AicW12fSeWjwdlh4tuLAiDtc6DUNnWQzcj OmviVnAxZhzjb/kiz/cK2I0eB8P6S8qCmi7RxbDZZ1+UT1LjNHXNu4SDsKmgY6u6LG8f 1+1U5gpNWkKidDLBoocz0cYPQQGVqu2oDCVnIeqomIGO/fmr/Y5g/wpSzRZrApZB9Tkj 0cfg== X-Gm-Message-State: AOAM530OAAHbwBbcSi2xgTYzr7+Gv7yjI3qBbELkljrAUfMSO0Br5Lz+ GeeOZ/rNDBUGu8thUFBze0Bd5JCX/SAoylrx X-Received: by 2002:a1c:9a46:: with SMTP id c67mr230998wme.159.1614287739208; Thu, 25 Feb 2021 13:15:39 -0800 (PST) Received: from hthiery.fritz.box (ip1f1322f8.dynamic.kabel-deutschland.de. [31.19.34.248]) by smtp.gmail.com with ESMTPSA id s124sm8636373wms.40.2021.02.25.13.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 13:15:38 -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 22:15:16 +0100 Message-Id: <20210225211514.9115-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) v3: I did a mistake and did not test properly - add parenteses - fix the used variable drivers/net/ethernet/freescale/fec_ptp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 2e344aada4c6..1753807cbf97 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -377,9 +377,16 @@ static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) u64 ns; unsigned long flags; + mutex_lock(&adapter->ptp_clk_mutex); + /* Check the ptp clock */ + if (!adapter->ptp_clk_on) { + mutex_unlock(&adapter->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(&adapter->ptp_clk_mutex); *ts = ns_to_timespec64(ns); -- 2.30.0