[PATCH -next resend] sfc: farch: fix compile warning in efx_farch_dimension_resources()

Subsystems: networking drivers, sfc network driver, the rest

STALE1942d

4 messages, 2 authors, 2021-05-20 · open the first message on its own page

[PATCH -next resend] sfc: farch: fix compile warning in efx_farch_dimension_resources()

From: Yang Yingliang <hidden>
Date: 2021-05-19 02:09:25

Fix the following kernel build warning when CONFIG_SFC_SRIOV is disabled:

  drivers/net/ethernet/sfc/farch.c: In function ‘efx_farch_dimension_resources’:
  drivers/net/ethernet/sfc/farch.c:1671:21: warning: variable ‘buftbl_min’ set but not used [-Wunused-but-set-variable]
    unsigned vi_count, buftbl_min, total_tx_channels;

Signed-off-by: Yang Yingliang <redacted>
---
 drivers/net/ethernet/sfc/farch.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 49df02ecee91..6048b08b89ec 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c

@@ -1668,13 +1668,17 @@ void efx_farch_rx_pull_indir_table(struct efx_nic *efx)
  */
 void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
 {
-	unsigned vi_count, buftbl_min, total_tx_channels;
+	unsigned vi_count, total_tx_channels;
 
 #ifdef CONFIG_SFC_SRIOV
 	struct siena_nic_data *nic_data = efx->nic_data;
+	unsigned buftbl_min;
 #endif
 
 	total_tx_channels = efx->n_tx_channels + efx->n_extra_tx_channels;
+	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
+
+#ifdef CONFIG_SFC_SRIOV
 	/* Account for the buffer table entries backing the datapath channels
 	 * and the descriptor caches for those channels.
 	 */

@@ -1682,9 +1686,6 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
 		       total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL * EFX_MAX_DMAQ_SIZE +
 		       efx->n_channels * EFX_MAX_EVQ_SIZE)
 		      * sizeof(efx_qword_t) / EFX_BUF_SIZE);
