[src/jdolecek-ncq]: src/sys/dev/ic header changes for siisata switch to new e...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/36074f73c2f0
branches:  jdolecek-ncq
changeset: 822962:36074f73c2f0
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Jul 19 20:03:29 2017 +0000

description:
header changes for siisata switch to new error handling world order

diffstat:

 sys/dev/ic/siisatareg.h |  5 ++++-
 sys/dev/ic/siisatavar.h |  4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 54fc26165135 -r 36074f73c2f0 sys/dev/ic/siisatareg.h
--- a/sys/dev/ic/siisatareg.h   Wed Jul 19 20:02:40 2017 +0000
+++ b/sys/dev/ic/siisatareg.h   Wed Jul 19 20:03:29 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisatareg.h,v 1.7.42.2 2017/06/12 23:51:40 jakllsch Exp $ */
+/* $NetBSD: siisatareg.h,v 1.7.42.3 2017/07/19 20:03:29 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2007, 2008, 2009, 2010, 2011 Jonathan A. Kollasch.
@@ -164,6 +164,8 @@
 #define PRSO_RTC       0x04            /* recieved transfer count */
 #define PRSO_FIS       0x08            /* base of FIS */
 
+#define PRO_PMPSTS(i)  (0x0f80 + i * 8)
+#define PRO_PMPQACT(i) (0x0f80 + i * 8 + 4)
 #define PRO_PCS                0x1000          /* (write) port control set */
 #define PRO_PS         PRO_PCS         /* (read) port status */
 #define PRO_PCC                0x1004          /* port control clear */
@@ -186,6 +188,7 @@
 #define PRO_CARX(p,s)     (PRX(p, PRO_CAR) + (s) * sizeof(uint64_t))
 
 #define PRO_PCR                0x1e04          /* port context register */
+#define     PRO_PCR_PMP(x)     (((x) & __BITS(8, 5)) >> 5) /* PM Port */
 #define PRO_SCONTROL   0x1f00          /* SControl */
 #define PRO_SSTATUS    0x1f04          /* SStatus */
 #define PRO_SERROR     0x1f08          /* SError */
diff -r 54fc26165135 -r 36074f73c2f0 sys/dev/ic/siisatavar.h
--- a/sys/dev/ic/siisatavar.h   Wed Jul 19 20:02:40 2017 +0000
+++ b/sys/dev/ic/siisatavar.h   Wed Jul 19 20:03:29 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisatavar.h,v 1.6.48.1 2017/06/13 00:02:19 jakllsch Exp $ */
+/* $NetBSD: siisatavar.h,v 1.6.48.2 2017/07/19 20:03:29 jdolecek Exp $ */
 
 /* from ahcisatavar.h */
 
@@ -101,6 +101,8 @@
                bus_dmamap_t sch_datad[SIISATA_MAX_SLOTS];
 
                uint32_t sch_active_slots;
+               uint32_t sch_hold_slots;
+               bool sch_recovering;
        } sc_channels[SIISATA_MAX_PORTS];
 };