2021-05-19 19:05:16

by Yang Yingliang

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

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 <[email protected]>
---
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

2021-05-19 20:10:56

by Edward Cree

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

On 19/05/2021 03:11, Yang Yingliang wrote:
> 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 <[email protected]>
> ---
> 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

>
> 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;
>

2021-05-20 02:15:16

by Yang Yingliang

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

Hi,

On 2021/5/19 22:40, Edward Cree wrote:
> On 19/05/2021 03:11, Yang Yingliang wrote:
>> 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 <[email protected]>
>> ---
>> 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
>
>>
>> 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;
>>
> .

2021-05-21 02:45:44

by Edward Cree

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

On 20/05/2021 03:13, Yang Yingliang wrote:
> On 2021/5/19 22:40, Edward Cree wrote:
>> 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:

> 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.
>  #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