Skip to contentSkip to conversation

Fix PFC related issues

PATCH Superseded Suman Ghosh 3 participants 13 messages Aug 21, 2023 – Aug 23, 2023

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Fix PFC related issues

This patchset fixes multiple PFC related issues related to Octeon.

Patch #1: octeontx2-pf: Fix PFC TX scheduler free

Patch #2: octeontx2-af: CN10KB: fix PFC configuration

Patch #3: octeonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously

Hariprasad Kelam (1):
octeontx2-af: CN10KB: fix PFC configuration

Suman Ghosh (2):
octeontx2-pf: Fix PFC TX scheduler free
cteonxt2-pf: Fix backpressure config for multiple PFC priorities to
work simultaneously

---
v3 changes:
Removed patch #1 from v2 patchset due to review comment from Jakub. I will find a more accurate fix for that and will push a separate patch.

v2 changes:
1. Fixed compilation error in patch #2
ERROR: modpost: "otx2_txschq_free_one" [drivers/net/ethernet/marvell/octeontx2/nic/rvu_nicvf.ko] undefined!
2. Added new patch #4 to the patch set. This patch fixes another PFC related issue.

 .../net/ethernet/marvell/octeontx2/af/rpm.c   | 17 +++++++++--------
 .../marvell/octeontx2/nic/otx2_common.c       |  1 +
 .../marvell/octeontx2/nic/otx2_dcbnl.c        | 19 ++++++-------------
 3 files changed, 16 insertions(+), 21 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 1/3 octeontx2-pf: Fix PFC TX scheduler free

During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 .../ethernet/marvell/octeontx2/nic/otx2_common.c  |  1 +
 .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c   | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
index 77c8f650f7ac..289371b8ce4f 100644
@@ -804,6 +804,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)
 
 	mutex_unlock(&pfvf->mbox.lock);
 }
+EXPORT_SYMBOL(otx2_txschq_free_one);
 
 void otx2_txschq_stop(struct otx2_nic *pfvf)
 {
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +4 -11
index ccaf97bb1ce0..6492749dd7c8 100644
@@ -125,19 +125,12 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)
 
 static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
 {
-	struct nix_txsch_free_req *free_req;
+	int lvl;
 
-	mutex_lock(&pfvf->mbox.lock);
 	/* free PFC TLx nodes */
-	free_req = otx2_mbox_alloc_msg_nix_txsch_free(&pfvf->mbox);
-	if (!free_req) {
-		mutex_unlock(&pfvf->mbox.lock);
-		return -ENOMEM;
-	}
-
-	free_req->flags = TXSCHQ_FREE_ALL;
-	otx2_sync_mbox_msg(&pfvf->mbox);
-	mutex_unlock(&pfvf->mbox.lock);
+	for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++)
+		otx2_txschq_free_one(pfvf, lvl,
+				     pfvf->pfc_schq_list[lvl][prio]);
 
 	pfvf->pfc_alloc_status[prio] = false;
 	return 0;
Signature · 1 line
2.25.1
reviewer
#2 lore raw

Re: [net PATCH V3 1/3] octeontx2-pf: Fix PFC TX scheduler free

Quoted 16 lines · Suman Ghosh

During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 .../ethernet/marvell/octeontx2/nic/otx2_common.c  |  1 +
 .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c   | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0 -0
index 77c8f650f7ac..289371b8ce4f 100644

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq) · line 807

Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
@@ -804,6 +804,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)
 
 	mutex_unlock(&pfvf->mbox.lock);
 }
+EXPORT_SYMBOL(otx2_txschq_free_one);

Hi Suman,

Given that the licence of both this file and otx2_dcbnl.c is GPLv2, I wonder if EXPORT_SYMBOL_GPL would be more appropriate here.

