From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: Rob Herring <robh@kernel.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linux-arm-msm@vger.kernel.org,
open list <linux-kernel@vger.kernel.org>,
Sinan Kaya <okaya@codeaurora.org>,
Bhumika Goyal <bhumirks@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Tyrel Datwyler <tyreld@linux.vnet.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
"open list:LINUX FOR POWERPC 32-BIT AND 64-BIT"
<linuxppc-dev@lists.ozlabs.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 02/29] powerpc/PCI: deprecate pci_get_bus_and_slot()
Date: Wed, 22 Nov 2017 17:48:57 -0500 [thread overview]
Message-ID: <1511390964-9979-3-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1511390964-9979-1-git-send-email-okaya@codeaurora.org>
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.
Getting ready to remove pci_get_bus_and_slot() function in favor of
pci_get_domain_bus_and_slot().
Use pci_get_domain_bus_and_slot() with a domain number of 0 as the code
is not ready to consume multiple domains and existing code used domain
number 0.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
arch/powerpc/kernel/pci_32.c | 3 ++-
arch/powerpc/platforms/powermac/feature.c | 2 +-
arch/powerpc/sysdev/mv64x60_pci.c | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 1d817f4..85ad2f7 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -96,7 +96,8 @@
reg = of_get_property(node, "reg", NULL);
if (!reg)
continue;
- dev = pci_get_bus_and_slot(pci_bus, ((reg[0] >> 8) & 0xff));
+ dev = pci_get_domain_bus_and_slot(0, pci_bus,
+ ((reg[0] >> 8) & 0xff));
if (!dev || !dev->subordinate) {
pci_dev_put(dev);
continue;
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 9e3f39d..ed8b166 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -829,7 +829,7 @@ static long core99_scc_enable(struct device_node *node, long param, long value)
if (value) {
if (pci_device_from_OF_node(node, &pbus, &pid) == 0)
- pdev = pci_get_bus_and_slot(pbus, pid);
+ pdev = pci_get_domain_bus_and_slot(0, pbus, pid);
if (pdev == NULL)
return 0;
rc = pci_enable_device(pdev);
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index d52b3b8..6fe9104 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -37,7 +37,7 @@ static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj,
if (count < MV64X60_VAL_LEN_MAX)
return -EINVAL;
- phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+ phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
if (!phb)
return -ENODEV;
pci_read_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, &v);
@@ -61,7 +61,7 @@ static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj,
if (sscanf(buf, "%i", &v) != 1)
return -EINVAL;
- phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+ phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
if (!phb)
return -ENODEV;
pci_write_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, v);
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2017-11-22 22:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-22 22:48 [PATCH V2 00/29] PCI: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-11-22 22:48 ` [PATCH V2 01/29] alpha/PCI: " Sinan Kaya
2017-11-22 22:48 ` Sinan Kaya [this message]
2017-11-22 22:48 ` [PATCH V2 03/29] x86/PCI: " Sinan Kaya
2017-11-22 22:48 ` [PATCH V2 04/29] ata: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 05/29] agp: nvidia: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 06/29] edd: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 07/29] ibft: " Sinan Kaya
2017-11-24 13:29 ` Konrad Rzeszutek Wilk
2017-11-22 22:49 ` [PATCH V2 08/29] drm/gma500: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 09/29] drm/i915: " Sinan Kaya
2017-11-22 23:25 ` Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 10/29] drm/nouveau: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 11/29] Drivers: ide: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 12/29] iommu/amd: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 13/29] powerpc/powermac: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 14/29] bnx2x: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 15/29] pch_gbe: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 16/29] PCI: cpqhp: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 17/29] PCI: ibmphp: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 18/29] PCI/quirks: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 19/29] PCI/syscall: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 20/29] xen: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 21/29] openprom: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 22/29] [media] atomisp: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 23/29] staging: rts5208: " Sinan Kaya
2017-11-24 14:58 ` Greg Kroah-Hartman
2017-11-22 22:49 ` [PATCH V2 24/29] backlight: " Sinan Kaya
2017-11-23 12:11 ` Daniel Thompson
2017-11-22 22:49 ` [PATCH V2 25/29] video: fbdev: intelfb: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 26/29] video: fbdev: nvidia: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 27/29] video: fbdev: riva: " Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 28/29] i7300_idle: remove unused file Sinan Kaya
2017-11-22 22:49 ` [PATCH V2 29/29] PCI: remove pci_get_bus_and_slot() function Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1511390964-9979-3-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=benh@kernel.crashing.org \
--cc=bhumirks@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robh@kernel.org \
--cc=timur@codeaurora.org \
--cc=tyreld@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).