From 748b88ff6deca4fda640b16ca021857b33aa5ca6 Mon Sep 17 00:00:00 2001

From: Sasikumar Chandrasekaran <sasikumar.pc@broadcom.com>

Date: Tue, 10 Jan 2017 18:20:43 -0500

Subject: [PATCH 01/11] scsi: megaraid_sas: Add new pci device Ids for SAS3.5

 Generic Megaraid Controllers

This patch contains new pci device ids for SAS3.5 Generic Megaraid Controllers

Signed-off-by: Sasikumar Chandrasekaran <sasikumar.pc@broadcom.com>

Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

---

 drivers/scsi/megaraid/megaraid_sas.h        | 12 +++++++++---

 drivers/scsi/megaraid/megaraid_sas_base.c   | 14 +++++++++++++-

 drivers/scsi/megaraid/megaraid_sas_fusion.c | 30 ++++++++++++++++++++++-------

 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h

index ba52d14..e5ac6b1 100644

--- a/drivers/scsi/megaraid/megaraid_sas.h

+++ b/drivers/scsi/megaraid/megaraid_sas.h

@@ -56,6 +56,11 @@

 #define PCI_DEVICE_ID_LSI_INTRUDER_24		0x00cf

 #define PCI_DEVICE_ID_LSI_CUTLASS_52		0x0052

 #define PCI_DEVICE_ID_LSI_CUTLASS_53		0x0053

+#define PCI_DEVICE_ID_LSI_VENTURA		    0x0014

+#define PCI_DEVICE_ID_LSI_HARPOON		    0x0016

+#define PCI_DEVICE_ID_LSI_TOMCAT		    0x0017

+#define PCI_DEVICE_ID_LSI_VENTURA_4PORT		0x001B

+#define PCI_DEVICE_ID_LSI_CRUSADER_4PORT	0x001C

 /*

  * Intel HBA SSDIDs

@@ -100,7 +105,7 @@

  */

 /*

- * MFI stands for  MegaRAID SAS FW Interface. This is just a moniker for 

+ * MFI stands for  MegaRAID SAS FW Interface. This is just a moniker for

  * protocol between the software and firmware. Commands are issued using

  * "message frames"

  */

@@ -1435,7 +1440,7 @@ enum FW_BOOT_CONTEXT {

 * register set for both 1068 and 1078 controllers

 * structure extended for 1078 registers

 */

- 

+

 struct megasas_register_set {

 	u32	doorbell;                       /*0000h*/

 	u32	fusion_seq_offset;		/*0004h*/

@@ -1478,7 +1483,7 @@ struct megasas_register_set {

 	u32 	inbound_high_queue_port ;	/*00C4h*/

-	u32 	reserved_5;			/*00C8h*/

+	u32 inbound_single_queue_port;	/*00C8h*/

 	u32	res_6[11];			/*CCh*/

 	u32	host_diag;

 	u32	seq_offset;

@@ -2143,6 +2148,7 @@ struct megasas_instance {

 	u8 is_rdpq;

 	bool dev_handle;

 	bool fw_sync_cache_support;

+	bool is_ventura;

 };

 struct MR_LD_VF_MAP {

 	u32 size;

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c

index ac01648..a73e6f6 100644

--- a/drivers/scsi/megaraid/megaraid_sas_base.c

+++ b/drivers/scsi/megaraid/megaraid_sas_base.c

@@ -155,6 +155,12 @@ static struct pci_device_id megasas_pci_table[] = {

 	/* Intruder 24 port*/

 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CUTLASS_52)},

 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CUTLASS_53)},

+	/* VENTURA */

+	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA)},

+	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_HARPOON)},

+	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_TOMCAT)},

+	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA_4PORT)},

+	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CRUSADER_4PORT)},

 	{}

 };

