From patchwork Tue Jul 14 19:35:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6788661 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 3894BC05AC for ; Tue, 14 Jul 2015 19:35:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55F3B20709 for ; Tue, 14 Jul 2015 19:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CA87206BD for ; Tue, 14 Jul 2015 19:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752506AbbGNTfG (ORCPT ); Tue, 14 Jul 2015 15:35:06 -0400 Received: from mail-ob0-f169.google.com ([209.85.214.169]:35877 "EHLO mail-ob0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301AbbGNTfF (ORCPT ); Tue, 14 Jul 2015 15:35:05 -0400 Received: by obnw1 with SMTP id w1so12617626obn.3 for ; Tue, 14 Jul 2015 12:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=q5yhB4kde9ZUy+TKVVhDv93tLGh02DRIS71E36wGFs8=; b=XZ1I48Ac0KnCQWdyZSwnGdH2sDF5d9zVyZ+0ukm4cX7d3HuXynoGx/96EFwK6H713J 2ds41c4jq+OpFIVVgQxsFjwMEiBdVZWZF85YQiIGnsLW6Z5QYrG8yAoKlMxRwipVF3M5 UuBvmuVDqJtrQMkRvPRXbdITqpwRBeW0LEBWkPp8jHJ5jVHFtOKo0JtAw8MtxDfRidu+ 3J+pnElWzI5xw9pJ+zb+xUwNW3XMVimObBXV/Q+eivjLM5qP1vDISqY8J/5EEacBIg2D poOMqpsxxGfDozr0QYCwW3TKJc43hVsmYmhfwcQiOIf5Tu2+PeLNUfRXK0R4Vp3+jADU u5Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=q5yhB4kde9ZUy+TKVVhDv93tLGh02DRIS71E36wGFs8=; b=bRocHkk6Im5SD0Is1krYk+ZBP9R0yH9lU7RKOxG4+PmfPn0UasLaJviLDU0Kq41gKf fYSEPvwAyGZlt8b1lnFiVDaiM5cZ/h3HLpVGhilOaeQTAJ0sjQqoyRO2CkIZNWBghiBT igJPSiA8LNIedv+QFtbjHsc7CX2O5UJuQ7es4TcRP9PY4A+pusozd/txLb4Spmc4L5Wr +BZezkTN5JCf3Q36xdA30+4SnP+u0Wst7U4vdAIgK4MpFvFWNeN/fJ6WIGDR/yCOZBtZ xEHl5Am4Q3/mt7el95yO9oNmg+WzgDLNuyGM1XkXhTtxo1i6oLV4cyNe1cWnyzlsmrRI 39iA== X-Gm-Message-State: ALoCoQm1dpDf6N/C6VMBPnk4hO2jA51F2IAfF7LPAWfJNZvuaI8Cq5gk+qUQUmaQVJYzYnhsnlaR X-Received: by 10.202.204.78 with SMTP id c75mr223202oig.12.1436902504335; Tue, 14 Jul 2015 12:35:04 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id f8sm1004339obv.25.2015.07.14.12.35.02 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 Jul 2015 12:35:03 -0700 (PDT) Subject: [PATCH v2 4/5] PCI: Revert aeb30016fec3 ("PCI: add Intel USB specific reset method") To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Mathias Nyman , x86@kernel.org, Felipe Balbi , Yu Zhao , Huang Rui , Krzysztof =?utf-8?q?Ha=C5=82asa?= , Matthew Wilcox , Jason Chang Date: Tue, 14 Jul 2015 14:35:01 -0500 Message-ID: <20150714193501.13224.74481.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150714193153.13224.40528.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150714193153.13224.40528.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, 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 Revert aeb30016fec3 ("PCI: add Intel USB specific reset method"). We checked for "dev->class == PCI_CLASS_SERIAL_USB", but dev->class contains the entire three-byte base class/sub-class/interface, while PCI_CLASS_SERIAL_USB is only the two-byte base class/sub-class. This error meant that we used the Intel device-specific reset on devices with class code 0x000c03 instead of those with class code 0x0c03xx. 0x000c03 is a reserved value in the 0x00 backwards compatibility base class and shouldn't match any devices, so I think reset_intel_generic_dev() always failed. I considered adding a shift, but I can't test it, so it's as likely to break something as to fix something. Signed-off-by: Bjorn Helgaas CC: Yu Zhao CC: Mathias Nyman --- drivers/pci/quirks.c | 24 ------------------------ 1 file changed, 24 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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 9734b42..35f8d40 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3344,28 +3344,6 @@ fs_initcall_sync(pci_apply_final_quirks); * reset a single function if other methods (e.g. FLR, PM D0->D3) are * not available. */ -static int reset_intel_generic_dev(struct pci_dev *dev, int probe) -{ - int pos; - - /* only implement PCI_CLASS_SERIAL_USB at present */ - if (dev->class == PCI_CLASS_SERIAL_USB) { - pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); - if (!pos) - return -ENOTTY; - - if (probe) - return 0; - - pci_write_config_byte(dev, pos + 0x4, 1); - msleep(100); - - return 0; - } else { - return -ENOTTY; - } -} - static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe) { /* @@ -3524,8 +3502,6 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = { reset_ivb_igd }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_M2_VGA, reset_ivb_igd }, - { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, - reset_intel_generic_dev }, { PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID, reset_chelsio_generic_dev }, { 0 }