CVS commit: src/sys/dev/acpi

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sat Oct 24 08:57:06 UTC 2020

Modified Files:
        src/sys/dev/acpi: vmbus_acpi.c

Log Message:
Test the 64bit dma tag with BUS_DMA_TAG_VALID before using it.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/vmbus_acpi.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/dev/acpi/vmbus_acpi.c
diff -u src/sys/dev/acpi/vmbus_acpi.c:1.2 src/sys/dev/acpi/vmbus_acpi.c:1.3
--- src/sys/dev/acpi/vmbus_acpi.c:1.2	Fri May 24 14:28:48 2019
+++ src/sys/dev/acpi/vmbus_acpi.c	Sat Oct 24 08:57:06 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmbus_acpi.c,v 1.2 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: vmbus_acpi.c,v 1.3 2020/10/24 08:57:06 skrll Exp $	*/
 
 /*
  * Copyright (c) 2018 Kimihiro Nonaka <non...@netbsd.org>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmbus_acpi.c,v 1.2 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus_acpi.c,v 1.3 2020/10/24 08:57:06 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -84,7 +84,8 @@ vmbus_acpi_attach(device_t parent, devic
 	sc->sc.sc_dev = self;
 	sc->sc.sc_iot = aa->aa_iot;
 	sc->sc.sc_memt = aa->aa_memt;
-	sc->sc.sc_dmat = aa->aa_dmat64 ? aa->aa_dmat64 : aa->aa_dmat;
+	sc->sc.sc_dmat = BUS_DMA_TAG_VALID(aa->aa_dmat64) ?
+	    aa->aa_dmat64 : aa->aa_dmat;
 
 	if (vmbus_attach(&sc->sc))
 		return;