1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
diff --git a/buildrump.sh/src/sys/dev/ic/ahcisata_core.c b/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
index 8c4c8db2..4418ac85 100644
--- a/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
+++ b/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
@@ -959,7 +959,7 @@ ahci_exec_command(struct ata_drive_datas *drvp, struct ata_command *ata_c)
} else {
if (ata_c->flags & AT_WAIT) {
while ((ata_c->flags & AT_DONE) == 0) {
- tsleep(ata_c, PRIBIO, "ahcicmd", 0);
+ tsleep(ata_c, PRIBIO, "ahcicmd", mstohz(100));
}
ret = ATACMD_COMPLETE;
} else {
diff --git a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
index 272304e3..44b607f6 100644
--- a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+++ b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
@@ -8,6 +8,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb \
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
+RUMPPCIDEVS+= pci_ahcisata
RUMPPCIDEVS+= pci_piixide
RUMPPCIDEVS+= pci_usbhc
RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
new file mode 100644
index 00000000..2b7263bf
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
@@ -0,0 +1,19 @@
+ioconf ahcisata
+
+include "conf/files"
+include "dev/ata/files.ata"
+include "dev/pci/files.pci"
+include "rump/dev/files.rump"
+
+pseudo-root pci*
+
+# AHCI support
+ahcisata* at pci? dev ? function ?
+atabus* at ahcisata? channel ?
+ata_hl* at atabus? drive ?
+
+# Disks
+wd* at ata_hl?
+
+# ATAPI support
+atapi* at ahcisata?
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
new file mode 100644
index 00000000..1f6b870e
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
@@ -0,0 +1,21 @@
+.PATH: ${.CURDIR}/../../../../dev/pci \
+ ${.CURDIR}/../../../../dev/ata \
+ ${.CURDIR}/../../../../dev/scsipi \
+ ${.CURDIR}/../../../../dev/ic
+
+LIB= rumpdev_ahcisata
+COMMENT=AHCI support with SATA && ATAPI
+
+IOCONF= AHCISATA.ioconf
+
+SRCS+= ahcisata_pci.c
+SRCS+= sata_subr.c satafis_subr.c
+SRCS+= ahcisata_core.c
+SRCS+= atapi_wdc.c atapi_base.c
+SRCS+= wd.c ata.c ata_wdc.c
+SRCS+= wdc.c
+
+SRCS+= ahcisata_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
new file mode 100644
index 00000000..0cc9f481
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
@@ -0,0 +1,28 @@
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/kmem.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include <rump-sys/kern.h>
+#include <rump-sys/vfs.h>
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern struct bdevsw wd_bdevsw;
+ extern struct cdevsw wd_cdevsw;
+ devmajor_t bmaj, cmaj;
+
+ config_init_component(cfdriver_ioconf_ahcisata,
+ cfattach_ioconf_ahcisata, cfdata_ioconf_ahcisata);
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach("wd", &wd_bdevsw, &bmaj, &wd_cdevsw, &cmaj));
+
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/wd0", 'a',
+ bmaj, 0, 8));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd0", 'a',
+ cmaj, 0, 8));
+}
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
@@ -0,0 +1 @@
+
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
@@ -0,0 +1 @@
+
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
new file mode 100644
index 00000000..ad9cf43a
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
@@ -0,0 +1,3 @@
+#define NWD 1
+#define NSATA 1
+#define WDC_NO_IDS
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
@@ -0,0 +1 @@
+
diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
@@ -0,0 +1 @@
+
|
