diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2020-06-16 13:31:47 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-06-16 13:31:47 +0200 |
| commit | 4b3c1f1b15f576445c221cbc77a88540433a2ba7 (patch) | |
| tree | b88ac114c16fa1747205c9060bf00498bcb5df97 /drivers/pci/controller/vmd.c | |
| parent | drm/ttm: Fix dma_fence refcnt leak when adding move fence (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | wireguard-linux-4b3c1f1b15f576445c221cbc77a88540433a2ba7.tar.xz wireguard-linux-4b3c1f1b15f576445c221cbc77a88540433a2ba7.zip | |
Merge v5.8-rc1 into drm-misc-fixes
Beginning a new release cycles for what will become v5.8. Updating
drm-misc-fixes accordingly.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/pci/controller/vmd.c')
| -rw-r--r-- | drivers/pci/controller/vmd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index dac91d60701d..e386d4eac407 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -445,9 +445,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) if (!membar2) return -ENOMEM; offset[0] = vmd->dev->resource[VMD_MEMBAR1].start - - readq(membar2 + MB2_SHADOW_OFFSET); + (readq(membar2 + MB2_SHADOW_OFFSET) & + PCI_BASE_ADDRESS_MEM_MASK); offset[1] = vmd->dev->resource[VMD_MEMBAR2].start - - readq(membar2 + MB2_SHADOW_OFFSET + 8); + (readq(membar2 + MB2_SHADOW_OFFSET + 8) & + PCI_BASE_ADDRESS_MEM_MASK); pci_iounmap(vmd->dev, membar2); } } |