From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Paul Durrant" <paul@xen.org>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Rahul Singh" <Rahul.Singh@arm.com>
Subject: [PATCH v2 3/3] PCI: bring pci_get_real_pdev() in line with pci_get_pdev()
Date: Thu, 11 Aug 2022 12:52:30 +0200 [thread overview]
Message-ID: <b8a5294a-6869-121b-cd67-0740e6330769@suse.com> (raw)
In-Reply-To: <5379b4bb-76c9-d7be-4bd7-2f75dde470a8@suse.com>
Fold the three parameters into a single pci_sbdf_t one.
No functional change intended, despite the "(8 - stride)" ->
"stride" replacement (not really sure why it was written the more
complicated way originally).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v2: New.
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -639,8 +639,7 @@ static void cf_check parse_ppr_log_entry
struct pci_dev *pdev;
pcidevs_lock();
- pdev = pci_get_real_pdev(iommu->seg, PCI_BUS(device_id),
- PCI_DEVFN(device_id));
+ pdev = pci_get_real_pdev(PCI_SBDF(iommu->seg, device_id));
pcidevs_unlock();
if ( pdev )
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -576,20 +576,18 @@ int __init pci_ro_device(int seg, int bu
return 0;
}
-struct pci_dev *pci_get_real_pdev(int seg, int bus, int devfn)
+struct pci_dev *pci_get_real_pdev(pci_sbdf_t sbdf)
{
struct pci_dev *pdev;
int stride;
- if ( seg < 0 || bus < 0 || devfn < 0 )
- return NULL;
-
- for ( pdev = pci_get_pdev(NULL, PCI_SBDF(seg, bus, devfn)), stride = 4;
+ for ( pdev = pci_get_pdev(NULL, sbdf), stride = 4;
!pdev && stride; stride >>= 1 )
{
- if ( !(devfn & (8 - stride)) )
+ if ( !(sbdf.devfn & stride) )
continue;
- pdev = pci_get_pdev(NULL, PCI_SBDF(seg, bus, devfn & ~(8 - stride)));
+ sbdf.devfn &= ~stride;
+ pdev = pci_get_pdev(NULL, sbdf);
if ( pdev && stride != pdev->phantom_stride )
pdev = NULL;
}
@@ -1074,7 +1072,7 @@ void pci_check_disable_device(u16 seg, u
u16 cword;
pcidevs_lock();
- pdev = pci_get_real_pdev(seg, bus, devfn);
+ pdev = pci_get_real_pdev(PCI_SBDF(seg, bus, devfn));
if ( pdev )
{
if ( now < pdev->fault.time ||
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -178,7 +178,7 @@ int pci_remove_device(u16 seg, u8 bus, u
int pci_ro_device(int seg, int bus, int devfn);
int pci_hide_device(unsigned int seg, unsigned int bus, unsigned int devfn);
struct pci_dev *pci_get_pdev(const struct domain *d, pci_sbdf_t sbdf);
-struct pci_dev *pci_get_real_pdev(int seg, int bus, int devfn);
+struct pci_dev *pci_get_real_pdev(pci_sbdf_t sbdf);
void pci_check_disable_device(u16 seg, u8 bus, u8 devfn);
uint8_t pci_conf_read8(pci_sbdf_t sbdf, unsigned int reg);
next prev parent reply other threads:[~2022-08-11 10:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-11 10:50 [PATCH v2 0/3] PCI: re-work pci_get_pdev() and friends Jan Beulich
2022-08-11 10:51 ` [PATCH v2 1/3] PCI: simplify (and thus correct) pci_get_pdev{,_by_domain}() Jan Beulich
2022-08-11 13:11 ` Andrew Cooper
2022-08-11 13:21 ` Jan Beulich
2022-08-11 16:15 ` Rahul Singh
2022-08-11 10:52 ` [PATCH v2 2/3] PCI: fold pci_get_pdev{,_by_domain}() Jan Beulich
2022-08-11 13:21 ` Andrew Cooper
2022-08-11 13:26 ` Jan Beulich
2022-08-11 15:09 ` Andrew Cooper
2022-08-11 15:41 ` Jan Beulich
2022-08-11 16:17 ` Rahul Singh
2022-08-11 10:52 ` Jan Beulich [this message]
2022-08-11 13:28 ` [PATCH v2 3/3] PCI: bring pci_get_real_pdev() in line with pci_get_pdev() Andrew Cooper
2022-08-11 16:16 ` Rahul Singh
2022-08-11 16:37 ` [PATCH] x86/msi: Switch msi_info to using pci_sbdf_t Andrew Cooper
2022-08-12 6:45 ` Jan Beulich
2022-08-12 10:22 ` Andrew Cooper
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=b8a5294a-6869-121b-cd67-0740e6330769@suse.com \
--to=jbeulich@suse.com \
--cc=Rahul.Singh@arm.com \
--cc=andrew.cooper3@citrix.com \
--cc=paul@xen.org \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.