From: j.glisse@gmail.com
To: dri-devel@lists.freedesktop.org
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>, thellstrom@vmware.com
Subject: [PATCH 11/13] swiotlb: Expose swiotlb_nr_tlb function to modules
Date: Wed, 9 Nov 2011 15:22:28 -0500 [thread overview]
Message-ID: <1320870150-23151-12-git-send-email-j.glisse@gmail.com> (raw)
In-Reply-To: <1320870150-23151-1-git-send-email-j.glisse@gmail.com>
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
As a mechanism to detect whether SWIOTLB is enabled or not.
We also fix the spelling - it was swioltb instead of
swiotlb.
CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
[v1: Ripped out swiotlb_enabled]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/xen/swiotlb-xen.c | 2 +-
include/linux/swiotlb.h | 2 +-
lib/swiotlb.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index c984768..c50fb0b 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -152,7 +152,7 @@ void __init xen_swiotlb_init(int verbose)
char *m = NULL;
unsigned int repeat = 3;
- nr_tbl = swioltb_nr_tbl();
+ nr_tbl = swiotlb_nr_tbl();
if (nr_tbl)
xen_io_tlb_nslabs = nr_tbl;
else {
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 445702c..e872526 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -24,7 +24,7 @@ extern int swiotlb_force;
extern void swiotlb_init(int verbose);
extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
-extern unsigned long swioltb_nr_tbl(void);
+extern unsigned long swiotlb_nr_tbl(void);
/*
* Enumeration for sync targets
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 99093b3..058935e 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -110,11 +110,11 @@ setup_io_tlb_npages(char *str)
__setup("swiotlb=", setup_io_tlb_npages);
/* make io_tlb_overflow tunable too? */
-unsigned long swioltb_nr_tbl(void)
+unsigned long swiotlb_nr_tbl(void)
{
return io_tlb_nslabs;
}
-
+EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
/* Note that this doesn't work with highmem page */
static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
volatile void *address)
@@ -321,6 +321,7 @@ void __init swiotlb_free(void)
free_bootmem_late(__pa(io_tlb_start),
PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
}
+ io_tlb_nslabs = 0;
}
static int is_swiotlb_buffer(phys_addr_t paddr)
--
1.7.7.1
next prev parent reply other threads:[~2011-11-09 20:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 20:22 ttm: merge ttm_backend & ttm_tt, introduce ttm dma allocator j.glisse
2011-11-09 20:22 ` [PATCH 01/13] drm/ttm: remove userspace backed ttm object support j.glisse
2011-11-09 20:22 ` [PATCH 02/13] drm/ttm: remove split btw highmen and lowmem page j.glisse
2011-11-09 20:22 ` [PATCH 03/13] drm/ttm: remove unused backend flags field j.glisse
2011-11-09 20:22 ` [PATCH 04/13] drm/ttm: use ttm put pages function to properly restore cache attribute j.glisse
2011-11-09 20:22 ` [PATCH 05/13] drm/ttm: overhaul memory accounting j.glisse
2011-11-10 10:27 ` Thomas Hellstrom
2011-11-10 18:05 ` Jerome Glisse
2011-11-10 20:05 ` Thomas Hellstrom
2011-11-10 23:33 ` Jerome Glisse
2011-11-11 7:49 ` Thomas Hellstrom
2011-11-11 8:47 ` Dave Airlie
2011-11-11 9:08 ` Thomas Hellstrom
2011-11-11 15:47 ` Jerome Glisse
2011-11-11 16:22 ` Thomas Hellstrom
2011-11-11 17:15 ` Jerome Glisse
2011-11-09 20:22 ` [PATCH 06/13] drm/ttm: convert page allocation to use page ptr array instead of list V4 j.glisse
2011-11-09 20:22 ` [PATCH 07/13] drm/ttm: test for dma_address array allocation failure j.glisse
2011-11-09 20:22 ` [PATCH 08/13] drm/ttm: merge ttm_backend and ttm_tt V2 j.glisse
2011-11-09 20:22 ` [PATCH 09/13] drm/ttm: introduce callback for ttm_tt populate & unpopulate V2 j.glisse
2011-11-09 20:22 ` [PATCH 10/13] ttm: Provide DMA aware TTM page pool code. V5 j.glisse
2011-11-09 20:22 ` j.glisse [this message]
2011-11-09 20:22 ` [PATCH 12/13] drm/radeon/kms: Enable the TTM DMA pool if swiotlb is on V2 j.glisse
2011-11-09 20:22 ` [PATCH 13/13] drm/nouveau: enable the TTM DMA pool on 32-bit DMA only device V2 j.glisse
2011-11-09 20:25 ` ttm: merge ttm_backend & ttm_tt, introduce ttm dma allocator Thomas Hellstrom
2011-11-09 21:03 ` Jerome Glisse
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=1320870150-23151-12-git-send-email-j.glisse@gmail.com \
--to=j.glisse@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=thellstrom@vmware.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox