Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8066064ybl; Thu, 16 Jan 2020 10:03:23 -0800 (PST) X-Google-Smtp-Source: APXvYqxzjbxUGdJ4saWs21DdNwmj3zXXhVuNpMzdzzjbO78hhJxmZ1/6EZhLg9ZJm1Yn3bpIJD3o X-Received: by 2002:a9d:6758:: with SMTP id w24mr3208178otm.155.1579197803123; Thu, 16 Jan 2020 10:03:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579197803; cv=none; d=google.com; s=arc-20160816; b=olK4TSpzlRQpdXo8gBCbPCvuT0eh118J2RrF9fP9FxNssOcELQ8pBlEdPiyARra6S1 GXChQ2RyhSeFRL4dqkcMSdgazOD78hrxrFo7uVMy164qHFWiMz9RngpUJ8pTA+z1NYjX LT9QLeglupp1GBkE30AQ4RBw1Wszt2pivjegjuf+jiq15Zv7CoayBTkXbp/mCeIVncDX zn8ffOpfB0pz9MsYK0x9z6jfL5GENJeQsImymBBDJdKIheWOt5mqxp3YrtT5JMR+RaWV hqf8VB3NE19B/HnyfqUqzp/Xx4YkvIPT0WZX/RKG0UGtegTEcl+ZzEprPYIwN3zYE74k vvhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c63TLhJKybrpJwPAhlWCkUCL1Zk1sfU7VG2zJKunxFI=; b=EldTAacJjT04zGhuYuShVrszAg7qQ4N8e+ePcArcvnrxB6iv6SQktJqWG10ZgCpT+5 8vmGv2ESeRaqJFqGKYq0YXf1ZpNlp2TbnqzAsC/fbdMcnW4bOS1HIw6hbcW1wO4WsULo tlVLZpgX0Td0nJFdgFA+5S3/pVPBOt3ukvJwHjY5kwfO9UHDEUst91nQyCeITAWVv1FX 7rzs8hTGSKbiBA+IEqFfed0aUiYNWJmSOhTPLi0rEpP15SDBbG1ysHBjtfW4nQkmr4EP DbRPHc3eqSA0PfrDhJ1VAL1mVLD48Yywdp1AsVmUhQDITPrTDo+GQb9njf7aH60bPsSH MpGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XEX2jzml; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w131si12528520oif.240.2020.01.16.10.03.11; Thu, 16 Jan 2020 10:03:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XEX2jzml; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733084AbgAPSB0 (ORCPT + 99 others); Thu, 16 Jan 2020 13:01:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:59664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733225AbgAPRlt (ORCPT ); Thu, 16 Jan 2020 12:41:49 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B0359246AC; Thu, 16 Jan 2020 17:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196508; bh=u4Wnu6vdTq3zbpaXhgACT1ejyw+Rhxp+TLvXUrakHKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XEX2jzml1GNB5ifN02yyvYoO2ItdqDw4azpvwSR6rflW3ckpBLovwr9awVt0l+JiH zLzE2+XrkWUz3Yh3GBB0i2OBBzElILWEXBrpXVr2HnHH8iDKIh+/l+6BJ/90I1vyUO PNVJ3Va/CcONPqfGhQaPdjmC2NCk7Bj4GsDHqmCo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sam Bobroff , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 248/251] drm/radeon: fix bad DMA from INTERRUPT_CNTL2 Date: Thu, 16 Jan 2020 12:36:37 -0500 Message-Id: <20200116173641.22137-208-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sam Bobroff [ Upstream commit 62d91dd2851e8ae2ca552f1b090a3575a4edf759 ] 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: d8f60cfc9345 ("drm/radeon/kms: Add support for interrupts on r6xx/r7xx chips (v3)") Fixes: 25a857fbe973 ("drm/radeon/kms: add support for interrupts on SI") Fixes: a59781bbe528 ("drm/radeon: add support for interrupts on CIK (v5)") Signed-off-by: Sam Bobroff Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/cik.c | 4 ++-- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index b99f3e59011c..5fcb5869a489 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -7026,8 +7026,8 @@ static int cik_irq_init(struct radeon_device *rdev) } /* setup interrupt control */ - /* XXX this should actually be a bus address, not an MC address. same on older asics */ - WREG32(INTERRUPT_CNTL2, rdev->ih.gpu_addr >> 8); + /* set dummy read address to dummy page address */ + WREG32(INTERRUPT_CNTL2, rdev->dummy_page.addr >> 8); interrupt_cntl = RREG32(INTERRUPT_CNTL); /* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index f2eac6b6c46a..9569c35f8766 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -3697,8 +3697,8 @@ int r600_irq_init(struct radeon_device *rdev) } /* setup interrupt control */ - /* set dummy read address to ring address */ - WREG32(INTERRUPT_CNTL2, rdev->ih.gpu_addr >> 8); + /* set dummy read address to dummy page address */ + WREG32(INTERRUPT_CNTL2, rdev->dummy_page.addr >> 8); interrupt_cntl = RREG32(INTERRUPT_CNTL); /* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index b75d809c292e..919d389869ce 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6018,8 +6018,8 @@ static int si_irq_init(struct radeon_device *rdev) } /* setup interrupt control */ - /* set dummy read address to ring address */ - WREG32(INTERRUPT_CNTL2, rdev->ih.gpu_addr >> 8); + /* set dummy read address to dummy page address */ + WREG32(INTERRUPT_CNTL2, rdev->dummy_page.addr >> 8); interrupt_cntl = RREG32(INTERRUPT_CNTL); /* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN -- 2.20.1