Skip to content

Commit 20b09c2

Browse files
Andy Yanjejb
authored andcommitted
[SCSI] mvsas: add support for 94xx; layout change; bug fixes
This version contains following main changes - Switch to new layout to support more types of ASIC. - SSP TMF supported and related Error Handing enhanced. - Support flash feature with delay 2*HZ when PHY changed. - Support Marvell 94xx series ASIC for 6G SAS/SATA, which has 2 88SE64xx chips but any different register description. - Support SPI flash for HBA-related configuration info. - Other patch enhanced from kernel side such as increasing PHY type [jejb: fold back in DMA_BIT_MASK changes] Signed-off-by: Ying Chu <jasonchu@marvell.com> Signed-off-by: Andy Yan <ayan@marvell.com> Signed-off-by: Ke Wei <kewei@marvell.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
1 parent dd4969a commit 20b09c2

File tree

11 files changed

+3919
-1403
lines changed

11 files changed

+3919
-1403
lines changed

drivers/scsi/mvsas/Kconfig

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,42 @@
11
#
2-
# Kernel configuration file for 88SE64XX SAS/SATA driver.
2+
# Kernel configuration file for 88SE64XX/88SE94XX SAS/SATA driver.
33
#
44
# Copyright 2007 Red Hat, Inc.
55
# Copyright 2008 Marvell. <kewei@marvell.com>
66
#
77
# This file is licensed under GPLv2.
88
#
9-
# This file is part of the 88SE64XX driver.
9+
# This file is part of the 88SE64XX/88SE94XX driver.
1010
#
11-
# The 88SE64XX driver is free software; you can redistribute
11+
# The 88SE64XX/88SE94XX driver is free software; you can redistribute
1212
# it and/or modify it under the terms of the GNU General Public License
1313
# as published by the Free Software Foundation; version 2 of the
1414
# License.
1515
#
16-
# The 88SE64XX driver is distributed in the hope that it will be
16+
# The 88SE64XX/88SE94XX driver is distributed in the hope that it will be
1717
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
1818
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1919
# General Public License for more details.
2020
#
2121
# You should have received a copy of the GNU General Public License
22-
# along with 88SE64XX Driver; if not, write to the Free Software
22+
# along with 88SE64XX/88SE94XX Driver; if not, write to the Free Software
2323
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2424
#
2525
#
2626

2727
config SCSI_MVSAS
28-
tristate "Marvell 88SE64XX SAS/SATA support"
28+
tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
2929
depends on PCI
3030
select SCSI_SAS_LIBSAS
3131
select FW_LOADER
3232
help
33-
This driver supports Marvell's SAS/SATA 3Gb/s PCI-E 88SE64XX
34-
chip based host adapters.
33+
This driver supports Marvell's SAS/SATA 3Gb/s PCI-E 88SE64XX and 6Gb/s
34+
PCI-E 88SE94XX chip based host adapters.
3535

36+
config SCSI_MVSAS_DEBUG
37+
bool "Compile in debug mode"
38+
default y
39+
depends on SCSI_MVSAS
40+
help
41+
Compiles the 88SE64XX/88SE94XX driver in debug mode. In debug mode,
42+
the driver prints some messages to the console.

drivers/scsi/mvsas/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Makefile for Marvell 88SE64xx SAS/SATA driver.
2+
# Makefile for Marvell 88SE64xx/88SE84xx SAS/SATA driver.
33
#
44
# Copyright 2007 Red Hat, Inc.
55
# Copyright 2008 Marvell. <kewei@marvell.com>
@@ -21,7 +21,12 @@
2121
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
2222
# USA
2323

24+
ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
25+
EXTRA_CFLAGS += -DMV_DEBUG
26+
endif
27+
2428
obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
2529
mvsas-y += mv_init.o \
2630
mv_sas.o \
27-
mv_64xx.o
31+
mv_64xx.o \
32+
mv_94xx.o

0 commit comments

Comments
 (0)