[PATCH net v2 0/5] Updating and correcting switch hardware versions and reported speeds

[PATCH net v2 0/5] Updating and correcting switch hardware versions and reported speeds

[Justin Lai]

This patch set mainly involves updating and correcting switch hardware
versions and reported speeds.
Details are as follows:
1. Refactor the rtase_check_mac_version_valid() function.
2. Correct the speed for RTL907XD-V1
3. Add support for RTL907XD-VA PCIe port
4. Corrects error handling of the rtase_check_mac_version_valid()
5. Add defines for hardware version id

Justin Lai (5):
  rtase: Refactor the rtase_check_mac_version_valid() function
  rtase: Correct the speed for RTL907XD-V1
  rtase: Add support for RTL907XD-VA PCIe port
  rtase: Corrects error handling of the rtase_check_mac_version_valid()
  rtase: Add defines for hardware version id

 drivers/net/ethernet/realtek/rtase/rtase.h    |  8 +++-
 .../net/ethernet/realtek/rtase/rtase_main.c   | 45 +++++++++++++------
 2 files changed, 39 insertions(+), 14 deletions(-)

-- 
2.34.1

[PATCH net v2 1/5] rtase: Refactor the rtase_check_mac_version_valid() function

[Justin Lai]

1. Sets tp->hw_ver.
2. Changes the return type from bool to int.
3. Modify the error message for an invalid hardware version id.

Fixes: a36e9f5cfe9e ("rtase: Add support for a pci table in this module")
Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase.h    |  2 ++
 .../net/ethernet/realtek/rtase/rtase_main.c   | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase.h b/drivers/net/ethernet/realtek/rtase/rtase.h
index 583c33930f88..547c71937b01 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase.h
+++ b/drivers/net/ethernet/realtek/rtase/rtase.h
@@ -327,6 +327,8 @@ struct rtase_private {
 	u16 int_nums;
 	u16 tx_int_mit;
 	u16 rx_int_mit;
+
+	u32 hw_ver;
 };
 
 #define RTASE_LSO_64K 64000
diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index f8777b7663d3..0c19c5645d53 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -1972,20 +1972,21 @@ static void rtase_init_software_variable(struct pci_dev *pdev,
 	tp->dev->max_mtu = RTASE_MAX_JUMBO_SIZE;
 }
 
