From owner-svn-src-head@freebsd.org Sun Mar 25 16:34:53 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 184EAF55D59; Sun, 25 Mar 2018 16:34:53 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-it0-f46.google.com (mail-it0-f46.google.com [209.85.214.46]) (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 9EB906C544; Sun, 25 Mar 2018 16:34:52 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-it0-f46.google.com with SMTP id z7-v6so10019904iti.1; Sun, 25 Mar 2018 09:34:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=1+U+U7TYFlnklqKbi+NdVrJWTSnlCGhOe5ySWAziTy4=; b=msqMiaJ1SWMFSUO+zwSXYm1ZEaavumHSCRjuBh/twOwwsm45CDyRes6akgkcY7jJao M2byDxh4iJ2fEjtcmY++01V3czGyp+CQM3FyTwB2G6GXzkVU7KGt7aoiA4j1yapyuYIb zFiSVFGJt40g+z37Tax6mxbv2TRjQQVMV6HioxplWYLzZUvWXoVyTZ5qY+6iRfWGf2xH rjz0e88a2KdeQ695PKZ1nwqn9IxwbQnyYWSIaN6FUpkHg418HEjWEWP7ju23Kkmyvm72 NBu2fmbDDOvrTOsno49Tb71TZLQvfW1aUJjBdXWLa5bkE+Ss2Fof4Quvk1EOI+7SaRUd 0avg== X-Gm-Message-State: AElRT7HepT7ZaCsdXDmqHmB8X5qB/O8cApElEzS1zZ5zwnv4VQqGpYmd xN5/HxrA6m0cmUsr3mXYYo3lToif X-Google-Smtp-Source: AIpwx48caxDjP7n3OBtrH2mh+G/aUcjLlnY1urlvWeW5wHS0quOf7BWoG/wWrMdr9T9RtNyIexfwPg== X-Received: by 2002:a24:a445:: with SMTP id v5-v6mr7905048iti.126.1521994213381; Sun, 25 Mar 2018 09:10:13 -0700 (PDT) Received: from mail-it0-f43.google.com (mail-it0-f43.google.com. [209.85.214.43]) by smtp.gmail.com with ESMTPSA id o186-v6sm8691769ita.28.2018.03.25.09.10.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Mar 2018 09:10:13 -0700 (PDT) Received: by mail-it0-f43.google.com with SMTP id v194-v6so7873423itb.0; Sun, 25 Mar 2018 09:10:13 -0700 (PDT) X-Received: by 2002:a24:2b52:: with SMTP id h79-v6mr3005001ita.135.1521994212897; Sun, 25 Mar 2018 09:10:12 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.62.19 with HTTP; Sun, 25 Mar 2018 09:10:12 -0700 (PDT) In-Reply-To: References: <201803231811.w2NIB6o8051699@repo.freebsd.org> From: Conrad Meyer Date: Sun, 25 Mar 2018 09:10:12 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r331447 - head/sys/dev/mlx5/mlx5_core To: Jeff Roberson Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 16:34:53 -0000 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 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); >> >