Commit 17631462 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge branch '5.1/scsi-fixes' into 5.2/merge 



We have a few submissions for 5.2 that depend on fixes merged post
5.1-rc1. Merge the fixes branch into queue.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 4b3766ec 5c2442fd

drivers/s390/scsi/zfcp_erp.c

+17 −0
Original line number Diff line number Diff line
@@ -624,6 +624,20 @@ static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action) 
	add_timer(&erp_action->timer);

}



void zfcp_erp_port_forced_reopen_all(struct zfcp_adapter *adapter,

				     int clear, char *dbftag)

{

	unsigned long flags;

	struct zfcp_port *port;



	write_lock_irqsave(&adapter->erp_lock, flags);

	read_lock(&adapter->port_list_lock);

	list_for_each_entry(port, &adapter->port_list, list)

		_zfcp_erp_port_forced_reopen(port, clear, dbftag);

	read_unlock(&adapter->port_list_lock);

	write_unlock_irqrestore(&adapter->erp_lock, flags);

}



static void _zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter,

				      int clear, char *dbftag)

{
@@ -1341,6 +1355,9 @@ static void zfcp_erp_try_rport_unblock(struct zfcp_port *port) 
		struct zfcp_scsi_dev *zsdev = sdev_to_zfcp(sdev);

		int lun_status;



		if (sdev->sdev_state == SDEV_DEL ||

		    sdev->sdev_state == SDEV_CANCEL)

			continue;

		if (zsdev->port != port)

			continue;

		/* LUN under port of interest */

drivers/s390/scsi/zfcp_ext.h

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ extern void zfcp_erp_port_reopen(struct zfcp_port *port, int clear, 
				 char *dbftag);

extern void zfcp_erp_port_shutdown(struct zfcp_port *, int, char *);

extern void zfcp_erp_port_forced_reopen(struct zfcp_port *, int, char *);

extern void zfcp_erp_port_forced_reopen_all(struct zfcp_adapter *adapter,

					    int clear, char *dbftag);

extern void zfcp_erp_set_lun_status(struct scsi_device *, u32);

extern void zfcp_erp_clear_lun_status(struct scsi_device *, u32);

extern void zfcp_erp_lun_reopen(struct scsi_device *, int, char *);

drivers/s390/scsi/zfcp_fc.c

+17 −4
Original line number Diff line number Diff line
@@ -239,10 +239,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, 
	list_for_each_entry(port, &adapter->port_list, list) {

		if ((port->d_id & range) == (ntoh24(page->rscn_fid) & range))

			zfcp_fc_test_link(port);

		if (!port->d_id)

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,

					     "fcrscn1");

	}

	read_unlock_irqrestore(&adapter->port_list_lock, flags);

}
@@ -250,6 +246,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, 
static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)

{

	struct fsf_status_read_buffer *status_buffer = (void *)fsf_req->data;

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct fc_els_rscn *head;

	struct fc_els_rscn_page *page;

	u16 i;
@@ -263,6 +260,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) 
	no_entries = be16_to_cpu(head->rscn_plen) /

		sizeof(struct fc_els_rscn_page);



	if (no_entries > 1) {

		/* handle failed ports */

		unsigned long flags;

		struct zfcp_port *port;



		read_lock_irqsave(&adapter->port_list_lock, flags);

		list_for_each_entry(port, &adapter->port_list, list) {

			if (port->d_id)

				continue;

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,

					     "fcrscn1");

		}

		read_unlock_irqrestore(&adapter->port_list_lock, flags);

	}



	for (i = 1; i < no_entries; i++) {

		/* skip head and start with 1st element */

		page++;

drivers/s390/scsi/zfcp_scsi.c

+4 −0
Original line number Diff line number Diff line
@@ -368,6 +368,10 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt) 
	struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;

	int ret = SUCCESS, fc_ret;



	if (!(adapter->connection_features & FSF_FEATURE_NPIV_MODE)) {

		zfcp_erp_port_forced_reopen_all(adapter, 0, "schrh_p");

		zfcp_erp_wait(adapter);

	}

	zfcp_erp_adapter_reopen(adapter, 0, "schrh_1");

	zfcp_erp_wait(adapter);

	fc_ret = fc_block_scsi_eh(scpnt);

drivers/scsi/aacraid/aacraid.h

+6 −1
Original line number Diff line number Diff line
@@ -2640,9 +2640,14 @@ static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor) 
	return capacity;

}



static inline int aac_pci_offline(struct aac_dev *dev)

{

	return pci_channel_offline(dev->pdev) || dev->handle_pci_error;

}



static inline int aac_adapter_check_health(struct aac_dev *dev)

{

	if (unlikely(pci_channel_offline(dev->pdev)))

	if (unlikely(aac_pci_offline(dev)))

		return -1;



	return (dev)->a_ops.adapter_check_health(dev);