Commit ff6abb73 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

scsi: smartpqi: add kdump support 



Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 14bb215d

drivers/scsi/smartpqi/smartpqi.h

+10 −3
Original line number Diff line number Diff line
@@ -79,11 +79,13 @@ struct pqi_ctrl_registers { 
	__le32	sis_ctrl_to_host_doorbell;		/* 9Ch */

	u8	reserved3[0xa0 - (0x9c + sizeof(__le32))];

	__le32	sis_ctrl_to_host_doorbell_clear;	/* A0h */

	u8	reserved4[0xbc - (0xa0 + sizeof(__le32))];

	u8	reserved4[0xb0 - (0xa0 + sizeof(__le32))];

	__le32	sis_driver_scratch;			/* B0h */

	u8	reserved5[0xbc - (0xb0 + sizeof(__le32))];

	__le32	sis_firmware_status;			/* BCh */

	u8	reserved5[0x1000 - (0xbc + sizeof(__le32))];

	u8	reserved6[0x1000 - (0xbc + sizeof(__le32))];

	__le32	sis_mailbox[8];				/* 1000h */

	u8	reserved6[0x4000 - (0x1000 + (sizeof(__le32) * 8))];

	u8	reserved7[0x4000 - (0x1000 + (sizeof(__le32) * 8))];

	/*

	 * The PQI spec states that the PQI registers should be at

	 * offset 0 from the PCIe BAR 0.  However, we can't map
@@ -963,6 +965,11 @@ struct pqi_ctrl_info { 
	struct semaphore lun_reset_sem;

};



enum pqi_ctrl_mode {

	UNKNOWN,

	PQI_MODE

};



/*

 * assume worst case: SATA queue depth of 31 minus 4 internal firmware commands

 */

drivers/scsi/smartpqi/smartpqi_init.c

+35 −0
Original line number Diff line number Diff line
@@ -153,6 +153,18 @@ static inline bool pqi_is_hba_lunid(u8 *scsi3addr) 
	return pqi_scsi3addr_equal(scsi3addr, RAID_CTLR_LUNID);

}



static inline enum pqi_ctrl_mode pqi_get_ctrl_mode(

	struct pqi_ctrl_info *ctrl_info)

{

	return sis_read_driver_scratch(ctrl_info);

}



static inline void pqi_save_ctrl_mode(struct pqi_ctrl_info *ctrl_info,

	enum pqi_ctrl_mode mode)

{

	sis_write_driver_scratch(ctrl_info, mode);

}



#define PQI_RESCAN_WORK_INTERVAL	(10 * HZ)



static inline void pqi_schedule_rescan_worker(struct pqi_ctrl_info *ctrl_info)
@@ -5266,10 +5278,30 @@ static int pqi_get_ctrl_firmware_version(struct pqi_ctrl_info *ctrl_info) 
	return rc;

}



static int pqi_kdump_init(struct pqi_ctrl_info *ctrl_info)

{

	if (!sis_is_firmware_running(ctrl_info))

		return -ENXIO;



	if (pqi_get_ctrl_mode(ctrl_info) == PQI_MODE) {

		sis_disable_msix(ctrl_info);

		if (pqi_reset(ctrl_info) == 0)

			sis_reenable_sis_mode(ctrl_info);

	}



	return 0;

}



static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)

{

	int rc;



	if (reset_devices) {

		rc = pqi_kdump_init(ctrl_info);

		if (rc)

			return rc;

	}



	/*

	 * When the controller comes out of reset, it is always running

	 * in legacy SIS mode.  This is so that it can be compatible
@@ -5343,6 +5375,7 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) 


	/* From here on, we are running in PQI mode. */

	ctrl_info->pqi_mode_enabled = true;

	pqi_save_ctrl_mode(ctrl_info, PQI_MODE);



	rc = pqi_alloc_admin_queues(ctrl_info);

	if (rc) {
@@ -5878,6 +5911,8 @@ static void __attribute__((unused)) verify_structures(void) 
		sis_ctrl_to_host_doorbell) != 0x9c);

	BUILD_BUG_ON(offsetof(struct pqi_ctrl_registers,

		sis_ctrl_to_host_doorbell_clear) != 0xa0);

	BUILD_BUG_ON(offsetof(struct pqi_ctrl_registers,

		sis_driver_scratch) != 0xb0);

	BUILD_BUG_ON(offsetof(struct pqi_ctrl_registers,

		sis_firmware_status) != 0xbc);

	BUILD_BUG_ON(offsetof(struct pqi_ctrl_registers,

drivers/scsi/smartpqi/smartpqi_sis.c

+10 −0
Original line number Diff line number Diff line
@@ -376,6 +376,16 @@ int sis_reenable_sis_mode(struct pqi_ctrl_info *ctrl_info) 
	return rc;

}



void sis_write_driver_scratch(struct pqi_ctrl_info *ctrl_info, u32 value)

{

	writel(value, &ctrl_info->registers->sis_driver_scratch);

}



u32 sis_read_driver_scratch(struct pqi_ctrl_info *ctrl_info)

{

	return readl(&ctrl_info->registers->sis_driver_scratch);

}



static void __attribute__((unused)) verify_structures(void)

{

	BUILD_BUG_ON(offsetof(struct sis_base_struct,

drivers/scsi/smartpqi/smartpqi_sis.h

+2 −0
Original line number Diff line number Diff line
@@ -28,5 +28,7 @@ void sis_enable_msix(struct pqi_ctrl_info *ctrl_info); 
void sis_disable_msix(struct pqi_ctrl_info *ctrl_info);

void sis_soft_reset(struct pqi_ctrl_info *ctrl_info);

int sis_reenable_sis_mode(struct pqi_ctrl_info *ctrl_info);

void sis_write_driver_scratch(struct pqi_ctrl_info *ctrl_info, u32 value);

u32 sis_read_driver_scratch(struct pqi_ctrl_info *ctrl_info);



#endif	/* _SMARTPQI_SIS_H */