Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3654946ybt; Tue, 23 Jun 2020 07:41:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoDEPTivxwYRxmu5RpOI1Af7VjK6t1SH22pO8fvyu0SB5MSqkyPd5YXjTT/7RWCIYwqjOH X-Received: by 2002:a05:6402:17f6:: with SMTP id t22mr9454971edy.141.1592923288320; Tue, 23 Jun 2020 07:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592923288; cv=none; d=google.com; s=arc-20160816; b=ItbZHAeCURrL3dnnFameKidVjyNJFppTQQ2Bx0cJje0RIPvaGUlAKZShWw4RiaSYNn GM6o6+5bi18V+5ZwxOZuDwZPWNdZ6q3FZzS2YYdMT/JW1P+gq9nhQJA/Ovl5Q4PWJ7pp kafZ8MVsA7WaSduXI7+MjIJCZkkn1l41zGCHCzmwaAyFNzGiYgUbcXZiKDGRrnEI0KRv g+JDH80WzqHM9gWRq97nJ1I9YPrseCgLRsGI6Y3HMYXcaMAiOZVpQ8lOeCFXMiZHfB9u 6oiBY/j2JuG7/WsYjZXYuN9pH6dMRrvT96o75RwTYzJT+PIotoPPs7A54My2X74r9bvt TbfQ== 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=ut3NckxTdvqMlwh/6Pk4hB948aP4ahS4e4xMAP8JsKYeaqfQ98i9pSi591yFq+V/dZ 4Cj1hTVHnJAzoqFaHRoHOqtx5sYURkNo4lbi+vtesFGpyyly/LveQO/CiFIvF63oNhd0 BxeMnh4gHOI/0aLVG35xFn/q9Ixajun0PbxKCnd4MF9v02pebC0gvxsmjnYoNgJv9Rbk 68quF1exGxx8F9zZp7WgPfTHkUx4/JpPK0gRgA93iEp18jZFi92GVUDSypCGoJyuCcL7 oK3tJEXarT5jq7xbgf1/bACLd267mW9SlPUyeUvWo5bACL9dnTKm/xQSVFFBjPhDma2j Zvtg== 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 ss12si10949575ejb.188.2020.06.23.07.41.04; Tue, 23 Jun 2020 07:41:28 -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 S1732966AbgFWOfz (ORCPT + 99 others); Tue, 23 Jun 2020 10:35:55 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:49037 "EHLO relay11.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732851AbgFWOfN (ORCPT ); Tue, 23 Jun 2020 10:35:13 -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 relay11.mail.gandi.net (Postfix) with ESMTPSA id 9EC49100018; Tue, 23 Jun 2020 14:35:10 +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 v4 4/8] net: phy: mscc: take into account the 1588 block in MACsec init Date: Tue, 23 Jun 2020 16:30:10 +0200 Message-Id: <20200623143014.47864-5-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200623143014.47864-1-antoine.tenart@bootlin.com> References: <20200623143014.47864-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