From patchwork Tue Jul 14 19:34:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6788631 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CED9B9F2F0 for ; Tue, 14 Jul 2015 19:34:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F37D520661 for ; Tue, 14 Jul 2015 19:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B3B420698 for ; Tue, 14 Jul 2015 19:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbbGNTek (ORCPT ); Tue, 14 Jul 2015 15:34:40 -0400 Received: from mail-ob0-f179.google.com ([209.85.214.179]:36649 "EHLO mail-ob0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbbGNTej (ORCPT ); Tue, 14 Jul 2015 15:34:39 -0400 Received: by obnw1 with SMTP id w1so12610590obn.3 for ; Tue, 14 Jul 2015 12:34:39 -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=pd23o17e1cbUhyUdBnWqJA3H1FglM2IrZetUmhEw+lE=; b=P8+JMqWSedEYRpJKNvrx0dyqRd0V/+Nl+TFz5at8bk0d5+5SoCd4UUTLhw+aeaPDTt SVJGHh/2ILCFUEq8iALWIkZUj3VeO9rwxQEU2o5pVf/n0lwrERTub5j0VlLdtmdE2yhk eeMNosy3nPXPu5NBojWhETgAxT3plogU1jTcbeEyb5MDdLKgA9PmJUkxYGaaa+5ppfCF Br/TmrkwJVeS3Fa89pjkuOtl89fK5mw7NjkoQZCgUU+bmpf/SfJiU2WuLfiiaRhMH8M+ BRQtaY62LPyHLaB+O5lzpTgRgkDG7eYNuMm24Q2edN8NprtY1VD1Ks2lPa3qxbAfcrUf FNjg== 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=pd23o17e1cbUhyUdBnWqJA3H1FglM2IrZetUmhEw+lE=; b=OdtoJrMQ/3wu3tPB7GhKHz7tEB8dxEUxyVOU36mLepjPZCjVK6qwWE47fgKT/gwUAk aAbKHbq2NQW1uVsBTJnOnLCfC9CpxUKXi5SiHkISkbOpB/puBNKoEV2FswWdZoBWwKla bqAwajPh42UrJjHaWpPBYJkQvEKQnzWIppZpGRajwIRX0qRpge7L9ajS3WZuxhWliLVi AiHZ6KqdMUh40tuVFOOlVzHnjyfNEBTXRhrd6X9s/FZEb+LipAVZMpPk5dUFpZIetmdR +tYIVcgsySqzfoYkpMD6nlmMu0b1mAeXdAHryjQrMR8xfby2HnuCkD+FYFmbIclhH16S bMwA== X-Gm-Message-State: ALoCoQkpnqp28jGKyUvur/4DTLd/iGKyuxKHQasf815V9zO350vHNIaAUgkciQWJkIRHwTokeb2E X-Received: by 10.60.78.197 with SMTP id d5mr146709oex.67.1436902479243; Tue, 14 Jul 2015 12:34:39 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id x82sm1010763oie.19.2015.07.14.12.34.37 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 Jul 2015 12:34:37 -0700 (PDT) Subject: [PATCH v2 1/5] PCI: Use PCI_CLASS_SERIAL_USB instead of bare number 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:34:36 -0500 Message-ID: <20150714193436.13224.8558.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=ham 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 be6646bfbaec ("PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD device") added a quirk to override the PCI class code of the AMD Nolan device. Use PCI_CLASS_SERIAL_USB instead of a bare number to improve greppability. Also add a log message about what we're doing. No functional change except the new message. Signed-off-by: Bjorn Helgaas Acked-by: Huang Rui CC: Jason Chang CC: Felipe Balbi --- drivers/pci/quirks.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 1b9fc4e..ecaad8f 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -424,10 +424,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_ */ static void quirk_amd_nl_class(struct pci_dev *pdev) { - /* - * Use 'USB Device' (0x0c03fe) instead of PCI header provided - */ - pdev->class = 0x0c03fe; + u32 class = pdev->class; + + /* Use "USB Device (not host controller)" class */ + pdev->class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe; + dev_info(&pdev->dev, "PCI class overridden (%#08x -> %#08x) so dwc3 driver can claim this instead of xhci\n", + class, pdev->class); } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB, quirk_amd_nl_class);