OSDN Git Service

drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2
authorSam Bobroff <sbobroff@linux.ibm.com>
Sun, 17 Nov 2019 23:53:54 +0000 (10:53 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:36:15 +0000 (16:36 +0100)
[ Upstream commit 3d0e3ce52ce3eb4b9de3caf9c38dbb5a4d3e13c3 ]

The INTERRUPT_CNTL2 register expects a valid DMA address, but is
currently set with a GPU MC address.  This can cause problems on
systems that detect the resulting DMA read from an invalid address
(found on a Power8 guest).

Instead, use the DMA address of the dummy page because it will always
be safe.

Fixes: 27ae10641e9c ("drm/amdgpu: add interupt handler implementation for si v3")
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/amdgpu/si_ih.c

index 60dad63..e40a3fb 100644 (file)
@@ -62,7 +62,8 @@ static int si_ih_irq_init(struct amdgpu_device *adev)
        u64 wptr_off;
 
        si_ih_disable_interrupts(adev);
-       WREG32(INTERRUPT_CNTL2, adev->irq.ih.gpu_addr >> 8);
+       /* set dummy read address to dummy page address */
+       WREG32(INTERRUPT_CNTL2, adev->dummy_page_addr >> 8);
        interrupt_cntl = RREG32(INTERRUPT_CNTL);
        interrupt_cntl &= ~IH_DUMMY_RD_OVERRIDE;
        interrupt_cntl &= ~IH_REQ_NONSNOOP_EN;