From patchwork Fri Sep 27 00:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 174559 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2787579ill; Thu, 26 Sep 2019 17:25:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwD0/CaTVvXrngA+m9cmv0Es8G9uqhJQBxVTYJWWXyWsGtKwvuQt+XNO0/24VEPV7HpjlCz X-Received: by 2002:a17:906:1c5b:: with SMTP id l27mr5661784ejg.27.1569543921270; Thu, 26 Sep 2019 17:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569543921; cv=none; d=google.com; s=arc-20160816; b=W5r6vlEBBH5bhAF/qCuvWvalVkShP7rbrwpLmZzttNTD30VDkDGtPtOLcxqR+DKfJF PN7/OPrKXfgcdyDaQkuRXBh0l3oBntI9jnkg8tnqIOBW0UsLBqP4PFWsIfqokueNbsjc Q3JZI3FxiF5qMtwFRwysWiOHtGQl5k/H/S15yaTsC4BcWDVsCcMNpoLRTczlql+H9KSi CNbVhZk/TsgL2wscerhMAkeHmnEXVHOHw04z0OGHc5RHA5EwLQUv//F3nrON4ww1UwbF qZoANtfeje28ZK2k5MMmiu/GPc9AovEf0eC8x5HkcWWKVNy9CXIGCN3HoY+bdCGXFE5b D/EQ== 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; bh=KvE1OjQp2Eo5TOhHCna2F9pDoURrQBiIlsatoh/ojtA=; b=Dk1Di/Q6E1HLW+KI9E0f/ehWpOcqhT5VAtGau46az8RyehlVJm73z2Lxlx6nkVKP9v HBM4FnOBMqU42IpfihJIwCzqO7/eAAcSEL9jSt8Aa5tcBK25gjxLtkOKYKCXJJ3cZF4Z 1KQW9iCtQ/yGa4f1aaiHDkwflHAaBheoVj0ccXRSvzixsmaaKtWWnQiBUBz2kxdnjX+1 Je3Qzj5iNmzYlRzqv9DH3GplfUbdNasSBjv9ZSrNUQe3+/MALSz4hzqK/g4Kkp1j/Xhr YLgT7RZ8zOed3RXNWatb4hUC6uYZm5F+OVSNfm+uSPwCV3CuKgrJHU1FAZgKd0OqTIbv CGtg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 r2si1932925ejj.90.2019.09.26.17.25.21; Thu, 26 Sep 2019 17:25:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728041AbfI0AZP (ORCPT + 8 others); Thu, 26 Sep 2019 20:25:15 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:33271 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728003AbfI0AZO (ORCPT ); Thu, 26 Sep 2019 20:25:14 -0400 Received: by mail-oi1-f195.google.com with SMTP id e18so3767601oii.0; Thu, 26 Sep 2019 17:25:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KvE1OjQp2Eo5TOhHCna2F9pDoURrQBiIlsatoh/ojtA=; b=KqYGlp4pnmNRkjgrtDJgECRHf1rpz2lNXLgnDrdZTmWoQOC+25/QKZtUkGcGBZ2MuG +1x0fm1hlBsfW5UNwdciNVoIxhvFoLj0slGnorylKWqjR960G+fgqUfylYBaBtnLrEK8 BvA59sYp08yFmC61qmHiujPvI4aGdJVivsF9vnZVGiqLtWYG3zATyAsQwn8JPze4b1hS 4tKA94mxv/Vvpk32tlwmP1JpQnKx5PpNRlnHP5/TnMfxIaHNZ4RaOqo0JBU8AdntxtTn hNXqTSnwdep+F+QLxG4vFvSPHt3XQerAcY+9zpnPZ84CFKIdzhyQPDxSXGViljO2oB6b 85aQ== X-Gm-Message-State: APjAAAXIHkETXzCMwxGJlQpNnmK+FX7+eCBnqF/zKARK2svJyUm2/YtN QPEXH1JaPw0RNhjzMgz3OPEqBrs= X-Received: by 2002:a05:6808:b0d:: with SMTP id s13mr4936115oij.52.1569543912890; Thu, 26 Sep 2019 17:25:12 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j11sm339866otk.80.2019.09.26.17.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 17:25:12 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Robin Murphy , Florian Fainelli , Stefan Wahren , Frank Rowand , Arnd Bergmann , Marek Vasut , Geert Uytterhoeven , Simon Horman , Lorenzo Pieralisi , Oza Pawandeep Subject: [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses Date: Thu, 26 Sep 2019 19:24:55 -0500 Message-Id: <20190927002455.13169-12-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190927002455.13169-1-robh@kernel.org> References: <20190927002455.13169-1-robh@kernel.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org of_pci_range_parser_one() has a bug when parsing dma-ranges. When it translates the parent address (aka cpu address in the code), 'ranges' is always being used. This happens to work because most users are just 1:1 translation. Cc: Robin Murphy Signed-off-by: Rob Herring --- drivers/of/address.c | 15 ++++++++++++--- include/linux/of_address.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/of/address.c b/drivers/of/address.c index 5b835d332709..54011a355b81 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -243,6 +243,7 @@ static int parser_init(struct of_pci_range_parser *parser, parser->node = node; parser->pna = of_n_addr_cells(node); parser->np = parser->pna + na + ns; + parser->dma = !strcmp(name, "dma-ranges"); parser->range = of_get_property(node, name, &rlen); if (parser->range == NULL) @@ -281,7 +282,11 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser, range->pci_space = be32_to_cpup(parser->range); range->flags = of_bus_pci_get_flags(parser->range); range->pci_addr = of_read_number(parser->range + 1, ns); - range->cpu_addr = of_translate_address(parser->node, + if (parser->dma) + range->cpu_addr = of_translate_dma_address(parser->node, + parser->range + na); + else + range->cpu_addr = of_translate_address(parser->node, parser->range + na); range->size = of_read_number(parser->range + parser->pna + na, ns); @@ -294,8 +299,12 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser, flags = of_bus_pci_get_flags(parser->range); pci_addr = of_read_number(parser->range + 1, ns); - cpu_addr = of_translate_address(parser->node, - parser->range + na); + if (parser->dma) + cpu_addr = of_translate_dma_address(parser->node, + parser->range + na); + else + cpu_addr = of_translate_address(parser->node, + parser->range + na); size = of_read_number(parser->range + parser->pna + na, ns); if (flags != range->flags) diff --git a/include/linux/of_address.h b/include/linux/of_address.h index ddda3936039c..eac7ab109df4 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -12,6 +12,7 @@ struct of_pci_range_parser { const __be32 *end; int np; int pna; + bool dma; }; struct of_pci_range {