diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
| commit | 77346a704c913268a2dad68d59523fd85dc74088 (patch) | |
| tree | 62c66bcb163b0db42a1fd0a397a6973e52f4ddce /drivers/pci/controller/vmd.c | |
| parent | iommu/qcom: add optional 'tbu' clock for TLB invalidate (diff) | |
| parent | Linux 5.8-rc3 (diff) | |
| download | wireguard-linux-77346a704c913268a2dad68d59523fd85dc74088.tar.xz wireguard-linux-77346a704c913268a2dad68d59523fd85dc74088.zip | |
Merge tag 'v5.8-rc3' into arm/qcom
Linux 5.8-rc3
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); } } |