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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 EF6EAC3815B for ; Mon, 20 Apr 2020 08:41:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE40420CC7 for ; Mon, 20 Apr 2020 08:41:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UAF7P6ya" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE40420CC7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Uu+aCa5/JPpnF5xYrrQAUJ+QZwoLeepKYXHFuwNnSO0=; b=UAF7P6yaWEhqjk iG2NCZA1JoAc3r0kxrl1PghupKCP9BarNd/wUo98c5lmxHbvGTVOazQe9hVtDgJSUkQnSpqpJ8Lmv jR3ERVnxOAoK48AjURYErZh6iswbuGOBlMy0VWYFOGSKot3cSXpOaaWyKZvFVKJWT5+a4b4j9siFq JXJbrU8g2wculTdnb/M86iy8xLSQwb1h1Ixxq0yL+nsgYgk9fMwEOuw4rZEqp5TUEVBsp3n/ICaxA 4N1M0WvW9IJYPNDXQREUCmvIk41yAWGhsBq6TX3Rkv/LWCoxpctsPH8vLQLpsy8ddAnt0OZhkoTAQ 7XFWhNVjciKWggLlb0Ng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQRzJ-0002sO-Ra; Mon, 20 Apr 2020 08:41:09 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQRzG-0002rl-7F for linux-arm-kernel@lists.infradead.org; Mon, 20 Apr 2020 08:41:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 88FCB30E; Mon, 20 Apr 2020 01:40:59 -0700 (PDT) Received: from red-moon.cambridge.arm.com (unknown [10.57.0.198]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1A9843F73D; Mon, 20 Apr 2020 01:40:57 -0700 (PDT) Date: Mon, 20 Apr 2020 09:40:51 +0100 From: Lorenzo Pieralisi To: Ard Biesheuvel Subject: Re: [PATCH] arm64: iort: take _DMA methods into account for named components Message-ID: <20200420084051.GA12852@red-moon.cambridge.arm.com> References: <20200404073047.17898-1-ardb@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200404073047.17898-1-ardb@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200420_014106_308610_0B1D8AA3 X-CRM114-Status: GOOD ( 16.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, will@kernel.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Apr 04, 2020 at 09:30:47AM +0200, Ard Biesheuvel wrote: > Where IORT nodes for named components can describe simple DMA limits > expressed as the number of address bits a device can driver, _DMA methods > in AML can express more complex topologies, involving DMA translation in > particular. > > Currently, we only take this _DMA method into account if it appears on a > ACPI device node describing a PCIe root complex, but it is perfectly > acceptable to attach them to named components as well, so let's ensure > we take them into account in those cases too. > > Reported-by: Andrei Warkentin > Fixes: 7ad4263980826e8b ("ACPI: Make acpi_dma_configure() DMA regions aware") > Cc: # v4.14+ > Signed-off-by: Ard Biesheuvel > --- > drivers/acpi/arm64/iort.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) Only question is whether there is FW in the field with _DMA methods that now we would start parsing (and hopefully everything will still work) but for that the only choice is applying this patch and see, so: Acked-by: Lorenzo Pieralisi > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index ed3d2d1a7ae9..07eb78baf198 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1146,13 +1146,10 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) > else > size = 1ULL << 32; > > - if (dev_is_pci(dev)) { > - ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size); > - if (ret == -ENODEV) > - ret = rc_dma_get_range(dev, &size); > - } else { > - ret = nc_dma_get_range(dev, &size); > - } > + ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size); > + if (ret == -ENODEV) > + ret = dev_is_pci(dev) ? rc_dma_get_range(dev, &size) > + : nc_dma_get_range(dev, &size); > > if (!ret) { > /* > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel