From owner-svn-src-head@freebsd.org Sun Mar 25 08:57:29 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AD7CF57A70; Sun, 25 Mar 2018 08:57:29 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D06507BE2B; Sun, 25 Mar 2018 08:57:28 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 97923260596; Sun, 25 Mar 2018 10:57:20 +0200 (CEST) Subject: Re: svn commit: r331447 - head/sys/dev/mlx5/mlx5_core To: Jeff Roberson Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201803231811.w2NIB6o8051699@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <14ae19c4-99fb-8639-d211-b247e099db0f@selasky.org> Date: Sun, 25 Mar 2018 10:57:14 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Mar 2018 08:57:29 -0000 On 03/25/18 09:47, Jeff Roberson 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); >> > > Hi, See here: https://svnweb.freebsd.org/changeset/base/331531 --HPS