Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp496623ybt; Wed, 17 Jun 2020 06:38:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwPT8GdaRt66Sk9kT7CHOKfDKZ9P55wmYeD/J40XgoCqXQTBsuKYhfAKYU/oWMI4E/N9Gi X-Received: by 2002:a17:906:899:: with SMTP id n25mr7054245eje.298.1592401136327; Wed, 17 Jun 2020 06:38:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592401136; cv=none; d=google.com; s=arc-20160816; b=qxjoTzhD7V91BjEnJW2WiH+d/KB7/uPRYrvxo0z3Zv4sDFrYvHgz9TdJ6YJQsVnhOK ojw8Wd0Iq5+Jxu+Quzl3J6G3241L+zOlo7jew3ZENok70ECwV+PBd25rXSMuExb+qaO8 TKYx0nug78UOycdXiOk0fAgPZRYM4QGLymNSXmTCwxd9eFlb/fUFNk4rW3RWsX+B97Af oDivdHibSBR4bXMqFCtLijcUtDGHz4ay05+DtEFGFqcWxu0pg9hpnwiwtbflmZ/QnayD BNfnaHIaPUy6wV+05hJXg9D1D4TFg9xEa6S85A2XLRWXbzStnGPBriAQjZROilqBulDs M1MQ== 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=sS//xBdqqn6elH1tQtBf+bAlEnCZqePdUW3Fuz+mAoZmZCGFlNx4w0J2Zkju6B7sng iV+jMXitv7RMbF28nvAhHg6S35lyzceRGIy0soIYCRL3zmShjg15fRwNekVu/8cCijDA o6jTCo2XP7mE2M6vSS32qFU9S6/CBRlftub54NNtRJVdRfwprBnAUAdtfb1FNuhf4aOA dUUrqZIHTahJrA/jf6sc3cTS6opPXdJqqS4yHextKIcQ88jkjlkQBnu9aFV93R0I9P9R Yp3yGO8ZKYIvmjoWQkcpUDbovCvoJV61NiHW6JcXB5usG7z/VvHp7Rqtm/UOXU2helIg c84w== 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 ar23si12186555ejc.169.2020.06.17.06.38.34; Wed, 17 Jun 2020 06:38:56 -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 S1727041AbgFQNge (ORCPT + 99 others); Wed, 17 Jun 2020 09:36:34 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:40511 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727023AbgFQNg2 (ORCPT ); Wed, 17 Jun 2020 09:36:28 -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 B890724000A; Wed, 17 Jun 2020 13:36:23 +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 v2 4/8] net: phy: mscc: take into account the 1588 block in MACsec init Date: Wed, 17 Jun 2020 15:31:23 +0200 Message-Id: <20200617133127.628454-5-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617133127.628454-1-antoine.tenart@bootlin.com> References: <20200617133127.628454-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