[dpdk-dev] [PATCH v2] net/axgbe: support flow control API

[dpdk-dev] [PATCH v2] net/axgbe: support flow control API

[asomalap]

From: Amaranath Somalapuram <asomalap@amd.com>

adding api for flow_ctrl_get and flow_ctrl_set
by default axgbe driver flow control is dissabled
adding dpdk flow control to set water high and low
Cc: stable@dpdk.org

Signed-off-by: Amaranath Somalapuram <asomalap@amd.com>
---
 drivers/net/axgbe/axgbe_ethdev.c | 85 +++++++++++++++++++++++++++++++-
 drivers/net/axgbe/axgbe_ethdev.h | 10 ++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index d0b6f091f..b88ad55ac 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -43,7 +43,11 @@ axgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
 				 unsigned int size);
 static int axgbe_dev_xstats_reset(struct rte_eth_dev *dev);
 static int  axgbe_dev_info_get(struct rte_eth_dev *dev,
-			       struct rte_eth_dev_info *dev_info);
+				struct rte_eth_dev_info *dev_info);
+static int axgbe_flow_ctrl_get(struct rte_eth_dev *dev,
+				struct rte_eth_fc_conf *fc_conf);
+static int axgbe_flow_ctrl_set(struct rte_eth_dev *dev,
+				struct rte_eth_fc_conf *fc_conf);
 
 struct axgbe_xstats {
 	char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -170,6 +174,8 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = {
 	.rx_queue_release     = axgbe_dev_rx_queue_release,
 	.tx_queue_setup       = axgbe_dev_tx_queue_setup,
 	.tx_queue_release     = axgbe_dev_tx_queue_release,
+	.flow_ctrl_get        = axgbe_flow_ctrl_get,
+	.flow_ctrl_set        = axgbe_flow_ctrl_set,
 };
 
 static int axgbe_phy_reset(struct axgbe_port *pdata)
@@ -815,6 +821,83 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
 	return 0;
 }
