Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp242184pxf; Wed, 10 Mar 2021 05:29:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzqM82MYinWa74z1G6vt4+XEEEbB59QiLPOdQHESHrYiL6yLXtz6j3yDGzcfJbaA4iklAk X-Received: by 2002:a17:906:dfce:: with SMTP id jt14mr3696857ejc.83.1615382949204; Wed, 10 Mar 2021 05:29:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615382949; cv=none; d=google.com; s=arc-20160816; b=TGJfapCFg9wfw552YwD9mrceINOe8WMOwA6eF22SCJNJQF+3u8W6gVcQPzAqFaKEt6 ffGYVAhLg33nnVyA02Dha8nabvr4kvGBTAs+yIYaNGKnERgdOMHkFcUGeqHRT4mh+fl9 nG2+Wui56syuwu0RaCMUp5k5jqmVMQobBgCucy6GGjacT+3UABiRaFSFtEYrk2rhmZyD 30ajFr8fS76lJKlr3hiKeFwg2udUe25PZulWU0u9DZpC2KfdWw/Ig3QHbtbAvnglSZ27 3Bw0kcIW6FgJlC3N1+N2nhdWOCNPgpHdmlAu85v5IQQkc+HIoyiXtLtwgNZzu7QwTjGN Dv3A== 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=66rSTKxkGLncDuz6R4jgAKNjV1aPAs5POc3hy3Uqfzs=; b=gC4WDNDWzr+sXvyPr+tTuOv9EwPpYST60GWAaYFN+YbPbe43joBpenxyVkuu7tSw8Q fsP1rR81mQCYoqGT4pI0Zcoa24i2NyjKNRLQqb4tO/tEEUDJOzJDP3NfYCXIER4cJasP J3GjL20l172I3dJ0u/9/ScVKmg7dEvkjzdG8PHOpcTfvidq1nxo4+b/cCibF4LhhGmB/ lY0r7Gu/GtQiMKr2EPu76Bq8IYbj/WR4g8Gf3W/y8G+Ht0LIb22LVmzJyGDnim3R6A9a 7uuD/tsXUpNU3LKK8gzUlgXqObjA9PnAqsUNC+GXAMrMLA4OXSODqznYmGUeekQRhOrI FcMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I16MTPv7; 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 z31si12644483ede.226.2021.03.10.05.28.46; Wed, 10 Mar 2021 05:29:09 -0800 (PST) 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=I16MTPv7; 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 S234008AbhCJN1t (ORCPT + 99 others); Wed, 10 Mar 2021 08:27:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:46636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233217AbhCJNZG (ORCPT ); Wed, 10 Mar 2021 08:25:06 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0909C64FFF; Wed, 10 Mar 2021 13:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382706; bh=Cqsrg7AhcVjMUaR+OKL0aUrlB3Dz98IhFJq2ubqAFu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I16MTPv7z5p/Q39nSKSZSSvtWmVsS1ezpkpcC0IgnVCiJUkp/qNw+OcKHj0AX0XP/ gHo+wNxIJEcbzQRGSGvfYHKiuMCogpbcvhC0WlTFfMvOiLrrC8eUxTX3YVYZM0/1tm 4acNJKNjJrmxBdb3O6OHMi/2O8TpDkf0nZoo7J14= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Lee Kruse , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 15/24] media: cx23885: add more quirks for reset DMA on some AMD IOMMU Date: Wed, 10 Mar 2021 14:24:27 +0100 Message-Id: <20210310132321.012882676@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132320.550932445@linuxfoundation.org> References: <20210310132320.550932445@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: Greg Kroah-Hartman From: Daniel Lee Kruse [ Upstream commit dbf0b3a7b719eb3f72cb53c2ce7d34a012a9c261 ] On AMD Family 15h (Models 30h-3fh), I/O Memory Management Unit RiSC engine sometimes stalls, requiring a reset. As result, MythTV and w-scan won't scan channels on the AMD Kaveri APU with the Hauppauge QuadHD TV tuner card. For the solution I added the Input/Output Memory Management Unit's PCI Identity of 0x1423 to the broken_dev_id[] array, which is used by a quirks logic meant to fix similar problems with other AMD chipsets. Signed-off-by: Daniel Lee Kruse Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/cx23885/cx23885-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c index 7e0b0b7cc2a3..ead0acb7807c 100644 --- a/drivers/media/pci/cx23885/cx23885-core.c +++ b/drivers/media/pci/cx23885/cx23885-core.c @@ -2074,6 +2074,10 @@ static struct { * 0x1451 is PCI ID for the IOMMU found on Ryzen */ { PCI_VENDOR_ID_AMD, 0x1451 }, + /* According to sudo lspci -nn, + * 0x1423 is the PCI ID for the IOMMU found on Kaveri + */ + { PCI_VENDOR_ID_AMD, 0x1423 }, }; static bool cx23885_does_need_dma_reset(void) -- 2.30.1