@@ -5765,6 +5771,12 @@ static int megasas_probe_one(struct pci_dev *pdev,

 	instance->pdev = pdev;

 	switch (instance->pdev->device) {

+	case PCI_DEVICE_ID_LSI_VENTURA:

+	case PCI_DEVICE_ID_LSI_HARPOON:

+	case PCI_DEVICE_ID_LSI_TOMCAT:

+	case PCI_DEVICE_ID_LSI_VENTURA_4PORT:

+	case PCI_DEVICE_ID_LSI_CRUSADER_4PORT:

+	     instance->is_ventura = true;

 	case PCI_DEVICE_ID_LSI_FUSION:

 	case PCI_DEVICE_ID_LSI_PLASMA:

 	case PCI_DEVICE_ID_LSI_INVADER:

@@ -5789,7 +5801,7 @@ static int megasas_probe_one(struct pci_dev *pdev,

 		if ((instance->pdev->device == PCI_DEVICE_ID_LSI_FUSION) ||

 			(instance->pdev->device == PCI_DEVICE_ID_LSI_PLASMA))

 			fusion->adapter_type = THUNDERBOLT_SERIES;

-		else

+		else if (!instance->is_ventura)

 			fusion->adapter_type = INVADER_SERIES;

 	}

 	break;

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c

index 7ecd0b4..5ad8a07 100644

--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c

+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c

@@ -189,15 +189,29 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance,

  */

 static void

 megasas_fire_cmd_fusion(struct megasas_instance *instance,

-		union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc)

+	union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc, bool is_32bit)

 {

+	struct megasas_register_set __iomem *regs = instance->reg_set;

+	unsigned long flags;

+

+	if (is_32bit)

+		writel(le32_to_cpu(req_desc->u.low),

+			&(regs)->inbound_single_queue_port);

+	else if (instance->is_ventura) {

+		spin_lock_irqsave(&instance->hba_lock, flags);

+		writel(le32_to_cpu(req_desc->u.low),

+			&(regs)->inbound_low_queue_port);

+		writel(le32_to_cpu(req_desc->u.high),

+			&(regs)->inbound_high_queue_port);

+		mmiowb();

+		spin_unlock_irqrestore(&instance->hba_lock, flags);

+	} else {

 #if defined(writeq) && defined(CONFIG_64BIT)

 	u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) |

 			le32_to_cpu(req_desc->u.low));

 	writeq(req_data, &instance->reg_set->inbound_low_queue_port);

 #else

-	unsigned long flags;

 	spin_lock_irqsave(&instance->hba_lock, flags);

 	writel(le32_to_cpu(req_desc->u.low),

@@ -207,6 +221,7 @@ megasas_fire_cmd_fusion(struct megasas_instance *instance,

 	mmiowb();

 	spin_unlock_irqrestore(&instance->hba_lock, flags);

 #endif

+	}

 }

 /**

@@ -850,7 +865,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)

 			break;

 	}

-	megasas_fire_cmd_fusion(instance, &req_desc);

+	megasas_fire_cmd_fusion(instance, &req_desc, false);

 	wait_and_poll(instance, cmd, MFI_POLL_TIMEOUT_SECS);

@@ -2224,7 +2239,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,

 	 */

 	atomic_inc(&instance->fw_outstanding);

-	megasas_fire_cmd_fusion(instance, req_desc);

+	megasas_fire_cmd_fusion(instance, req_desc, instance->is_ventura);

 	return 0;

 }

@@ -2592,7 +2607,7 @@ megasas_issue_dcmd_fusion(struct megasas_instance *instance,

 		return DCMD_NOT_FIRED;

 	}

-	megasas_fire_cmd_fusion(instance, req_desc);

+	megasas_fire_cmd_fusion(instance, req_desc, instance->is_ventura);

 	return DCMD_SUCCESS;

 }

@@ -2884,7 +2899,8 @@ void megasas_refire_mgmt_cmd(struct megasas_instance *instance)

 				cpu_to_le32(MR_DCMD_SYSTEM_PD_MAP_GET_INFO)))

 				&& !(cmd_mfi->flags & DRV_DCMD_SKIP_REFIRE);

 		if (refire_cmd)

-			megasas_fire_cmd_fusion(instance, req_desc);

+			megasas_fire_cmd_fusion(instance, req_desc,

+							instance->is_ventura);

 		else

 			megasas_return_cmd(instance, cmd_mfi);

 	}

@@ -3063,7 +3079,7 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle,

 		mr_request->tmReqFlags.isTMForLD = 1;

 	init_completion(&cmd_fusion->done);

-	megasas_fire_cmd_fusion(instance, req_desc);

+	megasas_fire_cmd_fusion(instance, req_desc, instance->is_ventura);

 	timeleft = wait_for_completion_timeout(&cmd_fusion->done, 50 * HZ);

-- 

1.8.3.1