+static int
+axgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+	struct axgbe_port *pdata = dev->data->dev_private;
+	struct xgbe_fc_info fc = pdata->fc;
+	unsigned int reg, reg_val = 0;
+
+	reg = MAC_Q0TFCR;
+	reg_val = AXGMAC_IOREAD(pdata, reg);
+	fc.low_water[0] =  AXGMAC_MTL_IOREAD_BITS(pdata, 0, MTL_Q_RQFCR, RFA);
+	fc.high_water[0] =  AXGMAC_MTL_IOREAD_BITS(pdata, 0, MTL_Q_RQFCR, RFD);
+	fc.pause_time[0] = AXGMAC_GET_BITS(reg_val, MAC_Q0TFCR, PT);
+	fc.autoneg = pdata->pause_autoneg;
+
+	if (pdata->rx_pause && pdata->tx_pause)
+		fc.mode = RTE_FC_FULL;
+	else if (pdata->rx_pause)
+		fc.mode = RTE_FC_RX_PAUSE;
+	else if (pdata->tx_pause)
+		fc.mode = RTE_FC_TX_PAUSE;
+	else
+		fc.mode = RTE_FC_NONE;
+
+	fc_conf->high_water =  (1024 + (fc.low_water[0] << 9)) / 1024;
+	fc_conf->low_water =  (1024 + (fc.high_water[0] << 9)) / 1024;
+	fc_conf->pause_time = fc.pause_time[0];
+	fc_conf->send_xon = fc.send_xon;
+	fc_conf->mode = fc.mode;
+
+	return 0;
+}
+
+static int
+axgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+	struct axgbe_port *pdata = dev->data->dev_private;
+	struct xgbe_fc_info fc = pdata->fc;
+	unsigned int reg, reg_val = 0;
+	reg = MAC_Q0TFCR;
+
+	pdata->pause_autoneg = fc_conf->autoneg;
+	pdata->phy.pause_autoneg = pdata->pause_autoneg;
+	fc.send_xon = fc_conf->send_xon;
+	AXGMAC_MTL_IOWRITE_BITS(pdata, 0, MTL_Q_RQFCR, RFA,
+			AXGMAC_FLOW_CONTROL_VALUE(1024 * fc_conf->high_water));
+	AXGMAC_MTL_IOWRITE_BITS(pdata, 0, MTL_Q_RQFCR, RFD,
+			AXGMAC_FLOW_CONTROL_VALUE(1024 * fc_conf->low_water));
+	AXGMAC_SET_BITS(reg_val, MAC_Q0TFCR, PT, fc_conf->pause_time);
+	AXGMAC_IOWRITE(pdata, reg, reg_val);
+	fc.mode = fc_conf->mode;
+
+	if (fc.mode == RTE_FC_FULL) {
+		pdata->tx_pause = 1;
+		pdata->rx_pause = 1;
+	} else if (fc.mode == RTE_FC_RX_PAUSE) {
+		pdata->tx_pause = 0;
+		pdata->rx_pause = 1;
+	} else if (fc.mode == RTE_FC_TX_PAUSE) {
+		pdata->tx_pause = 1;
+		pdata->rx_pause = 0;
+	} else {
+		pdata->tx_pause = 0;
+		pdata->rx_pause = 0;
+	}
+
+	if (pdata->tx_pause != (unsigned int)pdata->phy.tx_pause)
+		pdata->hw_if.config_tx_flow_control(pdata);
+
+	if (pdata->rx_pause != (unsigned int)pdata->phy.rx_pause)
+		pdata->hw_if.config_rx_flow_control(pdata);
+
+	pdata->hw_if.config_flow_control(pdata);
+	pdata->phy.tx_pause = pdata->tx_pause;
+	pdata->phy.rx_pause = pdata->rx_pause;
+
+	return 0;
+}
 
 static void axgbe_get_all_hw_features(struct axgbe_port *pdata)
 {
diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index a1083b17b..746fb2f15 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -485,6 +485,15 @@ struct axgbe_mmc_stats {
 	uint64_t rxwatchdogerror;
 };
 
+/* Flow control parameters */
+struct xgbe_fc_info {
+	uint32_t high_water[AXGBE_PRIORITY_QUEUES];
+	uint32_t low_water[AXGBE_PRIORITY_QUEUES];
+	uint16_t pause_time[AXGBE_PRIORITY_QUEUES];
+	uint16_t send_xon;
+	enum rte_eth_fc_mode mode;
+	uint8_t autoneg;
+};
 /*
  * Structure to store private data for each port.
  */
@@ -625,6 +634,7 @@ struct axgbe_port {
 	uint32_t rx_csum_enable;
 
 	struct axgbe_mmc_stats mmc_stats;
+	struct xgbe_fc_info fc;
 };
 
 void axgbe_init_function_ptrs_dev(struct axgbe_hw_if *hw_if);
-- 
2.17.1

Re: [dpdk-dev] [dpdk-stable] [PATCH v2] net/axgbe: support flow control API

[Ferruh Yigit]

On 1/30/2020 6:35 AM, asomalap@amd.com wrote:
> From: Amaranath Somalapuram <asomalap@amd.com>
> 
> adding api for flow_ctrl_get and flow_ctrl_set
> by default axgbe driver flow control is dissabled
> adding dpdk flow control to set water high and low
> Cc: stable@dpdk.org
> 
> Signed-off-by: Amaranath Somalapuram <asomalap@amd.com>

Please cc the maintainer.

This is a new feature and it received late in the release cycle, I am OK to get
it for -rc2 if it is acked by maintainer on time (same for priority flow
control) but if not it will be postponed to next release.

And related to the back-porting request, "Cc: stable@dpdk.org", this is a new
feature in the PMD and backporting it is the discretion of the LTS maintainers,
cc'ed them for comment.

Thanks,
ferruh

Re: [dpdk-dev] [dpdk-stable] [PATCH v2] net/axgbe: support flow control API

[Kevin Traynor]

On 31/01/2020 13:47, Ferruh Yigit wrote:
> On 1/30/2020 6:35 AM, asomalap@amd.com wrote:
>> From: Amaranath Somalapuram <asomalap@amd.com>
>>
>> adding api for flow_ctrl_get and flow_ctrl_set
>> by default axgbe driver flow control is dissabled
>> adding dpdk flow control to set water high and low

s/dissabled/disabled/

Also, please add some punctuation to the commit message.

>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Amaranath Somalapuram <asomalap@amd.com>
> 
> Please cc the maintainer.
> 
> This is a new feature and it received late in the release cycle, I am OK to get
> it for -rc2 if it is acked by maintainer on time (same for priority flow
> control) but if not it will be postponed to next release.
> 
> And related to the back-porting request, "Cc: stable@dpdk.org", this is a new
> feature in the PMD and backporting it is the discretion of the LTS maintainers,
> cc'ed them for comment.
> 

Which LTS is it requested for/tested on?

> Thanks,
> ferruh
> 

Re: [dpdk-dev] [dpdk-stable] [PATCH v2] net/axgbe: support flow control API

[Somalapuram, Amaranath]

Hi Kevin,

I will resubmit the patches.

Thanks.
Regards,
S.Amarnath

-----Original Message-----
From: Kevin Traynor <ktraynor@redhat.com> 
Sent: Friday, January 31, 2020 11:20 PM
To: Ferruh Yigit <ferruh.yigit@intel.com>; Somalapuram, Amaranath <Amaranath.Somalapuram@amd.com>; dev@dpdk.org
Cc: stable@dpdk.org; Kumar, Ravi1 <Ravi1.Kumar@amd.com>; Thomas Monjalon <thomas@monjalon.net>; Luca Boccassi <bluca@debian.org>
Subject: Re: [dpdk-stable] [PATCH v2] net/axgbe: support flow control API

[CAUTION: External Email]

On 31/01/2020 13:47, Ferruh Yigit wrote:
> On 1/30/2020 6:35 AM, asomalap@amd.com wrote:
>> From: Amaranath Somalapuram <asomalap@amd.com>
>>
>> adding api for flow_ctrl_get and flow_ctrl_set by default axgbe 
>> driver flow control is dissabled adding dpdk flow control to set 
>> water high and low

s/dissabled/disabled/

Also, please add some punctuation to the commit message.

>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Amaranath Somalapuram <asomalap@amd.com>
>
> Please cc the maintainer.
>
> This is a new feature and it received late in the release cycle, I am 
> OK to get it for -rc2 if it is acked by maintainer on time (same for 
> priority flow
> control) but if not it will be postponed to next release.
>
> And related to the back-porting request, "Cc: stable@dpdk.org", this 
> is a new feature in the PMD and backporting it is the discretion of 
> the LTS maintainers, cc'ed them for comment.
>

Which LTS is it requested for/tested on?

> Thanks,
> ferruh
>