From patchwork Sun Apr 19 19:51:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Kirsher X-Patchwork-Id: 221003 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 12289C38A30 for ; Sun, 19 Apr 2020 19:52:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8F812145D for ; Sun, 19 Apr 2020 19:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726335AbgDSTvd (ORCPT ); Sun, 19 Apr 2020 15:51:33 -0400 Received: from mga01.intel.com ([192.55.52.88]:45111 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725848AbgDSTvd (ORCPT ); Sun, 19 Apr 2020 15:51:33 -0400 IronPort-SDR: ca8GZOK44RcRuhSFtYC/l6YasB8GAAo6nA6+2k+Y9aNkwWbFLyuvry0k1xH80AusPJf63UoTni e45JyXQ3BI8Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2020 12:51:32 -0700 IronPort-SDR: Z+hz8Yq+rjaQuhkv4OhcGse6W8W/qPXXF7sO5M7q3saYUlOcFge1DLsspBIDimhoDIal3kSc2f gZh1JAvQTlOA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,404,1580803200"; d="scan'208";a="279034390" Received: from jtkirshe-desk1.jf.intel.com ([134.134.177.86]) by fmsmga004.fm.intel.com with ESMTP; 19 Apr 2020 12:51:32 -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/14][pull request] 1GbE Intel Wired LAN Driver Updates 2020-04-19 Date: Sun, 19 Apr 2020 12:51:17 -0700 Message-Id: <20200419195131.1068144-1-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 2.25.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 e1000e and igc only. Sasha adds new device IDs supported by the igc driver. Vitaly fixes the S0ix entry and exit flows in e1000e for TGP and newer MAC types when a cable is connected. Andre has the remaining changes in the series, starting with cleanup of the igc driver of duplicate code. Added a check for IGC_MAC_STATE_SRC_ADDR flag which is unsupported for MAC filters in igc. Cleaned up the return values for igc_add_mac_filter(), where the return value was not being used, so update the function to only return success or failure. Fix the return value of igc_uc_unsync() as well. Refactor the igc driver in several functions to help reduce the convoluted logic and simplify the driver filtering mechanisms. Improve the MAC address checks when adding a MAC filter. Lastly, improve the log messages related to MAC address filtering to ease debugging. The following are changes since commit 0fde6e3b55a15a13f3b5aa484a79fe5298c1ed40: Merge branch 'r8169-series-with-improvements' and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 1GbE Andre Guedes (12): igc: Remove duplicate code in MAC filtering logic igc: Check unsupported flag in igc_add_mac_filter() igc: Change igc_add_mac_filter() returning value igc: Fix igc_uc_unsync() igc: Refactor igc_rar_set_index() igc: Improve address check in igc_del_mac_filter() igc: Remove 'queue' check in igc_del_mac_filter() igc: Remove IGC_MAC_STATE_QUEUE_STEERING igc: Remove igc_*_mac_steering_filter() wrappers igc: Refactor igc_mac_entry_can_be_used() igc: Refactor igc_del_mac_filter() igc: Add debug messages to MAC filter code Sasha Neftin (1): igc: Add new device IDs for i225 part Vitaly Lifshits (1): e1000e: fix S0ix flows for cable connected case drivers/net/ethernet/intel/e1000e/netdev.c | 54 +++ drivers/net/ethernet/intel/e1000e/regs.h | 3 + drivers/net/ethernet/intel/igc/igc.h | 11 +- drivers/net/ethernet/intel/igc/igc_base.c | 3 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 22 +- drivers/net/ethernet/intel/igc/igc_hw.h | 3 + drivers/net/ethernet/intel/igc/igc_main.c | 371 ++++++++----------- 7 files changed, 233 insertions(+), 234 deletions(-)