From owner-svn-src-head@freebsd.org Sun Mar 25 07:48:12 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 2511DF523DE for ; Sun, 25 Mar 2018 07:48:12 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: from mail-pl0-x22e.google.com (mail-pl0-x22e.google.com [IPv6:2607:f8b0:400e:c01::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9922A792BE for ; Sun, 25 Mar 2018 07:48:11 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: by mail-pl0-x22e.google.com with SMTP id 91-v6so2208950pld.3 for ; Sun, 25 Mar 2018 00:48:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jroberson-net.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=OPcCc/ZISf5EXf+HKq6oLN4v0IHiX25/SFt7ek0YKzM=; b=a1HyDB4JDrmv+y6COfg1rxhCEiie3FniIwqI/TVRK8M/JWIpcBLveTgZx8ZKeF2b1K pCjoRWtsB/VMfk+7yFInuT1AX0Uyl9P4sJnFZz+z+pbj9coxCX0G6HOMxAR5rgPD3WnM Y4TYHJf4wBysHm670PuyYfPhx5+bIEdEFT8a7IMUWZ8F8CLRKewm4eV6jU9tuhWJXe3y R5MritcAmu2aneifM6mePV4rg1QGQSnVRZq0F1uvXcfC4j38FYscT3AxOaxJ9rVUdBJu cnKB7IosL2jA22Qe/dWJctRW5mvqdAGbHk8iDPuy3WCCJBXB+PsBExsoY/69K1SbPOfr WYmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=OPcCc/ZISf5EXf+HKq6oLN4v0IHiX25/SFt7ek0YKzM=; b=VYdmPstO1Rpuq83CMbUeAYD0kVCI68xfRcjnRMWW3dQqCbFdh27N8487+mg7Ml+yfT RDvf/XwDrFV3MQfI4OVWsxEzzOx0Kg5U2+LKl5Y9q6uB0IC7IbqnAaRSx5jpMaKxbHXR vxoRFRGeRask0e7dKpg41ujKvj6LlCXd/az4uIZKnfhIZpU+Dtc3s9JRxzxN0BoZqgtk fXvBM68XOxEcaIEGaK6uGEnS4nqeDun8OscCestOxto7wxdzdO7PsYHjZRpOr8ZgzF+Y V7nlgesWwitqVi3p7rH0xuLuMoHSE8tvCUO0VrU7NEF9uGq6QczjjSF4RFbra4rmZWu4 TaZw== X-Gm-Message-State: AElRT7FilLw9/kGzGdz4ZpbgoF8MdddQQFs9R+jk/3nWpMO9qt5KyCmR YdP72wu20x8nUzgMnhBWUm3lVg== X-Google-Smtp-Source: AG47ELte2iGS++eYZOXh64v+Ei5cRUCS6P4m6Etm68fqxxNoGzC2xdYrya4IvIFVCTz4K0Y3tp8zLg== X-Received: by 2002:a17:902:ac96:: with SMTP id h22-v6mr35346402plr.93.1521964090470; Sun, 25 Mar 2018 00:48:10 -0700 (PDT) Received: from rrcs-66-91-135-210.west.biz.rr.com (rrcs-66-91-135-210.west.biz.rr.com. [66.91.135.210]) by smtp.gmail.com with ESMTPSA id j65sm15410650pge.58.2018.03.25.00.48.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Mar 2018 00:48:09 -0700 (PDT) Date: Sat, 24 Mar 2018 21:47:07 -1000 (HST) From: Jeff Roberson X-X-Sender: jroberson@desktop To: Hans Petter Selasky cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331447 - head/sys/dev/mlx5/mlx5_core In-Reply-To: <201803231811.w2NIB6o8051699@repo.freebsd.org> Message-ID: References: <201803231811.w2NIB6o8051699@repo.freebsd.org> User-Agent: Alpine 2.21 (BSF 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed 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 07:48:12 -0000 > 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); >