Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b45b69c authored by James Bottomley's avatar James Bottomley
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci

parents db111e18 bc6f387d

drivers/scsi/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -830,6 +830,19 @@ config SCSI_GDTH 
	  To compile this driver as a module, choose M here: the

	  module will be called gdth.



config SCSI_ISCI

	tristate "Intel(R) C600 Series Chipset SAS Controller"

	depends on PCI && SCSI

	depends on X86

	# (temporary): known alpha quality driver

	depends on EXPERIMENTAL

	select SCSI_SAS_LIBSAS

	---help---

	  This driver supports the 6Gb/s SAS capabilities of the storage

	  control unit found in the Intel(R) C600 series chipset.



	  The experimental tag will be removed after the driver exits alpha



config SCSI_GENERIC_NCR5380

	tristate "Generic NCR5380/53c400 SCSI PIO support"

	depends on ISA && SCSI

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ obj-$(CONFIG_SCSI_AACRAID) += aacraid/ 
obj-$(CONFIG_SCSI_AIC7XXX_OLD)	+= aic7xxx_old.o

obj-$(CONFIG_SCSI_AIC94XX)	+= aic94xx/

obj-$(CONFIG_SCSI_PM8001)	+= pm8001/

obj-$(CONFIG_SCSI_ISCI)		+= isci/

obj-$(CONFIG_SCSI_IPS)		+= ips.o

obj-$(CONFIG_SCSI_FD_MCS)	+= fd_mcs.o

obj-$(CONFIG_SCSI_FUTURE_DOMAIN)+= fdomain.o

drivers/scsi/isci/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SCSI_ISCI) += isci.o

isci-objs := init.o phy.o request.o \

	     remote_device.o port.o \

	     host.o task.o probe_roms.o \

	     remote_node_context.o \

	     remote_node_table.o \

	     unsolicited_frame_control.o \

	     port_config.o \

drivers/scsi/isci/firmware/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Makefile for create_fw

#

CC=gcc

CFLAGS=-c -Wall -O2 -g

LDFLAGS=

SOURCES=create_fw.c

OBJECTS=$(SOURCES:.cpp=.o)

EXECUTABLE=create_fw



all: $(SOURCES) $(EXECUTABLE)



$(EXECUTABLE): $(OBJECTS)

	$(CC) $(LDFLAGS) $(OBJECTS) -o $@



.c.o:

	$(CC) $(CFLAGS) $< -O $@



clean:

	rm -f *.o $(EXECUTABLE)

drivers/scsi/isci/firmware/README

0 → 100644
+36 −0
Original line number Diff line number Diff line 
This defines the temporary binary blow we are to pass to the SCU

driver to emulate the binary firmware that we will eventually be

able to access via NVRAM on the SCU controller.



The current size of the binary blob is expected to be 149 bytes or larger



Header Types:

0x1: Phy Masks

0x2: Phy Gens

0x3: SAS Addrs

0xff: End of Data



ID string - u8[12]: "#SCU MAGIC#\0"

Version - u8: 1

SubVersion - u8: 0



Header Type - u8: 0x1

Size - u8: 8

Phy Mask - u32[8]



Header Type - u8: 0x2

Size - u8: 8

Phy Gen - u32[8]



Header Type - u8: 0x3

Size - u8: 8

Sas Addr - u64[8]



Header Type - u8: 0xf





==============================================================================



Place isci_firmware.bin in /lib/firmware

Be sure to recreate the initramfs image to include the firmware.