Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2706030pxj; Mon, 10 May 2021 08:57:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdfyCjd2BwalCXo3SPPZX2+quc6KV2o00B9Sp4WSCit75b5cACD1JDh/eN3Hnp5RrQhoWd X-Received: by 2002:a17:906:a88f:: with SMTP id ha15mr4690926ejb.246.1620662277867; Mon, 10 May 2021 08:57:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620662277; cv=none; d=google.com; s=arc-20160816; b=qX84zUP2oRk3zVcGWFeJ4FnlTiSsLVKMYEYIH4DkhRyRjZDxBsOeU3LdH8Qwz3sph1 ha08lpdXK8PFMWzjeZ5k8LYSYcozN91ZZhNfirKSRHY+Q/Ul8vD2XqHMsjCU4QyKQYG3 6d7biUMM00xtjaIal1wiiUugetg8/lg0tVG6ynjoxTqr/J8h61ro6OfQP7cxMoENeMwz eWOTzc+eJA89dCT3v0YB9guw933XoxmLcjCkU8vILZLPYFeO14dHQEh8pw9fbiS5Q2Gs jr78zExzCPMgfUP1bRaN8CcmIB/JXjyKx9QFvzMHf8z8z+Y6QWeK27l7DZe1p/QuA7yE jswA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=THjUi40dFJDV1qD64WJJ8olP/nmM90+Xlr339ZYcBz0=; b=UAKwNYprEb0oX6cec5ERnv1JqDbLwr0nyhIXUR73+t5oMNXt47zCyDyftFulkTkh3N A2cyEqfhL0lK8dYsoUC9vrJVyCUOA/hP1Cu+iiZT7mKvF6fsTjvZU1XWrAkZgSWIIIrz L1ddH0515g1P8WBt/b73AEfPwu/AUKAeIVv99LJWR3tnT1+jZVpkZY6nwbvlgYVQZCpd ez29lCT8Bwwx4x267KmmznmvYwLL7PIABWU45S7uDXJvc6P9lbh/bOj8MUWNT3ErZFiS 8pTCDew218YFwNOfbJx8dFtBTnp3nvOm6nay5CdQpkK0iNlAnaPUihXm3i5wN077EtDj NUSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yQHOIFp6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ci19si12140503ejb.68.2021.05.10.08.57.34; Mon, 10 May 2021 08:57:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yQHOIFp6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240464AbhEJLam (ORCPT + 99 others); Mon, 10 May 2021 07:30:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:52158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234830AbhEJK5J (ORCPT ); Mon, 10 May 2021 06:57:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C94AF6194A; Mon, 10 May 2021 10:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643780; bh=zF10B42BU7PZxpk8L9YI3lbTpw7BWdCgjXh1YWIYcew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yQHOIFp6nsy4tbC77woEx/bUzfc5SRCecMAe+hCNeTyUXrnMk+cHIREkONUtEVZrc c9uIJ3pyVvCzvDNa400KMmZANbX182wLn2VFKWL32fbPfQkAh27AYw+Q9rz/28T/+A 859hrXAgEXquIYDuHIGICXsA7j3oXZG+n6Uvx6GQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brad Love , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.11 155/342] media: cx23885: add more quirks for reset DMA on some AMD IOMMU Date: Mon, 10 May 2021 12:19:05 +0200 Message-Id: <20210510102015.219113302@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brad Love [ Upstream commit 5f864cfbf59bfed2057bd214ce7fbf6ad420d54b ] The folowing AMD IOMMU are affected by the RiSC engine stall, requiring a reset to maintain continual operation. After being added to the broken_dev_id list the systems are functional long term. 0x1481 is the PCI ID for the IOMMU found on Starship/Matisse 0x1419 is the PCI ID for the IOMMU found on 15h (Models 10h-1fh) family 0x5a23 is the PCI ID for the IOMMU found on RD890S/RD990 Signed-off-by: Brad Love Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/cx23885/cx23885-core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c index 22f55a7840a6..d0ca260ecf70 100644 --- a/drivers/media/pci/cx23885/cx23885-core.c +++ b/drivers/media/pci/cx23885/cx23885-core.c @@ -2077,6 +2077,15 @@ static struct { * 0x1423 is the PCI ID for the IOMMU found on Kaveri */ { PCI_VENDOR_ID_AMD, 0x1423 }, + /* 0x1481 is the PCI ID for the IOMMU found on Starship/Matisse + */ + { PCI_VENDOR_ID_AMD, 0x1481 }, + /* 0x1419 is the PCI ID for the IOMMU found on 15h (Models 10h-1fh) family + */ + { PCI_VENDOR_ID_AMD, 0x1419 }, + /* 0x5a23 is the PCI ID for the IOMMU found on RD890S/RD990 + */ + { PCI_VENDOR_ID_ATI, 0x5a23 }, }; static bool cx23885_does_need_dma_reset(void) -- 2.30.2