Module Name: src
Committed By: macallan
Date: Sun Mar 22 16:46:30 UTC 2020
Modified Files:
src/sys/dev/ic: mvsata.c
Log Message:
do not assume that a bus_space_handle_t is simply an offset
now this has a fighting chance of working on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/mvsata.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/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.53 src/sys/dev/ic/mvsata.c:1.54
--- src/sys/dev/ic/mvsata.c:1.53 Wed Feb 19 16:04:39 2020
+++ src/sys/dev/ic/mvsata.c Sun Mar 22 16:46:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.53 2020/02/19 16:04:39 riastradh Exp $ */
+/* $NetBSD: mvsata.c,v 1.54 2020/03/22 16:46:30 macallan Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.53 2020/02/19 16:04:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.54 2020/03/22 16:46:30 macallan Exp $");
#include "opt_mvsata.h"
@@ -669,7 +669,8 @@ mvsata_reset_channel(struct ata_channel
const uint32_t val = SControl_IPM_NONE | SControl_SPD_ANY |
SControl_DET_DISABLE;
- MVSATA_EDMA_WRITE_4(mvport, mvport->port_sata_scontrol, val);
+ bus_space_write_4(mvport->port_iot,
+ mvport->port_sata_scontrol, 0, val);
ctrl = MVSATA_EDMA_READ_4(mvport, SATA_SATAICFG);
ctrl &= ~(1 << 17); /* Disable GenII */
