diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0028-net-amd-xgbe-Alter-the-port-speed-bit-range.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0028-net-amd-xgbe-Alter-the-port-speed-bit-range.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0028-net-amd-xgbe-Alter-the-port-speed-bit-range.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0028-net-amd-xgbe-Alter-the-port-speed-bit-range.patch new file mode 100644 index 00000000..843936f2 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0028-net-amd-xgbe-Alter-the-port-speed-bit-range.patch @@ -0,0 +1,75 @@ +From fa98ddbdf7c804a8016488ccc98f8620149cac7b Mon Sep 17 00:00:00 2001 +From: Raju Rangoju <Raju.Rangoju@amd.com> +Date: Mon, 20 Dec 2021 19:24:27 +0530 +Subject: [PATCH 28/48] net: amd-xgbe: Alter the port speed bit range + +commit 2d4a0b79dc6194048f7aa49c38d827cd5b7db6f1 upstream + +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> +Signed-off-by: Jakub Kicinski <kuba@kernel.org> +Signed-off-by: Zhaolong Zhang <zhaolong.zhang@windriver.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.27.0 + |