-	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
-
-#ifdef CONFIG_SFC_SRIOV
 	if (efx->type->sriov_wanted) {
 		if (efx->type->sriov_wanted(efx)) {
 			unsigned vi_dc_entries, buftbl_free;

-- 
2.25.1

Re: [PATCH -next resend] sfc: farch: fix compile warning in efx_farch_dimension_resources()

From: Edward Cree <ecree.xilinx@gmail.com>
Date: 2021-05-19 14:41:34

On 19/05/2021 03:11, Yang Yingliang wrote:

quoted hunk

Fix the following kernel build warning when CONFIG_SFC_SRIOV is disabled:

  drivers/net/ethernet/sfc/farch.c: In function ‘efx_farch_dimension_resources’:
  drivers/net/ethernet/sfc/farch.c:1671:21: warning: variable ‘buftbl_min’ set but not used [-Wunused-but-set-variable]
    unsigned vi_count, buftbl_min, total_tx_channels;

Signed-off-by: Yang Yingliang <redacted>
---
 drivers/net/ethernet/sfc/farch.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 49df02ecee91..6048b08b89ec 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c

@@ -1668,13 +1668,17 @@ void efx_farch_rx_pull_indir_table(struct efx_nic *efx)
  */
 void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
 {
-	unsigned vi_count, buftbl_min, total_tx_channels;
+	unsigned vi_count, total_tx_channels;
 
 #ifdef CONFIG_SFC_SRIOV
 	struct siena_nic_data *nic_data = efx->nic_data;
+	unsigned buftbl_min;
 #endif

As I said the first time you sent this:
Reverse xmas tree is messed up here, please fix.
Apart from that, LGTM.

-ed

quoted hunk

 
 	total_tx_channels = efx->n_tx_channels + efx->n_extra_tx_channels;
+	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
+
+#ifdef CONFIG_SFC_SRIOV
 	/* Account for the buffer table entries backing the datapath channels
 	 * and the descriptor caches for those channels.
 	 */

@@ -1682,9 +1686,6 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
 		       total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL * EFX_MAX_DMAQ_SIZE +
 		       efx->n_channels * EFX_MAX_EVQ_SIZE)
 		      * sizeof(efx_qword_t) / EFX_BUF_SIZE);
-	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
-
-#ifdef CONFIG_SFC_SRIOV
 	if (efx->type->sriov_wanted) {
 		if (efx->type->sriov_wanted(efx)) {
 			unsigned vi_dc_entries, buftbl_free;

Re: [PATCH -next resend] sfc: farch: fix compile warning in efx_farch_dimension_resources()

From: Yang Yingliang <hidden>
Date: 2021-05-20 02:14:30

Hi,

On 2021/5/19 22:40, Edward Cree wrote:

On 19/05/2021 03:11, Yang Yingliang wrote:

quoted

Fix the following kernel build warning when CONFIG_SFC_SRIOV is disabled:

   drivers/net/ethernet/sfc/farch.c: In function ‘efx_farch_dimension_resources’:
   drivers/net/ethernet/sfc/farch.c:1671:21: warning: variable ‘buftbl_min’ set but not used [-Wunused-but-set-variable]
     unsigned vi_count, buftbl_min, total_tx_channels;

Signed-off-by: Yang Yingliang <redacted>
---
  drivers/net/ethernet/sfc/farch.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 49df02ecee91..6048b08b89ec 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c

@@ -1668,13 +1668,17 @@ void efx_farch_rx_pull_indir_table(struct efx_nic *efx)
   */
  void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
  {
-	unsigned vi_count, buftbl_min, total_tx_channels;
+	unsigned vi_count, total_tx_channels;
  
  #ifdef CONFIG_SFC_SRIOV
  	struct siena_nic_data *nic_data = efx->nic_data;
+	unsigned buftbl_min;
  #endif

As I said the first time you sent this:
Reverse xmas tree is messed up here, please fix.
Apart from that, LGTM.

Do you mean like this:

diff --git a/drivers/net/ethernet/sfc/farch.c

b/drivers/net/ethernet/sfc/farch.c

index 6048b08b89ec..b16f04cf7223 100644

--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c

@@ -1668,10 +1668,10 @@ void efx_farch_rx_pull_indir_table(struct

efx_nic *efx)
   */
  void efx_farch_dimension_resources(struct efx_nic *efx, unsigned 
sram_lim_qw)
  {
-    unsigned vi_count, total_tx_channels;
+    unsigned total_tx_channels, vi_count;

  #ifdef CONFIG_SFC_SRIOV
-    struct siena_nic_data *nic_data = efx->nic_data;
+    struct siena_nic_data *nic_data;
      unsigned buftbl_min;
  #endif

@@ -1679,6 +1679,7 @@ void efx_farch_dimension_resources(struct efx_nic

*efx, unsigned sram_lim_qw)
      vi_count = max(efx->n_channels, total_tx_channels * 
EFX_MAX_TXQ_PER_CHANNEL);

  #ifdef CONFIG_SFC_SRIOV
+    nic_data = efx->nic_data;
      /* Account for the buffer table entries backing the datapath channels
       * and the descriptor caches for those channels.
       */


Thanks,

Yang

-ed

quoted

  
  	total_tx_channels = efx->n_tx_channels + efx->n_extra_tx_channels;
+	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
+
+#ifdef CONFIG_SFC_SRIOV
  	/* Account for the buffer table entries backing the datapath channels
  	 * and the descriptor caches for those channels.
  	 */

@@ -1682,9 +1686,6 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
  		       total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL * EFX_MAX_DMAQ_SIZE +
  		       efx->n_channels * EFX_MAX_EVQ_SIZE)
  		      * sizeof(efx_qword_t) / EFX_BUF_SIZE);
-	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);
-
-#ifdef CONFIG_SFC_SRIOV
  	if (efx->type->sriov_wanted) {
  		if (efx->type->sriov_wanted(efx)) {
  			unsigned vi_dc_entries, buftbl_free;

Re: [PATCH -next resend] sfc: farch: fix compile warning in efx_farch_dimension_resources()

From: Edward Cree <ecree.xilinx@gmail.com>
Date: 2021-05-20 12:38:44

On 20/05/2021 03:13, Yang Yingliang wrote:

On 2021/5/19 22:40, Edward Cree wrote:

quoted

As I said the first time you sent this:
Reverse xmas tree is messed up here, please fix.
Apart from that, LGTM.

Do you mean like this:

That's one way to do it.  But, a couple of nits:

quoted hunk

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c

index 6048b08b89ec..b16f04cf7223 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c

@@ -1668,10 +1668,10 @@ void efx_farch_rx_pull_indir_table(struct efx_nic *efx)

  */
 void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
 {
-    unsigned vi_count, total_tx_channels;
+    unsigned total_tx_channels, vi_count;

No need to change the order of decls within a line.

Probably this blank line should be removed while we're at it.

quoted hunk

 #ifdef CONFIG_SFC_SRIOV
-    struct siena_nic_data *nic_data = efx->nic_data;
+    struct siena_nic_data *nic_data;
     unsigned buftbl_min;
 #endif

@@ -1679,6 +1679,7 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)

     vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);

 #ifdef CONFIG_SFC_SRIOV
+    nic_data = efx->nic_data;
     /* Account for the buffer table entries backing the datapath channels
      * and the descriptor caches for those channels.
      */

Otherwise, looks fine.
-ed

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help