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

Commit 1daa4eb5 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Move code for managing zfcp_unit devices to new file 



Move the code for managing zfcp_unit devices to the new file
zfcp_unit.c. This is in preparation for the change that zfcp_unit will
only track the LUNs configured via unit_add, other data will be moved
from zfcp_unit to the new struct zfcp_scsi_dev.

Reviewed-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 57c23773

drivers/s390/scsi/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for the S/390 specific device drivers

#



zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_scsi.o zfcp_erp.o zfcp_qdio.o \

	     zfcp_fsf.o zfcp_dbf.o zfcp_sysfs.o zfcp_fc.o zfcp_cfdc.o

zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_cfdc.o zfcp_dbf.o zfcp_erp.o \

	     zfcp_fc.o zfcp_fsf.o zfcp_qdio.o zfcp_scsi.o zfcp_sysfs.o \

	     zfcp_unit.o



obj-$(CONFIG_ZFCP) += zfcp.o

drivers/s390/scsi/zfcp_aux.c

+2 −120
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	struct ccw_device *cdev;

	struct zfcp_adapter *adapter;

	struct zfcp_port *port;

	struct zfcp_unit *unit;



	cdev = get_ccwdev_by_busid(&zfcp_ccw_driver, busid);

	if (!cdev)
@@ -72,18 +71,11 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	port = zfcp_get_port_by_wwpn(adapter, wwpn);

	if (!port)

		goto out_port;



	flush_work(&port->rport_work);

	unit = zfcp_unit_enqueue(port, lun);

	if (IS_ERR(unit))

		goto out_unit;



	zfcp_erp_unit_reopen(unit, 0, "auidc_1", NULL);

	zfcp_erp_wait(adapter);

	zfcp_scsi_scan(unit);



out_unit:

	zfcp_unit_add(port, lun);

	put_device(&port->dev);



out_port:

	zfcp_ccw_adapter_put(adapter);

out_ccw_device:
@@ -214,30 +206,6 @@ static void __exit zfcp_module_exit(void) 


module_exit(zfcp_module_exit);



/**

 * zfcp_get_unit_by_lun - find unit in unit list of port by FCP LUN

 * @port: pointer to port to search for unit

 * @fcp_lun: FCP LUN to search for

 *

 * Returns: pointer to zfcp_unit or NULL

 */

struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)

{

	unsigned long flags;

	struct zfcp_unit *unit;



	read_lock_irqsave(&port->unit_list_lock, flags);

	list_for_each_entry(unit, &port->unit_list, list)

		if (unit->fcp_lun == fcp_lun) {

			if (!get_device(&unit->dev))

				unit = NULL;

			read_unlock_irqrestore(&port->unit_list_lock, flags);

			return unit;

		}

	read_unlock_irqrestore(&port->unit_list_lock, flags);

	return NULL;

}



/**

 * zfcp_get_port_by_wwpn - find port in port list of adapter by wwpn

 * @adapter: pointer to adapter to search for port
@@ -263,92 +231,6 @@ struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter, 
	return NULL;

}



/**

 * zfcp_unit_release - dequeue unit

 * @dev: pointer to device

 *

 * waits until all work is done on unit and removes it then from the unit->list

 * of the associated port.

 */

static void zfcp_unit_release(struct device *dev)

{

	struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev);



	put_device(&unit->port->dev);

	kfree(unit);

}



/**

 * zfcp_unit_enqueue - enqueue unit to unit list of a port.

 * @port: pointer to port where unit is added

 * @fcp_lun: FCP LUN of unit to be enqueued

 * Returns: pointer to enqueued unit on success, ERR_PTR on error

 *

 * Sets up some unit internal structures and creates sysfs entry.

 */

struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)

