> -----Original Message----- > From: Xen-devel [mailto:xen-devel-boun...@lists.xenproject.org] On Behalf Of > Paul Durrant > Sent: 06 June 2019 12:11 > To: Roger Pau Monne <roger....@citrix.com>; xen-devel@lists.xenproject.org > Cc: Kevin Tian <kevin.t...@intel.com>; Stefano Stabellini > <sstabell...@kernel.org>; Wei Liu > <w...@xen.org>; Konrad Rzeszutek Wilk <konrad.w...@oracle.com>; Andrew Cooper > <andrew.coop...@citrix.com>; Tim (Xen.org) <t...@xen.org>; George Dunlap > <george.dun...@citrix.com>; > Julien Grall <julien.gr...@arm.com>; Jan Beulich <jbeul...@suse.com>; Ian > Jackson > <ian.jack...@citrix.com>; Roger Pau Monne <roger....@citrix.com> > Subject: Re: [Xen-devel] [PATCH v2 03/12] pci: make PCI_SBDF return a > pci_sbdf_t > > > -----Original Message----- > > From: Xen-devel [mailto:xen-devel-boun...@lists.xenproject.org] On Behalf > > Of Roger Pau Monne > > Sent: 06 June 2019 10:02 > > To: xen-devel@lists.xenproject.org > > Cc: Kevin Tian <kevin.t...@intel.com>; Stefano Stabellini > > <sstabell...@kernel.org>; Wei Liu > > <w...@xen.org>; Konrad Rzeszutek Wilk <konrad.w...@oracle.com>; George > > Dunlap > > <george.dun...@citrix.com>; Andrew Cooper <andrew.coop...@citrix.com>; Ian > > Jackson > > <ian.jack...@citrix.com>; Tim (Xen.org) <t...@xen.org>; Julien Grall > > <julien.gr...@arm.com>; Jan > > Beulich <jbeul...@suse.com>; Roger Pau Monne <roger....@citrix.com> > > Subject: [Xen-devel] [PATCH v2 03/12] pci: make PCI_SBDF return a pci_sbdf_t > > > > And fix it's only caller. > > > > Signed-off-by: Roger Pau Monné <roger....@citrix.com> > > Reviewed-by: Paul Durrant <paul.durr...@citrix.com>
Actually, on second thoughts... > > > --- > > Cc: Kevin Tian <kevin.t...@intel.com> > > Cc: Andrew Cooper <andrew.coop...@citrix.com> > > Cc: George Dunlap <george.dun...@eu.citrix.com> > > Cc: Ian Jackson <ian.jack...@eu.citrix.com> > > Cc: Jan Beulich <jbeul...@suse.com> > > Cc: Julien Grall <julien.gr...@arm.com> > > Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> > > Cc: Stefano Stabellini <sstabell...@kernel.org> > > Cc: Tim Deegan <t...@xen.org> > > Cc: Wei Liu <w...@xen.org> > > --- > > Changes since v1: > > - New in this version. > > --- > > xen/drivers/passthrough/vtd/dmar.c | 3 ++- > > xen/include/xen/pci.h | 3 ++- > > 2 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/xen/drivers/passthrough/vtd/dmar.c > > b/xen/drivers/passthrough/vtd/dmar.c > > index 9cc8623e53..59a46cd1c6 100644 > > --- a/xen/drivers/passthrough/vtd/dmar.c > > +++ b/xen/drivers/passthrough/vtd/dmar.c > > @@ -1115,7 +1115,8 @@ static int __init parse_rmrr_param(const char *str) > > > > /* Keep sbdf's even if they differ and later report an error. > > */ > > dev_count = user_rmrrs[nr_rmrr].dev_count; > > - user_rmrrs[nr_rmrr].sbdf[dev_count] = PCI_SBDF(seg, bus, dev, > > func); > > + user_rmrrs[nr_rmrr].sbdf[dev_count] = > > + PCI_SBDF(seg, bus, dev, func).sbdf; > > > > user_rmrrs[nr_rmrr].dev_count++; > > s = stmp; > > diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h > > index f4908abd8b..9ea41789d0 100644 > > --- a/xen/include/xen/pci.h > > +++ b/xen/include/xen/pci.h > > @@ -34,7 +34,8 @@ > > #define PCI_DEVFN2(bdf) ((bdf) & 0xff) > > #define PCI_BDF(b,d,f) ((((b) & 0xff) << 8) | PCI_DEVFN(d,f)) > > #define PCI_BDF2(b,df) ((((b) & 0xff) << 8) | ((df) & 0xff)) > > -#define PCI_SBDF(s,b,d,f) ((((s) & 0xffff) << 16) | PCI_BDF(b,d,f)) > > +#define PCI_SBDF(s,b,d,f) \ > > + ((pci_sbdf_t) { .sbdf = (((s) & 0xffff) << 16) | PCI_BDF(b,d,f) }) Wouldn't this be better coded along the lines of... ((pci_sbdf_t) { .seg = s, .bus = b, .dev = d, .fn = f }) ? Paul > > #define PCI_SBDF2(s,bdf) ((((s) & 0xffff) << 16) | ((bdf) & 0xffff)) > > #define PCI_SBDF3(s,b,df) ((((s) & 0xffff) << 16) | PCI_BDF2(b, df)) > > > > -- > > 2.20.1 (Apple Git-117) > > > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xenproject.org > > https://lists.xenproject.org/mailman/listinfo/xen-devel > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xenproject.org > https://lists.xenproject.org/mailman/listinfo/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel