mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
pci: make PCI_SBDF3 return a pci_sbdf_t
And adjust it's users. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Roger Pau Monné authored and Jan Beulich committed
1 parent
f1379f1bbf
commit
6e798501b3
4 files changed
+7
-8
No files matched your search
@@ -27,8 +27,8 @@ static int get_reserved_device_memory(xen_pfn_t start, xen_ulong_t nr,
|
||||
u32 id, void *ctxt)
|
||||
{
|
||||
struct get_reserved_device_memory *grdm = ctxt;
|
||||
u32 sbdf = PCI_SBDF3(grdm->map.dev.pci.seg, grdm->map.dev.pci.bus,
|
||||
grdm->map.dev.pci.devfn);
|
||||
uint32_t sbdf = PCI_SBDF3(grdm->map.dev.pci.seg, grdm->map.dev.pci.bus,
|
||||
grdm->map.dev.pci.devfn).sbdf;
|
||||
|
||||
if ( !(grdm->map.flags & XENMEM_RDM_ALL) && (sbdf != id) )
|
||||
return 0;
|
||||
|
||||
+2
-2
@@ -968,8 +968,8 @@ static int get_reserved_device_memory(xen_pfn_t start, xen_ulong_t nr,
|
||||
u32 id, void *ctxt)
|
||||
{
|
||||
struct get_reserved_device_memory *grdm = ctxt;
|
||||
u32 sbdf = PCI_SBDF3(grdm->map.dev.pci.seg, grdm->map.dev.pci.bus,
|
||||
grdm->map.dev.pci.devfn);
|
||||
uint32_t sbdf = PCI_SBDF3(grdm->map.dev.pci.seg, grdm->map.dev.pci.bus,
|
||||
grdm->map.dev.pci.devfn).sbdf;
|
||||
|
||||
if ( !(grdm->map.flags & XENMEM_RDM_ALL) && (sbdf != id) )
|
||||
return 0;
|
||||
|
||||
@@ -762,9 +762,7 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn,
|
||||
{
|
||||
unsigned int idx = pos + PCI_SRIOV_BAR + i * 4;
|
||||
u32 bar = pci_conf_read32(seg, bus, slot, func, idx);
|
||||
pci_sbdf_t sbdf = {
|
||||
.sbdf = PCI_SBDF3(seg, bus, devfn),
|
||||
};
|
||||
pci_sbdf_t sbdf = PCI_SBDF3(seg, bus, devfn);
|
||||
|
||||
if ( (bar & PCI_BASE_ADDRESS_SPACE) ==
|
||||
PCI_BASE_ADDRESS_SPACE_IO )
|
||||
|
||||
@@ -38,7 +38,8 @@
|
||||
((pci_sbdf_t){ .sbdf = (((s) & 0xffff) << 16) | PCI_BDF(b, d, f) })
|
||||
#define PCI_SBDF2(s,bdf) \
|
||||
((pci_sbdf_t){ .sbdf = (((s) & 0xffff) << 16) | ((bdf) & 0xffff) })
|
||||
#define PCI_SBDF3(s,b,df) ((((s) & 0xffff) << 16) | PCI_BDF2(b, df))
|
||||
#define PCI_SBDF3(s,b,df) \
|
||||
((pci_sbdf_t){ .sbdf = (((s) & 0xffff) << 16) | PCI_BDF2(b, df) })
|
||||
|
||||
typedef union {
|
||||
uint32_t sbdf;
|
||||
|
||||