From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 475E0C43387 for ; Wed, 19 Dec 2018 17:40:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3DAA217D9 for ; Wed, 19 Dec 2018 17:40:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nextdimension.cc header.i=@nextdimension.cc header.b="Y4DYb7O0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729188AbeLSRkj (ORCPT ); Wed, 19 Dec 2018 12:40:39 -0500 Received: from goldenrod.birch.relay.mailchannels.net ([23.83.209.74]:1862 "EHLO goldenrod.birch.relay.mailchannels.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeLSRki (ORCPT ); Wed, 19 Dec 2018 12:40:38 -0500 X-Sender-Id: dreamhost|x-authsender|brad@b-rad.cc Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 738551231F2; Wed, 19 Dec 2018 17:40:33 +0000 (UTC) Received: from pdx1-sub0-mail-a53.g.dreamhost.com (unknown [100.96.33.121]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id B1A39122FAF; Wed, 19 Dec 2018 17:40:32 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|brad@b-rad.cc Received: from pdx1-sub0-mail-a53.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Wed, 19 Dec 2018 17:40:33 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|brad@b-rad.cc X-MailChannels-Auth-Id: dreamhost X-Left-Stupid: 0c2e06ca49b52b1a_1545241233124_4051547293 X-MC-Loop-Signature: 1545241233124:1675980144 X-MC-Ingress-Time: 1545241233124 Received: from pdx1-sub0-mail-a53.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a53.g.dreamhost.com (Postfix) with ESMTP id B31D180433; Wed, 19 Dec 2018 09:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=nextdimension.cc; h= subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s= nextdimension.cc; bh=2kUUOQuknEo/Uz6yTdMiaWgy38I=; b=Y4DYb7O0QV8 TsZPPQwipcWmVmP8NJriyy0/aHHB2MkhB5dS4F3Qzdggw5BfW5pHgf/HDmx2H8et rvf7D75mMy5W8L9gcfYC5GQRHjg4qnGrSXBooliKFLCrhr4Cs9YuMvdPIZ9CxpXf gvM2eaI90paRm8O9mAugWwLKkCXeYKfk= Received: from [192.168.0.21] (66-90-189-166.dyn.grandenetworks.net [66.90.189.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: brad@b-rad.cc) by pdx1-sub0-mail-a53.g.dreamhost.com (Postfix) with ESMTPSA id 0FA888042E; Wed, 19 Dec 2018 09:40:29 -0800 (PST) Subject: Re: [PATCH v2] cx23885: only reset DMA on problematic CPUs To: Brad Love , Alex Deucher Cc: linux-media , mchehab@kernel.org, Markus Dobel References: <20181206173204.21b9366e@coco.lan> <1545173976-16992-1-git-send-email-brad@nextdimension.cc> X-DH-BACKEND: pdx1-sub0-mail-a53 From: Brad Love Openpgp: preference=signencrypt Autocrypt: addr=brad@nextdimension.cc; prefer-encrypt=mutual; keydata= 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 Message-ID: <2d336f89-011e-4836-bdd3-7bc3cb1db344@nextdimension.cc> Date: Wed, 19 Dec 2018 11:40:28 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-GB X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -85 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedrudejtddguddtgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhepuffvfhfhkffffgggjggtgfesthhqredttdefjeenucfhrhhomhepuehrrgguucfnohhvvgcuoegsrhgrugesnhgvgihtughimhgvnhhsihhonhdrtggtqeenucffohhmrghinhepohhpvghnsggvnhgthhhmrghrkhhinhhgrdhorhhgnecukfhppeeiiedrledtrddukeelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopegludelvddrudeikedrtddrvddungdpihhnvghtpeeiiedrledtrddukeelrdduieeipdhrvghtuhhrnhdqphgrthhhpeeurhgrugcunfhovhgvuceosghrrggusehnvgigthguihhmvghnshhiohhnrdgttgeqpdhmrghilhhfrhhomhepsghrrggusehnvgigthguihhmvghnshhiohhnrdgttgdpnhhrtghpthhtohepsghrrggusehnvgigthguihhmvghnshhiohhnrdgttgenucevlhhushhtvghrufhiiigvpedt Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Alex, On 19/12/2018 11.26, Brad Love wrote: > Hi Alex, > > > On 18/12/2018 17.49, Alex Deucher wrote: >> On Tue, Dec 18, 2018 at 5:59 PM Brad Love wrot= e: >>> It is reported that commit 95f408bbc4e4 ("media: cx23885: Ryzen DMA >>> related RiSC engine stall fixes") caused regresssions with other CPUs= =2E >>> >>> Ensure that the quirk will be applied only for the CPUs that >>> are known to cause problems. >>> >>> A module option is added for explicit control of the behaviour. >>> >>> Fixes: 95f408bbc4e4 ("media: cx23885: Ryzen DMA related RiSC engine s= tall fixes") >>> >>> Signed-off-by: Brad Love >>> --- >>> Changes since v1: >>> - Added module option for three way control >>> - Removed '7' from pci id description, Ryzen 3 is the same id >>> >>> drivers/media/pci/cx23885/cx23885-core.c | 54 ++++++++++++++++++++++= ++++++++-- >>> drivers/media/pci/cx23885/cx23885.h | 2 ++ >>> 2 files changed, 54 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media= /pci/cx23885/cx23885-core.c >>> index 39804d8..fb721c7 100644 >>> --- a/drivers/media/pci/cx23885/cx23885-core.c >>> +++ b/drivers/media/pci/cx23885/cx23885-core.c >>> @@ -23,6 +23,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -41,6 +42,18 @@ MODULE_AUTHOR("Steven Toth "); >>> MODULE_LICENSE("GPL"); >>> MODULE_VERSION(CX23885_VERSION); >>> >>> +/* >>> + * Some platforms have been found to require periodic resetting of t= he DMA >>> + * engine. Ryzen and XEON platforms are known to be affected. The sy= mptom >>> + * encountered is "mpeg risc op code error". Only Ryzen platforms em= ploy >>> + * this workaround if the option equals 1. The workaround can be exp= licitly >>> + * disabled for all platforms by setting to 0, the workaround can be= forced >>> + * on for any platform by setting to 2. >>> + */ >>> +static unsigned int dma_reset_workaround =3D 1; >>> +module_param(dma_reset_workaround, int, 0644); >>> +MODULE_PARM_DESC(dma_reset_workaround, "periodic RiSC dma engine res= et; 0-force disable, 1-driver detect (default), 2-force enable"); >>> + >>> static unsigned int debug; >>> module_param(debug, int, 0644); >>> MODULE_PARM_DESC(debug, "enable debug messages"); >>> @@ -603,8 +616,13 @@ static void cx23885_risc_disasm(struct cx23885_t= sport *port, >>> >>> static void cx23885_clear_bridge_error(struct cx23885_dev *dev) >>> { >>> - uint32_t reg1_val =3D cx_read(TC_REQ); /* read-only */ >>> - uint32_t reg2_val =3D cx_read(TC_REQ_SET); >>> + uint32_t reg1_val, reg2_val; >>> + >>> + if (!dev->need_dma_reset) >>> + return; >>> + >>> + reg1_val =3D cx_read(TC_REQ); /* read-only */ >>> + reg2_val =3D cx_read(TC_REQ_SET); >>> >>> if (reg1_val && reg2_val) { >>> cx_write(TC_REQ, reg1_val); >>> @@ -2058,6 +2076,36 @@ void cx23885_gpio_enable(struct cx23885_dev *d= ev, u32 mask, int asoutput) >>> /* TODO: 23-19 */ >>> } >>> >>> +static struct { >>> + int vendor, dev; >>> +} const broken_dev_id[] =3D { >>> + /* According with >>> + * https://openbenchmarking.org/system/1703021-RI-AMDZEN08075= /Ryzen%207%201800X/lspci, >>> + * 0x1451 is PCI ID for the IOMMU found on Ryzen >>> + */ >>> + { PCI_VENDOR_ID_AMD, 0x1451 }, >> Does this issue only happen with the IOMMU is enabled? Is it only for= >> p2p transfers? Until recently the DMA and PCI subsystems didn't >> actually support p2p properly when the IOMMU was enabled. that might >> explain some of the issues. Additionally, if you match based on the >> IOMMU id, you won't match if the user disables the IOMMU in the sbios.= >> Is this only an issue with the IOMMU enabled? >> >> Alex > > I'm unsure of the answers to your questions. I do still have my Ryzen3 > system around, I'll see if I can disable IOMMU and do some tests. > > Regards, > > Brad The moment I looked this up I recalled something. During testing I had to pass iommu=3Dpt as a kernel command line option, that option is still in my grub config. Without that set I would get critical AMD-VI errors from the onboard ethernet as well as gpu. I have left that setting as is the entire time (~8mo) I've been testing the system, because I could not boot initially without it. I'll try other options now. Regards, Brad > > >>> +}; >>> + >>> +static bool cx23885_does_need_dma_reset(void) >>> +{ >>> + int i; >>> + struct pci_dev *pdev =3D NULL; >>> + >>> + if (dma_reset_workaround =3D=3D 0) >>> + return false; >>> + else if (dma_reset_workaround =3D=3D 2) >>> + return true; >>> + >>> + for (i =3D 0; i < sizeof(broken_dev_id); i++) { >>> + pdev =3D pci_get_device(broken_dev_id[i].vendor, brok= en_dev_id[i].dev, NULL); >>> + if (pdev) { >>> + pci_dev_put(pdev); >>> + return true; >>> + } >>> + } >>> + return false; >>> +} >>> + >>> static int cx23885_initdev(struct pci_dev *pci_dev, >>> const struct pci_device_id *pci_id) >>> { >>> @@ -2069,6 +2117,8 @@ static int cx23885_initdev(struct pci_dev *pci_= dev, >>> if (NULL =3D=3D dev) >>> return -ENOMEM; >>> >>> + dev->need_dma_reset =3D cx23885_does_need_dma_reset(); >>> + >>> err =3D v4l2_device_register(&pci_dev->dev, &dev->v4l2_dev); >>> if (err < 0) >>> goto fail_free; >>> diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/= cx23885/cx23885.h >>> index d54c7ee..cf965ef 100644 >>> --- a/drivers/media/pci/cx23885/cx23885.h >>> +++ b/drivers/media/pci/cx23885/cx23885.h >>> @@ -451,6 +451,8 @@ struct cx23885_dev { >>> /* Analog raw audio */ >>> struct cx23885_audio_dev *audio_dev; >>> >>> + /* Does the system require periodic DMA resets? */ >>> + unsigned int need_dma_reset:1; >>> }; >>> >>> static inline struct cx23885_dev *to_cx23885(struct v4l2_device *v4l= 2_dev) >>> -- >>> 2.7.4 >>>