[PATCH net-next v2 0/3] net: amd-xgbe: Add support for Yellow Carp Ethernet device

[PATCH net-next v2 0/3] net: amd-xgbe: Add support for Yellow Carp Ethernet device

[Raju Rangoju]

From: Raju Rangoju <Raju.Rangoju@amd.com>

Add support for newer version of Hardware, the Yellow Carp Ethernet device

Changelog:
v1->v2:
 - Rework xgbe_pci_probe logic to set pdata->xpcs_window.. registers for
   all the platforms
 - Add a blank line before the comment

Raju Rangoju (3):
  net: amd-xgbe: Add Support for Yellow Carp Ethernet device
  net: amd-xgbe: Alter the port speed bit range
  net: amd-xgbe: Disable the CDR workaround path for Yellow Carp Devices

 drivers/net/ethernet/amd/xgbe/xgbe-common.h |  6 ++++--
 drivers/net/ethernet/amd/xgbe/xgbe-pci.c    | 11 +++++++++--
 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

-- 
2.25.1

[PATCH net-next v2 1/3] net: amd-xgbe: Add Support for Yellow Carp Ethernet device

[Raju Rangoju]

From: Raju Rangoju <Raju.Rangoju@amd.com>

Yellow Carp Ethernet devices use the existing PCI ID but
the window settings for the indirect PCS access have been
altered. Add the check for Yellow Carp Ethernet devices to
use the new register values.

Co-developed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>

---
changelog:
v1->v2:
 - Rework xgbe_pci_probe logic to set pdata->xpcs_window.. registers for
   all the platforms
---
 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++
 drivers/net/ethernet/amd/xgbe/xgbe-pci.c    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index 533b8519ec35..0075939121d1 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
@@ -898,6 +898,8 @@
 #define PCS_V2_WINDOW_SELECT		0x9064
 #define PCS_V2_RV_WINDOW_DEF		0x1060
 #define PCS_V2_RV_WINDOW_SELECT		0x1064
+#define PCS_V2_YC_WINDOW_DEF		0x18060
+#define PCS_V2_YC_WINDOW_SELECT		0x18064
 
 /* PCS register entry bit positions and sizes */
 #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
index 90cb55eb5466..0f930b17980e 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
@@ -278,6 +278,10 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	    (rdev->vendor == PCI_VENDOR_ID_AMD) && (rdev->device == 0x15d0)) {
 		pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
 		pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
+	} else if (rdev && (rdev->vendor == PCI_VENDOR_ID_AMD) &&
+		   (rdev->device == 0x14b5)) {
+		pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;
+		pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;
 	} else {
 		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
 		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
-- 
2.25.1

[PATCH net-next v2 2/3] net: amd-xgbe: Alter the port speed bit range

[Raju Rangoju]

From: Raju Rangoju <Raju.Rangoju@amd.com>

Newer generation Hardware uses the slightly different
port speed bit widths, so alter the existing port speed
bit range to extend support to the newer generation hardware
while maintaining the backward compatibility with older
generation hardware.

The previously reserved bits are now being used which
then requires the adjustment to the BIT values, e.g.:

Before:
   PORT_PROPERTY_0[22:21] - Reserved
   PORT_PROPERTY_0[26:23] - Supported Speeds

After:
   PORT_PROPERTY_0[21] - Reserved
   PORT_PROPERTY_0[26:22] - Supported Speeds

To make this backwards compatible, the existing BIT
definitions for the port speeds are incremented by one
to maintain the original position.

Co-developed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
---
 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 4 ++--
 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index 0075939121d1..466273b22f0a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
@@ -1032,8 +1032,8 @@
 #define XP_PROP_0_PORT_ID_WIDTH			8
 #define XP_PROP_0_PORT_MODE_INDEX		8
 #define XP_PROP_0_PORT_MODE_WIDTH		4
-#define XP_PROP_0_PORT_SPEEDS_INDEX		23
-#define XP_PROP_0_PORT_SPEEDS_WIDTH		4
+#define XP_PROP_0_PORT_SPEEDS_INDEX		22
+#define XP_PROP_0_PORT_SPEEDS_WIDTH		5
 #define XP_PROP_1_MAX_RX_DMA_INDEX		24
 #define XP_PROP_1_MAX_RX_DMA_WIDTH		5
 #define XP_PROP_1_MAX_RX_QUEUES_INDEX		8
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index 213769054391..2156600641b6 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -124,10 +124,10 @@
 #include "xgbe.h"
 #include "xgbe-common.h"
 
-#define XGBE_PHY_PORT_SPEED_100		BIT(0)
-#define XGBE_PHY_PORT_SPEED_1000	BIT(1)
-#define XGBE_PHY_PORT_SPEED_2500	BIT(2)
-#define XGBE_PHY_PORT_SPEED_10000	BIT(3)
+#define XGBE_PHY_PORT_SPEED_100		BIT(1)
+#define XGBE_PHY_PORT_SPEED_1000	BIT(2)
+#define XGBE_PHY_PORT_SPEED_2500	BIT(3)
+#define XGBE_PHY_PORT_SPEED_10000	BIT(4)
 
 #define XGBE_MUTEX_RELEASE		0x80000000
 
-- 
2.25.1

[PATCH net-next v2 3/3] net: amd-xgbe: Disable the CDR workaround path for Yellow Carp Devices

[Raju Rangoju]

From: Raju Rangoju <Raju.Rangoju@amd.com>

Yellow Carp Ethernet devices do not require
Autonegotiation CDR workaround, hence disable the same.

Co-developed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>

---
changelog:
v1->v2:
 - Add a blank line before the comment
---
 drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
index 0f930b17980e..efdcf484a510 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
@@ -282,6 +282,9 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		   (rdev->device == 0x14b5)) {
 		pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;
 		pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;
+
+		/* Yellow Carp devices do not need cdr workaround */
+		pdata->vdata->an_cdr_workaround = 0;
 	} else {
 		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
 		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
@@ -464,7 +467,7 @@ static int __maybe_unused xgbe_pci_resume(struct device *dev)
 	return ret;
 }
 
