From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Michel Dänzer" <mdaenzer@redhat.com>,
"Sasha Levin" <sashal@kernel.org>,
Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch,
andrey.grodzovsky@amd.com, guchun.chen@amd.com,
kevin1.wang@amd.com, lang.yu@amd.com, tao.zhou1@amd.com,
YiPeng.Chai@amd.com, ray.huang@amd.com, Yuliang.Shi@amd.com,
Jack.Gui@amd.com, PengJu.Zhou@amd.com, victor.skvortsov@amd.com,
Xiaojian.Du@amd.com, lee.jones@linaro.org, nirmoy.das@amd.com,
evan.quan@amd.com, Felix.Kuehling@amd.com,
zhouzongmin@kylinos.cn, Hawking.Zhang@amd.com,
john.clements@amd.com, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.15 05/41] drm/amdgpu/gmc: use PCI BARs for APUs in passthrough
Date: Mon, 11 Apr 2022 20:46:17 -0400 [thread overview]
Message-ID: <20220412004656.350101-5-sashal@kernel.org> (raw)
In-Reply-To: <20220412004656.350101-1-sashal@kernel.org>
From: Alex Deucher <alexander.deucher@amd.com>
[ Upstream commit b818a5d374542ccec73dcfe578a081574029820e ]
If the GPU is passed through to a guest VM, use the PCI
BAR for CPU FB access rather than the physical address of
carve out. The physical address is not valid in a guest.
v2: Fix HDP handing as suggested by Michel
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +++--
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 33026b3eafd2..2f2ae26a8068 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -5625,7 +5625,7 @@ void amdgpu_device_flush_hdp(struct amdgpu_device *adev,
struct amdgpu_ring *ring)
{
#ifdef CONFIG_X86_64
- if (adev->flags & AMD_IS_APU)
+ if ((adev->flags & AMD_IS_APU) && !amdgpu_passthrough(adev))
return;
#endif
if (adev->gmc.xgmi.connected_to_cpu)
@@ -5641,7 +5641,7 @@ void amdgpu_device_invalidate_hdp(struct amdgpu_device *adev,
struct amdgpu_ring *ring)
{
#ifdef CONFIG_X86_64
- if (adev->flags & AMD_IS_APU)
+ if ((adev->flags & AMD_IS_APU) && !amdgpu_passthrough(adev))
return;
#endif
if (adev->gmc.xgmi.connected_to_cpu)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 3c01be661014..93a4da4284ed 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -788,7 +788,7 @@ static int gmc_v10_0_mc_init(struct amdgpu_device *adev)
adev->gmc.aper_size = pci_resource_len(adev->pdev, 0);
#ifdef CONFIG_X86_64
- if (adev->flags & AMD_IS_APU) {
+ if ((adev->flags & AMD_IS_APU) && !amdgpu_passthrough(adev)) {
adev->gmc.aper_base = adev->gfxhub.funcs->get_mc_fb_offset(adev);
adev->gmc.aper_size = adev->gmc.real_vram_size;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 0a50fdaced7e..63c47f61d0df 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -381,8 +381,9 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)
adev->gmc.aper_size = pci_resource_len(adev->pdev, 0);
#ifdef CONFIG_X86_64
- if (adev->flags & AMD_IS_APU &&
- adev->gmc.real_vram_size > adev->gmc.aper_size) {
+ if ((adev->flags & AMD_IS_APU) &&
+ adev->gmc.real_vram_size > adev->gmc.aper_size &&
+ !amdgpu_passthrough(adev)) {
adev->gmc.aper_base = ((u64)RREG32(mmMC_VM_FB_OFFSET)) << 22;
adev->gmc.aper_size = adev->gmc.real_vram_size;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 63b890f1e8af..bef9610084f1 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -581,7 +581,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
adev->gmc.aper_size = pci_resource_len(adev->pdev, 0);
#ifdef CONFIG_X86_64
- if (adev->flags & AMD_IS_APU) {
+ if ((adev->flags & AMD_IS_APU) && !amdgpu_passthrough(adev)) {
adev->gmc.aper_base = ((u64)RREG32(mmMC_VM_FB_OFFSET)) << 22;
adev->gmc.aper_size = adev->gmc.real_vram_size;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 6dc16ccf6c81..0e731016921b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1387,7 +1387,7 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev)
*/
/* check whether both host-gpu and gpu-gpu xgmi links exist */
- if ((adev->flags & AMD_IS_APU) ||
+ if (((adev->flags & AMD_IS_APU) && !amdgpu_passthrough(adev)) ||
(adev->gmc.xgmi.supported &&
adev->gmc.xgmi.connected_to_cpu)) {
adev->gmc.aper_base =
--
2.35.1
next prev parent reply other threads:[~2022-04-12 0:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 0:46 [PATCH AUTOSEL 5.15 01/41] drm/amd: Add USBC connector ID Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 02/41] btrfs: fix fallocate to use file_modified to update permissions consistently Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 03/41] btrfs: do not warn for free space inode in cow_file_range Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 04/41] drm/amdgpu: conduct a proper cleanup of PDB bo Sasha Levin
2022-04-12 0:46 ` Sasha Levin [this message]
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 06/41] drm/amd/display: fix audio format not updated after edid updated Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 07/41] drm/amd/display: FEC check in timing validation Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 08/41] drm/amd/display: Update VTEM Infopacket definition Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 09/41] drm/amdkfd: Fix Incorrect VMIDs passed to HWS Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 10/41] drm/amdgpu/vcn: improve vcn dpg stop procedure Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 11/41] drm/amdkfd: Check for potential null return of kmalloc_array() Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 12/41] Drivers: hv: vmbus: Deactivate sysctl_record_panic_msg by default in isolated guests Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 13/41] PCI: hv: Propagate coherence from VMbus device to PCI device Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 14/41] Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 15/41] scsi: target: tcmu: Fix possible page UAF Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 16/41] scsi: lpfc: Fix queue failures when recovering from PCI parity error Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 17/41] scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024 Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 18/41] net: micrel: fix KS8851_MLL Kconfig Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 19/41] ata: libata-core: Disable READ LOG DMA EXT for Samsung 840 EVOs Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 20/41] gpu: ipu-v3: Fix dev_dbg frequency output Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 21/41] regulator: wm8994: Add an off-on delay for WM8994 variant Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 22/41] arm64: alternatives: mark patch_alternative() as `noinstr` Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 23/41] tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 24/41] net: axienet: setup mdio unconditionally Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 25/41] Drivers: hv: balloon: Disable balloon and hot-add accordingly Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 26/41] net: usb: aqc111: Fix out-of-bounds accesses in RX fixup Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 27/41] myri10ge: fix an incorrect free for skb in myri10ge_sw_tso Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 28/41] spi: cadence-quadspi: fix protocol setup for non-1-1-X operations Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 29/41] drm/amd/display: Enable power gating before init_pipes Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 30/41] drm/amd/display: Revert FEC check in validation Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 31/41] drm/amd/display: Fix allocate_mst_payload assert on resume Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 32/41] drbd: set QUEUE_FLAG_STABLE_WRITES Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 33/41] powerpc: Fix virt_addr_valid() for 64-bit Book3E & 32-bit Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 34/41] scsi: mpt3sas: Fail reset operation if config request timed out Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 35/41] scsi: mvsas: Add PCI ID of RocketRaid 2640 Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 36/41] scsi: megaraid_sas: Target with invalid LUN ID is deleted during scan Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 37/41] drivers: net: slip: fix NPD bug in sl_tx_timeout() Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 38/41] io_uring: zero tag on rsrc removal Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 39/41] io_uring: use nospec annotation for more indexes Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 40/41] arm64: Add part number for Arm Cortex-A78AE Sasha Levin
2022-04-12 0:46 ` [PATCH AUTOSEL 5.15 41/41] perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220412004656.350101-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Felix.Kuehling@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=Jack.Gui@amd.com \
--cc=PengJu.Zhou@amd.com \
--cc=Xiaojian.Du@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=YiPeng.Chai@amd.com \
--cc=Yuliang.Shi@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andrey.grodzovsky@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=evan.quan@amd.com \
--cc=guchun.chen@amd.com \
--cc=john.clements@amd.com \
--cc=kevin1.wang@amd.com \
--cc=lang.yu@amd.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdaenzer@redhat.com \
--cc=nirmoy.das@amd.com \
--cc=ray.huang@amd.com \
--cc=stable@vger.kernel.org \
--cc=tao.zhou1@amd.com \
--cc=victor.skvortsov@amd.com \
--cc=zhouzongmin@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).