Quoted 35 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0 -0
 void otx2_txschq_stop(struct otx2_nic *pfvf)
 {
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +4 -11
index ccaf97bb1ce0..6492749dd7c8 100644
@@ -125,19 +125,12 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)
 
 static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
 {
-	struct nix_txsch_free_req *free_req;
+	int lvl;
 
-	mutex_lock(&pfvf->mbox.lock);
 	/* free PFC TLx nodes */
-	free_req = otx2_mbox_alloc_msg_nix_txsch_free(&pfvf->mbox);
-	if (!free_req) {
-		mutex_unlock(&pfvf->mbox.lock);
-		return -ENOMEM;
-	}
-
-	free_req->flags = TXSCHQ_FREE_ALL;
-	otx2_sync_mbox_msg(&pfvf->mbox);
-	mutex_unlock(&pfvf->mbox.lock);
+	for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++)
+		otx2_txschq_free_one(pfvf, lvl,
+				     pfvf->pfc_schq_list[lvl][prio]);
 
 	pfvf->pfc_alloc_status[prio] = false;
 	return 0;
Signature · 1 line
2.25.1
maintainer
#3 lore raw

Re: [net PATCH V3 1/3] octeontx2-pf: Fix PFC TX scheduler free

Quoted 18 lines · Simon Horman
Quoted 17 lines · Suman Ghosh

During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 .../ethernet/marvell/octeontx2/nic/otx2_common.c  |  1 +
 .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c   | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0 -0
index 77c8f650f7ac..289371b8ce4f 100644
@@ -804,6 +804,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)
 
Quoted 8 lines

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq) · line 807

Quoted 3 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
 	mutex_unlock(&pfvf->mbox.lock);
 }
+EXPORT_SYMBOL(otx2_txschq_free_one);

Hi Suman,

Given that the licence of both this file and otx2_dcbnl.c is GPLv2, I wonder if EXPORT_SYMBOL_GPL would be more appropriate here.

AFAICS all the symbols exported by otx2_common use plain EXPORT_SYMBOL(). I think we can keep that for consistency in a -net patch. In the long run it would be nice to move all of them to EXPORT_SYMBOL_GPL :)

Cheers,

Paolo

reviewer
#4 lore raw

Re: [net PATCH V3 1/3] octeontx2-pf: Fix PFC TX scheduler free

Quoted 25 lines · Paolo Abeni
Quoted 24 lines · Simon Horman
Quoted 16 lines · Suman Ghosh

During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set which caused free up all schedulers other than the PFC schedulers. This patch fixes that to free only the PFC Tx schedulers.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 .../ethernet/marvell/octeontx2/nic/otx2_common.c  |  1 +
 .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c   | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0 -0
index 77c8f650f7ac..289371b8ce4f 100644

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq) · line 807

Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
@@ -804,6 +804,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)
 
 	mutex_unlock(&pfvf->mbox.lock);
 }
+EXPORT_SYMBOL(otx2_txschq_free_one);

Hi Suman,

Quoted 6 lines
Quoted 2 lines

Given that the licence of both this file and otx2_dcbnl.c is GPLv2, I wonder if EXPORT_SYMBOL_GPL would be more appropriate here.

AFAICS all the symbols exported by otx2_common use plain EXPORT_SYMBOL(). I think we can keep that for consistency in a -net patch.

Sure, no objection.

Quoted 7 lines

In the long run it would be nice to move all of them to EXPORT_SYMBOL_GPL :)

Cheers,

Paolo

#5 lore raw

RE: [EXT] Re: [net PATCH V3 1/3] octeontx2-pf: Fix PFC TX scheduler free

Quoted 18 lines
Quoted 9 lines
Quoted 5 lines

Hi Suman,

Given that the licence of both this file and otx2_dcbnl.c is GPLv2, I wonder if EXPORT_SYMBOL_GPL would be more appropriate here.

AFAICS all the symbols exported by otx2_common use plain EXPORT_SYMBOL(). I think we can keep that for consistency in a -net patch.

Sure, no objection.

Quoted 6 lines

In the long run it would be nice to move all of them to EXPORT_SYMBOL_GPL :)

Cheers,

Paolo

[Suman] Sure Paolo, we can push a separate patch in future.

