From owner-svn-src-projects@FreeBSD.ORG Sun Jan 13 22:18:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A77974FA; Sun, 13 Jan 2013 22:18:42 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 836581BC; Sun, 13 Jan 2013 22:18:42 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0DMIgWh014719; Sun, 13 Jan 2013 22:18:42 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0DMIgkZ014718; Sun, 13 Jan 2013 22:18:42 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201301132218.r0DMIgkZ014718@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 13 Jan 2013 22:18:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245391 - projects/altix2/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2013 22:18:42 -0000 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);