From patchwork Tue Jun 19 05:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 931405 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jwKcRkF/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418xbN65WFz9s2t for ; Tue, 19 Jun 2018 15:38:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755890AbeFSFiw (ORCPT ); Tue, 19 Jun 2018 01:38:52 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:36821 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755840AbeFSFiv (ORCPT ); Tue, 19 Jun 2018 01:38:51 -0400 Received: by mail-pl0-f66.google.com with SMTP id a7-v6so10311337plp.3 for ; Mon, 18 Jun 2018 22:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DiSUr2v1WBsHNzIFA3QwG98Nklmh5pCYfsmZXjMsHh4=; b=jwKcRkF/hi6YLeUJH1CTG7FqqhgFvqh1vjoDoe/NC3HwdfS77WCrReEDJV7TSeERWy 4kQy/Zu26ChDsBOYCbeIg/Y/6QoscDkiVVeY4LG1XFxLFzlMYVKqzlBuUb0t7moLT99r MiYZupx0ZyCpjy6agKBjbZG8c7888SPBhM7ENzEC00QW66kbQRpgc+PgqMFcogdqmass Riwf3dgylLF4+TvUgo9DBXgztiik9oata/MUuJ5vTZkpLyQdUXCdM4Vq7TJ6/g0AXyER dAGtAwVJrJ1VHJYQ9xuWPdkRTV729ogWduHdZxyzrJtMmMroJ0zugs7seuW5ZrLqpese M8cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DiSUr2v1WBsHNzIFA3QwG98Nklmh5pCYfsmZXjMsHh4=; b=FzEsft9Iv8nLeTy1jXr95Sm52YmlIJPD4AvB+PE0lZIUyEHJg9V8o8kuAb0NoTA2Jv jA7//HZ86VECYqU/vWr3XDpq6HFcMMUH/Qfm9P1OsO55rlNG3n3ni+GnW1RVj8xi/krW Uf8oUHfBUGsIPZbrevfuJtHAtLBY8Cax7z9F4bX/mD00CBI4RE/OLPykFuv4M37B3L4K UDrFpvEKKOkHwWdSUZmGWXVtOmjDcpEh4rolEusEDV5b4k8huYLOfbJYW6PGA/lOoCAi eetZ1ewV3HUXQLvLfchDpqwQolFzMuYvMgCWKdFXCrbpChVaKXtIlWfCoqO02BZsww0A Oubw== X-Gm-Message-State: APt69E0jsNZT8JKG04S5mYBz8Cdty0cQ9iQMHonKOb8IDp5qU5LCE58C rY1t9daHOFS/FM9HW5lOTmfEZCPrJA0= X-Google-Smtp-Source: ADUXVKJnnK7W+xAY4fWcSIRrF3YT5FQnYbhKYX4mKjROjofh34N9OfloXVqg7JAKuDpLgMoLKC7aBw== X-Received: by 2002:a17:902:52ee:: with SMTP id a101-v6mr17067243pli.131.1529386730698; Mon, 18 Jun 2018 22:38:50 -0700 (PDT) Received: from aurora.jms.id.au ([58.175.208.48]) by smtp.gmail.com with ESMTPSA id h84-v6sm26183220pfd.69.2018.06.18.22.38.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 22:38:50 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 19 Jun 2018 15:08:44 +0930 From: Joel Stanley To: Samuel Mendoza-Jonas , "David S . Miller" Cc: netdev@vger.kernel.org, Joe Perches Subject: [PATCH v2 1/4] net/ncsi: Silence debug messages Date: Tue, 19 Jun 2018 15:08:31 +0930 Message-Id: <20180619053834.12257-2-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619053834.12257-1-joel@jms.id.au> References: <20180619053834.12257-1-joel@jms.id.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In normal operation we see this series of messages as the host drives the network device: ftgmac100 1e660000.ethernet eth0: NCSI: LSC AEN - channel 0 state down ftgmac100 1e660000.ethernet eth0: NCSI: suspending channel 0 ftgmac100 1e660000.ethernet eth0: NCSI: configuring channel 0 ftgmac100 1e660000.ethernet eth0: NCSI: channel 0 link down after config ftgmac100 1e660000.ethernet eth0: NCSI interface down ftgmac100 1e660000.ethernet eth0: NCSI: LSC AEN - channel 0 state up ftgmac100 1e660000.ethernet eth0: NCSI: configuring channel 0 ftgmac100 1e660000.ethernet eth0: NCSI interface up ftgmac100 1e660000.ethernet eth0: NCSI: LSC AEN - channel 0 state down ftgmac100 1e660000.ethernet eth0: NCSI: suspending channel 0 ftgmac100 1e660000.ethernet eth0: NCSI: configuring channel 0 ftgmac100 1e660000.ethernet eth0: NCSI: channel 0 link down after config ftgmac100 1e660000.ethernet eth0: NCSI interface down ftgmac100 1e660000.ethernet eth0: NCSI: LSC AEN - channel 0 state up ftgmac100 1e660000.ethernet eth0: NCSI: configuring channel 0 ftgmac100 1e660000.ethernet eth0: NCSI interface up This makes all of these messages netdev_dbg. They are still useful to debug eg. misbehaving network device firmware, but we do not need them filling up the kernel logs in normal operation. Acked-by: Samuel Mendoza-Jonas Signed-off-by: Joel Stanley --- v2: Fix alignment in ftgmac100 change --- drivers/net/ethernet/faraday/ftgmac100.c | 4 ++-- net/ncsi/ncsi-aen.c | 4 ++-- net/ncsi/ncsi-manage.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 78db8e62a83f..ed6c76d20b45 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1735,8 +1735,8 @@ static void ftgmac100_ncsi_handler(struct ncsi_dev *nd) if (unlikely(nd->state != ncsi_dev_state_functional)) return; - netdev_info(nd->dev, "NCSI interface %s\n", - nd->link_up ? "up" : "down"); + netdev_dbg(nd->dev, "NCSI interface %s\n", + nd->link_up ? "up" : "down"); } static void ftgmac100_setup_clk(struct ftgmac100 *priv) diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c index e7b05de1e6d1..f899ed61bb57 100644 --- a/net/ncsi/ncsi-aen.c +++ b/net/ncsi/ncsi-aen.c @@ -73,8 +73,8 @@ static int ncsi_aen_handler_lsc(struct ncsi_dev_priv *ndp, ncm->data[2] = data; ncm->data[4] = ntohl(lsc->oem_status); - netdev_info(ndp->ndev.dev, "NCSI: LSC AEN - channel %u state %s\n", - nc->id, data & 0x1 ? "up" : "down"); + netdev_dbg(ndp->ndev.dev, "NCSI: LSC AEN - channel %u state %s\n", + nc->id, data & 0x1 ? "up" : "down"); chained = !list_empty(&nc->link); state = nc->state; diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 5561e221b71f..616441c2b54f 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -816,9 +816,9 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) } else { hot_nc = NULL; nc->state = NCSI_CHANNEL_INACTIVE; - netdev_warn(ndp->ndev.dev, - "NCSI: channel %u link down after config\n", - nc->id); + netdev_dbg(ndp->ndev.dev, + "NCSI: channel %u link down after config\n", + nc->id); } spin_unlock_irqrestore(&nc->lock, flags); @@ -1199,14 +1199,14 @@ int ncsi_process_next_channel(struct ncsi_dev_priv *ndp) switch (old_state) { case NCSI_CHANNEL_INACTIVE: ndp->ndev.state = ncsi_dev_state_config; - netdev_info(ndp->ndev.dev, "NCSI: configuring channel %u\n", - nc->id); + netdev_dbg(ndp->ndev.dev, "NCSI: configuring channel %u\n", + nc->id); ncsi_configure_channel(ndp); break; case NCSI_CHANNEL_ACTIVE: ndp->ndev.state = ncsi_dev_state_suspend; - netdev_info(ndp->ndev.dev, "NCSI: suspending channel %u\n", - nc->id); + netdev_dbg(ndp->ndev.dev, "NCSI: suspending channel %u\n", + nc->id); ncsi_suspend_channel(ndp); break; default: From patchwork Tue Jun 19 05:38:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 931406 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r+hxwa3j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418xbV0ZlJz9s1B for ; Tue, 19 Jun 2018 15:39:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755920AbeFSFi7 (ORCPT ); Tue, 19 Jun 2018 01:38:59 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42066 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755840AbeFSFi6 (ORCPT ); Tue, 19 Jun 2018 01:38:58 -0400 Received: by mail-pf0-f194.google.com with SMTP id w7-v6so9340974pfn.9 for ; Mon, 18 Jun 2018 22:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ua50FtB0ins3Urth+pwwsZv8Zp78ktq70XzisTwA+PA=; b=r+hxwa3joeMNYv8SGqZEo3uuHqbvyWepqywtFPpl5JAjQfJOZ+8RvjYKSNoNmyiv95 nMN00W+xMGd9sQZ12Yy3pLShLhGvtOOetfcXWbc9mdzfH+MJGIb5cLczAeyrfGWz8Qai 8cCZDlH+nDioj4hV/ApHBfTWSqaDQn+LC0joJlPNn4GfH9owoTdoWGheJ9obc343l4E0 +MyiJ01atIvWc5dICkc2RQcTV/d2MTLkRZt6b541dzS9RuG4c6UgMl06BEb0vUKuzZA+ 7ev/VQUobwR57Xou8oXlc6boOahGKIm3BiwpVdU+REdh+Ws66yBnQbMRpc03WzipZ74B fXzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ua50FtB0ins3Urth+pwwsZv8Zp78ktq70XzisTwA+PA=; b=fzP07Oe2mnzwamaB7spktU3GlSlPHHA7NQA+lJpvCDtGKKqVcGKROgqWMxmj441kGR Jgmq99upkNXZ65i9BLJsicvQQK8sq2PaqBJG19lcsDrm/3qmaKzP/RT22PRWOSkdeext EwVnFxnwhr7CP2DtwNCXUFdm1s26XW2n2ZX9krwHrcVHkKGf0COh/nm35vFotIMnaWV0 9QNaUXZ9DhXb7As9IflnB3R/IBm6cK3FJMaJq04w3nevBYNpOr6cJg26IcaZ5B/oylCf EHYaI5gOWnseyvw79chEnztLhtmTDcmUMtZ2FIQZZU9ihJaCGx5RMlDJwlCpx2DVXFdU DvTQ== X-Gm-Message-State: APt69E1Qn4H2gaVQgMyDkfjKl3VlspaNisXhSicoORRcF62b/AyMfkGY 0Ixod1oimsUZKT7unmQzS/NouheWyVc= X-Google-Smtp-Source: ADUXVKIORvnHZ5XL46ibGdYQjlBBOd/opt42OD5xqkmJgqZknh/kNH62Hg+IgnUAP+jO052LKsv38Q== X-Received: by 2002:a62:a09c:: with SMTP id p28-v6mr16651723pfl.9.1529386737756; Mon, 18 Jun 2018 22:38:57 -0700 (PDT) Received: from aurora.jms.id.au ([58.175.208.48]) by smtp.gmail.com with ESMTPSA id i67-v6sm20716755pgc.77.2018.06.18.22.38.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 22:38:57 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 19 Jun 2018 15:08:51 +0930 From: Joel Stanley To: Samuel Mendoza-Jonas , "David S . Miller" Cc: netdev@vger.kernel.org, Joe Perches Subject: [PATCH v2 2/4] net/ncsi: Drop no more channels message Date: Tue, 19 Jun 2018 15:08:32 +0930 Message-Id: <20180619053834.12257-3-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619053834.12257-1-joel@jms.id.au> References: <20180619053834.12257-1-joel@jms.id.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This does not provide useful information. As the ncsi maintainer said: > either we get a channel or broadcom has gone out to lunch Acked-by: Samuel Mendoza-Jonas Signed-off-by: Joel Stanley --- net/ncsi/ncsi-manage.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 616441c2b54f..716493a61ba6 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -1226,8 +1226,6 @@ int ncsi_process_next_channel(struct ncsi_dev_priv *ndp) return ncsi_choose_active_channel(ndp); } - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: No more channels to process\n"); ncsi_report_link(ndp, false); return -ENODEV; } From patchwork Tue Jun 19 05:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 931407 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZXDJhvRl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418xbc56lZz9s1B for ; Tue, 19 Jun 2018 15:39:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755940AbeFSFjG (ORCPT ); Tue, 19 Jun 2018 01:39:06 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34351 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755840AbeFSFjF (ORCPT ); Tue, 19 Jun 2018 01:39:05 -0400 Received: by mail-pg0-f68.google.com with SMTP id q4-v6so8628363pgr.1 for ; Mon, 18 Jun 2018 22:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FSRWV5pEe4omU1efDh/B4B7SCOem+b2sDOWX/vm5dLg=; b=ZXDJhvRlCus0kLFHwVxhI/Ig+2v3GzQuF3fSqMiY9D5wvrTjU/N/R5gV88sbDm/h5i wij6G+la199VJ1W0f8zlsGdC8mm5UA3QnBVcwJ8N0sjD6OxiNSR3fli2VfD4Uj4Yv1u1 M/TkZlkzfea28s0BEOO2nWAQ5qSuizZ/2Hez6X6LEOpHnGbqnOyiBbC4DYuD0gCcVT/6 rrCQcLjDuThzb03Vzhb0qPSd1A/uS+y3LCIHlOeLvgCejONnYwKCY+6+1yAMKVHYWuYo C6g7booNdKz9VyEsEY4iUCn9ILh0uuWjAQTmn8wTAD8ZBKRLjVeawCBh4i+rGtesBPRr GBtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FSRWV5pEe4omU1efDh/B4B7SCOem+b2sDOWX/vm5dLg=; b=VO7yUoLopazoERUWP/vd2Yn5Z2g5aezuCa6QtoZn3XV2kJXZ7Aq4p0nW43wB+/VB1h k21vOOINhKOsuniIApc5U05gleNqv8q6EFQ6WeZt/wAUrjhca6k2cFZIhAYx8ccpJjKH i3v4OvtYzLcmlaqpjuvtXEQt3Li27HX78ipfWxR1E4DyylWaXR44J3S04N3kuXU3O+1m KyMDvDEU1upZDmf+Dx4vIsmeAOwl4X9RzaNs3bTSyjsGPK3q6GNO7DXLaSU4nMzC3p+U NJ1uS1WfKLkgj4BDQk/g5duuRz7za6Is1UCeuXAspn6wwSinrBOFpedk22PjHw17zfdp P/5Q== X-Gm-Message-State: APt69E02pPH97sXW9y4DYNvn8MqyY2E55psKUKU6LOLl8F02k2n4sBd1 4A6ngmmytZvGkvz9GVxP3l0= X-Google-Smtp-Source: ADUXVKJxM56EyeyuYMTWXQKI/u4l/JazhZMFWsE8Qr2uHjQ6SBboksf90KOb253BoITnJ84fiNyGPw== X-Received: by 2002:a63:7f4f:: with SMTP id p15-v6mr13622513pgn.312.1529386744720; Mon, 18 Jun 2018 22:39:04 -0700 (PDT) Received: from aurora.jms.id.au ([58.175.208.48]) by smtp.gmail.com with ESMTPSA id x124-v6sm22025094pgb.53.2018.06.18.22.39.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 22:39:04 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 19 Jun 2018 15:08:58 +0930 From: Joel Stanley To: Samuel Mendoza-Jonas , "David S . Miller" Cc: netdev@vger.kernel.org, Joe Perches Subject: [PATCH v2 3/4] net/ncsi: Use netdev_dbg for debug messages Date: Tue, 19 Jun 2018 15:08:33 +0930 Message-Id: <20180619053834.12257-4-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619053834.12257-1-joel@jms.id.au> References: <20180619053834.12257-1-joel@jms.id.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This moves all of the netdev_printk(KERN_DEBUG, ...) messages over to netdev_dbg. As Joe explains: > netdev_dbg is not included in object code unless > DEBUG is defined or CONFIG_DYNAMIC_DEBUG is set. > And then, it is not emitted into the log unless > DEBUG is set or this specific netdev_dbg is enabled > via the dynamic debug control file. Which is what we're after in this case. Acked-by: Samuel Mendoza-Jonas Signed-off-by: Joel Stanley --- v2: update commit message net/ncsi/ncsi-aen.c | 6 +++--- net/ncsi/ncsi-manage.c | 33 +++++++++++++++------------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c index f899ed61bb57..25e483e8278b 100644 --- a/net/ncsi/ncsi-aen.c +++ b/net/ncsi/ncsi-aen.c @@ -148,9 +148,9 @@ static int ncsi_aen_handler_hncdsc(struct ncsi_dev_priv *ndp, hncdsc = (struct ncsi_aen_hncdsc_pkt *)h; ncm->data[3] = ntohl(hncdsc->status); spin_unlock_irqrestore(&nc->lock, flags); - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: host driver %srunning on channel %u\n", - ncm->data[3] & 0x1 ? "" : "not ", nc->id); + netdev_dbg(ndp->ndev.dev, + "NCSI: host driver %srunning on channel %u\n", + ncm->data[3] & 0x1 ? "" : "not ", nc->id); return 0; } diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 716493a61ba6..091284760d21 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -788,8 +788,8 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) } break; case ncsi_dev_state_config_done: - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: channel %u config done\n", nc->id); + netdev_dbg(ndp->ndev.dev, "NCSI: channel %u config done\n", + nc->id); spin_lock_irqsave(&nc->lock, flags); if (nc->reconfigure_needed) { /* This channel's configuration has been updated @@ -804,8 +804,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) list_add_tail_rcu(&nc->link, &ndp->channel_queue); spin_unlock_irqrestore(&ndp->lock, flags); - netdev_printk(KERN_DEBUG, dev, - "Dirty NCSI channel state reset\n"); + netdev_dbg(dev, "Dirty NCSI channel state reset\n"); ncsi_process_next_channel(ndp); break; } @@ -908,9 +907,9 @@ static int ncsi_choose_active_channel(struct ncsi_dev_priv *ndp) } ncm = &found->modes[NCSI_MODE_LINK]; - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: Channel %u added to queue (link %s)\n", - found->id, ncm->data[2] & 0x1 ? "up" : "down"); + netdev_dbg(ndp->ndev.dev, + "NCSI: Channel %u added to queue (link %s)\n", + found->id, ncm->data[2] & 0x1 ? "up" : "down"); out: spin_lock_irqsave(&ndp->lock, flags); @@ -1316,9 +1315,9 @@ static int ncsi_kick_channels(struct ncsi_dev_priv *ndp) if ((ndp->ndev.state & 0xff00) == ncsi_dev_state_config || !list_empty(&nc->link)) { - netdev_printk(KERN_DEBUG, nd->dev, - "NCSI: channel %p marked dirty\n", - nc); + netdev_dbg(nd->dev, + "NCSI: channel %p marked dirty\n", + nc); nc->reconfigure_needed = true; } spin_unlock_irqrestore(&nc->lock, flags); @@ -1336,8 +1335,7 @@ static int ncsi_kick_channels(struct ncsi_dev_priv *ndp) list_add_tail_rcu(&nc->link, &ndp->channel_queue); spin_unlock_irqrestore(&ndp->lock, flags); - netdev_printk(KERN_DEBUG, nd->dev, - "NCSI: kicked channel %p\n", nc); + netdev_dbg(nd->dev, "NCSI: kicked channel %p\n", nc); n++; } } @@ -1368,8 +1366,8 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) list_for_each_entry_rcu(vlan, &ndp->vlan_vids, list) { n_vids++; if (vlan->vid == vid) { - netdev_printk(KERN_DEBUG, dev, - "NCSI: vid %u already registered\n", vid); + netdev_dbg(dev, "NCSI: vid %u already registered\n", + vid); return 0; } } @@ -1388,7 +1386,7 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) vlan->vid = vid; list_add_rcu(&vlan->list, &ndp->vlan_vids); - netdev_printk(KERN_DEBUG, dev, "NCSI: Added new vid %u\n", vid); + netdev_dbg(dev, "NCSI: Added new vid %u\n", vid); found = ncsi_kick_channels(ndp) != 0; @@ -1417,8 +1415,7 @@ int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) /* Remove the VLAN id from our internal list */ list_for_each_entry_safe(vlan, tmp, &ndp->vlan_vids, list) if (vlan->vid == vid) { - netdev_printk(KERN_DEBUG, dev, - "NCSI: vid %u found, removing\n", vid); + netdev_dbg(dev, "NCSI: vid %u found, removing\n", vid); list_del_rcu(&vlan->list); found = true; kfree(vlan); @@ -1545,7 +1542,7 @@ void ncsi_stop_dev(struct ncsi_dev *nd) } } - netdev_printk(KERN_DEBUG, ndp->ndev.dev, "NCSI: Stopping device\n"); + netdev_dbg(ndp->ndev.dev, "NCSI: Stopping device\n"); ncsi_report_link(ndp, true); } EXPORT_SYMBOL_GPL(ncsi_stop_dev); From patchwork Tue Jun 19 05:38:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 931408 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JIsqXYzn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418xbr1pvrz9s4v for ; Tue, 19 Jun 2018 15:39:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965103AbeFSFjQ (ORCPT ); Tue, 19 Jun 2018 01:39:16 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:39410 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964895AbeFSFjM (ORCPT ); Tue, 19 Jun 2018 01:39:12 -0400 Received: by mail-pl0-f68.google.com with SMTP id f1-v6so10306737plt.6 for ; Mon, 18 Jun 2018 22:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9WU7AKJkZ41drRTDzWUtI+QrrAHR4lXQeEeW1ZVsgis=; b=JIsqXYznFvdu2Mp57M35gaDMuKKE0c19+/qpUty8eV6dPGys927fD0vx7/S9LqqTRf 0U/rQ/GEiSu4X7qTgQdlAiouDOrnPuSsmEaE7gp1ER+1UgsZVkw/vRDuw+UZ4HyUtIjU 1MW0zatC7iOHTq4Q8fP55pqldxPuy8uTs6aHn88Hv4qNcyOSIoPPQFZ5HskiT6+yqcjh DexBTyvrmdGnZ6cJK6fCk9/pdQN7d5+KGKpETrZ/SWGnjVEDVGvuz+Ql40GCC1Nu5aK4 VaBeeawBMZvD1az5KVWVCLi6oJYIx8yVD13Egi6PstanmbBkGomxDCFlHtegr0qqzM1q Ynfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9WU7AKJkZ41drRTDzWUtI+QrrAHR4lXQeEeW1ZVsgis=; b=oOY3ijZOvdzfhXvJdYgwmN1F6809bKjgNZC2ygU6y0P0JiPoQHWgBB+XSvp8nzghNY cfXB3ZPuSy9YaWF5P2pwQqvN/u7wcWtne/w3BpcKUG8mHt1eKxI8ut3oyia7M976HNAM sagG6yA2wmYXxKGX/2U3wBR7Il/KucluRJ9y3+Hy28mZ/z0wa507MTsyQlZmKN4lHLY/ 1PZFJs7q/Bwsb+C2nHlIxqp/4g3IbHk8f2heCPK1jFKgTSGcinyMbNZBiIfAmp0RuzPE M35eSV5RHyM8gQApCQ//EJK0BSiED18cMUWsP1R8GCqhOSFGVkUCCO8lvTg5Exj0kVnq WKwQ== X-Gm-Message-State: APt69E2vGg6HNLIVyjHO9eFSSjUrWp0Owl1tkLeSQN9JZgSvBVO8MFsl lCTUoK82B6EkpjfcRxAyDBE= X-Google-Smtp-Source: ADUXVKKuISWdrzzw611bKI6dNVr4l3rosypPRzGC4Dui15BYln1eCbJ8N9gr5cI8EJUaaD7eF8shGw== X-Received: by 2002:a17:902:88:: with SMTP id a8-v6mr16933262pla.156.1529386751800; Mon, 18 Jun 2018 22:39:11 -0700 (PDT) Received: from aurora.jms.id.au ([58.175.208.48]) by smtp.gmail.com with ESMTPSA id t13-v6sm19492520pgv.43.2018.06.18.22.39.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 22:39:10 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 19 Jun 2018 15:09:05 +0930 From: Joel Stanley To: Samuel Mendoza-Jonas , "David S . Miller" Cc: netdev@vger.kernel.org, Joe Perches Subject: [PATCH v2 4/4] MAINTAINERS: Add Sam as the maintainer for NCSI Date: Tue, 19 Jun 2018 15:08:34 +0930 Message-Id: <20180619053834.12257-5-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619053834.12257-1-joel@jms.id.au> References: <20180619053834.12257-1-joel@jms.id.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sam has been handing the maintenance of NCSI for a number release cycles now. Acked-by: Samuel Mendoza-Jonas Signed-off-by: Joel Stanley --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9d5eeff51b5f..44851f7c46fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9756,6 +9756,11 @@ L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/NCR_D700.* +NCSI LIBRARY: +M: Samuel Mendoza-Jonas +S: Maintained +F: net/ncsi/ + NCT6775 HARDWARE MONITOR DRIVER M: Guenter Roeck L: linux-hwmon@vger.kernel.org