Quoted 1 line
Quoted 1 line
#6 lore raw

PATCH v3 2/3 octeontx2-af: CN10KB: fix PFC configuration

In reply to Suman Ghosh

From: Hariprasad Kelam <[email protected]>

The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +9 -8
index b4fcb20c3f4f..af21e2030cff 100644
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,
 
 void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 {
+	u64 cfg, pfc_class_mask_cfg;
 	rpm_t *rpm = rpmd;
-	u64 cfg;
 
 	/* ALL pause frames received are completely ignored */
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 		rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL);
 
 	/* Disable all PFC classes */
-	cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;
+	cfg = rpm_read(rpm, lmac_id, pfc_class_mask_cfg);
 	cfg = FIELD_SET(RPM_PFC_CLASS_MASK, 0, cfg);
-	rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, cfg);
+	rpm_write(rpm, lmac_id, pfc_class_mask_cfg, cfg);
 }
 
 int rpm_get_rx_stats(void *rpmd, int lmac_id, int idx, u64 *rx_stat)
@@ -605,8 +607,11 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
 	if (!is_lmac_valid(rpm, lmac_id))
 		return -ENODEV;
 
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;
+
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
-	class_en = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	class_en = rpm_read(rpm, lmac_id, pfc_class_mask_cfg);
 	pfc_en |= FIELD_GET(RPM_PFC_CLASS_MASK, class_en);
 
 	if (rx_pause) {
@@ -635,10 +640,6 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
 		cfg |= RPMX_MTI_MAC100X_COMMAND_CONFIG_PFC_MODE;
 
 	rpm_write(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG, cfg);
-
-	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
-						RPMX_CMRX_PRT_CBFC_CTL;
-
 	rpm_write(rpm, lmac_id, pfc_class_mask_cfg, class_en);
 
 	return 0;
Signature · 1 line
2.25.1
reviewer
#7 lore raw

Re: [net PATCH V3 2/3] octeontx2-af: CN10KB: fix PFC configuration

Quoted 5 lines · Suman Ghosh

From: Hariprasad Kelam <[email protected]>

The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same.

Hi Suman,

I think it would be useful to describe what the bug is - it seems like an incorrect mask in some cases - and how that might affect users. Better still would be commands for an example usage where the problem previously manifested.

Quoted 22 lines
Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -1
index b4fcb20c3f4f..af21e2030cff 100644
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,
 
 void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 {
+	u64 cfg, pfc_class_mask_cfg;
 	rpm_t *rpm = rpmd;
-	u64 cfg;
 
 	/* ALL pause frames received are completely ignored */
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable) · line 384

Quoted 6 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +2 -1
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 		rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL);
 
 	/* Disable all PFC classes */
-	cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;

Maybe it is overkill, but as this appears at least twice, perhaps a helper would be appropriate.

Quoted 35 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +6 -6
+	cfg = rpm_read(rpm, lmac_id, pfc_class_mask_cfg);
 	cfg = FIELD_SET(RPM_PFC_CLASS_MASK, 0, cfg);
-	rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, cfg);
+	rpm_write(rpm, lmac_id, pfc_class_mask_cfg, cfg);
 }
 
 int rpm_get_rx_stats(void *rpmd, int lmac_id, int idx, u64 *rx_stat)
