From: Claire Chang <tientzu@chromium.org> To: Rob Herring <robh+dt@kernel.org>, mpe@ellerman.id.au, Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig <hch@lst.de>, Marek Szyprowski <m.szyprowski@samsung.com> Cc: benh@kernel.crashing.org, paulus@samba.org, "list@263.net:IOMMU DRIVERS" <iommu@lists.linux-foundation.org>, sstabellini@kernel.org, Robin Murphy <robin.murphy@arm.com>, grant.likely@arm.com, xypron.glpk@gmx.de, Thierry Reding <treding@nvidia.com>, mingo@kernel.org, bauerman@linux.ibm.com, peterz@infradead.org, Greg KH <gregkh@linuxfoundation.org>, Saravana Kannan <saravanak@google.com>, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, heikki.krogerus@linux.intel.com, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Randy Dunlap <rdunlap@infradead.org>, Dan Williams <dan.j.williams@intel.com>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, linux-devicetree <devicetree@vger.kernel.org>, lkml <linux-kernel@vger.kernel.org>, linuxppc-dev@lists.ozlabs.org, xen-devel@lists.xenproject.org, Nicolas Boichat <drinkcat@chromium.org>, Jim Quinlan <james.quinlan@broadcom.com>, Claire Chang <tientzu@chromium.org> Subject: [PATCH v4 02/14] swiotlb: Move is_swiotlb_buffer() to swiotlb.c Date: Tue, 9 Feb 2021 14:21:19 +0800 [thread overview] Message-ID: <20210209062131.2300005-3-tientzu@chromium.org> (raw) In-Reply-To: <20210209062131.2300005-1-tientzu@chromium.org> Move is_swiotlb_buffer() to swiotlb.c and make io_tlb_{start,end} static, so we can entirely hide struct swiotlb inside of swiotlb.c in the following patches. Signed-off-by: Claire Chang <tientzu@chromium.org> --- include/linux/swiotlb.h | 7 +------ kernel/dma/swiotlb.c | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 83200f3b042a..041611bf3c2a 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -70,13 +70,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys, #ifdef CONFIG_SWIOTLB extern enum swiotlb_force swiotlb_force; -extern phys_addr_t io_tlb_start, io_tlb_end; - -static inline bool is_swiotlb_buffer(phys_addr_t paddr) -{ - return paddr >= io_tlb_start && paddr < io_tlb_end; -} +bool is_swiotlb_buffer(phys_addr_t paddr); void __init swiotlb_exit(void); unsigned int swiotlb_max_segment(void); size_t swiotlb_max_mapping_size(struct device *dev); diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index e180211f6ad9..678490d39e55 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -69,7 +69,7 @@ enum swiotlb_force swiotlb_force; * swiotlb_tbl_sync_single_*, to see if the memory was in fact allocated by this * API. */ -phys_addr_t io_tlb_start, io_tlb_end; +static phys_addr_t io_tlb_start, io_tlb_end; /* * The number of IO TLB blocks (in groups of 64) between io_tlb_start and @@ -719,6 +719,11 @@ bool is_swiotlb_active(void) return io_tlb_end != 0; } +bool is_swiotlb_buffer(phys_addr_t paddr) +{ + return paddr >= io_tlb_start && paddr < io_tlb_end; +} + phys_addr_t get_swiotlb_start(void) { return io_tlb_start; -- 2.30.0.478.g8a0d178c01-goog
WARNING: multiple messages have this Message-ID (diff)
From: Claire Chang <tientzu@chromium.org> To: Rob Herring <robh+dt@kernel.org>, mpe@ellerman.id.au, Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig <hch@lst.de>, Marek Szyprowski <m.szyprowski@samsung.com> Cc: heikki.krogerus@linux.intel.com, peterz@infradead.org, grant.likely@arm.com, paulus@samba.org, mingo@kernel.org, sstabellini@kernel.org, Saravana Kannan <saravanak@google.com>, xypron.glpk@gmx.de, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, xen-devel@lists.xenproject.org, Thierry Reding <treding@nvidia.com>, linux-devicetree <devicetree@vger.kernel.org>, linuxppc-dev@lists.ozlabs.org, Nicolas Boichat <drinkcat@chromium.org>, Claire Chang <tientzu@chromium.org>, Dan Williams <dan.j.williams@intel.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Greg KH <gregkh@linuxfoundation.org>, Randy Dunlap <rdunlap@infradead.org>, lkml <linux-kernel@vger.kernel.org>, "list@263.net:IOMMU DRIVERS" <iommu@lists.linux-foundation.org>, Jim Quinlan <james.quinlan@broadcom.com>, Robin Murphy <robin.murphy@arm.com>, bauerman@linux.ibm.com Subject: [PATCH v4 02/14] swiotlb: Move is_swiotlb_buffer() to swiotlb.c Date: Tue, 9 Feb 2021 14:21:19 +0800 [thread overview] Message-ID: <20210209062131.2300005-3-tientzu@chromium.org> (raw) In-Reply-To: <20210209062131.2300005-1-tientzu@chromium.org> Move is_swiotlb_buffer() to swiotlb.c and make io_tlb_{start,end} static, so we can entirely hide struct swiotlb inside of swiotlb.c in the following patches. Signed-off-by: Claire Chang <tientzu@chromium.org> --- include/linux/swiotlb.h | 7 +------ kernel/dma/swiotlb.c | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 83200f3b042a..041611bf3c2a 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -70,13 +70,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys, #ifdef CONFIG_SWIOTLB extern enum swiotlb_force swiotlb_force; -extern phys_addr_t io_tlb_start, io_tlb_end; - -static inline bool is_swiotlb_buffer(phys_addr_t paddr) -{ - return paddr >= io_tlb_start && paddr < io_tlb_end; -} +bool is_swiotlb_buffer(phys_addr_t paddr); void __init swiotlb_exit(void); unsigned int swiotlb_max_segment(void); size_t swiotlb_max_mapping_size(struct device *dev); diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index e180211f6ad9..678490d39e55 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -69,7 +69,7 @@ enum swiotlb_force swiotlb_force; * swiotlb_tbl_sync_single_*, to see if the memory was in fact allocated by this * API. */ -phys_addr_t io_tlb_start, io_tlb_end; +static phys_addr_t io_tlb_start, io_tlb_end; /* * The number of IO TLB blocks (in groups of 64) between io_tlb_start and @@ -719,6 +719,11 @@ bool is_swiotlb_active(void) return io_tlb_end != 0; } +bool is_swiotlb_buffer(phys_addr_t paddr) +{ + return paddr >= io_tlb_start && paddr < io_tlb_end; +} + phys_addr_t get_swiotlb_start(void) { return io_tlb_start; -- 2.30.0.478.g8a0d178c01-goog
next prev parent reply other threads:[~2021-02-09 6:24 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-09 6:21 [PATCH v4 00/14] Restricted DMA Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 01/14] swiotlb: Remove external access to io_tlb_start Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 8:40 ` Christoph Hellwig 2021-02-09 8:40 ` Christoph Hellwig 2021-02-09 11:17 ` kernel test robot 2021-02-09 6:21 ` Claire Chang [this message] 2021-02-09 6:21 ` [PATCH v4 02/14] swiotlb: Move is_swiotlb_buffer() to swiotlb.c Claire Chang 2021-02-09 6:21 ` [PATCH v4 03/14] swiotlb: Add struct swiotlb Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 04/14] swiotlb: Refactor swiotlb_late_init_with_tbl Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 05/14] swiotlb: Add DMA_RESTRICTED_POOL Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 06/14] swiotlb: Add restricted DMA pool Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 9:39 ` kernel test robot 2021-02-09 9:56 ` kernel test robot 2021-02-09 11:39 ` kernel test robot 2021-02-09 6:21 ` [PATCH v4 07/14] swiotlb: Update swiotlb API to gain a struct device argument Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 08/14] swiotlb: Use restricted DMA pool if available Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 09/14] swiotlb: Refactor swiotlb_tbl_{map,unmap}_single Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 9:31 ` [PATCH v4 09/14] swiotlb: Refactor swiotlb_tbl_{map, unmap}_single kernel test robot 2021-02-09 6:21 ` [PATCH v4 10/14] dma-direct: Add a new wrapper __dma_direct_free_pages() Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 11/14] swiotlb: Add is_dev_swiotlb_force() Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 12/14] swiotlb: Add restricted DMA alloc/free support Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-26 4:17 ` Claire Chang 2021-02-26 4:17 ` Claire Chang 2021-02-26 4:17 ` Claire Chang 2021-02-26 4:17 ` Claire Chang 2021-02-26 5:17 ` Christoph Hellwig 2021-02-26 5:17 ` Christoph Hellwig 2021-02-26 5:17 ` Christoph Hellwig 2021-02-26 9:35 ` Claire Chang 2021-02-26 9:35 ` Claire Chang 2021-02-26 9:35 ` Claire Chang 2021-02-26 9:35 ` Claire Chang 2021-02-09 6:21 ` [PATCH v4 13/14] dt-bindings: of: Add restricted DMA pool Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-03-10 16:07 ` Will Deacon 2021-03-10 16:07 ` Will Deacon 2021-03-10 16:07 ` Will Deacon 2021-03-10 21:40 ` Rob Herring 2021-03-10 21:40 ` Rob Herring 2021-03-10 21:40 ` Rob Herring 2021-03-10 21:40 ` Rob Herring 2021-03-11 5:04 ` Florian Fainelli 2021-03-11 5:04 ` Florian Fainelli 2021-03-11 5:04 ` Florian Fainelli 2021-02-09 6:21 ` [PATCH v4 14/14] of: Add plumbing for " Claire Chang 2021-02-09 6:21 ` Claire Chang 2021-04-22 8:20 ` [PATCH v4 00/14] Restricted DMA Claire Chang 2021-04-22 8:20 ` Claire Chang 2021-04-22 8:20 ` Claire Chang 2021-04-22 8:20 ` Claire Chang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210209062131.2300005-3-tientzu@chromium.org \ --to=tientzu@chromium.org \ --cc=andriy.shevchenko@linux.intel.com \ --cc=bauerman@linux.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=bgolaszewski@baylibre.com \ --cc=boris.ostrovsky@oracle.com \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=drinkcat@chromium.org \ --cc=frowand.list@gmail.com \ --cc=grant.likely@arm.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@lst.de \ --cc=heikki.krogerus@linux.intel.com \ --cc=iommu@lists.linux-foundation.org \ --cc=james.quinlan@broadcom.com \ --cc=jgross@suse.com \ --cc=joro@8bytes.org \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=m.szyprowski@samsung.com \ --cc=mingo@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=peterz@infradead.org \ --cc=rafael.j.wysocki@intel.com \ --cc=rdunlap@infradead.org \ --cc=robh+dt@kernel.org \ --cc=robin.murphy@arm.com \ --cc=saravanak@google.com \ --cc=sstabellini@kernel.org \ --cc=treding@nvidia.com \ --cc=will@kernel.org \ --cc=xen-devel@lists.xenproject.org \ --cc=xypron.glpk@gmx.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.