Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp91220pxj; Tue, 15 Jun 2021 20:59:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7Ip5CdINeH9DYXcVVI3sMWhlL57ESo97Nghc2kN4qiFQa8ScPLPw/Vkji5D2WHAgh2xt4 X-Received: by 2002:a17:906:b748:: with SMTP id fx8mr3006903ejb.477.1623815943572; Tue, 15 Jun 2021 20:59:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623815943; cv=none; d=google.com; s=arc-20160816; b=fqbkPvidWLTDlY3raCPQH+4neTuar885VQp/iSe8gbdXLKZWSQqWznwXvi3bg+QWoL 5xTb9XWoZ2FbT5S3IDwYKwippOVYUykBpZEKPIxZc04/feam+5pl3vmxkIQK6ArKWQR/ N2alBcpEWXKMDJ57zGlpsFaFMBbRExbtgKFaoyrBkIc167dzbF8KnBAN1z+P8Z0GzLy/ kt3L3G9A9ECleQ7anYBXqKnI/JoUDtnDJDhPBxdNPvsnO45T7X/o+dNLEgbBwqtYEK6i 0YvKGxDnD7tRF+Ltz7/gdGQ9dG5ABGappf1c63m1eteMnI7TxPA8S3tCmVze+LIachOo PcyA== 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=ZYeaAkd+iNo+W89xhB8Ncv7vuedaBsxpEmzfDrF588+BDpYTs9ed0u7pJQJMdURnli JNXE/+EBkQm9bSgNAnZj7AHc1WEvUO1TsIHzyA4nUUXxui1RcLdU92TX2wY1OiDJE2ou 3fVQG+xTWXG/3HBZprFkWuEtZtXkeQYoGvIqXrDDQ8gYPw8jk+0V8wOZuMiXRGOsvnwh uF7jJz/9VIXwyWhTcIj0z7lCKqpMf/TiGH/ehAOrpG7rh/QKja5/1SczJRVjytnxJxnD nmYuqlV9DozaoLbbw6mfILzcu0tWIo65nfUrL4o0gSvb0VN/qsQAQjV9UFOfeAnZMrwj /i1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Li4AEy2J; 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 he38si901420ejc.308.2021.06.15.20.58.40; Tue, 15 Jun 2021 20:59:03 -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=Li4AEy2J; 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 S231416AbhFPD4q (ORCPT + 99 others); Tue, 15 Jun 2021 23:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbhFPD4n (ORCPT ); Tue, 15 Jun 2021 23:56:43 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A22F1C0617A6 for ; Tue, 15 Jun 2021 20:54:37 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id m13-20020a17090b068db02901656cc93a75so3139116pjz.3 for ; Tue, 15 Jun 2021 20:54:37 -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=Li4AEy2JF5gPy9ukpQUJjDPB8rq/Zch13XpWyeO7bHztoc5ctZfpP5asNBSNDWCRJ9 ebBl8RVKocmQh3z5hITYqIYweSnFDje1ai0AgaL9yWsFuJH6pOsddoNur+1F3lLEmeDF LM382R5+plRtaFQ3A0pI0SFPAyiAdN6Elek1g= 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=TPfdaxtVxXE6lQM+jwU4PvxbWDLTeh08RR5p8hfrs5aTCIYwBuXZ0APPP/tInmI8Cs qDiN+6PCd+7OgfLx7It8JStFcGELNO+qWvgmsLuc5hdMQVrhDBMuj2G6c4s3i6Z+Y0R4 FaJM656xk4REoeD4sXZGWvSTN7lqE1vjJE1CYHOo5vIZXFg+knLbc/DlLKYkPorGKbe9 GC7icUCu2PVHYHXE4TWcLHPcQAQM6ZzK4RQ/huF+5LqsS/3M/ww9NOkMlmGxtU7CDiaE iazBgtepsiGgt6cGUKmB8LwbUniAre3JPnJzyCbJqnykumyhWdAs+eJWv/2IQllTlwmZ FPAQ== X-Gm-Message-State: AOAM533bzQQI7JfkUnthpczOjWek4mFfWukJroIRdD2Bu40ZqV3MzX5A urPVeddLkTrZtJ7W8IqWdSZV4w== X-Received: by 2002:a17:902:d645:b029:11d:d075:cf43 with SMTP id y5-20020a170902d645b029011dd075cf43mr4991840plh.14.1623815676876; Tue, 15 Jun 2021 20:54:36 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:3d52:f252:7393:1992]) by smtp.gmail.com with UTF8SMTPSA id bv3sm3688867pjb.1.2021.06.15.20.54.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jun 2021 20:54:36 -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 v11 12/12] of: Add plumbing for restricted DMA pool Date: Wed, 16 Jun 2021 11:52:40 +0800 Message-Id: <20210616035240.840463-13-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210616035240.840463-1-tientzu@chromium.org> References: <20210616035240.840463-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