Author: br
Date: Thu Oct 15 13:47:52 2020
New Revision: 366724
URL: https://svnweb.freebsd.org/changeset/base/366724
Log:
Split-out Guest Address Space (GAS) macroses to a separate header.
Sponsored by: Innovate DSbD
Added:
head/sys/dev/iommu/iommu_gas.h (contents, props changed)
Modified:
head/sys/dev/iommu/busdma_iommu.h
head/sys/dev/iommu/iommu.h
head/sys/dev/iommu/iommu_gas.c
Modified: head/sys/dev/iommu/busdma_iommu.h
==============================================================================
--- head/sys/dev/iommu/busdma_iommu.h Thu Oct 15 13:43:43 2020
(r366723)
+++ head/sys/dev/iommu/busdma_iommu.h Thu Oct 15 13:47:52 2020
(r366724)
@@ -35,6 +35,7 @@
#define __X86_IOMMU_BUSDMA_DMAR_H
#include <dev/iommu/iommu.h>
+#include <dev/iommu/iommu_gas.h>
struct bus_dma_tag_iommu {
struct bus_dma_tag_common common;
Modified: head/sys/dev/iommu/iommu.h
==============================================================================
--- head/sys/dev/iommu/iommu.h Thu Oct 15 13:43:43 2020 (r366723)
+++ head/sys/dev/iommu/iommu.h Thu Oct 15 13:47:52 2020 (r366724)
@@ -65,18 +65,6 @@ struct iommu_map_entry {
struct iommu_qi_genseq gseq;
};
-#define IOMMU_MAP_ENTRY_PLACE 0x0001 /* Fake entry */
-#define IOMMU_MAP_ENTRY_RMRR 0x0002 /* Permanent, not linked by
- dmamap_link */
-#define IOMMU_MAP_ENTRY_MAP 0x0004 /* Busdma created, linked by
- dmamap_link */
-#define IOMMU_MAP_ENTRY_UNMAPPED 0x0010 /* No backing pages */
-#define IOMMU_MAP_ENTRY_QI_NF 0x0020 /* qi task, do not free entry */
-#define IOMMU_MAP_ENTRY_READ 0x1000 /* Read permitted */
-#define IOMMU_MAP_ENTRY_WRITE 0x2000 /* Write permitted */
-#define IOMMU_MAP_ENTRY_SNOOP 0x4000 /* Snoop */
-#define IOMMU_MAP_ENTRY_TM 0x8000 /* Transient */
-
struct iommu_unit {
struct mtx lock;
int unit;
@@ -148,17 +136,6 @@ struct iommu_ctx {
page table */
#define IOMMU_DOMAIN_RMRR 0x0020 /* Domain contains RMRR
entry,
cannot be turned off */
-
-/* Map flags */
-#define IOMMU_MF_CANWAIT 0x0001
-#define IOMMU_MF_CANSPLIT 0x0002
-#define IOMMU_MF_RMRR 0x0004
-
-#define IOMMU_PGF_WAITOK 0x0001
-#define IOMMU_PGF_ZERO 0x0002
-#define IOMMU_PGF_ALLOC 0x0004
-#define IOMMU_PGF_NOALLOC 0x0008
-#define IOMMU_PGF_OBJL 0x0010
#define IOMMU_LOCK(unit) mtx_lock(&(unit)->lock)
#define IOMMU_UNLOCK(unit) mtx_unlock(&(unit)->lock)
Modified: head/sys/dev/iommu/iommu_gas.c
==============================================================================
--- head/sys/dev/iommu/iommu_gas.c Thu Oct 15 13:43:43 2020
(r366723)
+++ head/sys/dev/iommu/iommu_gas.c Thu Oct 15 13:47:52 2020
(r366724)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/iommu/iommu.h>
+#include <dev/iommu/iommu_gas.h>
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/md_var.h>
Added: head/sys/dev/iommu/iommu_gas.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/iommu/iommu_gas.h Thu Oct 15 13:47:52 2020
(r366724)
@@ -0,0 +1,60 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Konstantin Belousov <k...@freebsd.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _DEV_IOMMU_IOMMU_GAS_H_
+#define _DEV_IOMMU_IOMMU_GAS_H_
+
+/* Map flags */
+#define IOMMU_MF_CANWAIT 0x0001
+#define IOMMU_MF_CANSPLIT 0x0002
+#define IOMMU_MF_RMRR 0x0004
+
+#define IOMMU_PGF_WAITOK 0x0001
+#define IOMMU_PGF_ZERO 0x0002
+#define IOMMU_PGF_ALLOC 0x0004
+#define IOMMU_PGF_NOALLOC 0x0008
+#define IOMMU_PGF_OBJL 0x0010
+
+#define IOMMU_MAP_ENTRY_PLACE 0x0001 /* Fake entry */
+#define IOMMU_MAP_ENTRY_RMRR 0x0002 /* Permanent, not linked by
+ dmamap_link */
+#define IOMMU_MAP_ENTRY_MAP 0x0004 /* Busdma created, linked by
+ dmamap_link */
+#define IOMMU_MAP_ENTRY_UNMAPPED 0x0010 /* No backing pages */
+#define IOMMU_MAP_ENTRY_QI_NF 0x0020 /* qi task, do not free entry */
+#define IOMMU_MAP_ENTRY_READ 0x1000 /* Read permitted */
+#define IOMMU_MAP_ENTRY_WRITE 0x2000 /* Write permitted */
+#define IOMMU_MAP_ENTRY_SNOOP 0x4000 /* Snoop */
+#define IOMMU_MAP_ENTRY_TM 0x8000 /* Transient */
+
+#endif /* !_DEV_IOMMU_IOMMU_GAS_H_ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
