| Message ID | 1470127147-12442-2-git-send-email-davidkiarie4@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 02, 2016 at 11:39:04AM +0300, David Kiarie wrote: > Introduce PCI macros from for use by AMD IOMMU > > Signed-off-by: David Kiarie <davidkiarie4@gmail.com> > --- > include/hw/pci/pci.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index 929ec2f..d47e0e6 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -11,11 +11,14 @@ > #include "hw/pci/pcie.h" > > /* PCI bus */ > - > +#define PCI_BDF(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) Seems the same as PCI_BUILD_BDF() below? > #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) > +#define PCI_BUS_NUM(x) (((x) >> 8) & 0xff) > #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) > #define PCI_FUNC(devfn) ((devfn) & 0x07) > #define PCI_BUILD_BDF(bus, devfn) ((bus << 8) | (devfn)) > +#define PCI_BUS_MAX 256 > +#define PCI_DEVFN_MAX 256 > #define PCI_SLOT_MAX 32 > #define PCI_FUNC_MAX 8 > > -- > 2.1.4 > -- peterx
On Mon, Aug 8, 2016 at 12:01 PM, Peter Xu <peterx@redhat.com> wrote: > On Tue, Aug 02, 2016 at 11:39:04AM +0300, David Kiarie wrote: > > Introduce PCI macros from for use by AMD IOMMU > > > > Signed-off-by: David Kiarie <davidkiarie4@gmail.com> > > --- > > include/hw/pci/pci.h | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > > index 929ec2f..d47e0e6 100644 > > --- a/include/hw/pci/pci.h > > +++ b/include/hw/pci/pci.h > > @@ -11,11 +11,14 @@ > > #include "hw/pci/pcie.h" > > > > /* PCI bus */ > > - > > +#define PCI_BDF(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) > > Seems the same as PCI_BUILD_BDF() below? > Yes, I noted. It's one of the things I intend to fix on the version. > > #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & > 0x07)) > > +#define PCI_BUS_NUM(x) (((x) >> 8) & 0xff) > > #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) > > #define PCI_FUNC(devfn) ((devfn) & 0x07) > > #define PCI_BUILD_BDF(bus, devfn) ((bus << 8) | (devfn)) > > +#define PCI_BUS_MAX 256 > > +#define PCI_DEVFN_MAX 256 > > #define PCI_SLOT_MAX 32 > > #define PCI_FUNC_MAX 8 > > > > -- > > 2.1.4 > > > > -- peterx >
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 929ec2f..d47e0e6 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -11,11 +11,14 @@ #include "hw/pci/pcie.h" /* PCI bus */ - +#define PCI_BDF(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) +#define PCI_BUS_NUM(x) (((x) >> 8) & 0xff) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) #define PCI_BUILD_BDF(bus, devfn) ((bus << 8) | (devfn)) +#define PCI_BUS_MAX 256 +#define PCI_DEVFN_MAX 256 #define PCI_SLOT_MAX 32 #define PCI_FUNC_MAX 8
Introduce PCI macros from for use by AMD IOMMU Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- include/hw/pci/pci.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)