[v4] net/ipn3ke: setup MTU when HW init
Checks
Commit Message
set up mtu to the minimun in tx mtu, rx mtu and IPN3KE_MAC_FRAME_SIZE_MAX.
Signed-off-by: Andy Pei <andy.pei@intel.com>
---
Cc: qi.z.zhang@intel.com
Cc: ferruh.yigit@intel.com
Cc: rosen.xu@intel.com
Cc: xiaolong.ye@intel.com
v2:
modify low bound and upper bound.
v3:
delete unnecessary MACROs.
extract the duplicated code to a common function.
v4:
delete unnecessary MACROs.
extract the duplicated code to a common function.
drivers/net/ipn3ke/ipn3ke_ethdev.c | 87 ++++++++++++++++++++++++++++++++++++++
drivers/net/ipn3ke/ipn3ke_ethdev.h | 6 +++
2 files changed, 93 insertions(+)
Comments
On 09/03, Andy Pei wrote:
>set up mtu to the minimun in tx mtu, rx mtu and IPN3KE_MAC_FRAME_SIZE_MAX.
>
>Signed-off-by: Andy Pei <andy.pei@intel.com>
>---
>
>Cc: qi.z.zhang@intel.com
>Cc: ferruh.yigit@intel.com
>Cc: rosen.xu@intel.com
>Cc: xiaolong.ye@intel.com
>
>v2:
>modify low bound and upper bound.
>
>v3:
>delete unnecessary MACROs.
>extract the duplicated code to a common function.
>
>v4:
>delete unnecessary MACROs.
>extract the duplicated code to a common function.
>
> drivers/net/ipn3ke/ipn3ke_ethdev.c | 87 ++++++++++++++++++++++++++++++++++++++
> drivers/net/ipn3ke/ipn3ke_ethdev.h | 6 +++
> 2 files changed, 93 insertions(+)
>
>diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/ipn3ke/ipn3ke_ethdev.c
>index c226d63..e619ba3 100644
>--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c
>+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c
>@@ -209,6 +209,90 @@
> return 0;
> }
>
>+static uint32_t
>+ipn3ke_mtu_cal(uint32_t tx, uint32_t rx)
>+{
>+ uint32_t tmp;
>+ tmp = RTE_MIN(tx, rx);
>+ tmp = RTE_MAX(tmp, (uint32_t)RTE_ETHER_MIN_MTU);
>+ tmp = RTE_MIN(tmp, (uint32_t)(IPN3KE_MAC_FRAME_SIZE_MAX -
>+ IPN3KE_ETH_OVERHEAD));
>+ return tmp;
>+}
>+
>+static void
>+ipn3ke_mtu_set
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel,
>+uint32_t txaddr, uint32_t rxaddr)
It's quite rare to start the arguments in a separate line, better to follow
the common convention like
static void
rte_eth_dev_config_restore(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info, uint16_t port_id)
Thanks,
Xiaolong
>+{
>+ uint32_t tx;
>+ uint32_t rx;
>+ uint32_t tmp;
>+
>+ if (!(*hw->f_mac_read) || !(*hw->f_mac_write))
>+ return;
>+
>+ (*hw->f_mac_read)(hw,
>+ &tx,
>+ txaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ (*hw->f_mac_read)(hw,
>+ &rx,
>+ rxaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ tmp = ipn3ke_mtu_cal(tx, rx);
>+
>+ (*hw->f_mac_write)(hw,
>+ tmp,
>+ txaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ (*hw->f_mac_write)(hw,
>+ tmp,
>+ rxaddr,
>+ mac_num,
>+ eth_group_sel);
>+}
>+
>+static void
>+ipn3ke_10G_mtu_setup
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel)
>+{
>+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
>+ IPN3KE_10G_TX_FRAME_MAXLENGTH, IPN3KE_10G_RX_FRAME_MAXLENGTH);
>+}
>+
>+static void
>+ipn3ke_25G_mtu_setup
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel)
>+{
>+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
>+ IPN3KE_25G_MAX_TX_SIZE_CONFIG, IPN3KE_25G_MAX_RX_SIZE_CONFIG);
>+}
>+
>+static void
>+ipn3ke_mtu_setup(struct ipn3ke_hw *hw)
>+{
>+ int i;
>+ if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
>+ for (i = 0; i < hw->port_num; i++) {
>+ ipn3ke_10G_mtu_setup(hw, i, 0);
>+ ipn3ke_10G_mtu_setup(hw, i, 1);
>+ }
>+ } else if (hw->retimer.mac_type ==
>+ IFPGA_RAWDEV_RETIMER_MAC_TYPE_25GE_25GAUI) {
>+ for (i = 0; i < hw->port_num; i++) {
>+ ipn3ke_25G_mtu_setup(hw, i, 0);
>+ ipn3ke_25G_mtu_setup(hw, i, 1);
>+ }
>+ }
>+}
>+
> static int
> ipn3ke_hw_init(struct rte_afu_device *afu_dev,
> struct ipn3ke_hw *hw)
>@@ -303,6 +387,9 @@
> }
> }
>
>+ /* init mtu */
>+ ipn3ke_mtu_setup(hw);
>+
> ret = rte_eth_switch_domain_alloc(&hw->switch_domain_id);
> if (ret)
> IPN3KE_AFU_PMD_WARN("failed to allocate switch domain for device %d",
>diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h b/drivers/net/ipn3ke/ipn3ke_ethdev.h
>index c7b336b..fc45826 100644
>--- a/drivers/net/ipn3ke/ipn3ke_ethdev.h
>+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h
>@@ -654,6 +654,12 @@ static inline void _ipn3ke_indrct_write(struct ipn3ke_hw *hw,
> #define IPN3KE_MAC_RX_FRAME_MAXLENGTH_MASK \
> IPN3KE_MASK(0xFFFF, IPN3KE_MAC_RX_FRAME_MAXLENGTH_SHIFT)
>
>+#define IPN3KE_25G_MAX_TX_SIZE_CONFIG 0x407
>+#define IPN3KE_25G_MAX_RX_SIZE_CONFIG 0x506
>+
>+#define IPN3KE_10G_TX_FRAME_MAXLENGTH 0x002C
>+#define IPN3KE_10G_RX_FRAME_MAXLENGTH 0x00AE
>+
> #define IPN3KE_REGISTER_WIDTH 32
>
> /*Bits[2:0]: Configuration of TX statistics counters:
>--
>1.8.3.1
>
Hi Xiaolong
OK. I will do that in v5.
-----Original Message-----
From: Ye, Xiaolong
Sent: Tuesday, September 3, 2019 9:32 PM
To: Pei, Andy <andy.pei@intel.com>
Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>; Xu, Rosen <rosen.xu@intel.com>
Subject: Re: [PATCH v4] net/ipn3ke: setup MTU when HW init
On 09/03, Andy Pei wrote:
>set up mtu to the minimun in tx mtu, rx mtu and IPN3KE_MAC_FRAME_SIZE_MAX.
>
>Signed-off-by: Andy Pei <andy.pei@intel.com>
>---
>
>Cc: qi.z.zhang@intel.com
>Cc: ferruh.yigit@intel.com
>Cc: rosen.xu@intel.com
>Cc: xiaolong.ye@intel.com
>
>v2:
>modify low bound and upper bound.
>
>v3:
>delete unnecessary MACROs.
>extract the duplicated code to a common function.
>
>v4:
>delete unnecessary MACROs.
>extract the duplicated code to a common function.
>
> drivers/net/ipn3ke/ipn3ke_ethdev.c | 87
> ++++++++++++++++++++++++++++++++++++++
> drivers/net/ipn3ke/ipn3ke_ethdev.h | 6 +++
> 2 files changed, 93 insertions(+)
>
>diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c
>b/drivers/net/ipn3ke/ipn3ke_ethdev.c
>index c226d63..e619ba3 100644
>--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c
>+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c
>@@ -209,6 +209,90 @@
> return 0;
> }
>
>+static uint32_t
>+ipn3ke_mtu_cal(uint32_t tx, uint32_t rx) {
>+ uint32_t tmp;
>+ tmp = RTE_MIN(tx, rx);
>+ tmp = RTE_MAX(tmp, (uint32_t)RTE_ETHER_MIN_MTU);
>+ tmp = RTE_MIN(tmp, (uint32_t)(IPN3KE_MAC_FRAME_SIZE_MAX -
>+ IPN3KE_ETH_OVERHEAD));
>+ return tmp;
>+}
>+
>+static void
>+ipn3ke_mtu_set
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel,
>+uint32_t txaddr, uint32_t rxaddr)
It's quite rare to start the arguments in a separate line, better to follow the common convention like
static void
rte_eth_dev_config_restore(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info, uint16_t port_id)
Thanks,
Xiaolong
>+{
>+ uint32_t tx;
>+ uint32_t rx;
>+ uint32_t tmp;
>+
>+ if (!(*hw->f_mac_read) || !(*hw->f_mac_write))
>+ return;
>+
>+ (*hw->f_mac_read)(hw,
>+ &tx,
>+ txaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ (*hw->f_mac_read)(hw,
>+ &rx,
>+ rxaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ tmp = ipn3ke_mtu_cal(tx, rx);
>+
>+ (*hw->f_mac_write)(hw,
>+ tmp,
>+ txaddr,
>+ mac_num,
>+ eth_group_sel);
>+
>+ (*hw->f_mac_write)(hw,
>+ tmp,
>+ rxaddr,
>+ mac_num,
>+ eth_group_sel);
>+}
>+
>+static void
>+ipn3ke_10G_mtu_setup
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel) {
>+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
>+ IPN3KE_10G_TX_FRAME_MAXLENGTH, IPN3KE_10G_RX_FRAME_MAXLENGTH); }
>+
>+static void
>+ipn3ke_25G_mtu_setup
>+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel) {
>+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
>+ IPN3KE_25G_MAX_TX_SIZE_CONFIG, IPN3KE_25G_MAX_RX_SIZE_CONFIG); }
>+
>+static void
>+ipn3ke_mtu_setup(struct ipn3ke_hw *hw) {
>+ int i;
>+ if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
>+ for (i = 0; i < hw->port_num; i++) {
>+ ipn3ke_10G_mtu_setup(hw, i, 0);
>+ ipn3ke_10G_mtu_setup(hw, i, 1);
>+ }
>+ } else if (hw->retimer.mac_type ==
>+ IFPGA_RAWDEV_RETIMER_MAC_TYPE_25GE_25GAUI) {
>+ for (i = 0; i < hw->port_num; i++) {
>+ ipn3ke_25G_mtu_setup(hw, i, 0);
>+ ipn3ke_25G_mtu_setup(hw, i, 1);
>+ }
>+ }
>+}
>+
> static int
> ipn3ke_hw_init(struct rte_afu_device *afu_dev,
> struct ipn3ke_hw *hw)
>@@ -303,6 +387,9 @@
> }
> }
>
>+ /* init mtu */
>+ ipn3ke_mtu_setup(hw);
>+
> ret = rte_eth_switch_domain_alloc(&hw->switch_domain_id);
> if (ret)
> IPN3KE_AFU_PMD_WARN("failed to allocate switch domain for device
>%d", diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h
>b/drivers/net/ipn3ke/ipn3ke_ethdev.h
>index c7b336b..fc45826 100644
>--- a/drivers/net/ipn3ke/ipn3ke_ethdev.h
>+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h
>@@ -654,6 +654,12 @@ static inline void _ipn3ke_indrct_write(struct
>ipn3ke_hw *hw, #define IPN3KE_MAC_RX_FRAME_MAXLENGTH_MASK \
> IPN3KE_MASK(0xFFFF, IPN3KE_MAC_RX_FRAME_MAXLENGTH_SHIFT)
>
>+#define IPN3KE_25G_MAX_TX_SIZE_CONFIG 0x407
>+#define IPN3KE_25G_MAX_RX_SIZE_CONFIG 0x506
>+
>+#define IPN3KE_10G_TX_FRAME_MAXLENGTH 0x002C
>+#define IPN3KE_10G_RX_FRAME_MAXLENGTH 0x00AE
>+
> #define IPN3KE_REGISTER_WIDTH 32
>
> /*Bits[2:0]: Configuration of TX statistics counters:
>--
>1.8.3.1
>
@@ -209,6 +209,90 @@
return 0;
}
+static uint32_t
+ipn3ke_mtu_cal(uint32_t tx, uint32_t rx)
+{
+ uint32_t tmp;
+ tmp = RTE_MIN(tx, rx);
+ tmp = RTE_MAX(tmp, (uint32_t)RTE_ETHER_MIN_MTU);
+ tmp = RTE_MIN(tmp, (uint32_t)(IPN3KE_MAC_FRAME_SIZE_MAX -
+ IPN3KE_ETH_OVERHEAD));
+ return tmp;
+}
+
+static void
+ipn3ke_mtu_set
+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel,
+uint32_t txaddr, uint32_t rxaddr)
+{
+ uint32_t tx;
+ uint32_t rx;
+ uint32_t tmp;
+
+ if (!(*hw->f_mac_read) || !(*hw->f_mac_write))
+ return;
+
+ (*hw->f_mac_read)(hw,
+ &tx,
+ txaddr,
+ mac_num,
+ eth_group_sel);
+
+ (*hw->f_mac_read)(hw,
+ &rx,
+ rxaddr,
+ mac_num,
+ eth_group_sel);
+
+ tmp = ipn3ke_mtu_cal(tx, rx);
+
+ (*hw->f_mac_write)(hw,
+ tmp,
+ txaddr,
+ mac_num,
+ eth_group_sel);
+
+ (*hw->f_mac_write)(hw,
+ tmp,
+ rxaddr,
+ mac_num,
+ eth_group_sel);
+}
+
+static void
+ipn3ke_10G_mtu_setup
+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel)
+{
+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
+ IPN3KE_10G_TX_FRAME_MAXLENGTH, IPN3KE_10G_RX_FRAME_MAXLENGTH);
+}
+
+static void
+ipn3ke_25G_mtu_setup
+(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t eth_group_sel)
+{
+ ipn3ke_mtu_set(hw, mac_num, eth_group_sel,
+ IPN3KE_25G_MAX_TX_SIZE_CONFIG, IPN3KE_25G_MAX_RX_SIZE_CONFIG);
+}
+
+static void
+ipn3ke_mtu_setup(struct ipn3ke_hw *hw)
+{
+ int i;
+ if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
+ for (i = 0; i < hw->port_num; i++) {
+ ipn3ke_10G_mtu_setup(hw, i, 0);
+ ipn3ke_10G_mtu_setup(hw, i, 1);
+ }
+ } else if (hw->retimer.mac_type ==
+ IFPGA_RAWDEV_RETIMER_MAC_TYPE_25GE_25GAUI) {
+ for (i = 0; i < hw->port_num; i++) {
+ ipn3ke_25G_mtu_setup(hw, i, 0);
+ ipn3ke_25G_mtu_setup(hw, i, 1);
+ }
+ }
+}
+
static int
ipn3ke_hw_init(struct rte_afu_device *afu_dev,
struct ipn3ke_hw *hw)
@@ -303,6 +387,9 @@
}
}
+ /* init mtu */
+ ipn3ke_mtu_setup(hw);
+
ret = rte_eth_switch_domain_alloc(&hw->switch_domain_id);
if (ret)
IPN3KE_AFU_PMD_WARN("failed to allocate switch domain for device %d",
@@ -654,6 +654,12 @@ static inline void _ipn3ke_indrct_write(struct ipn3ke_hw *hw,
#define IPN3KE_MAC_RX_FRAME_MAXLENGTH_MASK \
IPN3KE_MASK(0xFFFF, IPN3KE_MAC_RX_FRAME_MAXLENGTH_SHIFT)
+#define IPN3KE_25G_MAX_TX_SIZE_CONFIG 0x407
+#define IPN3KE_25G_MAX_RX_SIZE_CONFIG 0x506
+
+#define IPN3KE_10G_TX_FRAME_MAXLENGTH 0x002C
+#define IPN3KE_10G_RX_FRAME_MAXLENGTH 0x00AE
+
#define IPN3KE_REGISTER_WIDTH 32
/*Bits[2:0]: Configuration of TX statistics counters: