Author: jimharris
Date: Tue Jan 31 19:38:18 2012
New Revision: 230843
URL: http://svn.freebsd.org/changeset/base/230843
Log:
Add isci(4) driver for amd64 and i386 targets.
The isci driver is for the integrated SAS controller in the Intel C600
(Patsburg) chipset. Source files in sys/dev/isci directory are
FreeBSD-specific, and sys/dev/isci/scil subdirectory contains
an OS-agnostic library (SCIL) published by Intel to control the SAS
controller. This library is used primarily as-is in this driver, with
some post-processing to better integrate into the kernel build
environment.
isci.4 and a README in the sys/dev/isci directory contain a few
additional details.
This driver is only built for amd64 and i386 targets.
Sponsored by: Intel
Reviewed by: scottl
Approved by: scottl
Added:
head/share/man/man4/isci.4
- copied unchanged from r230794, user/jimharris/isci/share/man/man4/isci.4
head/sys/dev/isci/
- copied from r230794, user/jimharris/isci/sys/dev/isci/
head/sys/modules/isci/
- copied from r230794, user/jimharris/isci/sys/modules/isci/
Modified:
head/MAINTAINERS (contents, props changed)
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/amd64/conf/NOTES
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/options.amd64
head/sys/conf/options.i386
head/sys/i386/conf/GENERIC
head/sys/i386/conf/NOTES
head/sys/modules/Makefile
Directory Properties:
head/share/man/man4/ (props changed)
head/sys/ (props changed)
Modified: head/MAINTAINERS
==============================================================================
--- head/MAINTAINERS Tue Jan 31 19:07:08 2012 (r230842)
+++ head/MAINTAINERS Tue Jan 31 19:38:18 2012 (r230843)
@@ -124,6 +124,7 @@ usr.sbin/zic edwin Heads-up appreciat
lib/libc/stdtime edwin Heads-up appreciated, since parts of this code
is maintained by a third party source.
sbin/routed bms Pre-commit review; notify vendor at rhyolite.com
+isci(4) jimharris Pre-commit review requested.
Following are the entries from the Makefiles, and a few other sources.
Please remove stale entries from both their origin, and this file.
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Tue Jan 31 19:07:08 2012
(r230842)
+++ head/share/man/man4/Makefile Tue Jan 31 19:38:18 2012
(r230843)
@@ -182,6 +182,7 @@ MAN= aac.4 \
ipsec.4 \
ipw.4 \
ipwfw.4 \
+ isci.4 \
iscsi_initiator.4 \
isp.4 \
ispfw.4 \
Copied: head/share/man/man4/isci.4 (from r230794,
user/jimharris/isci/share/man/man4/isci.4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man4/isci.4 Tue Jan 31 19:38:18 2012 (r230843, copy
of r230794, user/jimharris/isci/share/man/man4/isci.4)
@@ -0,0 +1,110 @@
+.\"
+.\" Copyright (c) 2012 Intel Corporation
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions, and the following disclaimer,
+.\" without modification.
+.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer
+.\" substantially similar to the "NO WARRANTY" disclaimer below
+.\" ("Disclaimer") and any redistribution must be conditioned upon
+.\" including a substantially similar Disclaimer requirement for further
+.\" binary redistribution.
+.\"
+.\" NO WARRANTY
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGES.
+.\"
+.\" isci driver man page.
+.\"
+.\" Author: Jim Harris <jimhar...@freebsd.org>
+.\"
+.\" $FreeBSD$
+.\"
+.Dd January 23, 2012
+.Dt ISCI 4
+.Os
+.Sh NAME
+.Nm isci
+.Nd Intel C600 Serial Attached SCSI driver
+.Sh SYNOPSIS
+To compile this driver into your kernel,
+place the following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device scbus"
+.Cd "device isci"
+.Ed
+.Pp
+Or, to load the driver as a module at boot, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+isci_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for Intel C600
+.Tn SAS
+controller.
+.Sh CONFIGURATION
+To force legacy interrupts for all
+.Nm
+driver instances, set the following tunable value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+hw.isci.force_legacy_interrupts=1
+.Ed
+.Sh DEBUGGING
+To enable debugging prints from the
+.Nm
+driver, set the
+.Bd -literal -offset indent
+hw.isci.debug_level
+.Ed
+.Pp
+variable to a value between 1 and 4 in
+.Xr loader.conf 5 .
+.Pp
+The hardware layer in the isci driver has extensive logging capabilities
+which are disabled by default for performance reasons. These can be enabled
+by adding
+.Bd -literal -offset indent
+options ISCI_LOGGING
+.Ed
+.Pp
+to the kernel configuration file.
+.Sh SEE ALSO
+.Xr cd 4 ,
+.Xr ch 4 ,
+.Xr da 4 ,
+.Xr pci 4 ,
+.Xr sa 4 ,
+.Xr scsi 4 .
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was developed by Intel and originally written by
+.An Jim Harris Aq jimhar...@freebsd.org
+with contributions from Sohaib Ahsan and input from
+.An Scott Long Aq sco...@freebsd.org .
+.Pp
+This man page was written by
+.An Jim Harris Aq jimhar...@freebsd.org .
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/amd64/conf/GENERIC Tue Jan 31 19:38:18 2012 (r230843)
@@ -123,6 +123,7 @@ device adv # Advansys SCSI adapters
device adw # Advansys wide SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
+device isci # Intel C600 SAS controller
# ATA/SCSI peripherals
device scbus # SCSI bus (required for ATA/SCSI)
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/amd64/conf/NOTES Tue Jan 31 19:38:18 2012 (r230843)
@@ -409,6 +409,11 @@ device hptiop
device ips
#
+# Intel C600 (Patsburg) integrated SAS controller
+device isci
+options ISCI_LOGGING # enable debugging in isci HAL
+
+#
# SafeNet crypto driver: can be moved to the MI NOTES as soon as
# it's tested on a big-endian machine
#
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/conf/files.amd64 Tue Jan 31 19:38:18 2012 (r230843)
@@ -271,6 +271,115 @@ dev/tpm/tpm_isa.c optional tpm isa
dev/uart/uart_cpu_amd64.c optional uart
dev/viawd/viawd.c optional viawd
dev/wpi/if_wpi.c optional wpi
+dev/isci/isci.c
optional isci
+dev/isci/isci_controller.c optional isci
+dev/isci/isci_domain.c optional isci
+dev/isci/isci_interrupt.c optional isci
+dev/isci/isci_io_request.c optional isci
+dev/isci/isci_logger.c optional isci
+dev/isci/isci_oem_parameters.c optional isci
+dev/isci/isci_remote_device.c optional isci
+dev/isci/isci_sysctl.c optional isci
+dev/isci/isci_task_request.c optional isci
+dev/isci/isci_timer.c optional isci
+dev/isci/scil/sati.c optional isci
+dev/isci/scil/sati_abort_task_set.c optional isci
+dev/isci/scil/sati_atapi.c optional isci
+dev/isci/scil/sati_device.c optional isci
+dev/isci/scil/sati_inquiry.c optional isci
+dev/isci/scil/sati_log_sense.c optional isci
+dev/isci/scil/sati_lun_reset.c optional isci
+dev/isci/scil/sati_mode_pages.c
optional isci
+dev/isci/scil/sati_mode_select.c optional isci
+dev/isci/scil/sati_mode_sense.c
optional isci
+dev/isci/scil/sati_mode_sense_10.c optional isci
+dev/isci/scil/sati_mode_sense_6.c optional isci
+dev/isci/scil/sati_move.c optional isci
+dev/isci/scil/sati_passthrough.c optional isci
+dev/isci/scil/sati_read.c optional isci
+dev/isci/scil/sati_read_buffer.c optional isci
+dev/isci/scil/sati_read_capacity.c optional isci
+dev/isci/scil/sati_reassign_blocks.c optional isci
+dev/isci/scil/sati_report_luns.c optional isci
+dev/isci/scil/sati_request_sense.c optional isci
+dev/isci/scil/sati_start_stop_unit.c optional isci
+dev/isci/scil/sati_synchronize_cache.c optional isci
+dev/isci/scil/sati_test_unit_ready.c optional isci
+dev/isci/scil/sati_unmap.c optional isci
+dev/isci/scil/sati_util.c optional isci
+dev/isci/scil/sati_verify.c optional isci
+dev/isci/scil/sati_write.c optional isci
+dev/isci/scil/sati_write_and_verify.c optional isci
+dev/isci/scil/sati_write_buffer.c optional isci
+dev/isci/scil/sati_write_long.c
optional isci
+dev/isci/scil/sci_abstract_list.c optional isci
+dev/isci/scil/sci_base_controller.c optional isci
+dev/isci/scil/sci_base_domain.c
optional isci
+dev/isci/scil/sci_base_iterator.c optional isci
+dev/isci/scil/sci_base_library.c optional isci
+dev/isci/scil/sci_base_logger.c
optional isci
+dev/isci/scil/sci_base_memory_descriptor_list.c
optional isci
+dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci
+dev/isci/scil/sci_base_object.c
optional isci
+dev/isci/scil/sci_base_observer.c optional isci
+dev/isci/scil/sci_base_phy.c optional isci
+dev/isci/scil/sci_base_port.c optional isci
+dev/isci/scil/sci_base_remote_device.c optional isci
+dev/isci/scil/sci_base_request.c optional isci
+dev/isci/scil/sci_base_state_machine.c optional isci
+dev/isci/scil/sci_base_state_machine_logger.c optional isci
+dev/isci/scil/sci_base_state_machine_observer.c
optional isci
+dev/isci/scil/sci_base_subject.c optional isci
+dev/isci/scil/sci_util.c optional isci
+dev/isci/scil/scic_sds_controller.c optional isci
+dev/isci/scil/scic_sds_library.c optional isci
+dev/isci/scil/scic_sds_pci.c optional isci
+dev/isci/scil/scic_sds_phy.c optional isci
+dev/isci/scil/scic_sds_port.c optional isci
+dev/isci/scil/scic_sds_port_configuration_agent.c optional isci
+dev/isci/scil/scic_sds_remote_device.c optional isci
+dev/isci/scil/scic_sds_remote_node_context.c optional isci
+dev/isci/scil/scic_sds_remote_node_table.c optional isci
+dev/isci/scil/scic_sds_request.c optional isci
+dev/isci/scil/scic_sds_sgpio.c optional isci
+dev/isci/scil/scic_sds_smp_remote_device.c optional isci
+dev/isci/scil/scic_sds_smp_request.c optional isci
+dev/isci/scil/scic_sds_ssp_request.c optional isci
+dev/isci/scil/scic_sds_stp_packet_request.c optional isci
+dev/isci/scil/scic_sds_stp_remote_device.c optional isci
+dev/isci/scil/scic_sds_stp_request.c optional isci
+dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci
+dev/isci/scil/scif_sas_controller.c optional isci
+dev/isci/scil/scif_sas_controller_state_handlers.c optional isci
+dev/isci/scil/scif_sas_controller_states.c optional isci
+dev/isci/scil/scif_sas_domain.c
optional isci
+dev/isci/scil/scif_sas_domain_state_handlers.c optional isci
+dev/isci/scil/scif_sas_domain_states.c optional isci
+dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci
+dev/isci/scil/scif_sas_internal_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_io_request_states.c optional isci
+dev/isci/scil/scif_sas_library.c optional isci
+dev/isci/scil/scif_sas_remote_device.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_states.c optional isci
+dev/isci/scil/scif_sas_request.c optional isci
+dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
optional isci
+dev/isci/scil/scif_sas_smp_io_request.c
optional isci
+dev/isci/scil/scif_sas_smp_phy.c optional isci
+dev/isci/scil/scif_sas_smp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_io_request.c
optional isci
+dev/isci/scil/scif_sas_stp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_task_request_states.c optional isci
+dev/isci/scil/scif_sas_timer.c optional isci
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/kern_clocksource.c standard
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/conf/files.i386 Tue Jan 31 19:38:18 2012 (r230843)
@@ -248,6 +248,115 @@ dev/viawd/viawd.c optional viawd
dev/acpica/acpi_if.m standard
dev/acpi_support/acpi_wmi_if.m standard
dev/wpi/if_wpi.c optional wpi
+dev/isci/isci.c
optional isci
+dev/isci/isci_controller.c optional isci
+dev/isci/isci_domain.c optional isci
+dev/isci/isci_interrupt.c optional isci
+dev/isci/isci_io_request.c optional isci
+dev/isci/isci_logger.c optional isci
+dev/isci/isci_oem_parameters.c optional isci
+dev/isci/isci_remote_device.c optional isci
+dev/isci/isci_sysctl.c optional isci
+dev/isci/isci_task_request.c optional isci
+dev/isci/isci_timer.c optional isci
+dev/isci/scil/sati.c optional isci
+dev/isci/scil/sati_abort_task_set.c optional isci
+dev/isci/scil/sati_atapi.c optional isci
+dev/isci/scil/sati_device.c optional isci
+dev/isci/scil/sati_inquiry.c optional isci
+dev/isci/scil/sati_log_sense.c optional isci
+dev/isci/scil/sati_lun_reset.c optional isci
+dev/isci/scil/sati_mode_pages.c
optional isci
+dev/isci/scil/sati_mode_select.c optional isci
+dev/isci/scil/sati_mode_sense.c
optional isci
+dev/isci/scil/sati_mode_sense_10.c optional isci
+dev/isci/scil/sati_mode_sense_6.c optional isci
+dev/isci/scil/sati_move.c optional isci
+dev/isci/scil/sati_passthrough.c optional isci
+dev/isci/scil/sati_read.c optional isci
+dev/isci/scil/sati_read_buffer.c optional isci
+dev/isci/scil/sati_read_capacity.c optional isci
+dev/isci/scil/sati_reassign_blocks.c optional isci
+dev/isci/scil/sati_report_luns.c optional isci
+dev/isci/scil/sati_request_sense.c optional isci
+dev/isci/scil/sati_start_stop_unit.c optional isci
+dev/isci/scil/sati_synchronize_cache.c optional isci
+dev/isci/scil/sati_test_unit_ready.c optional isci
+dev/isci/scil/sati_unmap.c optional isci
+dev/isci/scil/sati_util.c optional isci
+dev/isci/scil/sati_verify.c optional isci
+dev/isci/scil/sati_write.c optional isci
+dev/isci/scil/sati_write_and_verify.c optional isci
+dev/isci/scil/sati_write_buffer.c optional isci
+dev/isci/scil/sati_write_long.c
optional isci
+dev/isci/scil/sci_abstract_list.c optional isci
+dev/isci/scil/sci_base_controller.c optional isci
+dev/isci/scil/sci_base_domain.c
optional isci
+dev/isci/scil/sci_base_iterator.c optional isci
+dev/isci/scil/sci_base_library.c optional isci
+dev/isci/scil/sci_base_logger.c
optional isci
+dev/isci/scil/sci_base_memory_descriptor_list.c
optional isci
+dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci
+dev/isci/scil/sci_base_object.c
optional isci
+dev/isci/scil/sci_base_observer.c optional isci
+dev/isci/scil/sci_base_phy.c optional isci
+dev/isci/scil/sci_base_port.c optional isci
+dev/isci/scil/sci_base_remote_device.c optional isci
+dev/isci/scil/sci_base_request.c optional isci
+dev/isci/scil/sci_base_state_machine.c optional isci
+dev/isci/scil/sci_base_state_machine_logger.c optional isci
+dev/isci/scil/sci_base_state_machine_observer.c
optional isci
+dev/isci/scil/sci_base_subject.c optional isci
+dev/isci/scil/sci_util.c optional isci
+dev/isci/scil/scic_sds_controller.c optional isci
+dev/isci/scil/scic_sds_library.c optional isci
+dev/isci/scil/scic_sds_pci.c optional isci
+dev/isci/scil/scic_sds_phy.c optional isci
+dev/isci/scil/scic_sds_port.c optional isci
+dev/isci/scil/scic_sds_port_configuration_agent.c optional isci
+dev/isci/scil/scic_sds_remote_device.c optional isci
+dev/isci/scil/scic_sds_remote_node_context.c optional isci
+dev/isci/scil/scic_sds_remote_node_table.c optional isci
+dev/isci/scil/scic_sds_request.c optional isci
+dev/isci/scil/scic_sds_sgpio.c optional isci
+dev/isci/scil/scic_sds_smp_remote_device.c optional isci
+dev/isci/scil/scic_sds_smp_request.c optional isci
+dev/isci/scil/scic_sds_ssp_request.c optional isci
+dev/isci/scil/scic_sds_stp_packet_request.c optional isci
+dev/isci/scil/scic_sds_stp_remote_device.c optional isci
+dev/isci/scil/scic_sds_stp_request.c optional isci
+dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci
+dev/isci/scil/scif_sas_controller.c optional isci
+dev/isci/scil/scif_sas_controller_state_handlers.c optional isci
+dev/isci/scil/scif_sas_controller_states.c optional isci
+dev/isci/scil/scif_sas_domain.c
optional isci
+dev/isci/scil/scif_sas_domain_state_handlers.c optional isci
+dev/isci/scil/scif_sas_domain_states.c optional isci
+dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci
+dev/isci/scil/scif_sas_internal_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_io_request_states.c optional isci
+dev/isci/scil/scif_sas_library.c optional isci
+dev/isci/scil/scif_sas_remote_device.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_states.c optional isci
+dev/isci/scil/scif_sas_request.c optional isci
+dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
optional isci
+dev/isci/scil/scif_sas_smp_io_request.c
optional isci
+dev/isci/scil/scif_sas_smp_phy.c optional isci
+dev/isci/scil/scif_sas_smp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_io_request.c
optional isci
+dev/isci/scil/scif_sas_stp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_task_request_states.c optional isci
+dev/isci/scil/scif_sas_timer.c optional isci
i386/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi
\
dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64 Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/conf/options.amd64 Tue Jan 31 19:38:18 2012 (r230843)
@@ -65,3 +65,6 @@ KDTRACE_FRAME opt_kdtrace.h
BPF_JITTER opt_bpf.h
XENHVM opt_global.h
+
+# options for the Intel C600 SAS driver (isci)
+ISCI_LOGGING opt_isci.h
Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386 Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/conf/options.i386 Tue Jan 31 19:38:18 2012 (r230843)
@@ -119,3 +119,6 @@ BPF_JITTER opt_bpf.h
NATIVE opt_global.h
XEN opt_global.h
XENHVM opt_global.h
+
+# options for the Intel C600 SAS driver (isci)
+ISCI_LOGGING opt_isci.h
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/i386/conf/GENERIC Tue Jan 31 19:38:18 2012 (r230843)
@@ -130,6 +130,7 @@ device bt # Buslogic/Mylex
MultiMaster
device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3
device stg # TMC 18C30/18C50
+device isci # Intel C600 SAS controller
# ATA/SCSI peripherals
device scbus # SCSI bus (required for ATA/SCSI)
Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/i386/conf/NOTES Tue Jan 31 19:38:18 2012 (r230843)
@@ -727,6 +727,11 @@ device hptiop
device ips
#
+# Intel C600 (Patsburg) integrated SAS controller
+device isci
+options ISCI_LOGGING # enable debugging in isci HAL
+
+#
# SafeNet crypto driver: can be moved to the MI NOTES as soon as
# it's tested on a big-endian machine
#
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Tue Jan 31 19:07:08 2012 (r230842)
+++ head/sys/modules/Makefile Tue Jan 31 19:38:18 2012 (r230843)
@@ -145,6 +145,7 @@ SUBDIR= ${_3dfx} \
${_ips} \
${_ipw} \
${_ipwfw} \
+ ${_isci} \
iscsi \
isp \
ispfw \
@@ -521,6 +522,7 @@ _ipmi= ipmi
_ips= ips
_ipw= ipw
_ipwfw= ipwfw
+_isci= isci
_iwi= iwi
_iwifw= iwifw
_iwn= iwn
@@ -602,6 +604,7 @@ _ipmi= ipmi
_ips= ips
_ipw= ipw
_ipwfw= ipwfw
+_isci= isci
_iwi= iwi
_iwifw= iwifw
_iwn= iwn
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
