From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Patrik Jakobsson <patrik.r.jakobsson@gmail.com>,
David Airlie <airlied@linux.ie>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH V4 08/26] drm/gma500: deprecate pci_get_bus_and_slot()
Date: Thu, 4 Jan 2018 07:27:18 -0500 [thread overview]
Message-ID: <3a650c54-1c7f-ac00-de00-55d5c62d0abd@codeaurora.org> (raw)
In-Reply-To: <1513661883-28662-9-git-send-email-okaya@codeaurora.org>
On 12/19/2017 12:37 AM, Sinan Kaya wrote:
> 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().
>
> Add domain parameter to CDV_MSG_READ32, CDV_MSG_WRITE32, MRST_MSG_READ32,
> MRST_MSG_WRITE32, MDFLD_MSG_READ32, MDFLD_MSG_WRITE32.
>
> Extract pci_dev from struct drm_device and use pdev to find the domain
> number while calling pci_get_domain_bus_and_slot().
>
> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> ---
> drivers/gpu/drm/gma500/cdv_device.c | 16 +++++++++-------
> drivers/gpu/drm/gma500/gma_device.c | 4 +++-
> drivers/gpu/drm/gma500/mid_bios.c | 12 +++++++++---
> drivers/gpu/drm/gma500/psb_drv.c | 10 ++++++++--
> drivers/gpu/drm/gma500/psb_drv.h | 18 ++++++++++--------
> 5 files changed, 39 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
> index 8745971..3a3bf75 100644
> --- a/drivers/gpu/drm/gma500/cdv_device.c
> +++ b/drivers/gpu/drm/gma500/cdv_device.c
> @@ -185,21 +185,22 @@ static int cdv_backlight_init(struct drm_device *dev)
> * for this and the MID devices.
> */
>
> -static inline u32 CDV_MSG_READ32(uint port, uint offset)
> +static inline u32 CDV_MSG_READ32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_read_config_dword(pci_root, 0xD4, &ret_val);
> pci_dev_put(pci_root);
> return ret_val;
> }
>
> -static inline void CDV_MSG_WRITE32(uint port, uint offset, u32 value)
> +static inline void CDV_MSG_WRITE32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD4, value);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_dev_put(pci_root);
> @@ -216,11 +217,12 @@ static void cdv_init_pm(struct drm_device *dev)
> {
> struct drm_psb_private *dev_priv = dev->dev_private;
> u32 pwr_cnt;
> + int domain = pci_domain_nr(dev->pdev->bus);
> int i;
>
> - dev_priv->apm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,
> + dev_priv->apm_base = CDV_MSG_READ32(domain, PSB_PUNIT_PORT,
> PSB_APMBA) & 0xFFFF;
> - dev_priv->ospm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,
> + dev_priv->ospm_base = CDV_MSG_READ32(domain, PSB_PUNIT_PORT,
> PSB_OSPMBA) & 0xFFFF;
>
> /* Power status */
> @@ -251,7 +253,7 @@ static void cdv_errata(struct drm_device *dev)
> * Bonus Launch to work around the issue, by degrading
> * performance.
> */
> - CDV_MSG_WRITE32(3, 0x30, 0x08027108);
> + CDV_MSG_WRITE32(pci_domain_nr(dev->pdev->bus), 3, 0x30, 0x08027108);
> }
>
> /**
> diff --git a/drivers/gpu/drm/gma500/gma_device.c b/drivers/gpu/drm/gma500/gma_device.c
> index 4a295f9..a7fb6de 100644
> --- a/drivers/gpu/drm/gma500/gma_device.c
> +++ b/drivers/gpu/drm/gma500/gma_device.c
> @@ -19,7 +19,9 @@
> 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(pci_domain_nr(dev->pdev->bus),
> + 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 1fa1633..7171b74 100644
> --- a/drivers/gpu/drm/gma500/mid_bios.c
> +++ b/drivers/gpu/drm/gma500/mid_bios.c
> @@ -32,7 +32,9 @@
> 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(pci_domain_nr(dev->pdev->bus),
> + 0, 0);
> uint32_t fuse_value = 0;
> uint32_t fuse_value_tmp = 0;
>
> @@ -104,7 +106,9 @@ 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));
> + int domain = pci_domain_nr(dev_priv->dev->pdev->bus);
> + struct pci_dev *pci_gfx_root =
> + pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(2, 0));
>
> if (pci_gfx_root == NULL) {
> WARN_ON(1);
> @@ -281,7 +285,9 @@ 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));
> + struct pci_dev *pci_gfx_root =
> + pci_get_domain_bus_and_slot(pci_domain_nr(dev->pdev->bus),
> + 0, PCI_DEVFN(2, 0));
> 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 38d09d4..ac32ab5 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.c
> +++ b/drivers/gpu/drm/gma500/psb_drv.c
> @@ -248,7 +248,11 @@ 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));
> + int domain = pci_domain_nr(dev->pdev->bus);
> +
> + dev_priv->aux_pdev =
> + pci_get_domain_bus_and_slot(domain, 0,
> + PCI_DEVFN(3, 0));
>
> if (dev_priv->aux_pdev) {
> resource_start = pci_resource_start(dev_priv->aux_pdev,
> @@ -268,7 +272,9 @@ 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));
> + dev_priv->lpc_pdev =
> + pci_get_domain_bus_and_slot(domain, 0,
> + PCI_DEVFN(31, 0));
> 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 4918efc..e8300f5 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_drv.h
> @@ -780,38 +780,40 @@ extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
> extern int drm_idle_check_interval;
>
> /* Utilities */
> -static inline u32 MRST_MSG_READ32(uint port, uint offset)
> +static inline u32 MRST_MSG_READ32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_read_config_dword(pci_root, 0xD4, &ret_val);
> pci_dev_put(pci_root);
> return ret_val;
> }
> -static inline void MRST_MSG_WRITE32(uint port, uint offset, u32 value)
> +static inline void MRST_MSG_WRITE32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD4, value);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_dev_put(pci_root);
> }
> -static inline u32 MDFLD_MSG_READ32(uint port, uint offset)
> +static inline u32 MDFLD_MSG_READ32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_read_config_dword(pci_root, 0xD4, &ret_val);
> pci_dev_put(pci_root);
> return ret_val;
> }
> -static inline void MDFLD_MSG_WRITE32(uint port, uint offset, u32 value)
> +static inline void MDFLD_MSG_WRITE32(int domain, 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(domain, 0, 0);
> pci_write_config_dword(pci_root, 0xD4, value);
> pci_write_config_dword(pci_root, 0xD0, mcr);
> pci_dev_put(pci_root);
>
Any feedback here? I don't have any hardware to test the changes. I just did a compile test.
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2018-01-04 12:27 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 5:37 [PATCH V4 00/26] PCI: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 01/26] alpha/PCI: " Sinan Kaya
2018-01-03 12:43 ` Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 02/26] powerpc/PCI: " Sinan Kaya
2017-12-19 10:29 ` Michael Ellerman
2017-12-19 12:24 ` Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 03/26] x86/PCI: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 04/26] ata: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 05/26] agp: nvidia: " Sinan Kaya
2018-01-03 12:44 ` Sinan Kaya
2018-01-29 21:43 ` Dave Airlie
2018-01-29 22:01 ` Sinan Kaya
2018-01-29 22:38 ` Bjorn Helgaas
2018-01-29 22:43 ` Dave Airlie
2017-12-19 5:37 ` [PATCH V4 06/26] edd: " Sinan Kaya
2018-01-03 12:48 ` Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 07/26] ibft: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 08/26] drm/gma500: " Sinan Kaya
2018-01-04 12:27 ` Sinan Kaya [this message]
[not found] ` <1513661883-28662-1-git-send-email-okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-12-19 5:37 ` [PATCH V4 09/26] drm/nouveau: " Sinan Kaya
2018-01-04 12:26 ` Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 11/26] iommu/amd: " Sinan Kaya
2018-01-04 12:25 ` Sinan Kaya
[not found] ` <8a5dad82-2886-2a51-28bc-b84ab253c361-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-01-04 16:28 ` Gary R Hook
2018-01-04 16:32 ` Sinan Kaya
2018-01-04 17:25 ` Gary R Hook
2018-01-17 13:02 ` Joerg Roedel
2017-12-19 5:37 ` [PATCH V4 10/26] Drivers: ide: " Sinan Kaya
2017-12-19 14:13 ` David Miller
2017-12-19 5:37 ` [PATCH V4 12/26] powerpc/powermac: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 13/26] bnx2x: " Sinan Kaya
2017-12-19 14:14 ` David Miller
2017-12-19 5:37 ` [PATCH V4 14/26] pch_gbe: " Sinan Kaya
2017-12-19 10:45 ` Andy Shevchenko
2017-12-19 12:17 ` Sinan Kaya
2017-12-19 13:24 ` Andy Shevchenko
2017-12-19 14:53 ` David Miller
2017-12-19 14:13 ` David Miller
2017-12-19 5:37 ` [PATCH V4 15/26] PCI: cpqhp: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 16/26] PCI: ibmphp: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 17/26] PCI/quirks: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 18/26] PCI/syscall: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 19/26] xen: " Sinan Kaya
2017-12-19 5:37 ` [PATCH V4 20/26] openprom: " Sinan Kaya
2017-12-19 14:13 ` David Miller
2017-12-19 5:37 ` [PATCH V4 21/26] backlight: " Sinan Kaya
2017-12-19 8:51 ` Lee Jones
2017-12-19 5:37 ` [PATCH V4 22/26] video: fbdev: intelfb: " Sinan Kaya
2018-01-02 13:38 ` Sinan Kaya
2018-01-03 11:18 ` Bartlomiej Zolnierkiewicz
2017-12-19 5:37 ` [PATCH V4 23/26] video: fbdev: nvidia: " Sinan Kaya
2018-01-02 13:38 ` Sinan Kaya
2018-01-03 11:18 ` Bartlomiej Zolnierkiewicz
2017-12-19 5:38 ` [PATCH V4 24/26] video: fbdev: riva: " Sinan Kaya
2018-01-02 13:37 ` Sinan Kaya
2018-01-03 11:18 ` Bartlomiej Zolnierkiewicz
2017-12-19 5:38 ` [PATCH V4 25/26] i7300_idle: remove unused file Sinan Kaya
2018-01-02 13:36 ` Sinan Kaya
2018-01-02 13:44 ` Greg Kroah-Hartman
2017-12-19 5:38 ` [PATCH V4 26/26] PCI: Remove pci_get_bus_and_slot() function Sinan Kaya
2018-02-16 14:55 ` Bjorn Helgaas
2018-01-11 23:57 ` [PATCH V4 00/26] PCI: deprecate pci_get_bus_and_slot() Bjorn Helgaas
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=3a650c54-1c7f-ac00-de00-55d5c62d0abd@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