| Message ID | 20241114111443.375649-2-justinlai0215@realtek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Updating and correcting switch hardware versions and reported speeds | expand |
On Thu, Nov 14, 2024 at 07:14:40PM +0800, Justin Lai wrote: > 1. Sets tp->hw_ver. > 2. Changes the return type from bool to int. > > Signed-off-by: Justin Lai <justinlai0215@realtek.com> > --- > drivers/net/ethernet/realtek/rtase/rtase.h | 2 ++ > .../net/ethernet/realtek/rtase/rtase_main.c | 21 +++++++++++-------- > 2 files changed, 14 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..33808afd588d 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: Since these magic numbers are being used in more places, please add some #define with sensible names. > - 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, contact rtase maintainers (see MAINTAINERS file)\n"); > + } Since you are changing this, maybe include the hw_ver? Andrew
On Thu, Nov 14, 2024 at 07:14:40PM +0800, Justin Lai wrote: > 1. Sets tp->hw_ver. > 2. Changes the return type from bool to int. > > Signed-off-by: Justin Lai <justinlai0215@realtek.com> If you want these in net, you should add a Fixes: tag. Andrew --- pw-bot: cr
> > On Thu, Nov 14, 2024 at 07:14:40PM +0800, Justin Lai wrote: > > 1. Sets tp->hw_ver. > > 2. Changes the return type from bool to int. > > > > Signed-off-by: Justin Lai <justinlai0215@realtek.com> > > --- > > drivers/net/ethernet/realtek/rtase/rtase.h | 2 ++ > > .../net/ethernet/realtek/rtase/rtase_main.c | 21 +++++++++++-------- > > 2 files changed, 14 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..33808afd588d 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: > > Since these magic numbers are being used in more places, please add some > #define with sensible names. Ok, I will define these hardware version ID names. > > > - 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, contact rtase maintainers > (see MAINTAINERS file)\n"); > > + } > > Since you are changing this, maybe include the hw_ver? Thank you for your suggestion, I will add hw_ver to the error message. > > Andrew
> > > On Thu, Nov 14, 2024 at 07:14:40PM +0800, Justin Lai wrote: > > 1. Sets tp->hw_ver. > > 2. Changes the return type from bool to int. > > > > Signed-off-by: Justin Lai <justinlai0215@realtek.com> > > If you want these in net, you should add a Fixes: tag. > > Andrew > Ok, I will do that. > --- > pw-bot: cr
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..33808afd588d 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,11 @@ 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, contact rtase maintainers (see MAINTAINERS file)\n"); + } rtase_init_software_variable(pdev, tp); rtase_init_hardware(tp);
1. Sets tp->hw_ver. 2. Changes the return type from bool to int. Signed-off-by: Justin Lai <justinlai0215@realtek.com> --- drivers/net/ethernet/realtek/rtase/rtase.h | 2 ++ .../net/ethernet/realtek/rtase/rtase_main.c | 21 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-)