svn commit: r288356 - stable/10/sys/dev/ahci
Author: mav
Date: Tue Sep 29 05:25:34 2015
New Revision: 288356
URL: https://svnweb.freebsd.org/changeset/base/288356
Log:
MFC r288111: Allow AHCI driver attach to all known chips reporting RAID class.
Reported by: Michael BlackHeart
Modified:
stable/10/sys/dev/ahci/ahci_pci.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ahci/ahci_pci.c
==
--- stable/10/sys/dev/ahci/ahci_pci.c Tue Sep 29 05:24:16 2015
(r288355)
+++ stable/10/sys/dev/ahci/ahci_pci.c Tue Sep 29 05:25:34 2015
(r288356)
@@ -326,6 +326,9 @@ ahci_probe(device_t dev)
pci_get_subclass(dev) == PCIS_STORAGE_SATA &&
pci_get_progif(dev) == PCIP_STORAGE_SATA_AHCI_1_0)
valid = 1;
+ else if (pci_get_class(dev) == PCIC_STORAGE &&
+ pci_get_subclass(dev) == PCIS_STORAGE_RAID)
+ valid = 2;
/* Is this a known AHCI chip? */
for (i = 0; ahci_ids[i].id != 0; i++) {
if (ahci_ids[i].id == devid &&
@@ -342,7 +345,7 @@ ahci_probe(device_t dev)
return (BUS_PROBE_DEFAULT);
}
}
- if (!valid)
+ if (valid != 1)
return (ENXIO);
device_set_desc_copy(dev, "AHCI SATA controller");
return (BUS_PROBE_DEFAULT);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288354 - stable/10/sys/cam/scsi
Author: mav
Date: Tue Sep 29 05:23:26 2015
New Revision: 288354
URL: https://svnweb.freebsd.org/changeset/base/288354
Log:
MFC r287819: Make CAM log errors that make it wait.
Waiting can take minutes, and it would be good for user to know what is
going on.
Modified:
stable/10/sys/cam/scsi/scsi_all.c
stable/10/sys/cam/scsi/scsi_all.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/scsi/scsi_all.c
==
--- stable/10/sys/cam/scsi/scsi_all.c Tue Sep 29 05:03:24 2015
(r288353)
+++ stable/10/sys/cam/scsi/scsi_all.c Tue Sep 29 05:23:26 2015
(r288354)
@@ -1079,7 +1079,7 @@ static struct asc_table_entry asc_table[
{ SST(0x04, 0x00, SS_RDEF,
"Logical unit not ready, cause not reportable") },
/* DTLPWROMAEBKVF */
- { SST(0x04, 0x01, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | EBUSY,
+ { SST(0x04, 0x01, SS_WAIT | EBUSY,
"Logical unit is in process of becoming ready") },
/* DTLPWROMAEBKVF */
{ SST(0x04, 0x02, SS_START | SSQ_DECREMENT_COUNT | ENXIO,
@@ -1106,7 +1106,7 @@ static struct asc_table_entry asc_table[
{ SST(0x04, 0x09, SS_RDEF, /* XXX TBD */
"Logical unit not ready, self-test in progress") },
/* DTLPWROMAEBKVF */
- { SST(0x04, 0x0A, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | ENXIO,
+ { SST(0x04, 0x0A, SS_WAIT | ENXIO,
"Logical unit not accessible, asymmetric access state transition")},
/* DTLPWROMAEBKVF */
{ SST(0x04, 0x0B, SS_FATAL | ENXIO,
@@ -1121,7 +1121,7 @@ static struct asc_table_entry asc_table[
{ SST(0x04, 0x10, SS_RDEF, /* XXX TBD */
"Logical unit not ready, auxiliary memory not accessible") },
/* DT WRO AEB VF */
- { SST(0x04, 0x11, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | EBUSY,
+ { SST(0x04, 0x11, SS_WAIT | EBUSY,
"Logical unit not ready, notify (enable spinup) required") },
/*MV */
{ SST(0x04, 0x12, SS_RDEF, /* XXX TBD */
Modified: stable/10/sys/cam/scsi/scsi_all.h
==
--- stable/10/sys/cam/scsi/scsi_all.h Tue Sep 29 05:03:24 2015
(r288353)
+++ stable/10/sys/cam/scsi/scsi_all.h Tue Sep 29 05:23:26 2015
(r288354)
@@ -103,6 +103,9 @@ typedef enum {
/* The retyable, error action, with table specified error code */
#defineSS_RET SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
+/* Wait for transient error status to change */
+#defineSS_WAIT
SS_TUR|SSQ_MANY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
+
/* Fatal error action, with table specified error code */
#defineSS_FATALSS_FAIL|SSQ_PRINT_SENSE
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288346 - stable/10/cddl/contrib/opensolaris/cmd/zfs
Author: delphij
Date: Mon Sep 28 18:58:27 2015
New Revision: 288346
URL: https://svnweb.freebsd.org/changeset/base/288346
Log:
MFC r287770: MFV r277429:
Document -S option when zfs inherit fails on quota and
in manual pages.
Illumos ZFS issues:
5410 Document -S option to zfs inherit
https://illumos.org/issues/5410
5412 Mention -S option when zfs inherit fails on quota
https://illumos.org/issues/5412
illumos/illumos-gate@5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Mon Sep 28 18:39:21
2015(r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Mon Sep 28 18:58:27
2015(r288346)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 30, 2015
+.Dd September 14, 2015
.Dt ZFS 8
.Os
.Sh NAME
@@ -2126,7 +2126,8 @@ Property name
.It value
Property value
.It source
-Property source. Can either be local, default, temporary, inherited, or none
+Property source. Can either be local, default, temporary, inherited, received,
+or none
(\&-).
.El
.Pp
@@ -2192,8 +2193,11 @@ The default value is all sources.
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
.Xc
.Pp
-Clears the specified property, causing it to be inherited from an ancestor. If
-no ancestor has the property set, then the default value is used. See the
+Clears the specified property, causing it to be inherited from an ancestor,
+restored to default if no ancestor has the property set, or with the
+.Fl S
+option reverted to the received value if one exists.
+See the
.Qq Sx Properties
section for a listing of default values, and details on which properties can be
inherited.
@@ -2201,8 +2205,10 @@ inherited.
.It Fl r
Recursively inherit the given property for all children.
.It Fl S
-For properties with a received value, revert to this value. This flag has no
-effect on properties that do not have a received value.
+Revert the property to the received value if one exists; otherwise operate as
+if the
+.Fl S
+option was not specified.
.El
.It Xo
.Nm
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28
18:39:21 2015(r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28
18:58:27 2015(r288346)
@@ -1927,9 +1927,13 @@ zfs_do_inherit(int argc, char **argv)
if (prop == ZFS_PROP_QUOTA ||
prop == ZFS_PROP_RESERVATION ||
prop == ZFS_PROP_REFQUOTA ||
- prop == ZFS_PROP_REFRESERVATION)
+ prop == ZFS_PROP_REFRESERVATION) {
(void) fprintf(stderr, gettext("use 'zfs set "
"%s=none' to clear\n"), propname);
+ (void) fprintf(stderr, gettext("use 'zfs "
+ "inherit -S %s' to revert to received "
+ "value\n"), propname);
+ }
return (1);
}
if (received && (prop == ZFS_PROP_VOLSIZE ||
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r288338 - in stable/10/sys/cam: ata scsi
Author: mav
Date: Mon Sep 28 12:30:22 2015
New Revision: 288338
URL: https://svnweb.freebsd.org/changeset/base/288338
Log:
MFC r287289: Attach pass driver to LUNs is OFFLINE state.
Previously such LUNs were silently ignored. But while they indeed unable
to process most of SCSI commands, some, like RTPG, they still can.
Modified:
stable/10/sys/cam/ata/ata_xpt.c
stable/10/sys/cam/scsi/scsi_cd.c
stable/10/sys/cam/scsi/scsi_ch.c
stable/10/sys/cam/scsi/scsi_da.c
stable/10/sys/cam/scsi/scsi_pt.c
stable/10/sys/cam/scsi/scsi_sa.c
stable/10/sys/cam/scsi/scsi_xpt.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ata/ata_xpt.c
==
--- stable/10/sys/cam/ata/ata_xpt.c Mon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/ata/ata_xpt.c Mon Sep 28 12:30:22 2015
(r288338)
@@ -1090,7 +1090,8 @@ notsata:
periph_qual = SID_QUAL(inq_buf);
- if (periph_qual != SID_QUAL_LU_CONNECTED)
+ if (periph_qual != SID_QUAL_LU_CONNECTED &&
+ periph_qual != SID_QUAL_LU_OFFLINE)
break;
/*
Modified: stable/10/sys/cam/scsi/scsi_cd.c
==
--- stable/10/sys/cam/scsi/scsi_cd.cMon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_cd.cMon Sep 28 12:30:22 2015
(r288338)
@@ -392,7 +392,8 @@ cdasync(void *callback_arg, u_int32_t co
if (cgd->protocol != PROTO_SCSI)
break;
-
+ if (SID_QUAL(&cgd->inq_data) != SID_QUAL_LU_CONNECTED)
+ break;
if (SID_TYPE(&cgd->inq_data) != T_CDROM
&& SID_TYPE(&cgd->inq_data) != T_WORM)
break;
Modified: stable/10/sys/cam/scsi/scsi_ch.c
==
--- stable/10/sys/cam/scsi/scsi_ch.cMon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_ch.cMon Sep 28 12:30:22 2015
(r288338)
@@ -337,7 +337,8 @@ chasync(void *callback_arg, u_int32_t co
if (cgd->protocol != PROTO_SCSI)
break;
-
+ if (SID_QUAL(&cgd->inq_data) != SID_QUAL_LU_CONNECTED)
+ break;
if (SID_TYPE(&cgd->inq_data)!= T_CHANGER)
break;
Modified: stable/10/sys/cam/scsi/scsi_da.c
==
--- stable/10/sys/cam/scsi/scsi_da.cMon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_da.cMon Sep 28 12:30:22 2015
(r288338)
@@ -1667,7 +1667,8 @@ daasync(void *callback_arg, u_int32_t co
if (cgd->protocol != PROTO_SCSI)
break;
-
+ if (SID_QUAL(&cgd->inq_data) != SID_QUAL_LU_CONNECTED)
+ break;
if (SID_TYPE(&cgd->inq_data) != T_DIRECT
&& SID_TYPE(&cgd->inq_data) != T_RBC
&& SID_TYPE(&cgd->inq_data) != T_OPTICAL)
Modified: stable/10/sys/cam/scsi/scsi_pt.c
==
--- stable/10/sys/cam/scsi/scsi_pt.cMon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_pt.cMon Sep 28 12:30:22 2015
(r288338)
@@ -366,7 +366,8 @@ ptasync(void *callback_arg, u_int32_t co
if (cgd->protocol != PROTO_SCSI)
break;
-
+ if (SID_QUAL(&cgd->inq_data) != SID_QUAL_LU_CONNECTED)
+ break;
if (SID_TYPE(&cgd->inq_data) != T_PROCESSOR)
break;
Modified: stable/10/sys/cam/scsi/scsi_sa.c
==
--- stable/10/sys/cam/scsi/scsi_sa.cMon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_sa.cMon Sep 28 12:30:22 2015
(r288338)
@@ -2254,7 +2254,8 @@ saasync(void *callback_arg, u_int32_t co
if (cgd->protocol != PROTO_SCSI)
break;
-
+ if (SID_QUAL(&cgd->inq_data) != SID_QUAL_LU_CONNECTED)
+ break;
if (SID_TYPE(&cgd->inq_data) != T_SEQUENTIAL)
break;
Modified: stable/10/sys/cam/scsi/scsi_xpt.c
==
--- stable/10/sys/cam/scsi/scsi_xpt.c Mon Sep 28 12:23:10 2015
(r288337)
+++ stable/10/sys/cam/scsi/scsi_xpt.c Mon Sep 28 12:30:22 2015
(r288338)
@@ -1126,6 +1126,7 @@ probedone(struct cam_periph *periph, uni
{
probe_softc *softc;
struct cam_path *path;
+ struct scsi_inquiry_data *inq_buf;
u_int32_
