summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2015-02-11 07:08:35 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2015-02-11 07:08:35 +0000
commite307c570b12bdb02aa9848b370c7568205db0d19 (patch)
tree12ea1f1ada1239dbf48cf2194c7aefcd2ed4baa2 /sys/dev/ic
parent8d7f2c1964df23fdbc680aff4d8508cc3ccd5438 (diff)
recognise ahci 1.3.1
ok dlg@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/ahci.c5
-rw-r--r--sys/dev/ic/ahcireg.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c
index db893ab3ef1..bbeb1feb3cc 100644
--- a/sys/dev/ic/ahci.c
+++ b/sys/dev/ic/ahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci.c,v 1.17 2014/12/03 04:33:06 jsg Exp $ */
+/* $OpenBSD: ahci.c,v 1.18 2015/02/11 07:08:34 jmatthew Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -406,6 +406,9 @@ ahci_init(struct ahci_softc *sc)
case AHCI_REG_VS_1_3:
revision = "1.3";
break;
+ case AHCI_REG_VS_1_3_1:
+ revision = "1.3.1";
+ break;
default:
printf(" unsupported AHCI revision 0x%08x\n", reg);
diff --git a/sys/dev/ic/ahcireg.h b/sys/dev/ic/ahcireg.h
index 5e59d27a159..f4e53f3d4d3 100644
--- a/sys/dev/ic/ahcireg.h
+++ b/sys/dev/ic/ahcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahcireg.h,v 1.3 2014/04/14 04:42:22 dlg Exp $ */
+/* $OpenBSD: ahcireg.h,v 1.4 2015/02/11 07:08:34 jmatthew Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -62,6 +62,7 @@
#define AHCI_REG_VS_1_1 0x00010100 /* 1.1 */
#define AHCI_REG_VS_1_2 0x00010200 /* 1.2 */
#define AHCI_REG_VS_1_3 0x00010300 /* 1.3 */
+#define AHCI_REG_VS_1_3_1 0x00010301 /* 1.3.1 */
#define AHCI_REG_CCC_CTL 0x014 /* Coalescing Control */
#define AHCI_REG_CCC_CTL_INT(_r) (((_r) & 0xf8) >> 3) /* CCC INT slot */
#define AHCI_REG_CCC_PORTS 0x018 /* Coalescing Ports */