{

	struct zfcp_unit *unit;

	int retval = -ENOMEM;



	get_device(&port->dev);



	unit = zfcp_get_unit_by_lun(port, fcp_lun);

	if (unit) {

		put_device(&unit->dev);

		retval = -EEXIST;

		goto err_out;

	}



	unit = kzalloc(sizeof(struct zfcp_unit), GFP_KERNEL);

	if (!unit)

		goto err_out;



	unit->port = port;

	unit->fcp_lun = fcp_lun;

	unit->dev.parent = &port->dev;

	unit->dev.release = zfcp_unit_release;



	if (dev_set_name(&unit->dev, "0x%016llx",

			 (unsigned long long) fcp_lun)) {

		kfree(unit);

		goto err_out;

	}

	retval = -EINVAL;



	INIT_WORK(&unit->scsi_work, zfcp_scsi_scan_work);



	spin_lock_init(&unit->latencies.lock);

	unit->latencies.write.channel.min = 0xFFFFFFFF;

	unit->latencies.write.fabric.min = 0xFFFFFFFF;

	unit->latencies.read.channel.min = 0xFFFFFFFF;

	unit->latencies.read.fabric.min = 0xFFFFFFFF;

	unit->latencies.cmd.channel.min = 0xFFFFFFFF;

	unit->latencies.cmd.fabric.min = 0xFFFFFFFF;



	if (device_register(&unit->dev)) {

		put_device(&unit->dev);

		goto err_out;

	}



	if (sysfs_create_group(&unit->dev.kobj, &zfcp_sysfs_unit_attrs))

		goto err_out_put;



	write_lock_irq(&port->unit_list_lock);

	list_add_tail(&unit->list, &port->unit_list);

	write_unlock_irq(&port->unit_list_lock);



	atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status);



	return unit;



err_out_put:

	device_unregister(&unit->dev);

err_out:

	put_device(&port->dev);

	return ERR_PTR(retval);

}



static int zfcp_allocate_low_mem_buffers(struct zfcp_adapter *adapter)

{

	adapter->pool.erp_req =

drivers/s390/scsi/zfcp_ext.h

+9 −4
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@ 
#include "zfcp_fc.h"



/* zfcp_aux.c */

extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);

extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *, u64);

extern struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *);

extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, u64, u32,

					   u32);

extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, u64);

extern void zfcp_sg_free_table(struct scatterlist *, int);

extern int zfcp_sg_setup_table(struct scatterlist *, int);

extern void zfcp_device_unregister(struct device *,
@@ -163,8 +161,6 @@ extern void zfcp_scsi_rport_work(struct work_struct *); 
extern void zfcp_scsi_schedule_rport_register(struct zfcp_port *);

extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *);

extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *);

extern void zfcp_scsi_scan(struct zfcp_unit *);

extern void zfcp_scsi_scan_work(struct work_struct *);

extern void zfcp_scsi_set_prot(struct zfcp_adapter *);

extern void zfcp_scsi_dif_sense_error(struct scsi_cmnd *, int);
@@ -175,4 +171,13 @@ extern struct attribute_group zfcp_sysfs_port_attrs; 
extern struct device_attribute *zfcp_sysfs_sdev_attrs[];

extern struct device_attribute *zfcp_sysfs_shost_attrs[];



/* zfcp_unit.c */

extern int zfcp_unit_add(struct zfcp_port *, u64);

extern int zfcp_unit_remove(struct zfcp_port *, u64);

extern struct zfcp_unit *zfcp_unit_find(struct zfcp_port *, u64);

extern struct scsi_device *zfcp_unit_sdev(struct zfcp_unit *unit);

extern void zfcp_unit_scsi_scan(struct zfcp_unit *);

extern void zfcp_unit_queue_scsi_scan(struct zfcp_port *);

extern unsigned int zfcp_unit_sdev_status(struct zfcp_unit *);



#endif	/* ZFCP_EXT_H */

drivers/s390/scsi/zfcp_scsi.c

+2 −39
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct zfcp_unit *zfcp_unit_lookup(struct zfcp_adapter *adapter, 
	list_for_each_entry(port, &adapter->port_list, list) {

		if (!port->rport || (id != port->rport->scsi_target_id))

			continue;

		unit = zfcp_get_unit_by_lun(port, lun);

		unit = zfcp_unit_find(port, lun);

		if (unit)

			break;

	}
@@ -534,20 +534,6 @@ static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport) 
	}

}



static void zfcp_scsi_queue_unit_register(struct zfcp_port *port)