@@ -605,8 +607,11 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
 	if (!is_lmac_valid(rpm, lmac_id))
 		return -ENODEV;
 
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;
+
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
-	class_en = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	class_en = rpm_read(rpm, lmac_id, pfc_class_mask_cfg);
 	pfc_en |= FIELD_GET(RPM_PFC_CLASS_MASK, class_en);
 
 	if (rx_pause) {
@@ -635,10 +640,6 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
 		cfg |= RPMX_MTI_MAC100X_COMMAND_CONFIG_PFC_MODE;
 
 	rpm_write(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG, cfg);
-
-	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
-						RPMX_CMRX_PRT_CBFC_CTL;
-
 	rpm_write(rpm, lmac_id, pfc_class_mask_cfg, class_en);
 
 	return 0;
Signature · 1 line
2.25.1
maintainer
#8 lore raw

Re: [net PATCH V3 2/3] octeontx2-af: CN10KB: fix PFC configuration

Quoted 7 lines · Simon Horman
Quoted 5 lines · Suman Ghosh

From: Hariprasad Kelam <[email protected]>

The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same.

Quoted 6 lines

Hi Suman,

I think it would be useful to describe what the bug is - it seems like an incorrect mask in some cases - and how that might affect users. Better still would be commands for an example usage where the problem previously manifested.

Suman, please address Simon's feedback above in the new iteration.

Quoted 24 lines
Quoted 24 lines
Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -1
index b4fcb20c3f4f..af21e2030cff 100644
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,
 
 void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 {
+	u64 cfg, pfc_class_mask_cfg;
 	rpm_t *rpm = rpmd;
-	u64 cfg;
 
 	/* ALL pause frames received are completely ignored */
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 		rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL);
 
Quoted 7 lines

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable) · line 384

Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +2 -1
 	/* Disable all PFC classes */
-	cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;

Maybe it is overkill, but as this appears at least twice, perhaps a helper would be appropriate.

I think this is a matter of personal preferences (there is another similar chunk with will not fit an helper, short of implementing it with a somewhat ugly macro. So the overall code would be asymmetric),

I'm fine either way.

Cheers,

Paolo

reviewer
#9 lore raw

Re: [net PATCH V3 2/3] octeontx2-af: CN10KB: fix PFC configuration

Quoted 49 lines · Paolo Abeni
Quoted 7 lines · Simon Horman
Quoted 5 lines · Suman Ghosh

From: Hariprasad Kelam <[email protected]>

The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same.

Quoted 6 lines

Hi Suman,

I think it would be useful to describe what the bug is - it seems like an incorrect mask in some cases - and how that might affect users. Better still would be commands for an example usage where the problem previously manifested.

Suman, please address Simon's feedback above in the new iteration.

Quoted 24 lines
Quoted 24 lines
Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -1
index b4fcb20c3f4f..af21e2030cff 100644
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,
 
 void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 {
+	u64 cfg, pfc_class_mask_cfg;
 	rpm_t *rpm = rpmd;
-	u64 cfg;
 
 	/* ALL pause frames received are completely ignored */
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
 		rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL);
 
Quoted 7 lines

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable) · line 384

Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +2 -1
 	/* Disable all PFC classes */
-	cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL :
+						RPMX_CMRX_PRT_CBFC_CTL;

Maybe it is overkill, but as this appears at least twice, perhaps a helper would be appropriate.

Quoted 5 lines

I think this is a matter of personal preferences (there is another similar chunk with will not fit an helper, short of implementing it with a somewhat ugly macro. So the overall code would be asymmetric),

I'm fine either way.

Likewise, I don't feel strongly either way.

#10 lore raw

RE: [EXT] Re: [net PATCH V3 2/3] octeontx2-af: CN10KB: fix PFC configuration

Quoted 18 lines

----------------------------------------------------------------------

Quoted 16 lines · Paolo Abeni
Quoted 7 lines · Simon Horman
Quoted 5 lines · Suman Ghosh

From: Hariprasad Kelam <[email protected]>

The previous patch which added new CN10KB RPM block support, has a bug due to which PFC is not getting configured properly. This patch fixes the same.

Quoted 6 lines

Hi Suman,

I think it would be useful to describe what the bug is - it seems like an incorrect mask in some cases - and how that might affect users. Better still would be commands for an example usage where the problem previously manifested.

Suman, please address Simon's feedback above in the new iteration.

[Suman] Sure. I will update in V4

