diff mbox

[V12,1/4] hw/pci: Prepare for AMD IOMMU

Message ID 1465993312-18119-2-git-send-email-davidkiarie4@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

David Kiarie June 15, 2016, 12:21 p.m. UTC
Introduce PCI macros from linux headers for use by AMD IOMMU

Signed-off-by: David Kiarie <davidkiarie4@gmail.com>
---
 include/hw/pci/pci.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jan Kiszka June 22, 2016, 7:53 p.m. UTC | #1
On 2016-06-15 14:21, David Kiarie wrote:
> Introduce PCI macros from linux headers for use by AMD IOMMU
> 
> Signed-off-by: David Kiarie <davidkiarie4@gmail.com>
> ---
>  include/hw/pci/pci.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index 4420f47..ac376c5 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -12,6 +12,8 @@
>  
>  /* PCI bus */
>  
> +#define PCI_BUS_NUM(x)          (((x) >> 8) & 0xff)

Minor: should probably come after PCI_DEVFN and before PCI_SLOT to have
some logical grouping.

> +#define PCI_DEVID(bus, devfn)   ((((uint16_t)(bus)) << 8) | (devfn))

That's often called "BDF" (bus-device-function). At least for me clearer
than "device ID".

>  #define PCI_DEVFN(slot, func)   ((((slot) & 0x1f) << 3) | ((func) & 0x07))
>  #define PCI_SLOT(devfn)         (((devfn) >> 3) & 0x1f)
>  #define PCI_FUNC(devfn)         ((devfn) & 0x07)
> 

Jan
diff mbox

Patch

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 4420f47..ac376c5 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -12,6 +12,8 @@ 
 
 /* PCI bus */
 
+#define PCI_BUS_NUM(x)          (((x) >> 8) & 0xff)
+#define PCI_DEVID(bus, devfn)   ((((uint16_t)(bus)) << 8) | (devfn))
 #define PCI_DEVFN(slot, func)   ((((slot) & 0x1f) << 3) | ((func) & 0x07))
 #define PCI_SLOT(devfn)         (((devfn) >> 3) & 0x1f)
 #define PCI_FUNC(devfn)         ((devfn) & 0x07)