From patchwork Wed Nov 22 05:30:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069783 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6EF676038F for ; Wed, 22 Nov 2017 05:40:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B34129AE2 for ; Wed, 22 Nov 2017 05:40:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6031829AE7; Wed, 22 Nov 2017 05:40:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A6D429AE2 for ; Wed, 22 Nov 2017 05:40:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751781AbdKVFkH (ORCPT ); Wed, 22 Nov 2017 00:40:07 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36708 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751384AbdKVFbb (ORCPT ); Wed, 22 Nov 2017 00:31:31 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 8ABD660865; Wed, 22 Nov 2017 05:31:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328690; bh=M8NMUzgKwwdzwtujBiL5CQCkNrNDWSlRgyARkhC67Sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OlWacETnowVQ8VRYh2CBh/6xSySHPDyemXf7zp+ZftJokQN7vvTjveNTbsuQZ+HGV XvQQRj9XRPoUsSaLO5pkMwbRpQvxEHORjZfF7TR/50fYvd3xfU56SwpJQCjQHBN/40 zVxQScurseUfObGmgsCkd3oVSOGk8h/GLN2ydA6s= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D23E16084A; Wed, 22 Nov 2017 05:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328689; bh=M8NMUzgKwwdzwtujBiL5CQCkNrNDWSlRgyARkhC67Sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VRFeE36I9Ce+rAXPkOPn/8HOvMsD04r0waOv+kHwGdsphD/utUKKaVi3L7zRGwlyf P0bxDZ2qNapEnlQuOJfxOpmxZiy1yqjv6V2yzsWBkAQ8Zy+7k/EZdwNy8D1dRy2d91 M+EuObNxGsHyAWogHk/v1cIK7RSC7UJNhZ0L6RFM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D23E16084A Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH 03/30] x86/PCI: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:30:48 -0500 Message-Id: <1511328675-21981-4-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> References: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't extract the domain number. Other places, use the actual domain number from the device. Signed-off-by: Sinan Kaya --- arch/x86/pci/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 04526291..52e5510 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -839,7 +839,8 @@ static void __init pirq_find_router(struct irq_router *r) DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for [%04x:%04x]\n", rt->rtr_vendor, rt->rtr_device); - pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn); + pirq_router_dev = pci_get_domain_bus_and_slot(0, rt->rtr_bus, + rt->rtr_devfn); if (!pirq_router_dev) { DBG(KERN_DEBUG "PCI: Interrupt router not found at " "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);