Module Name: src
Committed By: thorpej
Date: Sun Jul 18 05:09:47 UTC 2021
Modified Files:
src/sys/arch/alpha/pci: cia_dma.c tsp_dma.c
Log Message:
Oops, pass the correct bus_dma_tag_t to the "hi" sgmap init function.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/alpha/pci/cia_dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/pci/tsp_dma.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/arch/alpha/pci/cia_dma.c
diff -u src/sys/arch/alpha/pci/cia_dma.c:1.35 src/sys/arch/alpha/pci/cia_dma.c:1.36
--- src/sys/arch/alpha/pci/cia_dma.c:1.35 Sat Jul 17 00:30:39 2021
+++ src/sys/arch/alpha/pci/cia_dma.c Sun Jul 18 05:09:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.35 2021/07/17 00:30:39 thorpej Exp $ */
+/* $NetBSD: cia_dma.c,v 1.36 2021/07/18 05:09:47 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.35 2021/07/17 00:30:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.36 2021/07/18 05:09:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,14 +202,14 @@ cia_dma_init(struct cia_config *ccp)
*/
/*
- * Initialize the SGMAP(s). Must align page table to 32k
+ * Initialize the SGMAP(s). Must align page table to at least 32k
* (hardware bug?).
*/
alpha_sgmap_init(t, &ccp->cc_sgmap_lo, "cia_sgmap_lo",
CIA_SGMAP_MAPPED_LO_BASE, 0, CIA_SGMAP_MAPPED_LO_SIZE,
sizeof(uint64_t), NULL, (32*1024));
if (t_sg_hi != NULL) {
- alpha_sgmap_init(t, &ccp->cc_sgmap_hi, "cia_sgmap_hi",
+ alpha_sgmap_init(t_sg_hi, &ccp->cc_sgmap_hi, "cia_sgmap_hi",
CIA_SGMAP_MAPPED_HI_BASE, 0, CIA_SGMAP_MAPPED_HI_SIZE,
sizeof(uint64_t), NULL, (32*1024));
}
Index: src/sys/arch/alpha/pci/tsp_dma.c
diff -u src/sys/arch/alpha/pci/tsp_dma.c:1.19 src/sys/arch/alpha/pci/tsp_dma.c:1.20
--- src/sys/arch/alpha/pci/tsp_dma.c:1.19 Sun Jul 18 00:01:20 2021
+++ src/sys/arch/alpha/pci/tsp_dma.c Sun Jul 18 05:09:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.19 2021/07/18 00:01:20 thorpej Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.20 2021/07/18 05:09:47 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2021 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.19 2021/07/18 00:01:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.20 2021/07/18 05:09:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -292,7 +292,7 @@ tsp_dma_init(struct tsp_config *pcp)
TSP_SGMAP_MAPPED_LO_BASE, 0, TSP_SGMAP_MAPPED_LO_SIZE,
sizeof(uint64_t), NULL, (32*1024));
if (t_sg_hi != NULL) {
- alpha_sgmap_init(t, &pcp->pc_sgmap_hi, "tsp_sgmap_hi",
+ alpha_sgmap_init(t_sg_hi, &pcp->pc_sgmap_hi, "tsp_sgmap_hi",
TSP_SGMAP_MAPPED_HI_BASE, 0, TSP_SGMAP_MAPPED_HI_SIZE,
sizeof(uint64_t), NULL, (32*1024));
}