-static bool rtase_check_mac_version_valid(struct rtase_private *tp)
+static int rtase_check_mac_version_valid(struct rtase_private *tp)
 {
-	u32 hw_ver = rtase_r32(tp, RTASE_TX_CONFIG_0) & RTASE_HW_VER_MASK;
-	bool known_ver = false;
+	int ret = -ENODEV;
 
-	switch (hw_ver) {
+	tp->hw_ver = rtase_r32(tp, RTASE_TX_CONFIG_0) & RTASE_HW_VER_MASK;
+
+	switch (tp->hw_ver) {
 	case 0x00800000:
 	case 0x04000000:
 	case 0x04800000:
-		known_ver = true;
+		ret = 0;
 		break;
 	}
 
-	return known_ver;
+	return ret;
 }
 
 static int rtase_init_board(struct pci_dev *pdev, struct net_device **dev_out,
@@ -2105,9 +2106,12 @@ static int rtase_init_one(struct pci_dev *pdev,
 	tp->pdev = pdev;
 
 	/* identify chip attached to board */
-	if (!rtase_check_mac_version_valid(tp))
-		return dev_err_probe(&pdev->dev, -ENODEV,
-				     "unknown chip version, contact rtase maintainers (see MAINTAINERS file)\n");
+	ret = rtase_check_mac_version_valid(tp);
+	if (ret != 0) {
+		dev_err(&pdev->dev,
+			"unknown chip version: 0x%08x, contact rtase maintainers (see MAINTAINERS file)\n",
+			tp->hw_ver);
+	}
 
 	rtase_init_software_variable(pdev, tp);
 	rtase_init_hardware(tp);
-- 
2.34.1

[PATCH net v2 2/5] rtase: Correct the speed for RTL907XD-V1

[Justin Lai]

Correct the speed for RTL907XD-V1.

Fixes: dd7f17c40fd1 ("rtase: Implement ethtool function")
Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index 0c19c5645d53..5b8012987ea6 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -1714,10 +1714,21 @@ static int rtase_get_settings(struct net_device *dev,
 			      struct ethtool_link_ksettings *cmd)
 {
 	u32 supported = SUPPORTED_MII | SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+	const struct rtase_private *tp = netdev_priv(dev);
 
 	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
 						supported);
-	cmd->base.speed = SPEED_5000;
+
+	switch (tp->hw_ver) {
+	case 0x00800000:
+	case 0x04000000:
+		cmd->base.speed = SPEED_5000;
+		break;
+	case 0x04800000:
+		cmd->base.speed = SPEED_10000;
+		break;
+	}
+
 	cmd->base.duplex = DUPLEX_FULL;
 	cmd->base.port = PORT_MII;
 	cmd->base.autoneg = AUTONEG_DISABLE;
-- 
2.34.1

[PATCH net v2 3/5] rtase: Add support for RTL907XD-VA PCIe port

[Justin Lai]

1. Add RTL907XD-VA hardware version id.
2. Add the reported speed for RTL907XD-VA.

Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index 5b8012987ea6..22389911a7d4 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -1725,6 +1725,7 @@ static int rtase_get_settings(struct net_device *dev,
 		cmd->base.speed = SPEED_5000;
 		break;
 	case 0x04800000:
+	case 0x08000000:
 		cmd->base.speed = SPEED_10000;
 		break;
 	}
@@ -1993,6 +1994,7 @@ static int rtase_check_mac_version_valid(struct rtase_private *tp)
 	case 0x00800000:
 	case 0x04000000:
 	case 0x04800000:
+	case 0x08000000:
 		ret = 0;
 		break;
 	}
-- 
2.34.1

Re: [PATCH net v2 3/5] rtase: Add support for RTL907XD-VA PCIe port

[Andrew Lunn]

On Fri, Nov 15, 2024 at 05:54:27PM +0800, Justin Lai wrote:
> 1. Add RTL907XD-VA hardware version id.
> 2. Add the reported speed for RTL907XD-VA.

This is not a fix, it never worked on this device as far as i see. So
this should be for net-next.

Please separate these patches out into real fixes, and new features.

	Andrew

RE: [PATCH net v2 3/5] rtase: Add support for RTL907XD-VA PCIe port

[Justin Lai]

> 
> On Fri, Nov 15, 2024 at 05:54:27PM +0800, Justin Lai wrote:
> > 1. Add RTL907XD-VA hardware version id.
> > 2. Add the reported speed for RTL907XD-VA.
> 
> This is not a fix, it never worked on this device as far as i see. So
> this should be for net-next.
> 
> Please separate these patches out into real fixes, and new features.
> 
>         Andrew

Thank you for your response. I will follow these guidelines for the
categorization and upload the patch to net-next accordingly. I appreciate
your assistance.

Re: [PATCH net v2 3/5] rtase: Add support for RTL907XD-VA PCIe port

[Paolo Abeni]

On 11/18/24 03:30, Justin Lai wrote:
>>
>> On Fri, Nov 15, 2024 at 05:54:27PM +0800, Justin Lai wrote:
>>> 1. Add RTL907XD-VA hardware version id.
>>> 2. Add the reported speed for RTL907XD-VA.
>>
>> This is not a fix, it never worked on this device as far as i see. So
>> this should be for net-next.
>>
>> Please separate these patches out into real fixes, and new features.
>>
>>         Andrew
> 
> Thank you for your response. I will follow these guidelines for the
> categorization and upload the patch to net-next accordingly. I appreciate
> your assistance.

Please re-post the series including net patches only and wait for the
merge window completion (~2w from now) before posting the net-next patch.

Thanks!

Paolo

RE: [PATCH net v2 3/5] rtase: Add support for RTL907XD-VA PCIe port

[Justin Lai]

> On 11/18/24 03:30, Justin Lai wrote:
> >>
> >> On Fri, Nov 15, 2024 at 05:54:27PM +0800, Justin Lai wrote:
> >>> 1. Add RTL907XD-VA hardware version id.
> >>> 2. Add the reported speed for RTL907XD-VA.
> >>
> >> This is not a fix, it never worked on this device as far as i see. So
> >> this should be for net-next.
> >>
> >> Please separate these patches out into real fixes, and new features.
> >>
> >>         Andrew
> >
> > Thank you for your response. I will follow these guidelines for the
> > categorization and upload the patch to net-next accordingly. I
> > appreciate your assistance.
> 
> Please re-post the series including net patches only and wait for the merge
> window completion (~2w from now) before posting the net-next patch.
> 
> Thanks!
> 
> Paolo

Hi Paolo

Thank you for the notification. I have removed this patch from the latest
patch set.

Justin

[PATCH net v2 4/5] rtase: Corrects error handling of the rtase_check_mac_version_valid()

[Justin Lai]

Corrects error handling of the rtase_check_mac_version_valid().

Fixes: a36e9f5cfe9e ("rtase: Add support for a pci table in this module")
Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index 22389911a7d4..91ad19e80f67 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -2124,6 +2124,7 @@ static int rtase_init_one(struct pci_dev *pdev,
 		dev_err(&pdev->dev,
 			"unknown chip version: 0x%08x, contact rtase maintainers (see MAINTAINERS file)\n",
 			tp->hw_ver);
+		goto err_out_release_board;
 	}
 
 	rtase_init_software_variable(pdev, tp);
@@ -2198,6 +2199,7 @@ static int rtase_init_one(struct pci_dev *pdev,
 		netif_napi_del(&ivec->napi);
 	}
 
+err_out_release_board:
 	rtase_release_board(pdev, dev, ioaddr);
 
 	return ret;
-- 
2.34.1

Re: [PATCH net v2 4/5] rtase: Corrects error handling of the rtase_check_mac_version_valid()

[Andrew Lunn]

On Fri, Nov 15, 2024 at 05:54:28PM +0800, Justin Lai wrote:
> Corrects error handling of the rtase_check_mac_version_valid().
> 
> Fixes: a36e9f5cfe9e ("rtase: Add support for a pci table in this module")
> Signed-off-by: Justin Lai <justinlai0215@realtek.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

[PATCH net v2 5/5] rtase: Add defines for hardware version id

[Justin Lai]

Add defines for hardware version id.

Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase.h      |  6 +++++-
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 16 ++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase.h b/drivers/net/ethernet/realtek/rtase/rtase.h
index 547c71937b01..6dfb839d78f0 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase.h
+++ b/drivers/net/ethernet/realtek/rtase/rtase.h
@@ -9,7 +9,11 @@
 #ifndef RTASE_H
 #define RTASE_H
 
-#define RTASE_HW_VER_MASK 0x7C800000
+#define RTASE_HW_VER_MASK     0x7C800000
+#define RTASE_HW_VER_906X_7XA 0x00800000
+#define RTASE_HW_VER_906X_7XC 0x04000000
+#define RTASE_HW_VER_907XD_V1 0x04800000
+#define RTASE_HW_VER_907XD_VA 0x08000000
 
 #define RTASE_RX_DMA_BURST_256       4
 #define RTASE_TX_DMA_BURST_UNLIMITED 7
diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index 91ad19e80f67..d352e25fd9af 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -1720,12 +1720,12 @@ static int rtase_get_settings(struct net_device *dev,
 						supported);
 
 	switch (tp->hw_ver) {
-	case 0x00800000:
-	case 0x04000000:
+	case RTASE_HW_VER_906X_7XA:
+	case RTASE_HW_VER_906X_7XC:
 		cmd->base.speed = SPEED_5000;
 		break;
-	case 0x04800000:
-	case 0x08000000:
+	case RTASE_HW_VER_907XD_V1:
+	case RTASE_HW_VER_907XD_VA:
 		cmd->base.speed = SPEED_10000;
 		break;
 	}
@@ -1991,10 +1991,10 @@ static int rtase_check_mac_version_valid(struct rtase_private *tp)
 	tp->hw_ver = rtase_r32(tp, RTASE_TX_CONFIG_0) & RTASE_HW_VER_MASK;
 
 	switch (tp->hw_ver) {
-	case 0x00800000:
-	case 0x04000000:
-	case 0x04800000:
-	case 0x08000000:
+	case RTASE_HW_VER_906X_7XA:
+	case RTASE_HW_VER_906X_7XC:
+	case RTASE_HW_VER_907XD_V1:
+	case RTASE_HW_VER_907XD_VA:
 		ret = 0;
 		break;
 	}
-- 
2.34.1

Re: [PATCH net v2 5/5] rtase: Add defines for hardware version id

[Andrew Lunn]

On Fri, Nov 15, 2024 at 05:54:29PM +0800, Justin Lai wrote:
> Add defines for hardware version id.
> 
> Signed-off-by: Justin Lai <justinlai0215@realtek.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew