From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: David Airlie <airlied@linux.ie>,
linux-arm-msm@vger.kernel.org,
open list <linux-kernel@vger.kernel.org>,
Patrik Jakobsson <patrik.r.jakobsson@gmail.com>,
Sinan Kaya <okaya@codeaurora.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/30] drm/gma500: deprecate pci_get_bus_and_slot()
Date: Wed, 22 Nov 2017 00:30:53 -0500 [thread overview]
Message-ID: <1511328675-21981-9-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1511328675-21981-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.
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 <okaya@codeaurora.org>
---
drivers/gpu/drm/gma500/cdv_device.c | 4 ++--
drivers/gpu/drm/gma500/gma_device.c | 2 +-
drivers/gpu/drm/gma500/mid_bios.c | 8 +++++---
drivers/gpu/drm/gma500/psb_drv.c | 7 +++++--
drivers/gpu/drm/gma500/psb_drv.h | 8 ++++----
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 8745971..da9630f 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -189,7 +189,7 @@ static inline u32 CDV_MSG_READ32(uint port, uint offset)
{
int mcr = (0x10<<24) | (port << 16) | (offset << 8);
uint32_t ret_val = 0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_read_config_dword(pci_root, 0xD4, &ret_val);
pci_dev_put(pci_root);
@@ -199,7 +199,7 @@ static inline u32 CDV_MSG_READ32(uint port, uint offset)
static inline void CDV_MSG_WRITE32(uint port, uint offset, u32 value)
{
int mcr = (0x11<<24) | (port << 16) | (offset << 8) | 0xF0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD4, value);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_dev_put(pci_root);
diff --git a/drivers/gpu/drm/gma500/gma_device.c b/drivers/gpu/drm/gma500/gma_device.c
index 4a295f9..5dd5335 100644
--- a/drivers/gpu/drm/gma500/gma_device.c
+++ b/drivers/gpu/drm/gma500/gma_device.c
@@ -19,7 +19,7 @@
void gma_get_core_freq(struct drm_device *dev)
{
uint32_t clock;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
struct drm_psb_private *dev_priv = dev->dev_private;
/*pci_write_config_dword(pci_root, 0xD4, 0x00C32004);*/
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index d75ecb3..fed2c7a 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -32,7 +32,7 @@
static void mid_get_fuse_settings(struct drm_device *dev)
{
struct drm_psb_private *dev_priv = dev->dev_private;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
uint32_t fuse_value = 0;
uint32_t fuse_value_tmp = 0;
@@ -104,7 +104,8 @@ static void mid_get_fuse_settings(struct drm_device *dev)
static void mid_get_pci_revID(struct drm_psb_private *dev_priv)
{
uint32_t platform_rev_id = 0;
- struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
+ uint16_t devfn = PCI_DEVFN(2, 0);
+ struct pci_dev *pci_gfx_root = pci_get_domain_bus_and_slot(0, 0, devfn);
if (pci_gfx_root == NULL) {
WARN_ON(1);
@@ -281,7 +282,8 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
u32 addr;
u8 __iomem *vbt_virtual;
struct mid_vbt_header vbt_header;
- struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
+ uint16_t devfn = PCI_DEVFN(2, 0);
+ struct pci_dev *pci_gfx_root = pci_get_domain_bus_and_slot(0, 0, devfn);
int ret = -1;
/* Get the address of the platform config vbt */
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 37a3be7..5327729 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -261,7 +261,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
goto out_err;
if (IS_MRST(dev)) {
- dev_priv->aux_pdev = pci_get_bus_and_slot(0, PCI_DEVFN(3, 0));
+ uint16_t devfn = PCI_DEVFN(3, 0);
+
+ dev_priv->aux_pdev = pci_get_domain_bus_and_slot(0, 0, devfn);
if (dev_priv->aux_pdev) {
resource_start = pci_resource_start(dev_priv->aux_pdev,
@@ -281,7 +283,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
}
dev_priv->gmbus_reg = dev_priv->aux_reg;
- dev_priv->lpc_pdev = pci_get_bus_and_slot(0, PCI_DEVFN(31, 0));
+ devfn = PCI_DEVFN(31, 0);
+ dev_priv->lpc_pdev = pci_get_domain_bus_and_slot(0, 0, devfn);
if (dev_priv->lpc_pdev) {
pci_read_config_word(dev_priv->lpc_pdev, PSB_LPC_GBA,
&dev_priv->lpc_gpio_base);
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 821497d..0959191 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -785,7 +785,7 @@ static inline u32 MRST_MSG_READ32(uint port, uint offset)
{
int mcr = (0xD0<<24) | (port << 16) | (offset << 8);
uint32_t ret_val = 0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_read_config_dword(pci_root, 0xD4, &ret_val);
pci_dev_put(pci_root);
@@ -794,7 +794,7 @@ static inline u32 MRST_MSG_READ32(uint port, uint offset)
static inline void MRST_MSG_WRITE32(uint port, uint offset, u32 value)
{
int mcr = (0xE0<<24) | (port << 16) | (offset << 8) | 0xF0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD4, value);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_dev_put(pci_root);
@@ -803,7 +803,7 @@ static inline u32 MDFLD_MSG_READ32(uint port, uint offset)
{
int mcr = (0x10<<24) | (port << 16) | (offset << 8);
uint32_t ret_val = 0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_read_config_dword(pci_root, 0xD4, &ret_val);
pci_dev_put(pci_root);
@@ -812,7 +812,7 @@ static inline u32 MDFLD_MSG_READ32(uint port, uint offset)
static inline void MDFLD_MSG_WRITE32(uint port, uint offset, u32 value)
{
int mcr = (0x11<<24) | (port << 16) | (offset << 8) | 0xF0;
- struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
+ struct pci_dev *pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
pci_write_config_dword(pci_root, 0xD4, value);
pci_write_config_dword(pci_root, 0xD0, mcr);
pci_dev_put(pci_root);
--
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 5:30 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-22 5:30 [PATCH 00/30] PCI: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-11-22 5:30 ` [PATCH 01/30] alpha/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 02/30] powerpc/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 03/30] x86/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 04/30] ata: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 05/30] agp: nvidia: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 06/30] edd: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 07/30] ibft: " Sinan Kaya
2017-11-22 5:30 ` Sinan Kaya [this message]
2017-11-22 5:30 ` [PATCH 09/30] drm/i915: " Sinan Kaya
2017-11-22 7:52 ` Joonas Lahtinen
2017-11-22 16:28 ` Sinan Kaya
2017-11-22 19:50 ` Jani Nikula
2017-11-22 19:58 ` Timur Tabi
2017-11-23 7:14 ` Jani Nikula
2017-11-23 7:42 ` Joonas Lahtinen
2017-11-23 18:37 ` Sinan Kaya
2017-11-27 8:56 ` Joonas Lahtinen
2017-11-27 14:05 ` Sinan Kaya
2017-11-22 5:30 ` [PATCH 10/30] drm/nouveau: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 11/30] hwmon: (coretemp) " Sinan Kaya
2017-11-22 15:07 ` [11/30] " Guenter Roeck
2017-11-22 5:30 ` [PATCH 12/30] Drivers: ide: " Sinan Kaya
2017-11-22 7:53 ` Greg KH
2017-11-22 16:24 ` Sinan Kaya
2017-11-22 5:30 ` [PATCH 13/30] iommu/amd: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 14/30] powerpc/powermac: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 15/30] bnx2x: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 16/30] pch_gbe: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 17/30] PCI: cpqhp: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 18/30] PCI: ibmphp: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 19/30] PCI/quirks: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 20/30] PCI/syscall: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 21/30] xen: " Sinan Kaya
2017-11-22 12:53 ` Juergen Gross
2017-11-22 5:31 ` [PATCH 22/30] openprom: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 23/30] [media] atomisp: " Sinan Kaya
2017-11-22 12:20 ` Alan Cox
2017-11-22 14:05 ` Sinan Kaya
2017-11-22 14:06 ` Sinan Kaya
2017-11-22 5:31 ` [PATCH 24/30] staging: rts5208: " Sinan Kaya
2017-11-22 7:54 ` Greg Kroah-Hartman
2017-11-22 5:31 ` [PATCH 25/30] backlight: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 26/30] video: fbdev: intelfb: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 27/30] video: fbdev: nvidia: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 28/30] video: fbdev: riva: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 29/30] i7300_idle: " Sinan Kaya
2017-11-22 7:53 ` Greg Kroah-Hartman
2017-11-22 16:15 ` Sinan Kaya
2017-11-22 16:45 ` Greg Kroah-Hartman
2017-11-22 16:50 ` Sinan Kaya
2017-11-22 16:58 ` Greg Kroah-Hartman
2017-11-22 5:31 ` [PATCH 30/30] PCI: remove pci_get_bus_and_slot() function Sinan Kaya
2017-11-22 5:45 ` Timur Tabi
2017-11-22 5:55 ` Sinan Kaya
2017-11-22 6:08 ` Timur Tabi
2017-11-22 7:51 ` Greg KH
2017-11-22 14:42 ` Timur Tabi
2017-11-22 14:49 ` Greg KH
2017-11-22 15:18 ` 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=1511328675-21981-9-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=airlied@linux.ie \
--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=patrik.r.jakobsson@gmail.com \
--cc=timur@codeaurora.org \
/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).