From patchwork Tue May 19 00:00:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rustad, Mark D" X-Patchwork-Id: 473646 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5C9F5140D4E for ; Tue, 19 May 2015 10:01:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755306AbbESABD (ORCPT ); Mon, 18 May 2015 20:01:03 -0400 Received: from mga02.intel.com ([134.134.136.20]:32895 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755270AbbESAAy (ORCPT ); Mon, 18 May 2015 20:00:54 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 18 May 2015 17:00:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,456,1427785200"; d="scan'208";a="712150484" Received: from mdrustad-wks.jf.intel.com ([134.134.176.89]) by fmsmga001.fm.intel.com with ESMTP; 18 May 2015 17:00:42 -0700 Subject: [PATCH] pci: Limit VPD reads for all Intel Ethernet devices From: Mark D Rustad To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Date: Mon, 18 May 2015 17:00:42 -0700 Message-ID: <20150519000042.56109.69779.stgit@mdrustad-wks.jf.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To save boot time and some memory, limit VPD size to the maximum possible for all Intel Ethernet devices that have VPD, which is 1K. Signed-off-by: Mark Rustad Acked-by: Jeff Kirsher --- drivers/pci/quirks.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c6dc1dfd25d5..4fabbeda964a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1903,12 +1903,15 @@ static void quirk_netmos(struct pci_dev *dev) DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_SERIAL, 8, quirk_netmos); -static void quirk_e100_interrupt(struct pci_dev *dev) +static void quirk_intel_enet(struct pci_dev *dev) { u16 command, pmcsr; u8 __iomem *csr; u8 cmd_hi; + if (dev->vpd) + dev->vpd->len = 0x400; + switch (dev->device) { /* PCI IDs taken from drivers/net/e100.c */ case 0x1029: @@ -1967,7 +1970,7 @@ static void quirk_e100_interrupt(struct pci_dev *dev) iounmap(csr); } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, - PCI_CLASS_NETWORK_ETHERNET, 8, quirk_e100_interrupt); + PCI_CLASS_NETWORK_ETHERNET, 8, quirk_intel_enet); /* * The 82575 and 82598 may experience data corruption issues when transitioning