Module Name: src
Committed By: skrll
Date: Sun Oct 20 15:37:37 UTC 2024
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
src/sys/arch/riscv/riscv: bus_dma.c
Log Message:
Revert previous - I misread the code.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/riscv/bus_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/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.146 src/sys/arch/arm/arm32/bus_dma.c:1.147
--- src/sys/arch/arm/arm32/bus_dma.c:1.146 Sun Oct 20 15:07:32 2024
+++ src/sys/arch/arm/arm32/bus_dma.c Sun Oct 20 15:37:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.146 2024/10/20 15:07:32 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.147 2024/10/20 15:37:37 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.146 2024/10/20 15:07:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.147 2024/10/20 15:37:37 skrll Exp $");
#include <sys/param.h>
@@ -95,6 +95,8 @@ static struct evcnt bus_dma_sync_postrea
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync postreadwrite");
static struct evcnt bus_dma_sync_postwrite =
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync postwrite");
+static struct evcnt bus_dma_inrange_fail =
+ EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "inrange check failed");
static struct evcnt bus_dma_sync_coherent_prereadwrite =
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync coherent prereadwrite");
@@ -131,6 +133,7 @@ EVCNT_ATTACH_STATIC(bus_dma_sync_postrea
EVCNT_ATTACH_STATIC(bus_dma_sync_postwrite);
EVCNT_ATTACH_STATIC(bus_dma_inrange_fail);
+EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_prereadwrite);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_preread);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_prewrite);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_postread);
Index: src/sys/arch/riscv/riscv/bus_dma.c
diff -u src/sys/arch/riscv/riscv/bus_dma.c:1.6 src/sys/arch/riscv/riscv/bus_dma.c:1.7
--- src/sys/arch/riscv/riscv/bus_dma.c:1.6 Sun Oct 20 15:07:32 2024
+++ src/sys/arch/riscv/riscv/bus_dma.c Sun Oct 20 15:37:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.6 2024/10/20 15:07:32 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.7 2024/10/20 15:37:37 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _RISCV_NEED_BUS_DMA_BOUNCE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.6 2024/10/20 15:07:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.7 2024/10/20 15:37:37 skrll Exp $");
#include <sys/param.h>
@@ -89,6 +89,8 @@ static struct evcnt bus_dma_sync_postrea
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync postreadwrite");
static struct evcnt bus_dma_sync_postwrite =
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync postwrite");
+static struct evcnt bus_dma_inrange_fail =
+ EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "inrange check failed");
static struct evcnt bus_dma_sync_coherent_prereadwrite =
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "busdma", "sync coherent prereadwrite");
@@ -125,6 +127,7 @@ EVCNT_ATTACH_STATIC(bus_dma_sync_postrea
EVCNT_ATTACH_STATIC(bus_dma_sync_postwrite);
EVCNT_ATTACH_STATIC(bus_dma_inrange_fail);
+EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_prereadwrite);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_preread);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_prewrite);
EVCNT_ATTACH_STATIC(bus_dma_sync_coherent_postread);