{

	struct zfcp_unit *unit;



	read_lock_irq(&port->unit_list_lock);

	list_for_each_entry(unit, &port->unit_list, list) {

		get_device(&unit->dev);

		if (scsi_queue_work(port->adapter->scsi_host,

				    &unit->scsi_work) <= 0)

			put_device(&unit->dev);

	}

	read_unlock_irq(&port->unit_list_lock);

}



static void zfcp_scsi_rport_register(struct zfcp_port *port)

{

	struct fc_rport_identifiers ids;
@@ -574,7 +560,7 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port) 
	port->rport = rport;

	port->starget_id = rport->scsi_target_id;



	zfcp_scsi_queue_unit_register(port);

	zfcp_unit_queue_scsi_scan(port);

}



static void zfcp_scsi_rport_block(struct zfcp_port *port)
@@ -637,29 +623,6 @@ void zfcp_scsi_rport_work(struct work_struct *work) 
	put_device(&port->dev);

}



/**

 * zfcp_scsi_scan - Register LUN with SCSI midlayer

 * @unit: The LUN/unit to register

 */

void zfcp_scsi_scan(struct zfcp_unit *unit)

{

	struct fc_rport *rport = unit->port->rport;



	if (rport && rport->port_state == FC_PORTSTATE_ONLINE)

		scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,

				 scsilun_to_int((struct scsi_lun *)

						&unit->fcp_lun), 0);

}



void zfcp_scsi_scan_work(struct work_struct *work)

{

	struct zfcp_unit *unit = container_of(work, struct zfcp_unit,

					      scsi_work);



	zfcp_scsi_scan(unit);

	put_device(&unit->dev);

}



/**

 * zfcp_scsi_set_prot - Configure DIF/DIX support in scsi_host

 * @adapter: The adapter where to configure DIF/DIX for the SCSI host

drivers/s390/scsi/zfcp_sysfs.c

+8 −48
Original line number Diff line number Diff line
@@ -257,28 +257,15 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev, 
					 const char *buf, size_t count)

{

	struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);

	struct zfcp_unit *unit;

	u64 fcp_lun;

	int retval = -EINVAL;



	if (!(port && get_device(&port->dev)))

		return -EBUSY;



	if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))

		goto out;

		return -EINVAL;



	unit = zfcp_unit_enqueue(port, fcp_lun);

	if (IS_ERR(unit))

		goto out;

	else

		retval = 0;

	if (zfcp_unit_add(port, fcp_lun))

		return -EINVAL;



	zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL);

	zfcp_erp_wait(unit->port->adapter);

	zfcp_scsi_scan(unit);

out:

	put_device(&port->dev);

	return retval ? retval : (ssize_t) count;

	return count;

}

static DEVICE_ATTR(unit_add, S_IWUSR, NULL, zfcp_sysfs_unit_add_store);
@@ -287,42 +274,15 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev, 
					    const char *buf, size_t count)

{

	struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);

	struct zfcp_unit *unit;

	u64 fcp_lun;

	int retval = -EINVAL;

	struct scsi_device *sdev;



	if (!(port && get_device(&port->dev)))

		return -EBUSY;



	if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))

		goto out;



	unit = zfcp_get_unit_by_lun(port, fcp_lun);

	if (!unit)

		goto out;

	else

		retval = 0;

		return -EINVAL;



	sdev = scsi_device_lookup(port->adapter->scsi_host, 0,

				  port->starget_id,

				  scsilun_to_int((struct scsi_lun *)&fcp_lun));

	if (sdev) {

		scsi_remove_device(sdev);

		scsi_device_put(sdev);

	}

	if (zfcp_unit_remove(port, fcp_lun))

		return -EINVAL;



	write_lock_irq(&port->unit_list_lock);

	list_del(&unit->list);

	write_unlock_irq(&port->unit_list_lock);



	put_device(&unit->dev);



	zfcp_erp_unit_shutdown(unit, 0, "syurs_1", NULL);

	zfcp_device_unregister(&unit->dev, &zfcp_sysfs_unit_attrs);

out:

	put_device(&port->dev);

	return retval ? retval : (ssize_t) count;

	return count;

}

static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);