Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:28:04 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: io-mapping.h
src/sys/external/bsd/drm2/linux: files.drmkms_linux
Added Files:
src/sys/external/bsd/drm2/linux: linux_io_mapping.c
Log Message:
drm: Move io_mapping to very own .c file.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/include/linux/io-mapping.h
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/linux/files.drmkms_linux
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/linux/linux_io_mapping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/io-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.12 src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.13
--- src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.12 Sun Dec 19 12:27:49 2021
+++ src/sys/external/bsd/drm2/include/linux/io-mapping.h Sun Dec 19 12:28:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io-mapping.h,v 1.12 2021/12/19 12:27:49 riastradh Exp $ */
+/* $NetBSD: io-mapping.h,v 1.13 2021/12/19 12:28:04 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,13 +32,18 @@
#ifndef _LINUX_IO_MAPPING_H_
#define _LINUX_IO_MAPPING_H_
-#include <sys/param.h>
+#include <sys/types.h>
+
#include <sys/bus.h>
-#include <sys/kmem.h>
-#include <sys/systm.h>
-#include <sys/mman.h>
-#include <uvm/uvm_extern.h>
+#define bus_space_io_mapping_init_wc linux_bus_space_io_mapping_init_wc
+#define bus_space_io_mapping_create_wc linux_bus_space_io_mapping_create_wc
+#define io_mapping_fini linux_io_mapping_fini
+#define io_mapping_free linux_io_mapping_free
+#define io_mapping_map_wc linux_io_mapping_map_wc
+#define io_mapping_unmap linux_io_mapping_unmap
+#define io_mapping_map_atomic_wc linux_io_mapping_map_atomic_wc
+#define io_mapping_unmap_atomic linux_io_mapping_unmap_atomic
struct io_mapping {
bus_space_tag_t diom_bst;
@@ -48,157 +53,18 @@ struct io_mapping {
bool diom_atomic;
};
-static inline bool
-bus_space_io_mapping_init_wc(bus_space_tag_t bst, struct io_mapping *mapping,
- bus_addr_t addr, bus_size_t size)
-{
- bus_size_t offset;
-
- KASSERT(PAGE_SIZE <= size);
- KASSERT(0 == (size & (PAGE_SIZE - 1)));
- KASSERT(__type_fit(off_t, size));
-
- /*
- * XXX For x86: Reserve the region (bus_space_reserve) and set
- * an MTRR to make it write-combining. Doesn't matter if we
- * have PAT and we use pmap_kenter_pa, but matters if we don't
- * have PAT or if we later make this use direct map.
- */
-
- /* Make sure the region is mappable. */
- for (offset = 0; offset < size; offset += PAGE_SIZE) {
- if (bus_space_mmap(bst, addr, offset, PROT_READ|PROT_WRITE,
- BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE)
- == (paddr_t)-1)
- return false;
- }
-
- /* Initialize the mapping record. */
- mapping->diom_bst = bst;
- mapping->base = addr;
- mapping->size = size;
- mapping->diom_atomic = false;
-
- /* Allocate kva for one page. */
- mapping->diom_va = uvm_km_alloc(kernel_map, PAGE_SIZE, PAGE_SIZE,
- UVM_KMF_VAONLY | UVM_KMF_WAITVA);
- KASSERT(mapping->diom_va != 0);
-
- return true;
-}
-
-static inline void
-io_mapping_fini(struct io_mapping *mapping)
-{
-
- KASSERT(!mapping->diom_atomic);
-
- uvm_km_free(kernel_map, mapping->diom_va, PAGE_SIZE, UVM_KMF_VAONLY);
- mapping->diom_va = 0; /* paranoia */
-}
-
-static inline struct io_mapping *
-bus_space_io_mapping_create_wc(bus_space_tag_t bst, bus_addr_t addr,
- bus_size_t size)
-{
- struct io_mapping *mapping;
-
- mapping = kmem_alloc(sizeof(*mapping), KM_SLEEP);
- if (!bus_space_io_mapping_init_wc(bst, mapping, addr, size)) {
- kmem_free(mapping, sizeof(*mapping));
- return NULL;
- }
-
- return mapping;
-}
-
-static inline void
-io_mapping_free(struct io_mapping *mapping)
-{
-
- io_mapping_fini(mapping);
- kmem_free(mapping, sizeof(*mapping));
-}
-
-static inline void *
-io_mapping_map_wc(struct io_mapping *mapping, bus_addr_t offset,
- bus_size_t size)
-{
- bus_size_t pg, npgs = size >> PAGE_SHIFT;
- vaddr_t va;
- paddr_t cookie;
-
- KASSERT(0 == (offset & (PAGE_SIZE - 1)));
- KASSERT(PAGE_SIZE <= mapping->size);
- KASSERT(offset <= (mapping->size - PAGE_SIZE));
- KASSERT(__type_fit(off_t, offset));
-
- va = uvm_km_alloc(kernel_map, size, PAGE_SIZE,
- UVM_KMF_VAONLY|UVM_KMF_WAITVA);
- KASSERT(va != mapping->diom_va);
- for (pg = 0; pg < npgs; pg++) {
- cookie = bus_space_mmap(mapping->diom_bst, mapping->base,
- offset + pg*PAGE_SIZE,
- PROT_READ|PROT_WRITE,
- BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE);
- KASSERT(cookie != (paddr_t)-1);
-
- pmap_kenter_pa(va + pg*PAGE_SIZE, pmap_phys_address(cookie),
- PROT_READ|PROT_WRITE, pmap_mmap_flags(cookie));
- }
- pmap_update(pmap_kernel());
-
- return (void *)va;
-}
-
-static inline void
-io_mapping_unmap(struct io_mapping *mapping, void *ptr, bus_size_t size)
-{
- vaddr_t va = (vaddr_t)ptr;
-
- KASSERT(mapping->diom_va != va);
-
- pmap_kremove(va, size);
- pmap_update(pmap_kernel());
-
- uvm_km_free(kernel_map, va, size, UVM_KMF_VAONLY);
-}
-
-static inline void *
-io_mapping_map_atomic_wc(struct io_mapping *mapping, bus_addr_t offset)
-{
- paddr_t cookie;
-
- KASSERT(0 == (offset & (PAGE_SIZE - 1)));
- KASSERT(PAGE_SIZE <= mapping->size);
- KASSERT(offset <= (mapping->size - PAGE_SIZE));
- KASSERT(__type_fit(off_t, offset));
- KASSERT(!mapping->diom_atomic);
-
- cookie = bus_space_mmap(mapping->diom_bst, mapping->base, offset,
- PROT_READ|PROT_WRITE,
- BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE);
- KASSERT(cookie != (paddr_t)-1);
-
- pmap_kenter_pa(mapping->diom_va, pmap_phys_address(cookie),
- PROT_READ|PROT_WRITE, pmap_mmap_flags(cookie));
- pmap_update(pmap_kernel());
-
- mapping->diom_atomic = true;
- return (void *)mapping->diom_va;
-}
-
-static inline void
-io_mapping_unmap_atomic(struct io_mapping *mapping, void *ptr __diagused)
-{
-
- KASSERT(mapping->diom_atomic);
- KASSERT(mapping->diom_va == (vaddr_t)ptr);
+bool bus_space_io_mapping_init_wc(bus_space_tag_t, struct io_mapping *,
+ bus_addr_t, bus_size_t);
+void io_mapping_fini(struct io_mapping *);
+
+struct io_mapping *bus_space_io_mapping_create_wc(bus_space_tag_t, bus_addr_t,
+ bus_size_t);
+void io_mapping_free(struct io_mapping *);
- pmap_kremove(mapping->diom_va, PAGE_SIZE);
- pmap_update(pmap_kernel());
+void *io_mapping_map_wc(struct io_mapping *, bus_addr_t, bus_size_t);
+void io_mapping_unmap(struct io_mapping *, void *, bus_size_t);
- mapping->diom_atomic = false;
-}
+void *io_mapping_map_atomic_wc(struct io_mapping *, bus_addr_t);
+void io_mapping_unmap_atomic(struct io_mapping *, void *);
#endif /* _LINUX_IO_MAPPING_H_ */
Index: src/sys/external/bsd/drm2/linux/files.drmkms_linux
diff -u src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.39 src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.40
--- src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.39 Sun Dec 19 12:23:07 2021
+++ src/sys/external/bsd/drm2/linux/files.drmkms_linux Sun Dec 19 12:28:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms_linux,v 1.39 2021/12/19 12:23:07 riastradh Exp $
+# $NetBSD: files.drmkms_linux,v 1.40 2021/12/19 12:28:04 riastradh Exp $
define drmkms_linux: i2cexec, i2c_bitbang
@@ -17,6 +17,7 @@ file external/bsd/drm2/linux/linux_firmw
file external/bsd/drm2/linux/linux_hrtimer.c drmkms_linux
file external/bsd/drm2/linux/linux_i2c.c drmkms_linux
file external/bsd/drm2/linux/linux_idr.c drmkms_linux
+file external/bsd/drm2/linux/linux_io_mapping.c drmkms_linux
file external/bsd/drm2/linux/linux_irq_work.c drmkms_linux
file external/bsd/drm2/linux/linux_kmap.c drmkms_linux
file external/bsd/drm2/linux/linux_kthread.c drmkms_linux
Added files:
Index: src/sys/external/bsd/drm2/linux/linux_io_mapping.c
diff -u /dev/null src/sys/external/bsd/drm2/linux/linux_io_mapping.c:1.1
--- /dev/null Sun Dec 19 12:28:04 2021
+++ src/sys/external/bsd/drm2/linux/linux_io_mapping.c Sun Dec 19 12:28:04 2021
@@ -0,0 +1,193 @@
+/* $NetBSD: linux_io_mapping.c,v 1.1 2021/12/19 12:28:04 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013-2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: linux_io_mapping.c,v 1.1 2021/12/19 12:28:04 riastradh Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kmem.h>
+#include <sys/systm.h>
+#include <sys/mman.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <linux/io-mapping.h>
+
+bool
+bus_space_io_mapping_init_wc(bus_space_tag_t bst, struct io_mapping *mapping,
+ bus_addr_t addr, bus_size_t size)
+{
+ bus_size_t offset;
+
+ KASSERT(PAGE_SIZE <= size);
+ KASSERT(0 == (size & (PAGE_SIZE - 1)));
+ KASSERT(__type_fit(off_t, size));
+
+ /*
+ * XXX For x86: Reserve the region (bus_space_reserve) and set
+ * an MTRR to make it write-combining. Doesn't matter if we
+ * have PAT and we use pmap_kenter_pa, but matters if we don't
+ * have PAT or if we later make this use direct map.
+ */
+
+ /* Make sure the region is mappable. */
+ for (offset = 0; offset < size; offset += PAGE_SIZE) {
+ if (bus_space_mmap(bst, addr, offset, PROT_READ|PROT_WRITE,
+ BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE)
+ == (paddr_t)-1)
+ return false;
+ }
+
+ /* Initialize the mapping record. */
+ mapping->diom_bst = bst;
+ mapping->base = addr;
+ mapping->size = size;
+ mapping->diom_atomic = false;
+
+ /* Allocate kva for one page. */
+ mapping->diom_va = uvm_km_alloc(kernel_map, PAGE_SIZE, PAGE_SIZE,
+ UVM_KMF_VAONLY | UVM_KMF_WAITVA);
+ KASSERT(mapping->diom_va != 0);
+
+ return true;
+}
+
+void
+io_mapping_fini(struct io_mapping *mapping)
+{
+
+ KASSERT(!mapping->diom_atomic);
+
+ uvm_km_free(kernel_map, mapping->diom_va, PAGE_SIZE, UVM_KMF_VAONLY);
+ mapping->diom_va = 0; /* paranoia */
+}
+
+struct io_mapping *
+bus_space_io_mapping_create_wc(bus_space_tag_t bst, bus_addr_t addr,
+ bus_size_t size)
+{
+ struct io_mapping *mapping;
+
+ mapping = kmem_alloc(sizeof(*mapping), KM_SLEEP);
+ if (!bus_space_io_mapping_init_wc(bst, mapping, addr, size)) {
+ kmem_free(mapping, sizeof(*mapping));
+ return NULL;
+ }
+
+ return mapping;
+}
+
+void
+io_mapping_free(struct io_mapping *mapping)
+{
+
+ io_mapping_fini(mapping);
+ kmem_free(mapping, sizeof(*mapping));
+}
+
+void *
+io_mapping_map_wc(struct io_mapping *mapping, bus_addr_t offset,
+ bus_size_t size)
+{
+ bus_size_t pg, npgs = size >> PAGE_SHIFT;
+ vaddr_t va;
+ paddr_t cookie;
+
+ KASSERT(0 == (offset & (PAGE_SIZE - 1)));
+ KASSERT(PAGE_SIZE <= mapping->size);
+ KASSERT(offset <= (mapping->size - PAGE_SIZE));
+ KASSERT(__type_fit(off_t, offset));
+
+ va = uvm_km_alloc(kernel_map, size, PAGE_SIZE,
+ UVM_KMF_VAONLY|UVM_KMF_WAITVA);
+ KASSERT(va != mapping->diom_va);
+ for (pg = 0; pg < npgs; pg++) {
+ cookie = bus_space_mmap(mapping->diom_bst, mapping->base,
+ offset + pg*PAGE_SIZE,
+ PROT_READ|PROT_WRITE,
+ BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE);
+ KASSERT(cookie != (paddr_t)-1);
+
+ pmap_kenter_pa(va + pg*PAGE_SIZE, pmap_phys_address(cookie),
+ PROT_READ|PROT_WRITE, pmap_mmap_flags(cookie));
+ }
+ pmap_update(pmap_kernel());
+
+ return (void *)va;
+}
+
+void
+io_mapping_unmap(struct io_mapping *mapping, void *ptr, bus_size_t size)
+{
+ vaddr_t va = (vaddr_t)ptr;
+
+ KASSERT(mapping->diom_va != va);
+
+ pmap_kremove(va, size);
+ pmap_update(pmap_kernel());
+
+ uvm_km_free(kernel_map, va, size, UVM_KMF_VAONLY);
+}
+
+void *
+io_mapping_map_atomic_wc(struct io_mapping *mapping, bus_addr_t offset)
+{
+ paddr_t cookie;
+
+ KASSERT(0 == (offset & (PAGE_SIZE - 1)));
+ KASSERT(PAGE_SIZE <= mapping->size);
+ KASSERT(offset <= (mapping->size - PAGE_SIZE));
+ KASSERT(__type_fit(off_t, offset));
+ KASSERT(!mapping->diom_atomic);
+
+ cookie = bus_space_mmap(mapping->diom_bst, mapping->base, offset,
+ PROT_READ|PROT_WRITE,
+ BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE);
+ KASSERT(cookie != (paddr_t)-1);
+
+ pmap_kenter_pa(mapping->diom_va, pmap_phys_address(cookie),
+ PROT_READ|PROT_WRITE, pmap_mmap_flags(cookie));
+ pmap_update(pmap_kernel());
+
+ mapping->diom_atomic = true;
+ return (void *)mapping->diom_va;
+}
+
+void
+io_mapping_unmap_atomic(struct io_mapping *mapping, void *ptr __diagused)
+{
+
+ KASSERT(mapping->diom_atomic);
+ KASSERT(mapping->diom_va == (vaddr_t)ptr);
+
+ pmap_kremove(mapping->diom_va, PAGE_SIZE);
+ pmap_update(pmap_kernel());
+
+ mapping->diom_atomic = false;
+}
