Sorry for the noise. On 08/10/2016 11:18 AM, Cao jin wrote:
The parameter table_offset & pba_offset is kind of confusing, they shouldn't include bir field.Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com> --- According to the passed arguments, I guess all the callers of msix_init() has the same feeling with me, but I am not quite sure about this, so, RFC. hw/pci/msix.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 0ec1cb1..3a16d83 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -264,8 +264,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, if ((table_bar_nr == pba_bar_nr && ranges_overlap(table_offset, table_size, pba_offset, pba_size)) || table_offset + table_size > memory_region_size(table_bar) || - pba_offset + pba_size > memory_region_size(pba_bar) || - (table_offset | pba_offset) & PCI_MSIX_FLAGS_BIRMASK) { + pba_offset + pba_size > memory_region_size(pba_bar)) { return -EINVAL; } @@ -282,8 +281,8 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, dev->msix_entries_nr = nentries; dev->msix_function_masked = true; - pci_set_long(config + PCI_MSIX_TABLE, table_offset | table_bar_nr); - pci_set_long(config + PCI_MSIX_PBA, pba_offset | pba_bar_nr); + pci_set_long(config + PCI_MSIX_TABLE, (table_offset << 3) | table_bar_nr); + pci_set_long(config + PCI_MSIX_PBA, (pba_offset << 3) | pba_bar_nr); /* Make flags bit writable. */ dev->wmask[cap + MSIX_CONTROL_OFFSET] |= MSIX_ENABLE_MASK |
-- Yours Sincerely, Cao jin
