From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A455454E9 for ; Tue, 25 Jun 2024 02:00:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AB8941140; Tue, 25 Jun 2024 02:00:45 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id BBB82400EF for ; Tue, 25 Jun 2024 02:00:43 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-36279cf6414so3942488f8f.3 for ; Mon, 24 Jun 2024 17:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273643; x=1719878443; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gkqG5rqjfYKV9CpAp3Ygwr3KTGlRiKn16UiCXRldamM=; b=BaP6eJbnuFgnhrCadKNezKFWErMZwDeFH5Oef+FRLBBGwuj1t6Yws46JILCfAYYy+0 0ThASlUh/fpOWlhECdliI1qSTl3czFb5Pj+lvpLL51lWN1W14hBE6q51K9GqFvuR4xOD jCXgMROdzblIPcQoT25r8J2cB+6ryDow2ZomPNsVKf8X6Mk3dDI0zRJcdiv+90DiT3rT OukOcZ6b9UxM35uKwACOrqtLcWr1pKb70wv5l769zlgds/uJUd05iEKQztxIPiFNzmun jFV/TJZOxTvRXwDSsSTeG74l1wlp6pD+EKaT9uS3JlmnSahkK7ioRv3ixzYTd7syekAo XIbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273643; x=1719878443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gkqG5rqjfYKV9CpAp3Ygwr3KTGlRiKn16UiCXRldamM=; b=HvT7povrhMvaoqNrY91tiLrxvEaQyYEHUXfXoEO+FUNTpA83o2OrLSHTb6hkOY3wXs lpl0skr4nbswcdO2wZ+0yM2+QPTpXQ/0m/RQKXvKJBQ9iO4StbzYKznKWaTHYQEkAjBd kRDodZ135lXIXixVxzW9IAsVchCD81wh4cU6YW8FTHovJ5tAIzMs9qnh4po88Ovpy+0T Hyr4FbKTUHLkJ4eJuL98qdYoklA7huwuJF1pqSc0FBr+mzlpOBtKXUfKmAKnnz7UEZAJ LG/phtwCYgne4BDAR8eaeq2NFNqU2qZlngEy9ObUADXDTiFQM3hbDqJjVWAAl2jY52wR sIag== X-Forwarded-Encrypted: i=1; AJvYcCX5XFOPzFm8wxCppr+Uqhg8zScbcnFdHN9moX5DOcTSK1/YTM0ZflyOLhFjCyA0kGLFpNVKwYPhZAcVn/1JaFE= X-Gm-Message-State: AOJu0YxFdfpwy3aXCh8zjhpTWY7hS2iFTxcDXtIl2ZEbHTs/EdlItYLj jP5hR1wcU2/Ty5xdwYguC2nGn61s9DWG61ZCE3waKb/OJZ2fQk3Ucth4Qg== X-Google-Smtp-Source: AGHT+IEONNxP31tXdTw7Z7Wg10z4Dz7YQkSgqgySy3oxIcekXYZk0SekJ0gZxbV1LjL9Sx13fBeeyw== X-Received: by 2002:a5d:4686:0:b0:363:7816:7568 with SMTP id ffacd0b85a97d-366e9661d46mr3509195f8f.70.1719273643354; Mon, 24 Jun 2024 17:00:43 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366383f675esm11344146f8f.22.2024.06.24.17.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:00:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Venkat Kumar Ande Cc: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: enable PLL control for fixed PHY modes only' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:14 +0100 Message-Id: <20240624235907.885628-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/07b6c26ee2bbe092c60b96d2dc5d44e067fe1055 Thanks. Luca Boccassi --- >From 07b6c26ee2bbe092c60b96d2dc5d44e067fe1055 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:39 +0530 Subject: [PATCH] net/axgbe: enable PLL control for fixed PHY modes only [ upstream commit 1c68b393b8ba05b6ddb321e3632d45fc1021ed96 ] PLL control setting is needed only in fixed PHY configuration to fix the peer-peer issues. Without the PLL control setting, the link up takes longer time in a fixed PHY configuration. Without the fix the user will not get the link come UP. Driver implements SW RRC for Autoneg On configuration, hence PLL control setting is not needed for AN On configuration, and can be skipped. Also, PLL re-initialization is not needed for PHY Power Off and RRC commands. Otherwise, they lead to mailbox errors. Added the changes accordingly. Fixes: 09b0a36cc7ae ("net/axgbe: toggle PLL settings during rate change") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- drivers/net/axgbe/axgbe_phy_impl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 46ee5f0617..040176b8ef 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1228,6 +1228,10 @@ static void axgbe_phy_rx_reset(struct axgbe_port *pdata) static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable) { + /* PLL_CTRL feature needs to be enabled for fixed PHY modes (Non-Autoneg) only */ + if (pdata->phy.autoneg != AUTONEG_DISABLE) + return; + XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_VEND2_PMA_MISC_CTRL0, XGBE_PMA_PLL_CTRL_MASK, enable ? XGBE_PMA_PLL_CTRL_SET @@ -1272,8 +1276,9 @@ static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, axgbe_phy_rx_reset(pdata); reenable_pll: - /* Re-enable the PLL control */ - axgbe_phy_pll_ctrl(pdata, true); + /* Enable PLL re-initialization, not needed for PHY Power Off and RRC cmds */ + if (cmd != 0 && cmd != 5) + axgbe_phy_pll_ctrl(pdata, true); PMD_DRV_LOG(NOTICE, "firmware mailbox command did not complete\n"); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:15.336087708 +0100 +++ 0028-net-axgbe-enable-PLL-control-for-fixed-PHY-modes-onl.patch 2024-06-25 00:22:13.117184263 +0100 @@ -1 +1 @@ -From 1c68b393b8ba05b6ddb321e3632d45fc1021ed96 Mon Sep 17 00:00:00 2001 +From 07b6c26ee2bbe092c60b96d2dc5d44e067fe1055 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c68b393b8ba05b6ddb321e3632d45fc1021ed96 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index f51830f800..bcefbf28f2 100644 +index 46ee5f0617..040176b8ef 100644