svn commit: r331447 - head/sys/dev/mlx5/mlx5_core

[Conrad Meyer]

It seems it slipped back in via r331445 after I had removed it in r330714.


On Sun, Mar 25, 2018 at 12:47 AM, Jeff Roberson <jroberson at jroberson.net> wrote:
>
>> Author: hselasky
>> Date: Fri Mar 23 18:11:06 2018
>> New Revision: 331447
>> URL: https://svnweb.freebsd.org/changeset/base/331447
>>
>> Log:
>>  Hide verbose proclamation of error when forced in mlx5core.
>>
>>  When mlx5_enter_error_state() operation is forced by shutdown, the
>>  messages surrounding setting the error state are not informational
>>  and confuse users.
>>
>>  Submitted by:  kib@
>>  MFC after:     1 week
>>  Sponsored by:  Mellanox Technologies
>
>
>
> This broke on sparc64 build:
>
> In file included from /usr/head/sys/dev/mlx5/mlx5_core/mlx5_cmd.c:41:
> /usr/head/sys/dev/mlx5/mlx5_core/mlx5_core.h:86: warning: redundant
> redeclaration of 'm
> lx5_enter_error_state' [-Wredundant-decls]
> /usr/head/sys/dev/mlx5/driver.h:871: warning: previous declaration of
> 'mlx5_enter_error
> _state' was here
> --- mlx5_alloc.o ---
> cc1: warnings being treated as errors
>
> Thanks,
> Jeff
>
>
>>
>> Modified:
>>  head/sys/dev/mlx5/mlx5_core/mlx5_health.c
>>
>> Modified: head/sys/dev/mlx5/mlx5_core/mlx5_health.c
>>
>> ==============================================================================
>> --- head/sys/dev/mlx5/mlx5_core/mlx5_health.c   Fri Mar 23 18:09:09 2018
>> (r331446)
>> +++ head/sys/dev/mlx5/mlx5_core/mlx5_health.c   Fri Mar 23 18:11:06 2018
>> (r331447)
>> @@ -99,14 +99,16 @@ void mlx5_enter_error_state(struct mlx5_core_dev *dev,
>>                 return;
>>         }
>>
>> -       mlx5_core_err(dev, "start\n");
>> +       if (!force)
>> +               mlx5_core_err(dev, "internal state error detected\n");
>>         if (pci_channel_offline(dev->pdev) || in_fatal(dev) || force) {
>>                 dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR;
>>                 mlx5_trigger_cmd_completions(dev);
>>         }
>>
>>         mlx5_core_event(dev, MLX5_DEV_EVENT_SYS_ERROR, 0);
>> -       mlx5_core_err(dev, "end\n");
>> +       if (!force)
>> +               mlx5_core_err(dev, "system error event triggered\n");
>>
>> unlock:
>>         mutex_unlock(&dev->intf_state_mutex);
>>
>