From patchwork Thu May 21 07:27:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Kirsher X-Patchwork-Id: 218840 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE049C433E0 for ; Thu, 21 May 2020 07:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A51620738 for ; Thu, 21 May 2020 07:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728353AbgEUH2B (ORCPT ); Thu, 21 May 2020 03:28:01 -0400 Received: from mga11.intel.com ([192.55.52.93]:34923 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728300AbgEUH2B (ORCPT ); Thu, 21 May 2020 03:28:01 -0400 IronPort-SDR: ZRjpEJHsfUVth9QiISbe6GgQmBZYHXVUSP23ZtrLZvRW6/GxsiNLHGSoK6YKOLEot4UWMJH0GU texP/lsZuO5g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2020 00:28:01 -0700 IronPort-SDR: ysALxiBUx9R8HagzrZXBM8KCx3DgK+v2Nl7nrwAIuggfnV/dlkhswrEiLPJUU/dLPxpeEJguvY Aj49It+EVl0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,417,1583222400"; d="scan'208";a="343758676" Received: from jtkirshe-desk1.jf.intel.com ([134.134.177.86]) by orsmga001.jf.intel.com with ESMTP; 21 May 2020 00:27:59 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: Jeff Kirsher , netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com Subject: [net-next 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-20 Date: Thu, 21 May 2020 00:27:43 -0700 Message-Id: <20200521072758.440264-1-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This series contains updates to igc and e1000. Andre cleans up code that was left over from the igb driver that handled MAC address filters based on the source address, which is not currently supported. Simplifies the MAC address filtering code and prepare the igc driver for future source address support. Updated the MAC address filter internal APIs to support filters based on source address. Added support for Network Flow Classification (NFC) rules based on source MAC address. Cleaned up the 'cookie' field which is not used anywhere in the code and cleaned up a wrapper function that was not needed. Simplified the filtering code for readability and aligned the ethtool functions, so that function names were consistent. Alex provides a fix for e1000 to resolve a deadlock issue when NAPI is being disabled. Sasha does additional cleanup of the igc driver of dead code that is not used or needed. The following are changes since commit de1b99ef2aa1e982c86b15853e013c6e3dbc1e7a: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 1GbE Alexander Duyck (1): e1000: Do not perform reset in reset_task if we are already down Andre Guedes (11): igc: Remove IGC_MAC_STATE_SRC_ADDR flag igc: Remove mac_table from igc_adapter igc: Add support for source address filters in core igc: Enable NFC rules based source MAC address igc: Remove unused field from igc_nfc_filter igc: Get rid of igc_max_channels() igc: Cleanup _get|set_rxnfc ethtool ops igc: Early return in igc_get_ethtool_nfc_entry() igc: Add 'igc_ethtool_' prefix to functions in igc_ethtool.c igc: Align terms used in NFC support code igc: Change byte order in struct igc_nfc_filter Sasha Neftin (3): igc: Remove obsolete circuit breaker registers igc: Remove header redirection register igc: Remove per queue good transmited counter register drivers/net/ethernet/intel/e1000/e1000_main.c | 18 +- drivers/net/ethernet/intel/igc/igc.h | 69 +-- drivers/net/ethernet/intel/igc/igc_defines.h | 3 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 468 +++++++++--------- drivers/net/ethernet/intel/igc/igc_mac.c | 4 - drivers/net/ethernet/intel/igc/igc_main.c | 162 +++--- drivers/net/ethernet/intel/igc/igc_regs.h | 11 - 7 files changed, 342 insertions(+), 393 deletions(-)