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

Commit 5765c5b8 authored by Sumit.Saxena@avagotech.com's avatar Sumit.Saxena@avagotech.com Committed by James Bottomley
Browse files

megaraid_sas : Support for Avago's Single server High Availability product 



This patch will add support for Single Server High Availability(SSHA) cluster
support.  Here is the short decsription of changes done to add support for
SSHA-

1) Host will send system's Unique ID based on DMI_PRODUCT_UUID to firmware.
2) Toggle the devhandle in LDIO path for Remote LDs.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@avagotech.com>
Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 09fced19

drivers/scsi/megaraid/megaraid_sas.h

+15 −2
Original line number Diff line number Diff line
@@ -1271,8 +1271,10 @@ struct megasas_init_frame { 
	u32 queue_info_new_phys_addr_hi;	/*1Ch */

	u32 queue_info_old_phys_addr_lo;	/*20h */

	u32 queue_info_old_phys_addr_hi;	/*24h */



	u32 reserved_4[6];	/*28h */

	u32 reserved_4[2];	/*28h */

	u32 system_info_lo;      /*30h */

	u32 system_info_hi;      /*34h */

	u32 reserved_5[2];	/*38h */



} __attribute__ ((packed));
@@ -1649,12 +1651,22 @@ struct megasas_irq_context { 
	u32 MSIxIndex;

};



struct MR_DRV_SYSTEM_INFO {

	u8	infoVersion;

	u8	systemIdLength;

	u16	reserved0;

	u8	systemId[64];

	u8	reserved[1980];

};



struct megasas_instance {



	u32 *producer;

	dma_addr_t producer_h;

	u32 *consumer;

	dma_addr_t consumer_h;

	struct MR_DRV_SYSTEM_INFO *system_info_buf;

	dma_addr_t system_info_h;

	struct MR_LD_VF_AFFILIATION *vf_affiliation;

	dma_addr_t vf_affiliation_h;

	struct MR_LD_VF_AFFILIATION_111 *vf_affiliation_111;
@@ -1769,6 +1781,7 @@ struct megasas_instance { 
	u16 throttlequeuedepth;

	u8 mask_interrupts;

	u8 is_imr;

	bool dev_handle;

};

struct MR_LD_VF_MAP {

	u32 size;

drivers/scsi/megaraid/megaraid_sas_base.c

+14 −1
Original line number Diff line number Diff line
@@ -5265,6 +5265,13 @@ static int megasas_probe_one(struct pci_dev *pdev, 
		break;

	}



	instance->system_info_buf = pci_zalloc_consistent(pdev,

					sizeof(struct MR_DRV_SYSTEM_INFO),

					&instance->system_info_h);



	if (!instance->system_info_buf)

		dev_info(&instance->pdev->dev, "Can't allocate system info buffer\n");



	/* Crash dump feature related initialisation*/

	instance->drv_buf_index = 0;

	instance->drv_buf_alloc = 0;
@@ -5676,8 +5683,10 @@ megasas_resume(struct pci_dev *pdev) 
					    &instance->sriov_heartbeat_timer,

					    megasas_sriov_heartbeat_handler,

					    MEGASAS_SRIOV_HEARTBEAT_INTERVAL_VF);

		else

		else {

			instance->skip_heartbeat_timer_del = 1;

			goto fail_init_mfi;

		}

	}



	instance->instancet->enable_intr(instance);
@@ -5833,6 +5842,10 @@ static void megasas_detach_one(struct pci_dev *pdev) 
		pci_free_consistent(pdev, CRASH_DMA_BUF_SIZE,

			    instance->crash_dump_buf, instance->crash_dump_h);



	if (instance->system_info_buf)

		pci_free_consistent(pdev, sizeof(struct MR_DRV_SYSTEM_INFO),

				    instance->system_info_buf, instance->system_info_h);



	scsi_host_put(host);



	pci_disable_device(pdev);

drivers/scsi/megaraid/megaraid_sas_fusion.c

+20 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <scsi/scsi_device.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_dbg.h>

#include <linux/dmi.h>



#include "megaraid_sas_fusion.h"

#include "megaraid_sas.h"
@@ -579,6 +580,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) 
	union MEGASAS_REQUEST_DESCRIPTOR_UNION req_desc;

	int i;

	struct megasas_header *frame_hdr;

	const char *sys_info;



	fusion = instance->ctrl_context;
@@ -641,6 +643,16 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) 
	/* Convert capability to LE32 */

	cpu_to_le32s((u32 *)&init_frame->driver_operations.mfi_capabilities);



	sys_info = dmi_get_system_info(DMI_PRODUCT_UUID);

	if (instance->system_info_buf && sys_info) {

		memcpy(instance->system_info_buf->systemId, sys_info,

			strlen(sys_info) > 64 ? 64 : strlen(sys_info));

		instance->system_info_buf->systemIdLength =

			strlen(sys_info) > 64 ? 64 : strlen(sys_info);

		init_frame->system_info_lo = instance->system_info_h;

		init_frame->system_info_hi = 0;

	}



	init_frame->queue_info_new_phys_addr_hi =

		cpu_to_le32(upper_32_bits(ioc_init_handle));

	init_frame->queue_info_new_phys_addr_lo =
@@ -1572,6 +1584,14 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, 
			cmd->pd_r1_lb = io_info.pd_after_lb;

		} else

			scp->SCp.Status &= ~MEGASAS_LOAD_BALANCE_FLAG;



		if ((raidLUN[0] == 1) &&

			(local_map_ptr->raidMap.devHndlInfo[io_info.pd_after_lb].validHandles > 2)) {

			instance->dev_handle = !(instance->dev_handle);

			io_info.devHandle =

				local_map_ptr->raidMap.devHndlInfo[io_info.pd_after_lb].devHandle[instance->dev_handle];

		}



		cmd->request_desc->SCSIIO.DevHandle = io_info.devHandle;

		io_request->DevHandle = io_info.devHandle;

		/* populate the LUN field */