From patchwork Fri Jul 6 18:44:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 940698 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="LdZY/R6M"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41MkF45hwjz9rxs for ; Sat, 7 Jul 2018 04:45:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934476AbeGFSp1 (ORCPT ); Fri, 6 Jul 2018 14:45:27 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:38991 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934424AbeGFSox (ORCPT ); Fri, 6 Jul 2018 14:44:53 -0400 Received: by mail-lj1-f193.google.com with SMTP id t7-v6so9821170ljj.6 for ; Fri, 06 Jul 2018 11:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iNJp3bA1HPrmxKSHRfEc7Kw5FQhP8REbtrVID/LEq/Y=; b=LdZY/R6M4rhE+IKqQQUFuqQJmpbcPPuaz1+YxRWbd8lMFrhCyIZ/LyKg4FNFjdf/MA IzDmx7EgDblTUdYWZF/92tY/qZEzUSQoI/5+F3lJZcyFnw9bzaPFalanhnjaD7bfGaXk lfbTknJxUBf7oNu4+DnGolEo81nJRytAxUan4= 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=iNJp3bA1HPrmxKSHRfEc7Kw5FQhP8REbtrVID/LEq/Y=; b=ZV0ULM58VijaZVLdC2OUPmzrTrjxyxrucldJt53E+If645+fyA97CCUsy2It4n8nVl e2kUU/lHt89Y+86tCP0gcogTJL5K2YW01KNj7ZZCP5e91odHsDCVY3xchLLKLrJjYC2R U/k0/a9gTgftnTjr6oA5f1lbnwt7bDZ/7xDWk2urLx9emYAiuq37ZmQ4MlFwDnagHt21 Rk3WyJTyttow1D13Uq+NJEX/Ktr/RCtkOV2wSI/7WER+aWPvl21Aj1oFQwxaNfF/kqsZ I9WGdRJqcouyqBqcO7RfXmvNVsnzUDS4NdriwO3kL9XPewxA910AQv0dVoRGs6FbuXzl tp8Q== X-Gm-Message-State: APt69E3s3Og70kPy9td4vVFp/JVVG1NI/73XRrnzThcj+B2VTkk5010h OYmqVZhzpDejw/3EO1U0SwMINg== X-Google-Smtp-Source: AAOMgperxhwA3qCaq76ZB1CY5MiJQ3RVhR/1iF6KMKHq9d7eSnQaAMn1v6gH8uJbk9BfIOplRUzNeQ== X-Received: by 2002:a2e:954e:: with SMTP id t14-v6mr3408437ljh.68.1530902691774; Fri, 06 Jul 2018 11:44:51 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id h65-v6sm2312063lfb.22.2018.07.06.11.44.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jul 2018 11:44:51 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net Cc: linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH 1/2] net: ethernet: ti: cpsw: use BIT macro Date: Fri, 6 Jul 2018 21:44:44 +0300 Message-Id: <20180706184445.29111-2-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706184445.29111-1-ivan.khoronzhuk@linaro.org> References: <20180706184445.29111-1-ivan.khoronzhuk@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's needed to avoid checkpatch warnings for farther changes. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 093998124149..f355e65323f3 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -253,23 +253,23 @@ struct cpsw_ss_regs { #define RX_DSCP_PRI_MAP7 0x4c /* Rx DSCP Priority to Rx Packet Mapping */ /* Bit definitions for the CPSW2_CONTROL register */ -#define PASS_PRI_TAGGED (1<<24) /* Pass Priority Tagged */ -#define VLAN_LTYPE2_EN (1<<21) /* VLAN LTYPE 2 enable */ -#define VLAN_LTYPE1_EN (1<<20) /* VLAN LTYPE 1 enable */ -#define DSCP_PRI_EN (1<<16) /* DSCP Priority Enable */ -#define TS_320 (1<<14) /* Time Sync Dest Port 320 enable */ -#define TS_319 (1<<13) /* Time Sync Dest Port 319 enable */ -#define TS_132 (1<<12) /* Time Sync Dest IP Addr 132 enable */ -#define TS_131 (1<<11) /* Time Sync Dest IP Addr 131 enable */ -#define TS_130 (1<<10) /* Time Sync Dest IP Addr 130 enable */ -#define TS_129 (1<<9) /* Time Sync Dest IP Addr 129 enable */ -#define TS_TTL_NONZERO (1<<8) /* Time Sync Time To Live Non-zero enable */ -#define TS_ANNEX_F_EN (1<<6) /* Time Sync Annex F enable */ -#define TS_ANNEX_D_EN (1<<4) /* Time Sync Annex D enable */ -#define TS_LTYPE2_EN (1<<3) /* Time Sync LTYPE 2 enable */ -#define TS_LTYPE1_EN (1<<2) /* Time Sync LTYPE 1 enable */ -#define TS_TX_EN (1<<1) /* Time Sync Transmit Enable */ -#define TS_RX_EN (1<<0) /* Time Sync Receive Enable */ +#define PASS_PRI_TAGGED BIT(24) /* Pass Priority Tagged */ +#define VLAN_LTYPE2_EN BIT(21) /* VLAN LTYPE 2 enable */ +#define VLAN_LTYPE1_EN BIT(20) /* VLAN LTYPE 1 enable */ +#define DSCP_PRI_EN BIT(16) /* DSCP Priority Enable */ +#define TS_320 BIT(14) /* Time Sync Dest Port 320 enable */ +#define TS_319 BIT(13) /* Time Sync Dest Port 319 enable */ +#define TS_132 BIT(12) /* Time Sync Dest IP Addr 132 enable */ +#define TS_131 BIT(11) /* Time Sync Dest IP Addr 131 enable */ +#define TS_130 BIT(10) /* Time Sync Dest IP Addr 130 enable */ +#define TS_129 BIT(9) /* Time Sync Dest IP Addr 129 enable */ +#define TS_TTL_NONZERO BIT(8) /* Time Sync Time To Live Non-zero enable */ +#define TS_ANNEX_F_EN BIT(6) /* Time Sync Annex F enable */ +#define TS_ANNEX_D_EN BIT(4) /* Time Sync Annex D enable */ +#define TS_LTYPE2_EN BIT(3) /* Time Sync LTYPE 2 enable */ +#define TS_LTYPE1_EN BIT(2) /* Time Sync LTYPE 1 enable */ +#define TS_TX_EN BIT(1) /* Time Sync Transmit Enable */ +#define TS_RX_EN BIT(0) /* Time Sync Receive Enable */ #define CTRL_V2_TS_BITS \ (TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\ From patchwork Fri Jul 6 18:44:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 940696 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ffOgNZ+4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41MkDn3wzvz9rxs for ; Sat, 7 Jul 2018 04:45:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934644AbeGFSpD (ORCPT ); Fri, 6 Jul 2018 14:45:03 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:42391 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934201AbeGFSoy (ORCPT ); Fri, 6 Jul 2018 14:44:54 -0400 Received: by mail-lj1-f193.google.com with SMTP id 1-v6so9814087ljv.9 for ; Fri, 06 Jul 2018 11:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s2bgLLlhLyHW7qceKFyXMqYp88Ub3JuO1EFI33PSEf0=; b=ffOgNZ+4CcKQLlIQi5vrnKhm0RQx7pWZzI+lXynpsJ22Vip4ab2RfIQCYcGdW38eKZ xypiHwWAx+xTSFaTjOgtxbQ6kexCHhHQTB76bkkkyXr+vFn7k6+mViuFyidSDqj2enZl tPy2m6ezcg3PqYc6EVoOtBmRlFyP4LOhQAdlg= 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=s2bgLLlhLyHW7qceKFyXMqYp88Ub3JuO1EFI33PSEf0=; b=WlXmkM3owRHg5SH9iNshty40Yaq4/WVERrkgiyXfiIZbPWCFzsabVnfqugoL1KHzQ8 K/t9hmXvamwHmb4WtkKY1o7XH+4pEt04ysMCgyDcu9U+Lm86kIgfJ+iK52ezYv0/9wAM Wds0sBfdAsn6M16aDmFANNGmEQNH3u4QLSCyz6MJsKe43dOdcG3DnfN+224z94gIhrUA GbnYZM4Q3otraS4muhR/lSLkFNwPiCxX8vwZwVz0F358Rp33DwYcDOEoAXR7ncE4hWcO Oc8QT6Rc1Ft44pGkVbezshO5qyZKvpwn8mkNiGaSkawqKXgqU2bSFS6bP3UZrK3cEo7d 3vdQ== X-Gm-Message-State: APt69E2pZm8N0OWAlreBBGEzR6H1x0QsX6BJA7gG0+wcSo8p3nTGyQjb bnYfIYOpxcJ4Q95WLM7XCzye4A== X-Google-Smtp-Source: AAOMgpf1dh/wn/j2v5HqnhAVCxHzENwv+DBvgOXZNvo01YWhQLi5P+b9s52BLGaW2MUDvyF25Kux1Q== X-Received: by 2002:a2e:7c12:: with SMTP id x18-v6mr6958879ljc.71.1530902692874; Fri, 06 Jul 2018 11:44:52 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id h65-v6sm2312063lfb.22.2018.07.06.11.44.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jul 2018 11:44:52 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net Cc: linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH 2/2] net: ethernet: ti: cpsw: allow PTP 224.0.0.107 to be timestamped Date: Fri, 6 Jul 2018 21:44:45 +0300 Message-Id: <20180706184445.29111-3-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706184445.29111-1-ivan.khoronzhuk@linaro.org> References: <20180706184445.29111-1-ivan.khoronzhuk@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Tested on AM572x with cpsw v1.15 for PTP sync and delay_req messages. It doesn't work on cpsw v1.12, so added only for cpsw v > 1.15. Command for testing: ptp4l -P -4 -H -i eth0 -l 6 -m -q -p /dev/ptp0 -f ptp.cfg where ptp.cfg: [global] tx_timestamp_timeout 20 Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index f355e65323f3..00761fe59848 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -257,6 +257,7 @@ struct cpsw_ss_regs { #define VLAN_LTYPE2_EN BIT(21) /* VLAN LTYPE 2 enable */ #define VLAN_LTYPE1_EN BIT(20) /* VLAN LTYPE 1 enable */ #define DSCP_PRI_EN BIT(16) /* DSCP Priority Enable */ +#define TS_107 BIT(15) /* Tyme Sync Dest IP Address 107 */ #define TS_320 BIT(14) /* Time Sync Dest Port 320 enable */ #define TS_319 BIT(13) /* Time Sync Dest Port 319 enable */ #define TS_132 BIT(12) /* Time Sync Dest IP Addr 132 enable */ @@ -281,7 +282,7 @@ struct cpsw_ss_regs { #define CTRL_V3_TS_BITS \ - (TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\ + (TS_107 | TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\ TS_TTL_NONZERO | TS_ANNEX_F_EN | TS_ANNEX_D_EN |\ TS_LTYPE1_EN)