From patchwork Tue Dec 29 22:19:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan_Hargrave@Dell.com X-Patchwork-Id: 7930811 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 87F45BEEE5 for ; Tue, 29 Dec 2015 22:21:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ABFF920160 for ; Tue, 29 Dec 2015 22:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEA6420114 for ; Tue, 29 Dec 2015 22:21:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980AbbL2WVH (ORCPT ); Tue, 29 Dec 2015 17:21:07 -0500 Received: from ausxipps301.us.dell.com ([143.166.148.223]:22183 "EHLO ausxipps301.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbbL2WVH (ORCPT ); Tue, 29 Dec 2015 17:21:07 -0500 DomainKey-Signature: s=smtpout; d=dell.com; c=nofws; q=dns; h=X-LoopCount0:X-IronPort-AV:From:To:Cc:Subject:Date: Message-Id:X-Mailer:To; b=FiO9a1lmjSZq38vfMx85dfUpsBLC7drWrN5DminHVcJLB1wBgtCtwY4F MnMWL/CEIXLsvx6grwQcebMSFJwoTC5LmWj6zO6fVxqycE7jm3RvUJ4yv Y8twNmo6EhakLjOFpvGIk0+1cSjwKlc+txLQSjMfWFucfgtrUTJZFiGW5 s=; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dell.com; i=@dell.com; q=dns/txt; s=smtpout; t=1451427667; x=1482963667; h=from:cc:subject:date:message-id; bh=iXotZEchzW1fIyDJGTM4tMl7wwXL6uunGFTwwmYl3Gg=; b=J9CicR7nJ6iNEpGC7WtCtJi2Tu6ElTDLCPLD1SkSaFzh0iC+v72/+gxv vLRA3K2CWkAc8eb/SngVfTj5VuFa9I+CL8dJ2G6g9Hctz9PtBDzKDgCgc aXHnqNdycyr+BemDyAX3bFko6JzCV1KppzOulTAJtjJ89aZ2LMmJIqG4e I=; X-LoopCount0: from 10.208.46.141 X-IronPort-AV: E=Sophos;i="5.20,497,1444712400"; d="scan'208";a="744585868" From: Jordan Hargrave To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, helgaas@kernel.org, alexander.duyck@gmail.com, Jordan Hargrave Subject: [PATCH] Limit VPD length on Atheros wifi cards Date: Tue, 29 Dec 2015 16:19:02 -0600 Message-Id: <1451427542-30482-1-git-send-email-Jordan_Hargrave@dell.com> X-Mailer: git-send-email 1.7.1 To: Jordan_Hargrave@dell.com Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Attempt to read VPD on these cards causes kernel hang or delay Signed-off-by: Jordan Hargrave --- drivers/pci/quirks.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e6376f6..a72667f 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2161,6 +2161,16 @@ static void quirk_brcm_570x_limit_vpd(struct pci_dev *dev) } } +static void quirk_atheros_vpd(struct pci_dev *dev) +{ + /* Atheros WiFi cards hang when reading VPD */ + if (dev->vpd) + dev->vpd->len = 0; +} + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, quirk_atheros_vpd); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, PCI_ANY_ID, quirk_atheros_vpd); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, quirk_brcm_570x_limit_vpd);