Module Name: src
Committed By: tsutsui
Date: Tue Feb 7 14:27:59 UTC 2023
Modified Files:
src/sys/arch/next68k/stand/boot: dmareg.h
Log Message:
Make sure to specify volatile explicitly on DMA register accesses.
It looks booting from SCSI disks on next68k have been broken
since NetBSD 1.6 days, but now it works.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/next68k/stand/boot/dmareg.h
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/next68k/stand/boot/dmareg.h
diff -u src/sys/arch/next68k/stand/boot/dmareg.h:1.3 src/sys/arch/next68k/stand/boot/dmareg.h:1.4
--- src/sys/arch/next68k/stand/boot/dmareg.h:1.3 Wed Sep 11 01:46:36 2002
+++ src/sys/arch/next68k/stand/boot/dmareg.h Tue Feb 7 14:27:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dmareg.h,v 1.3 2002/09/11 01:46:36 mycroft Exp $ */
+/* $NetBSD: dmareg.h,v 1.4 2023/02/07 14:27:59 tsutsui Exp $ */
/*
* Copyright (c) 1997 Rolf Grossmann
* All rights reserved.
@@ -55,7 +55,7 @@
&~(DMA_ENDALIGNMENT-1))|0x80000000))
struct dma_dev { /* format of dma device registers */
- int dd_csr; /* control & status register */
+ volatile uint32_t dd_csr; /* control & status register */
char dd_pad[0x3fec]; /* csr not contiguous with next */
char *dd_saved_next; /* saved pointers for HW restart */
char *dd_saved_limit;