Quoted 38 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17
+++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -1
index b4fcb20c3f4f..af21e2030cff 100644
@@ -355,8 +355,8 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int
 lmac_id, u8 tx_pause,
 
 void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool
 enable)  {
+	u64 cfg, pfc_class_mask_cfg;
 	rpm_t *rpm = rpmd;
-	u64 cfg;
 
Quoted 3 lines
Quoted 3 lines

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd,

Quoted 3 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +0 -0
 	/* ALL pause frames received are completely ignored */
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +0 -0
 	cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
@@ -380,9 +380,11 @@ void rpm_lmac_pause_frm_config(void *rpmd,

int lmac_id, bool enable)

Quoted 5 lines
Quoted 5 lines

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)

Quoted 5 lines
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -1
 		rpm_write(rpm, 0, RPMX_CMR_CHAN_MSK_OR, ~0ULL);
 
 	/* Disable all PFC classes */
-	cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+	pfc_class_mask_cfg = is_dev_rpm2(rpm) ? RPM2_CMRX_PRT_CBFC_CTL

:

Quoted 5 lines
Quoted 4 lines

drivers/net/ethernet/marvell/octeontx2/af/rpm.c void rpm_lmac_pause_frm_config(void *rpmd, · line 384

Quoted 1 line
drivers/net/ethernet/marvell/octeontx2/af/rpm.c +1 -0
+						RPMX_CMRX_PRT_CBFC_CTL;

Maybe it is overkill, but as this appears at least twice, perhaps a helper would be appropriate.

Quoted 7 lines
Quoted 5 lines

I think this is a matter of personal preferences (there is another similar chunk with will not fit an helper, short of implementing it with a somewhat ugly macro. So the overall code would be asymmetric),

I'm fine either way.

Likewise, I don't feel strongly either way.

[Suman] Then, I would like to keep it as is. I can consider macro/function if we are using more of it in future.

#11 lore raw

PATCH v3 3/3 cteonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously

In reply to Suman Ghosh

MAC (CGX or RPM) asserts backpressure at TL3 or TL2 node of the egress hierarchical scheduler tree depending on link level config done. If there are multiple PFC priorities enabled at a time and for all such flows to backoff, each priority will have to assert backpressure at different TL3/TL2 scheduler nodes and these flows will need to submit egress pkts to these nodes.

Current PFC configuration has an issue where in only one backpressure scheduler node is being allocated which is resulting in only one PFC priority to work. This patch fixes this issue.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
---
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +3 -3
index 6492749dd7c8..bfddbff7bcdf 100644
@@ -70,7 +70,7 @@ static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)
 	 * link config level. These rest of the scheduler can be
 	 * same as hw.txschq_list.
 	 */
-	for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++)
+	for (lvl = 0; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++)
 		req->schq[lvl] = 1;
 
 	rc = otx2_sync_mbox_msg(&pfvf->mbox);
@@ -83,7 +83,7 @@ static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)
 		return PTR_ERR(rsp);
 
 	/* Setup transmit scheduler list */
-	for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++) {
+	for (lvl = 0; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++) {
 		if (!rsp->schq[lvl])
 			return -ENOSPC;
 
@@ -128,7 +128,7 @@ static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
 	int lvl;
 
 	/* free PFC TLx nodes */
-	for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++)
+	for (lvl = 0; lvl <= pfvf->hw.txschq_link_cfg_lvl; lvl++)
 		otx2_txschq_free_one(pfvf, lvl,
 				     pfvf->pfc_schq_list[lvl][prio]);
 
Signature · 1 line
2.25.1
reviewer Reviewed-by on v3 3/3
#12 lore raw

Re: [net PATCH V3 3/3] cteonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously

Quoted 7 lines · Suman Ghosh

MAC (CGX or RPM) asserts backpressure at TL3 or TL2 node of the egress hierarchical scheduler tree depending on link level config done. If there are multiple PFC priorities enabled at a time and for all such flows to backoff, each priority will have to assert backpressure at different TL3/TL2 scheduler nodes and these flows will need to submit egress pkts to these nodes.

Quoted 6 lines

Current PFC configuration has an issue where in only one backpressure scheduler node is being allocated which is resulting in only one PFC priority to work. This patch fixes this issue.

Fixes 99c969a83d82 ("octeontx2-pf: Add egress PFC support")