svn commit: r245391 - projects/altix2/sys/kern

[Marcel Moolenaar]

Author: marcel
Date: Sun Jan 13 22:18:41 2013
New Revision: 245391
URL: http://svnweb.freebsd.org/changeset/base/245391

Log:
  busdma/mi has the lower 16 bits reserved for platform-specific flags.
  No driver should use these right now, which means that if they're set
  then we have a driver that still uses the old busdma flags. Print a
  useful message and mask these out. This helps with conversions.

Modified:
  projects/altix2/sys/kern/subr_busdma.c

Modified: projects/altix2/sys/kern/subr_busdma.c
==============================================================================
--- projects/altix2/sys/kern/subr_busdma.c	Sun Jan 13 22:08:18 2013	(r245390)
+++ projects/altix2/sys/kern/subr_busdma.c	Sun Jan 13 22:18:41 2013	(r245391)
@@ -246,6 +246,17 @@ _busdma_data_dump(const char *func, stru
 
 /* Section 3.3: API support functions. */
 
+static u_int
+_busdma_flags(const char *func, device_t dev, u_int flags)
+{
+
+	if (flags & BUSDMA_MD_PLATFORM_FLAGS)
+		device_printf(dev, "called %s() with invalid flags %#x\n",
+		    func, flags);
+
+	return (flags & ~BUSDMA_MD_PLATFORM_FLAGS);
+}
+
 static struct busdma_md_seg *
 _busdma_md_get_seg(struct busdma_md *md, u_int idx)
 {
@@ -524,6 +535,8 @@ busdma_tag_create(device_t dev, bus_addr
 	CTR5(KTR_BUSDMA, "%s: maxsz=%#jx, nsegs=%u, maxsegsz=%#jx, flags=%#x",
 	    __func__, maxsz, nsegs, (uintmax_t)maxsegsz, flags);
 
+	flags = _busdma_flags(__func__, dev, flags);
+
 	if (dev == NULL || tag_p == NULL)
 		return (EINVAL);
 
@@ -556,6 +569,8 @@ busdma_tag_derive(struct busdma_tag *bas
 	CTR5(KTR_BUSDMA, "%s: maxsz=%#jx, nsegs=%u, maxsegsz=%#jx, flags=%#x",
 	    __func__, maxsz, nsegs, (uintmax_t)maxsegsz, flags);
 
+	flags = _busdma_flags(__func__, base->dt_device, flags);
+
 	if (base == NULL || tag_p == NULL)
 		return (EINVAL);
 
@@ -603,6 +618,8 @@ busdma_md_create(struct busdma_tag *tag,
 
 	CTR3(KTR_BUSDMA, "%s: tag=%p, flags=%#x", __func__, tag, flags);
 
+	flags = _busdma_flags(__func__, tag->dt_device, flags);
+
 	if (tag == NULL || md_p == NULL)
 		return (EINVAL);
 
@@ -725,6 +742,8 @@ busdma_md_load_linear(struct busdma_md *
 	CTR6(KTR_BUSDMA, "busdma_md_load_linear: md=%p, buf=%p, len=%zu, "
 	    "cb=%p, arg=%p, flags=%#x", md, buf, len, cb, arg, flags);
 
+	flags = _busdma_flags(__func__, md->md_tag->dt_device, flags);
+
 	if (md == NULL || buf == NULL || len == 0)
 		return (EINVAL);
 
@@ -747,6 +766,8 @@ busdma_md_load_phys(struct busdma_md *md
 	    "cb=%p, arg=%p, flags=%#x", md, (uintmax_t)buf, len, cb, arg,
 	    flags);
 
+	flags = _busdma_flags(__func__, md->md_tag->dt_device, flags);
+
 	panic(__func__);
 	(*cb)(arg, md, ENOSYS);
 	return (0);
@@ -760,6 +781,8 @@ busdma_md_load_uio(struct busdma_md *md,
 	CTR6(KTR_BUSDMA, "%s: md=%p, uio=%p, cb=%p, arg=%p, flags=%#x",
 	    __func__, md, uio, cb, arg, flags);
 
+	flags = _busdma_flags(__func__, md->md_tag->dt_device, flags);
+
 	panic(__func__);
 	(*cb)(arg, md, ENOSYS);
 	return (0);
@@ -806,6 +829,8 @@ busdma_mem_alloc(struct busdma_tag *tag,
 
 	CTR3(KTR_BUSDMA, "%s: tag=%p, flags=%#x", __func__, tag, flags);
 
+	flags = _busdma_flags(__func__, tag->dt_device, flags);
+
 	if (tag == NULL || md_p == NULL)
 		return (EINVAL);