Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp182442pxj; Tue, 15 Jun 2021 23:25:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPiCSSci0WCaawtXJTaV7xLb7+0TadwV+DUKyt3SlD2pl6Cy5kIKxNZ0hgKn9Y1DjhrpY4 X-Received: by 2002:a02:9442:: with SMTP id a60mr2756152jai.105.1623824753458; Tue, 15 Jun 2021 23:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623824753; cv=none; d=google.com; s=arc-20160816; b=gvm3X5eYAqM0ADiYkkpvz4oIVEUS06e0TlTFVnt2Kngo5kIhydVl1vVGYFMGrdPnHR fRDkblQttXus0guaPEcH4oM3BMaLZCkBGEoNBXd4kfYut5ZiwCwyqdtI7YhpJ022upyw 2A1u9ugSDAN5VqfzXlirU81igv5NOnxBEBwsRIRNwWIPEZ9agCkTFwPYu66GT1gozhQh 8rpZLskQ+dIkUGZwE+ItuAhUzPL5qtismF1nGB+Mlo98aEAdlz5w295AQyKpf0+FDMTC B0PuanBAR2GwLVF5Foib+ctrdZ6PYLn6sSktz0CDfNiAYh3FQbW6hGFWMe6EyO+oyn5Y 593w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4psftO+uH/TVnoki1qOI27Xe5kV3FYGMoE+zQAlSb7o=; b=YhT9SIYqfgFWJGCSpjE9iSnfNukj9eep8z1qdSquhCNLYWgrODbGR0cc0N477vujWX nHJpewwuo6vmAchsJOUFH1dblofxJBjDPNMaZBmP+CColt3K0X2fAHULzG5mGWfk5WiD afgraq/c1QuUmMZ6qNmbkcAwUTCs+d2QxzQXEzJqmjefMydI7GCt6r/tJupg/9r8E8J/ 4gRj60xfwrkWmkipRdbpC4m3yvEdSwVuzf3kmvjk8xEitafZm+gGf5IKI/dhBAwTWcsy Ppkt2SXqe26lhtRdBbZNblqH6cUsd4JaxzNsWyZxGiXmHBH1ohL7/DTwlgyxy3kQg+Ee BWGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="V/ahoq2v"; 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=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a21si2031922jab.23.2021.06.15.23.25.41; Tue, 15 Jun 2021 23:25:53 -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=@chromium.org header.s=google header.b="V/ahoq2v"; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbhFPG0B (ORCPT + 99 others); Wed, 16 Jun 2021 02:26:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231663AbhFPGZ7 (ORCPT ); Wed, 16 Jun 2021 02:25:59 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D668DC061760 for ; Tue, 15 Jun 2021 23:23:52 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id n12so1100654pgs.13 for ; Tue, 15 Jun 2021 23:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4psftO+uH/TVnoki1qOI27Xe5kV3FYGMoE+zQAlSb7o=; b=V/ahoq2vs8tTy7w+Y5OEwDE5hShbh8znTC5ewffraAkNPn/O4nZhX/k5O/Q4vn+BYw sVVqtxW5hQdZQN9GpVNrLf5hjnu+aW1hXGdh6T0neJbe4VzN1V/QXoB+hgAnMu1VsF+r sglWPBXIWMNhL2qZeTlT+lltwdWi+fBX8GceE= 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=4psftO+uH/TVnoki1qOI27Xe5kV3FYGMoE+zQAlSb7o=; b=aF3aAMONwhGn8IKc5oGxlxlVRlbN5C7pjQwBO6iQDWUqRIXyKGxiw/kYSXb1mx76I/ zN11igGMXHpWJsRHJ0fHciKfuYMdHt2hKbKVnX9ZNSAHrdsxWEGG4NaRIzVrrCEBkrVU 8zDTfreZMVe+vXiHj+1VW+2Ee87aSYZzBhyWy0tSj7hpJd9JuY/ftojnQioC/AVgL32I iS8fsx+kPhsoBHBfGT85CuUWnssYguY9f0Rci6XXd8Dhc2pqjJll0+NIjFYZ1rQgiBEI k56EGt0hLFgUIC+qhkGCa57eVsFqBYFGVggtE3xH0X4xx9iYgTQiMHVz5d5WVAbiIdc1 nWuA== X-Gm-Message-State: AOAM532VgN2MftTRZg6il/PyiJMwDSbyKIQ9JlRMIwjWX5b0MxImIZia Kd/EAkAiLi2M0YUJV6qK7aN2fA== X-Received: by 2002:a62:ae03:0:b029:2f8:b04f:c012 with SMTP id q3-20020a62ae030000b02902f8b04fc012mr8079076pff.62.1623824632264; Tue, 15 Jun 2021 23:23:52 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:3d52:f252:7393:1992]) by smtp.gmail.com with UTF8SMTPSA id j13sm1144475pgp.29.2021.06.15.23.23.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jun 2021 23:23:51 -0700 (PDT) From: Claire Chang To: Rob Herring , mpe@ellerman.id.au, Joerg Roedel , Will Deacon , Frank Rowand , Konrad Rzeszutek Wilk , boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig , Marek Szyprowski Cc: benh@kernel.crashing.org, paulus@samba.org, "list@263.net:IOMMU DRIVERS" , sstabellini@kernel.org, Robin Murphy , grant.likely@arm.com, xypron.glpk@gmx.de, Thierry Reding , mingo@kernel.org, bauerman@linux.ibm.com, peterz@infradead.org, Greg KH , Saravana Kannan , "Rafael J . Wysocki" , heikki.krogerus@linux.intel.com, Andy Shevchenko , Randy Dunlap , Dan Williams , Bartosz Golaszewski , linux-devicetree , lkml , linuxppc-dev@lists.ozlabs.org, xen-devel@lists.xenproject.org, Nicolas Boichat , Jim Quinlan , tfiga@chromium.org, bskeggs@redhat.com, bhelgaas@google.com, chris@chris-wilson.co.uk, tientzu@chromium.org, daniel@ffwll.ch, airlied@linux.ie, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, jxgao@google.com, joonas.lahtinen@linux.intel.com, linux-pci@vger.kernel.org, maarten.lankhorst@linux.intel.com, matthew.auld@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com Subject: [PATCH v12 12/12] of: Add plumbing for restricted DMA pool Date: Wed, 16 Jun 2021 14:21:57 +0800 Message-Id: <20210616062157.953777-13-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210616062157.953777-1-tientzu@chromium.org> References: <20210616062157.953777-1-tientzu@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a device is not behind an IOMMU, we look up the device node and set up the restricted DMA when the restricted-dma-pool is presented. Signed-off-by: Claire Chang --- drivers/of/address.c | 33 +++++++++++++++++++++++++++++++++ drivers/of/device.c | 3 +++ drivers/of/of_private.h | 6 ++++++ 3 files changed, 42 insertions(+) diff --git a/drivers/of/address.c b/drivers/of/address.c index 73ddf2540f3f..cdf700fba5c4 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1022,6 +1023,38 @@ int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map) of_node_put(node); return ret; } + +int of_dma_set_restricted_buffer(struct device *dev, struct device_node *np) +{ + struct device_node *node, *of_node = dev->of_node; + int count, i; + + count = of_property_count_elems_of_size(of_node, "memory-region", + sizeof(u32)); + /* + * If dev->of_node doesn't exist or doesn't contain memory-region, try + * the OF node having DMA configuration. + */ + if (count <= 0) { + of_node = np; + count = of_property_count_elems_of_size( + of_node, "memory-region", sizeof(u32)); + } + + for (i = 0; i < count; i++) { + node = of_parse_phandle(of_node, "memory-region", i); + /* + * There might be multiple memory regions, but only one + * restricted-dma-pool region is allowed. + */ + if (of_device_is_compatible(node, "restricted-dma-pool") && + of_device_is_available(node)) + return of_reserved_mem_device_init_by_idx(dev, of_node, + i); + } + + return 0; +} #endif /* CONFIG_HAS_DMA */ /** diff --git a/drivers/of/device.c b/drivers/of/device.c index 6cb86de404f1..e68316836a7a 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -165,6 +165,9 @@ int of_dma_configure_id(struct device *dev, struct device_node *np, arch_setup_dma_ops(dev, dma_start, size, iommu, coherent); + if (!iommu) + return of_dma_set_restricted_buffer(dev, np); + return 0; } EXPORT_SYMBOL_GPL(of_dma_configure_id); diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index d9e6a324de0a..25cebbed5f02 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -161,12 +161,18 @@ struct bus_dma_region; #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_HAS_DMA) int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map); +int of_dma_set_restricted_buffer(struct device *dev, struct device_node *np); #else static inline int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map) { return -ENODEV; } +static inline int of_dma_set_restricted_buffer(struct device *dev, + struct device_node *np) +{ + return -ENODEV; +} #endif #endif /* _LINUX_OF_PRIVATE_H */ -- 2.32.0.272.g935e593368-goog