6594630 add SCMD_SYNCHRONIZE_CACHE support for aac

6594637 aac card quirks should be updated
6594691 aac should use one lock for most io operations
6595687 Sunrise Lake IOP reset needs different handling
6597917 driver should always poll io for the pkt's of AAC_CMD_NO_INTR

1 files changed, 59 insertions, 4 deletions

diff --git a/usr/src/uts/intel/aac/Makefile b/usr/src/uts/intel/aac/Makefile
index 6e92be10bf..4a1cb94e35 100644
--- a/usr/src/uts/intel/aac/Makefile
+++ b/usr/src/uts/intel/aac/Makefile
@@ -1,5 +1,26 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -22,6 +43,9 @@ OBJECTS		= $(AAC_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(AAC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/intel/io/aac
+WARLOCK_OUT     = $(AAC_OBJS:%.o=%.ll)
+WARLOCK_OK      = $(MODULE).ok
+WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -40,11 +64,8 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 # to investigate and remove these for maximum lint coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
 LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
 
 #
 # 	Overrides
@@ -75,3 +96,37 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
+
+#
+#	Defines for local commands.
+#
+WARLOCK		= warlock
+WLCC		= wlcc
+TOUCH		= touch
+TEST		= test
+
+#
+#	lock_lint rules
+#
+SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/intel/scsi/%.ll)
+
+%.wlcmd:
+	cd $(WLCMD_DIR); $(TEST) -f $@ || $(SCCS) get $@
+
+warlock: $(WARLOCK_OK)
+
+$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files aac.wlcmd
+	$(WARLOCK) -c $(WLCMD_DIR)/aac.wlcmd $(WARLOCK_OUT) \
+	$(SCSI_FILES) \
+	$(UTSBASE)/intel/warlock/scsi.ll \
+	-l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll
+	$(TOUCH) $@
+
+%.ll: $(UTSBASE)/intel/io/aac/%.c
+	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
+
+warlock_ddi.files:
+	@cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock
+
+scsi.files:
+	@cd $(UTSBASE)/intel/scsi; pwd; $(MAKE) warlock