Mon Aug 27 13:41:50 2018 UTC ()

Temporary diagnostic kludge: confirm the ubc_uiomove worked as expected.


(riastradh)

diff -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c

--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_guc_loader.c 2018/08/27 13:40:28	1.7
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_guc_loader.c 2018/08/27 13:41:50	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_guc_loader.c,v 1.7 2018/08/27 13:40:28 riastradh Exp $	*/
+/*	$NetBSD: intel_guc_loader.c,v 1.8 2018/08/27 13:41:50 riastradh Exp $	*/
 /*
  * Copyright © 2014 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
 @@ -19,27 +19,27 @@
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
+ *
  * Authors:
  *    Vinit Azad <vinit.azad@intel.com>
  *    Ben Widawsky <ben@bwidawsk.net>
  *    Dave Gordon <david.s.gordon@intel.com>
  *    Alex Dai <yu.dai@intel.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.7 2018/08/27 13:40:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.8 2018/08/27 13:41:50 riastradh Exp $");
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include "i915_drv.h"
 #include "intel_guc.h"
 /**
  * DOC: GuC
+ *
  * intel_guc:
  * Top level structure of guc. It handles firmware loading and manages client
  * pool and doorbells. intel_guc owns a i915_guc_client to replace the legacy
  * ExecList submission.
 @@ -529,26 +529,55 @@ static void guc_fw_fetch(struct drm_devi
 	DRM_DEBUG_DRIVER("firmware version %d.%d OK (minimum %d.%d)\n",
 			guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found,
 			guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted);
 	mutex_lock(&dev->struct_mutex);
 	obj = i915_gem_object_create_from_data(dev, fw->data, fw->size);
 	mutex_unlock(&dev->struct_mutex);
 	if (IS_ERR_OR_NULL(obj)) {
 		err = obj ? PTR_ERR(obj) : -ENOMEM;
 		goto fail;
+	}
 #ifdef __NetBSD__		/* XXX temporary diagnostic kludge */
+	{
 		void *buf = kmem_alloc(fw->size, KM_SLEEP);
 		struct iovec iov;
 		struct uio uio;
 		iov.iov_base = buf;
 		iov.iov_len = fw->size;
 		uio.uio_iov = &iov;
 		uio.uio_iovcnt = 1;
 		uio.uio_resid = fw->size;
 		uio.uio_rw = UIO_READ;
 		UIO_SETUP_SYSSPACE(&uio);
 		err = -ubc_uiomove(obj->base.filp, &uio, fw->size,
 		    UVM_ADV_NORMAL, UBC_READ);
 		if (err) {
 			DRM_DEBUG_DRIVER("ubc_uiomove failed for test: %d\n",
 			    err);
 			kmem_free(buf, fw->size);
 			goto fail;
+		}
 		if (memcmp(fw->data, buf, fw->size) != 0) {
 			DRM_DEBUG_DRIVER("firmware copy corrupted\n");
 			kmem_free(buf, fw->size);
 			goto fail;
+		}
 		kmem_free(buf, fw->size);
+	}
 #endif
 	guc_fw->guc_fw_obj = obj;
 	guc_fw->guc_fw_size = fw->size;
 	DRM_DEBUG_DRIVER("GuC fw fetch status SUCCESS, obj %p\n",
 			guc_fw->guc_fw_obj);
 	release_firmware(fw);
 	guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_SUCCESS;
 	return;
 fail:
 	DRM_DEBUG_DRIVER("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n",
 		err, fw, guc_fw->guc_fw_obj);