From patchwork Wed Nov 22 05:30:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069807 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 5391360353 for ; Wed, 22 Nov 2017 05:50:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CC1F29ABA for ; Wed, 22 Nov 2017 05:50:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 405E029B48; Wed, 22 Nov 2017 05:50:54 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB3B129ABA for ; Wed, 22 Nov 2017 05:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=6O31/NuUG+RlSxTkZl6CfC9U6KozrxdJXLZuE0fC52o=; b=Qn+nNO3tJWAlP9xwwVyCuzm4Bf NcxlJZb/WPVqhkBellrYP4Rxc3p5/B3yv9FQYkU4T/pcAHGt0chO1Ku6pBzty9iwCy1rP2cze61gu mKQAayAfr/rFXKrrCfKEVgPBQHXokXrJJ8oxoLvBkSUnL83+8GeW3rFLscwJYtqoaFESEyjIa9h/2 OMR3u0MYfcTn5r3zRZPeFOYeSER9CRJhxuTbWgGdZfK2fYtAqkxjMHLGsCQvL7+TnFArsrZcfwZe4 5frxjpFuq2qFamAjWrMLyOKO/k9emY8fd8lE1iMZcMU1jEBers/cNPs/icsA0CSrAEuCwTJxWNizm FmSBcxJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eHNvm-00050I-1F; Wed, 22 Nov 2017 05:50:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNuI-0002Bb-9M for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 05:49:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=E5uitvd5bnKi2SFDK9KIrvsSH8tG50shOZaO5TCvP+4=; b=Ks2VwYRXH504XPgvnA5yjSHCE TSFgAPjYc/oIzAiOrEDkvWC8FyvDQ/zF73TYxaePpjJZAAoWV9PV1o4CP3z/P4LpZhi4B5A4Nm1Xe WtDyb8lLy6cGZwBj04WgKN4jCsHDlp46LCKoR4Z5Qn2bPdOb6gN3h5Eo01zK0O2cdJyCDL30MRCjm xJMvLdUIgl6huljYMoZZlx52WNKviJs/Q7SrgdWhA6QhuRyFWPyF38Uqk3kU2HAbDqjs6iVrITovw n25ZuhxQbxPRjIrm6UX6v9RXVK2EXSuDAnkSECvFNeoWfT0RLvdHu3frqxd2MDmEY9/dM7bnXQBBy o3ObsW+7w==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNeD-00082q-Mk for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:35 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 232546089E; Wed, 22 Nov 2017 05:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328731; bh=XsUjVqk4thK7GwM2NRCaX0NLaN4dN9y49k9rWh5ganU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCJbVppFGRPWQbcqVFqyRSDALk/bCKOnPJ6KyTU0PIEeRzfygGDTH2NyuZMfFawJR kCNmCxgIoUheUdFatqIPsOGF7UgIqPnn3+1wAaTnyr4kbi5yjfg/rYct2PL4/Y2Pdy zXGlWjIYqp/UdafUpty7hU+de+P37J335eXrPMxM= 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 5574D60913; Wed, 22 Nov 2017 05:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328719; bh=XsUjVqk4thK7GwM2NRCaX0NLaN4dN9y49k9rWh5ganU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XQOQAxuV0m04yv/DVv23nEkKjWTBTLKrjCLwzUmQ383Q8UjGa/DGDO//rmbruClTs sm/TBKDW4JBu1Nbbks6miKSJJPamgrH8hSYGKFkaVaW1FAxW1CfKf5p4e62hDGyhLw A+YflFWYnZS1HVTnCa1vM1sUHBNfTba3FLjfHv70= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5574D60913 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 Subject: [PATCH 13/30] iommu/amd: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:30:58 -0500 Message-Id: <1511328675-21981-14-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171122_053234_088900_46CA197A X-CRM114-Status: GOOD ( 15.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, Joerg Roedel , open list , Sinan Kaya , "open list:AMD IOMMU AMD-VI" , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- drivers/iommu/amd_iommu.c | 3 ++- drivers/iommu/amd_iommu_init.c | 10 ++++++---- drivers/iommu/amd_iommu_v2.c | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 8e8874d..2c3452f 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -528,7 +528,8 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id, struct iommu_dev_data *dev_data = NULL; struct pci_dev *pdev; - pdev = pci_get_bus_and_slot(PCI_BUS_NUM(devid), devid & 0xff); + pdev = pci_get_domain_bus_and_slot(0, PCI_BUS_NUM(devid), + devid & 0xff); if (pdev) dev_data = get_dev_data(&pdev->dev); diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 6fe2d03..8d159ff 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1697,8 +1697,8 @@ static int iommu_init_pci(struct amd_iommu *iommu) u32 range, misc, low, high; int ret; - iommu->dev = pci_get_bus_and_slot(PCI_BUS_NUM(iommu->devid), - iommu->devid & 0xff); + iommu->dev = pci_get_domain_bus_and_slot(0, PCI_BUS_NUM(iommu->devid), + iommu->devid & 0xff); if (!iommu->dev) return -ENODEV; @@ -1763,9 +1763,11 @@ static int iommu_init_pci(struct amd_iommu *iommu) if (is_rd890_iommu(iommu->dev)) { int i, j; + u16 busnr = iommu->dev->bus->number; + u16 devfn = PCI_DEVFN(0, 0); - iommu->root_pdev = pci_get_bus_and_slot(iommu->dev->bus->number, - PCI_DEVFN(0, 0)); + iommu->root_pdev = pci_get_domain_bus_and_slot(0, busnr, + devfn); /* * Some rd890 systems may not be fully reconfigured by the diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index 7d94e1d..8696382 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -564,7 +564,8 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) finish = (iommu_fault->tag >> 9) & 1; devid = iommu_fault->device_id; - pdev = pci_get_bus_and_slot(PCI_BUS_NUM(devid), devid & 0xff); + pdev = pci_get_domain_bus_and_slot(0, PCI_BUS_NUM(devid), + devid & 0xff); if (!pdev) return -ENODEV; dev_data = get_dev_data(&pdev->dev);