From: Jan Beulich Date: Tue, 3 Jun 2014 10:21:12 +0000 (+0200) Subject: VT-d: fix mask applied to DMIBAR in desktop chipset XSA-59 workaround X-Git-Tag: 4.2.5-rc1~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2bc830e4fea6f4ecc974dfe09fab27b01b9b633a;p=xen.git VT-d: fix mask applied to DMIBAR in desktop chipset XSA-59 workaround In commit ("VT-d: suppress UR signaling for desktop chipsets") the mask applied to the value read from DMIBAR is to narrow, only the comment accompanying it was correct. Fix that and tag the literal number as "long long" at once to avoid eventual compiler warnings. The widest possible value so far is 39 bits; all chipsets covered here but having less than this number of bits have the remaining bits marked reserved (zero), and hence there's no need for making the mask chipset specific. Signed-off-by: Jan Beulich Acked-by: Yang Zhang master commit: f8ecf31c31906552522c2a1b0d1cada07d78876e master date: 2014-05-26 12:28:46 +0200 --- diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index bfa25d7bc5..c0f409f19c 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -474,7 +474,7 @@ void pci_vtd_quirk(const struct pci_dev *pdev) case 0xc00: case 0xc04: case 0xc08: /* Haswell */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); - pa = bar & 0x7fffff000; /* bits 12...38 */ + pa = bar & 0x7ffffff000ULL; /* bits 12...38 */ if ( (bar & 1) && pa && page_is_ram_type(paddr_to_pfn(pa), RAM_TYPE_RESERVED) ) {