Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1547779pxj; Wed, 19 May 2021 08:22:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwy1/dmIT+H2AA/mxnnsATPGnAKyDQxJYqt3o/rrR1EpVDGDgLoiYS8x6NvbXcHrBawDenU X-Received: by 2002:a17:906:3c56:: with SMTP id i22mr13204705ejg.147.1621437723671; Wed, 19 May 2021 08:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621437723; cv=none; d=google.com; s=arc-20160816; b=UpIzQVJLoSiy7L6bVu1ZVUoftySrCwAHnJy3ApB/wtdQ+rvc2I4Fw8jY6KZZ63vmHw c+EvFscJ+FLW6uJeSBTFdMHDsRpsHu8lGXDqBvfFONiW7GZrOekKtgFj85vmPJfLpu8o da49JUC3oXkXwP7Y34ojGdNZWhZSNoB90FypzQwwaIrm6Xmh0EQ31v7Y6t7QIFyq5Rre swEEwcTbLeauMf4NUOk0CKysKc50W1JNMGhjR8HZ+jNr2jUPkoRT+lSMgdkmwLROySzx jCvVZ1hBjdx5/DrVGtppGmzDnFmpVUmHX7eBvkD5ZF5kDF8PgyMZrXvQkAgSlS0mt0EN MDLg== 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=I5cfiiuVy355q+pMGkQSgcYSZ5RdxJgoq0S/wr5t2jQ=; b=DBqTeT1GbTpBDYwq/Op3BtGukFqWXC4E/6CerX0dNYCHaLm1u7HR1Gnz4RCSN7PL98 S8wNCW0qc9ObL0Dea7CUPa0tG3qTw4auIXHBjf7lcdOaAgciuY0FFx3gLo0qfmD1O6Or HUtx8UJjeWB1o0DCo53OakNXLYmhTCWxhXdzy0sDEDEOUxECIcB4aO39hd482Z5q0kh2 Wak2bWasFd55gxftNpDzPtx+eR1UWBlu67KRCDGrssm84Sm7kWipqO+WEqGbCgf1RXz3 p3aYQsiBy2jEPHNOiK5zqoRssULk4nUJ4mcHAUwP52pBHTqKI4GSG6VHXdui4THNxeim VZ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VCVUNM1M; 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 c15si20908434ejb.625.2021.05.19.08.21.36; Wed, 19 May 2021 08:22: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=VCVUNM1M; 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 S1346871AbhERGqD (ORCPT + 99 others); Tue, 18 May 2021 02:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346877AbhERGqA (ORCPT ); Tue, 18 May 2021 02:46:00 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A459AC061346 for ; Mon, 17 May 2021 23:44:42 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id 69so4531734plc.5 for ; Mon, 17 May 2021 23:44:42 -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=I5cfiiuVy355q+pMGkQSgcYSZ5RdxJgoq0S/wr5t2jQ=; b=VCVUNM1MLDDCM1YEpGwmMdmzVg+pX5xmo6WpPBxB4HadDcwl/CwygcBJ5Z5xVX7EGU JOp+gYR2V8ugVsU2F+sXgC/jRu3mFZRgRkzZFN+5qA7YQg/e6fHR9WHgCovgX+k3cvqU Wun2WPZQV8InkeRjlR+5gd/zLl5l3irc9NkFk= 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=I5cfiiuVy355q+pMGkQSgcYSZ5RdxJgoq0S/wr5t2jQ=; b=KhaX1nQW1+0iud58mD3+AluGwhADxPW3tvtlAjh6g4b8z9jqJyVPbLuFsGvohOmpbB id46FFJmSq0vbD/UpioGBLWm5AnZ1SeAaL+cv5a1J+sLHCgVxbOnejbMQeslZS9SUFm+ CZFkDk/X7sOur7GamsyrcrpBSF27sqW+5meHB5pSIvhvUYloRSawtQIf7Gjp8eBTlNLS AKsl9448nRLPiQ9LmkUF4jd3v2LA9y87/mUKqj3DhsegdEtpoZBKR5KxHsUvMP+WdkIa xebzM5+vgw/xdm3flgqb2QgSyNVfNz0AgpuDjAEXfKeRGWDMkt+4TPJ7epl3epxdv9Ab LKTA== X-Gm-Message-State: AOAM532zxZ2hpaYRrM0KAlLtXSQHh8pNQbiqJ+6c6cOA2LYzp5bi/I6z ADqHXR1izhFO2JVwHJavEsxtFw== X-Received: by 2002:a17:90a:9312:: with SMTP id p18mr3499688pjo.171.1621320282285; Mon, 17 May 2021 23:44:42 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:f284:b819:54ca:c198]) by smtp.gmail.com with UTF8SMTPSA id u23sm1635824pfn.106.2021.05.17.23.44.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 May 2021 23:44:41 -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 v7 15/15] of: Add plumbing for restricted DMA pool Date: Tue, 18 May 2021 14:42:15 +0800 Message-Id: <20210518064215.2856977-16-tientzu@chromium.org> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog In-Reply-To: <20210518064215.2856977-1-tientzu@chromium.org> References: <20210518064215.2856977-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 | 25 +++++++++++++++++++++++++ drivers/of/device.c | 3 +++ drivers/of/of_private.h | 5 +++++ 3 files changed, 33 insertions(+) diff --git a/drivers/of/address.c b/drivers/of/address.c index aca94c348bd4..c562a9ff5f0b 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1112,6 +1113,30 @@ bool of_dma_is_coherent(struct device_node *np) } EXPORT_SYMBOL_GPL(of_dma_is_coherent); +int of_dma_set_restricted_buffer(struct device *dev) +{ + struct device_node *node; + int count, i; + + if (!dev->of_node) + return 0; + + count = of_property_count_elems_of_size(dev->of_node, "memory-region", + sizeof(phandle)); + for (i = 0; i < count; i++) { + node = of_parse_phandle(dev->of_node, "memory-region", i); + /* There might be multiple memory regions, but only one + * restriced-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, dev->of_node, i); + } + + return 0; +} + /** * of_mmio_is_nonposted - Check if device uses non-posted MMIO * @np: device node diff --git a/drivers/of/device.c b/drivers/of/device.c index c5a9473a5fb1..d8d865223e51 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); + return 0; } EXPORT_SYMBOL_GPL(of_dma_configure_id); diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index d717efbd637d..9fc874548528 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -163,12 +163,17 @@ 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); #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) +{ + return -ENODEV; +} #endif #endif /* _LINUX_OF_PRIVATE_H */ -- 2.31.1.751.gd2f1c929bd-goog