Add support for next generation megaraid sas raid controllers.

From Jim Giannoules <gortag@gmail.com>

4 files changed, 66 insertions, 6 deletions

diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 2a24027598f..8166d17a33f 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.87 2008/10/31 21:39:04 marco Exp $ */
+/* $OpenBSD: mfi.c,v 1.88 2009/01/28 23:45:12 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -131,6 +131,18 @@ static const struct mfi_iop_ops mfi_iop_ppc = {
 	mfi_ppc_post
 };
 
+u_int32_t	mfi_gen2_fw_state(struct mfi_softc *sc);
+void		mfi_gen2_intr_ena(struct mfi_softc *sc);
+int		mfi_gen2_intr(struct mfi_softc *sc);
+void		mfi_gen2_post(struct mfi_softc *sc, struct mfi_ccb *ccb);
+
+static const struct mfi_iop_ops mfi_iop_gen2 = {
+	mfi_gen2_fw_state,
+	mfi_gen2_intr_ena,
+	mfi_gen2_intr,
+	mfi_gen2_post
+};
+
 #define mfi_fw_state(_s)	((_s)->sc_iop->mio_fw_state(_s))
 #define mfi_intr_enable(_s)	((_s)->sc_iop->mio_intr_ena(_s))
 #define mfi_my_intr(_s)		((_s)->sc_iop->mio_intr(_s))
@@ -612,6 +624,9 @@ mfi_attach(struct mfi_softc *sc, enum mfi_iop iop)
 	case MFI_IOP_PPC:
 		sc->sc_iop = &mfi_iop_ppc;
 		break;
+	case MFI_IOP_GEN2:
+		sc->sc_iop = &mfi_iop_gen2;
+		break;
 	default:
 		panic("%s: unknown iop %d", DEVNAME(sc), iop);
 	}
@@ -2029,3 +2044,38 @@ mfi_ppc_post(struct mfi_softc *sc, struct mfi_ccb *ccb)
 	mfi_write(sc, MFI_IQP, 0x1 | ccb->ccb_pframe |
 	    (ccb->ccb_extra_frames << 1));
 }
+
+u_int32_t
+mfi_gen2_fw_state(struct mfi_softc *sc)
+{
+	return (mfi_read(sc, MFI_OSP));
+}
+
+void
+mfi_gen2_intr_ena(struct mfi_softc *sc)
+{
+	mfi_write(sc, MFI_ODC, 0xffffffff);
+	mfi_write(sc, MFI_OMSK, ~MFI_OSTS_GEN2_INTR_VALID);
+}
+
+int
+mfi_gen2_intr(struct mfi_softc *sc)
+{
+	u_int32_t status;
+
+	status = mfi_read(sc, MFI_OSTS);
+	if (!ISSET(status, MFI_OSTS_GEN2_INTR_VALID))
+		return (0);
+
+	/* write status back to acknowledge interrupt */
+	mfi_write(sc, MFI_ODC, status);
+
+	return (1);
+}
+
+void
+mfi_gen2_post(struct mfi_softc *sc, struct mfi_ccb *ccb)
+{
+	mfi_write(sc, MFI_IQP, 0x1 | ccb->ccb_pframe |
+	    (ccb->ccb_extra_frames << 1));
+}
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h
index fa559cce4ed..3d8678de895 100644
--- a/sys/dev/ic/mfireg.h
+++ b/sys/dev/ic/mfireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfireg.h,v 1.27 2008/10/31 21:37:20 marco Exp $ */
+/* $OpenBSD: mfireg.h,v 1.28 2009/01/28 23:45:12 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -24,6 +24,7 @@
 #define MFI_SENSE_SIZE				128
 #define MFI_OSTS_INTR_VALID			0x00000002 /* valid interrupt */
 #define MFI_OSTS_PPC_INTR_VALID			0x80000000
+#define MFI_OSTS_GEN2_INTR_VALID		(0x00000001 | 0x00000004)
 #define MFI_INVALID_CTX				0xffffffff
 #define MFI_ENABLE_INTR				0x01
 #define MFI_MAXFER				MAXPHYS	/* XXX bogus */
diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h
index f8c5d3e1c1a..1b6cd59e0ca 100644
--- a/sys/dev/ic/mfivar.h
+++ b/sys/dev/ic/mfivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfivar.h,v 1.34 2008/10/31 21:39:04 marco Exp $ */
+/* $OpenBSD: mfivar.h,v 1.35 2009/01/28 23:45:12 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -94,7 +94,8 @@ TAILQ_HEAD(mfi_ccb_list, mfi_ccb);
 
 enum mfi_iop {
 	MFI_IOP_XSCALE,
-	MFI_IOP_PPC
+	MFI_IOP_PPC,
+	MFI_IOP_GEN2
 };
 
 struct mfi_iop_ops {
diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c
index 1f4ddf1ab1a..038726387bd 100644
--- a/sys/dev/pci/mfi_pci.c
+++ b/sys/dev/pci/mfi_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi_pci.c,v 1.18 2008/11/23 12:50:23 dlg Exp $ */
+/* $OpenBSD: mfi_pci.c,v 1.19 2009/01/28 23:45:13 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -72,6 +72,10 @@ static const struct mfi_pci_subtype mfi_perc5_subtypes[] = {
 	{ 0x0,		"" }
 };
 
+static const struct mfi_pci_subtype mfi_gen2_subtypes[] = {
+	{ 0x0,		"" } /* XXX add entries when known */
+};
+
 static const
 struct	mfi_pci_device {
 	pcireg_t			mpd_vendor;
@@ -88,7 +92,11 @@ struct	mfi_pci_device {
 	{ PCI_VENDOR_DELL,	PCI_PRODUCT_DELL_PERC5,
 	  MFI_IOP_XSCALE,	mfi_perc5_subtypes },
 	{ PCI_VENDOR_SYMBIOS,	PCI_PRODUCT_DELL_PERC6,
-	  MFI_IOP_PPC,		mfi_1078_subtypes }
+	  MFI_IOP_PPC,		mfi_1078_subtypes },
+	{ PCI_VENDOR_SYMBIOS,	PCI_PRODUCT_SYMBIOS_SAS2108_1,
+	  MFI_IOP_GEN2,		mfi_gen2_subtypes },
+	{ PCI_VENDOR_SYMBIOS,	PCI_PRODUCT_SYMBIOS_SAS2108_2,
+	  MFI_IOP_GEN2,		mfi_gen2_subtypes },
 };
 
 const struct mfi_pci_device *mfi_pci_find_device(struct pci_attach_args *);