Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp458954ybt; Fri, 19 Jun 2020 06:04:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZbKJb3E9JNxFoucyxcJvbIThxj+4c+NPJbevTlyveQVdUY1XoyNuxIbI17qwVztoc3S8j X-Received: by 2002:a17:906:7fc4:: with SMTP id r4mr3538399ejs.21.1592571899566; Fri, 19 Jun 2020 06:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592571899; cv=none; d=google.com; s=arc-20160816; b=mjz1dy6m+OwC4oluoQBxNN91lLA/IJ2jCxoDa9QYkLFr8IpKM3d5+i1ioH0E628KYI nxralCdS4+gzNK8FO1xYkeKjaCaeBKNH9CsIQk1tYfOJtmCEUXsZMJfaCncvpv4IWPB4 79fZZAE3REVF7nvEiPSvNZcMmQkQKOaMNgoiZni7e3A2N/FZGVp3+S+2ukQHwaHYATU5 Mh863CBKllR+WbdxmohH1Lza/hB3hF5qsco3TQmN6Z6rWqmKEWxovg/IlW8U42y1tOLp 7T4YPnEbUu4k9Z+0DAXw3Uh+2hJJyvVj38nP2qo1LRSPnJIfqvxE2cISSP0mRAycNNQ7 AKhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0ZhsdymycxMgGbdBgWxI1Dp13LV2OmgNJrR3Kzniczw=; b=YaQKVSnS53tLNc1/T9swYpVh0ZFspmYMqE10T0A4LK9GttGZfYcB8RT4cPu3cNSPBc b2sKifUyZl+o36+vm3FlC1AsnTIJnQp2qRAHSV/aH6R+F/KAmpOMe+97cKEYcY0xbKcQ Mht00L78quLCzjzjbqbbnSD2Kqpn6FzBMRaumQ/zu8hGBr/udKBqznlYcxbZjhT53tW3 lsC4vRODSMNwfjN0yTxpeLRIqWq+QwR2PsazSj1zCYQEI/II1S9WKcHW88QDGZ6KK2NQ vwCUIymtyYyYmIRtE6bfK3yPH6uPYJRSyC49rABiVxBE+FuP3NM8NNNcWMXbumXSTZVI ylAg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f22si3846357edt.167.2020.06.19.06.04.36; Fri, 19 Jun 2020 06:04:59 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733124AbgFSM10 (ORCPT + 99 others); Fri, 19 Jun 2020 08:27:26 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:34949 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733024AbgFSMZT (ORCPT ); Fri, 19 Jun 2020 08:25:19 -0400 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id E2EC2240006; Fri, 19 Jun 2020 12:25:12 +0000 (UTC) From: Antoine Tenart To: davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, richardcochran@gmail.com, alexandre.belloni@bootlin.com, UNGLinuxDriver@microchip.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, allan.nielsen@microchip.com, foss@0leil.net, antoine.tenart@bootlin.com Subject: [PATCH net-next v3 4/8] net: phy: mscc: take into account the 1588 block in MACsec init Date: Fri, 19 Jun 2020 14:22:56 +0200 Message-Id: <20200619122300.2510533-5-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200619122300.2510533-1-antoine.tenart@bootlin.com> References: <20200619122300.2510533-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch takes in account the use of the 1588 block in the MACsec initialization, as a conditional configuration has to be done (when the 1588 block is used). Signed-off-by: Antoine Tenart --- drivers/net/phy/mscc/mscc_macsec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c index c0eeb62cb940..713c62b1d1f0 100644 --- a/drivers/net/phy/mscc/mscc_macsec.c +++ b/drivers/net/phy/mscc/mscc_macsec.c @@ -285,7 +285,9 @@ static void vsc8584_macsec_mac_init(struct phy_device *phydev, MSCC_MAC_CFG_PKTINF_CFG_STRIP_PREAMBLE_ENA | MSCC_MAC_CFG_PKTINF_CFG_INSERT_PREAMBLE_ENA | (bank == HOST_MAC ? - MSCC_MAC_CFG_PKTINF_CFG_ENABLE_TX_PADDING : 0)); + MSCC_MAC_CFG_PKTINF_CFG_ENABLE_TX_PADDING : 0) | + (IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING) ? + MSCC_MAC_CFG_PKTINF_CFG_MACSEC_BYPASS_NUM_PTP_STALL_CLKS(0x8) : 0)); val = vsc8584_macsec_phy_read(phydev, bank, MSCC_MAC_CFG_MODE_CFG); val &= ~MSCC_MAC_CFG_MODE_CFG_DISABLE_DIC; -- 2.26.2