From patchwork Tue Jul 14 19:34:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6788651 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 D4DDD9F2F0 for ; Tue, 14 Jul 2015 19:35:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D38C20709 for ; Tue, 14 Jul 2015 19:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 290C8206BD for ; Tue, 14 Jul 2015 19:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752436AbbGNTe5 (ORCPT ); Tue, 14 Jul 2015 15:34:57 -0400 Received: from mail-oi0-f44.google.com ([209.85.218.44]:33672 "EHLO mail-oi0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301AbbGNTe4 (ORCPT ); Tue, 14 Jul 2015 15:34:56 -0400 Received: by oige126 with SMTP id e126so13711907oig.0 for ; Tue, 14 Jul 2015 12:34:56 -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=Hf/yPYLZjspL69T9AJcmpX4IzVQ5ts+fsdmr34DWNa0=; b=pBSXWavUneXnGABidyiTwqFt3HhaFbEIUwR7cb5bc3h4/lwaGJVr2wqbGsG396KyIP JtnH7o/PgnqfQ5ktsR9fnVcztnoE3twvqSkY5AHSH6E8zl+yK/ngpR/ND/Tanu3/Gzrq Ok98c0c4kDonywK0YHnRJcYwhftpQ1XJpTems2/R/OElA0xnmnHkIo7BMTafCDzKrvBi EKnui4dfjpljxY8++Oza+t1D5PlVSNnNiw3OeJGnJhV5WRsVoHB6IMz0ywSHD+0OdAJU smyZP7tJIycpFvKqFE9QQIsjaQTu8GRFwV6k1rq7lpbLfBYXmkvwpDcrH27i8O/L/NRO 8tMg== 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=Hf/yPYLZjspL69T9AJcmpX4IzVQ5ts+fsdmr34DWNa0=; b=VIdVE2UBUMSwqJeGRTLdAY7cLc56j7++2x+40XqEnzoFbz4OEqcmlXpqbEMCkHzOBa srG2/fL+BNj0BANbABfbxWlKG+cfFE/S4JUDKKVrkpyiC/F8ndtbk410G42GfdXtItSj c2Cfk3BVko4lRXKOkjPxTCIBvoBeUwyX35hyTlnP7NHDbZzTKSJsCqDiS9njt0Z/EtZK DGzwHJcmJeOhJahPY3raZXA2JWqQfo7piRHf77qHBRAxXY7vto8noV3ZiM46l/nbl/Yh p/k0GPJg/J1PQm41VRk2ucrd7Wvj0sQtbfxZI/0MYLpQyiML1UKV0jikh27rfcuk61c+ +t4w== X-Gm-Message-State: ALoCoQnAHdDj/MYdrqjmyLjXMQTSdPGaJDbPyUGZphtibyjxuBrAgQWlZ3oPQwhlFt1HT9UH0UXa X-Received: by 10.202.229.66 with SMTP id c63mr166882oih.57.1436902496332; Tue, 14 Jul 2015 12:34:56 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id f3sm1013743obm.18.2015.07.14.12.34.54 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 Jul 2015 12:34:55 -0700 (PDT) Subject: [PATCH v2 3/5] PCI: Fix TI816X class code quirk 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:52 -0500 Message-ID: <20150714193452.13224.5892.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 In fixup_ti816x_class(), we assigned "class = PCI_CLASS_MULTIMEDIA_VIDEO". But PCI_CLASS_MULTIMEDIA_VIDEO is only the two-byte base class/sub-class and needs to be shifted to make space for the low-order interface byte. Shift PCI_CLASS_MULTIMEDIA_VIDEO to set the correct class code. Fixes: 63c4408074cb ("PCI: Add quirk for setting valid class for TI816X Endpoint") Signed-off-by: Bjorn Helgaas CC: Hemant Pedanekar --- drivers/pci/quirks.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 afc8151..9734b42 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2835,12 +2835,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors); static void fixup_ti816x_class(struct pci_dev *dev) { + u32 class = dev->class; + /* TI 816x devices do not have class code set when in PCIe boot mode */ - dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n"); - dev->class = PCI_CLASS_MULTIMEDIA_VIDEO; + dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8; + dev_info(&dev->dev, "PCI class overridden (%#08x -> %#08x)\n", + class, dev->class); } DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800, - PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class); + PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class); /* Some PCIe devices do not work reliably with the claimed maximum * payload size supported.