Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp531959ybb; Fri, 20 Mar 2020 03:42:32 -0700 (PDT) X-Google-Smtp-Source: ADFU+vudcjn2Tz9yMxIPwRewlTJqembwPb88CMTVGEFHOGqBcCaknwXHPBt1xs3RemMZOuMCW+hm X-Received: by 2002:a05:6830:1251:: with SMTP id s17mr6381352otp.75.1584700951952; Fri, 20 Mar 2020 03:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584700951; cv=none; d=google.com; s=arc-20160816; b=sl38EKQu/UynRlxW8c4Fh2jj0hdJWgJRTCQjJDdT9enyhbGG8Umh3WOUAcCT4ijBFt BNn4JHaYaIz6y2+l3kGaVTcKzb8lkS6SN1uZzRQsbz3TFnxKYioArOR5ZmZECC8q58FE D4FqNxMaXHR1m95CW6FN3Vud5jm3WSHpyc4HnmCkNa3zvNf/pyRACUc9p62Pk60iuTsp ENRiLt40p9q4vYhepCqZFhBaOj8Q3ubHre444Lm1qGy5//2jvga8v+JGpkfAWapji9R0 JrDhXqnv/x90Yn5h8ssznkdEZv8SMwXF+xHZ6hvWETjakjcuGjDTwsHsJroezX25RiTA erNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=YPET4af/qyxRYWW0sFpUTQ0KOCBpZsU9sk91pzQBIUU=; b=EX06EpBckUlw2qbMgWEN93r2Cj+osoo2Mu8b3es2eGAd6Y9VIZWDW/5j0Vl4l+3G5J CQgzuBPovo5kD5dKfxFkixVhC0VKuhK1yteiuFgL496m1hzY9CyMm89Ax6slyn+Lorr3 EblhTh9or7I+9A4BBDlWiwVrPBKUiZPHq0ocEIGob7rVtWqwK1OqnFVXTe/MxpgAteCx ALwrpSGwqYRXjZ0LOc7qQIm0EO+dm0u1HpNPsM5SZF4KD/zAUdwGlr5i+U6db6h0DY3Z 6//mM956rstV7ksYAPVQW2Yfc3nl9HL9gOwFJo5xjsnTd8JTBcwYvxleunrFPMuBjatk KxdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 45si2826339otu.264.2020.03.20.03.42.20; Fri, 20 Mar 2020 03:42:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727460AbgCTKl0 (ORCPT + 99 others); Fri, 20 Mar 2020 06:41:26 -0400 Received: from inva021.nxp.com ([92.121.34.21]:54848 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727272AbgCTKlE (ORCPT ); Fri, 20 Mar 2020 06:41:04 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C581B2004B1; Fri, 20 Mar 2020 11:41:02 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id A8CC82004A4; Fri, 20 Mar 2020 11:40:56 +0100 (CET) Received: from localhost.localdomain (mega.ap.freescale.net [10.192.208.232]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id E4B1C402FF; Fri, 20 Mar 2020 18:40:48 +0800 (SGT) From: Yangbo Lu To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Yangbo Lu , "David S . Miller" , Richard Cochran , Vladimir Oltean , Claudiu Manoil , Andrew Lunn , Vivien Didelot , Florian Fainelli , Alexandre Belloni , Microchip Linux Driver Support Subject: [PATCH 3/6] net: mscc: ocelot: fix timestamp info if ptp clock does not work Date: Fri, 20 Mar 2020 18:37:23 +0800 Message-Id: <20200320103726.32559-4-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200320103726.32559-1-yangbo.lu@nxp.com> References: <20200320103726.32559-1-yangbo.lu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The timestamp info should be only software timestamp capabilities if ptp clock does not work. Signed-off-by: Yangbo Lu --- drivers/net/ethernet/mscc/ocelot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index b342bbd..114d605 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1348,6 +1348,12 @@ int ocelot_get_ts_info(struct ocelot *ocelot, int port, { info->phc_index = ocelot->ptp_clock ? ptp_clock_index(ocelot->ptp_clock) : -1; + if (info->phc_index == -1) { + info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE | + SOF_TIMESTAMPING_RX_SOFTWARE | + SOF_TIMESTAMPING_SOFTWARE; + return 0; + } info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_RX_SOFTWARE | SOF_TIMESTAMPING_SOFTWARE | -- 2.7.4