-static const struct xgbe_version_data xgbe_v2a = {
+static struct xgbe_version_data xgbe_v2a = {
 	.init_function_ptrs_phy_impl	= xgbe_init_function_ptrs_phy_v2,
 	.xpcs_access			= XGBE_XPCS_ACCESS_V2,
 	.mmc_64bit			= 1,
@@ -479,7 +482,7 @@ static const struct xgbe_version_data xgbe_v2a = {
 	.an_cdr_workaround		= 1,
 };
 
-static const struct xgbe_version_data xgbe_v2b = {
+static struct xgbe_version_data xgbe_v2b = {
 	.init_function_ptrs_phy_impl	= xgbe_init_function_ptrs_phy_v2,
 	.xpcs_access			= XGBE_XPCS_ACCESS_V2,
 	.mmc_64bit			= 1,
-- 
2.25.1

Re: [PATCH net-next v2 0/3] net: amd-xgbe: Add support for Yellow Carp Ethernet device

[Tom Lendacky]

On 12/20/21 7:54 AM, Raju Rangoju wrote:
> From: Raju Rangoju <Raju.Rangoju@amd.com>
> 
> Add support for newer version of Hardware, the Yellow Carp Ethernet device

Looks good Raju.

Thanks,
Tom

> 
> Changelog:
> v1->v2:
>   - Rework xgbe_pci_probe logic to set pdata->xpcs_window.. registers for
>     all the platforms
>   - Add a blank line before the comment
> 
> Raju Rangoju (3):
>    net: amd-xgbe: Add Support for Yellow Carp Ethernet device
>    net: amd-xgbe: Alter the port speed bit range
>    net: amd-xgbe: Disable the CDR workaround path for Yellow Carp Devices
> 
>   drivers/net/ethernet/amd/xgbe/xgbe-common.h |  6 ++++--
>   drivers/net/ethernet/amd/xgbe/xgbe-pci.c    | 11 +++++++++--
>   drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c |  8 ++++----
>   3 files changed, 17 insertions(+), 8 deletions(-)
> 

Re: [PATCH net-next v2 0/3] net: amd-xgbe: Add support for Yellow Carp Ethernet device

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 20 Dec 2021 19:24:25 +0530 you wrote:
> From: Raju Rangoju <Raju.Rangoju@amd.com>
> 
> Add support for newer version of Hardware, the Yellow Carp Ethernet device
> 
> Changelog:
> v1->v2:
>  - Rework xgbe_pci_probe logic to set pdata->xpcs_window.. registers for
>    all the platforms
>  - Add a blank line before the comment
> 
> [...]

Here is the summary with links:
  - [net-next,v2,1/3] net: amd-xgbe: Add Support for Yellow Carp Ethernet device
    https://git.kernel.org/netdev/net-next/c/dbb6c58b5a61
  - [net-next,v2,2/3] net: amd-xgbe: Alter the port speed bit range
    https://git.kernel.org/netdev/net-next/c/2d4a0b79dc61
  - [net-next,v2,3/3] net: amd-xgbe: Disable the CDR workaround path for Yellow Carp Devices
    https://git.kernel.org/netdev/net-next/c/6f60ecf233f9

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html