Commit 0e7e8501 authored by Manish Rangankar's avatar Manish Rangankar Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Remove reduandant code after open-iscsi integration. 



1. Remove device database entry (ddb) state.
2. Remove device database (DDB) list building.
                With open-iscsi integration the logins to the target devices are
        handled by the user space. So the information of target is now
        maintained in the iscsi_session object. This is handled at
        libiscsi level so there is no need to maintain a list of DDBs in
        the qla4xxx LLD.
3. qla4xxx: Remove add_device_dynamically.
                Since autologin in FW is disabled with open-iscsi integration,
        driver will never get an AEN for which driver has not requested
        a DDB index. So remove the add_device_dynamically function.
4. Remove qla4xxx_tgt_dscvr
        Since firmware autologin is disabled this function will not work.
        Now user has the ability to do the target discovery and login to
        each target individually. Firwmare will not do the login on its own.
5. Remove relogin related code
        All relogin is handled by userspace now. qla4xxx just need to
        notify userspace of a connection failure, this triggers the
        relogin.
6. Remove add_session and alloc_session
        Now qla4xxx uses iscsi_session_setup that would do the necessary
        allocations for session and ddb_entry.

Signed-off-by: default avatarManish Rangankar <manish.rangankar@qlogic.com>
Signed-off-by: default avatarLalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b3a271a9

drivers/scsi/qla4xxx/ql4_def.h

+1 −44
Original line number Diff line number Diff line
@@ -233,52 +233,12 @@ struct ql4_aen_log { 
 * Device Database (DDB) structure

 */

struct ddb_entry {

	struct list_head list;	/* ddb list */

	struct scsi_qla_host *ha;

	struct iscsi_cls_session *sess;

	struct iscsi_cls_conn *conn;



	atomic_t state;		/* DDB State */



	unsigned long flags;	/* DDB Flags */



	uint16_t fw_ddb_index;	/* DDB firmware index */

	uint16_t options;

	uint32_t fw_ddb_device_state; /* F/W Device State  -- see ql4_fw.h */



	uint32_t CmdSn;

	uint16_t target_session_id;

	uint16_t connection_id;

	uint16_t exe_throttle;	/* Max mumber of cmds outstanding

				 * simultaneously */

	uint16_t task_mgmt_timeout; /* Min time for task mgmt cmds to

				     * complete */

	uint16_t default_relogin_timeout; /*  Max time to wait for

					   *  relogin to complete */

	uint16_t tcp_source_port_num;

	uint32_t default_time2wait; /* Default Min time between

				     * relogins (+aens) */



	atomic_t retry_relogin_timer; /* Min Time between relogins

				       * (4000 only) */

	atomic_t relogin_timer;	/* Max Time to wait for relogin to complete */

	atomic_t relogin_retry_count; /* Num of times relogin has been

				       * retried */



	uint16_t port;

	uint32_t tpgt;

	uint8_t ip_addr[IP_ADDR_LEN];

	uint8_t iscsi_name[ISCSI_NAME_SIZE];	/* 72 x48 */

	uint8_t iscsi_alias[0x20];

	uint8_t isid[6];

	uint16_t iscsi_max_burst_len;

	uint16_t iscsi_max_outsnd_r2t;

	uint16_t iscsi_first_burst_len;

	uint16_t iscsi_max_rcv_data_seg_len;

	uint16_t iscsi_max_snd_data_seg_len;



	struct in6_addr remote_ipv6_addr;

	struct in6_addr link_local_ipv6_addr;

};



/*
@@ -546,10 +506,7 @@ struct scsi_qla_host { 
	volatile uint8_t mbox_status_count;

	volatile uint32_t mbox_status[MBOX_REG_COUNT];



	/* local device database list (contains internal ddb entries) */

	struct list_head ddb_list;



	/* Map ddb_list entry by FW ddb index */

	/* FW ddb index map */

	struct ddb_entry *fw_ddb_index_map[MAX_DDB_ENTRIES];



	/* Saved srb for status continuation entry processing */

drivers/scsi/qla4xxx/ql4_glbl.h

+1 −11
Original line number Diff line number Diff line
@@ -12,20 +12,15 @@ struct iscsi_cls_conn; 


int qla4xxx_hw_reset(struct scsi_qla_host *ha);

int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a);

int qla4xxx_send_tgts(struct scsi_qla_host *ha, char *ip, uint16_t port);

int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb *srb);

int qla4xxx_initialize_adapter(struct scsi_qla_host *ha,

			       uint8_t renew_ddb_list);

int qla4xxx_initialize_adapter(struct scsi_qla_host *ha);

int qla4xxx_soft_reset(struct scsi_qla_host *ha);

irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id);



void qla4xxx_free_ddb_list(struct scsi_qla_host *ha);

void qla4xxx_free_ddb(struct scsi_qla_host *ha, struct ddb_entry *ddb_entry);

void qla4xxx_process_aen(struct scsi_qla_host *ha, uint8_t process_aen);



int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host *ha);

int qla4xxx_relogin_device(struct scsi_qla_host *ha,

			   struct ddb_entry *ddb_entry);

int qla4xxx_abort_task(struct scsi_qla_host *ha, struct srb *srb);

int qla4xxx_reset_lun(struct scsi_qla_host *ha, struct ddb_entry *ddb_entry,

		      int lun);
@@ -66,9 +61,6 @@ int qla4xxx_get_acb(struct scsi_qla_host *ha, uint32_t *mbox_cmd, 
void qla4xxx_mark_device_missing(struct iscsi_cls_session *cls_session);

u16 rd_nvram_word(struct scsi_qla_host *ha, int offset);

void qla4xxx_get_crash_record(struct scsi_qla_host *ha);

struct ddb_entry *qla4xxx_alloc_sess(struct scsi_qla_host *ha);

int qla4xxx_add_sess(struct ddb_entry *);

void qla4xxx_destroy_sess(struct ddb_entry *ddb_entry);

int qla4xxx_is_nvram_configuration_valid(struct scsi_qla_host *ha);

int qla4xxx_about_firmware(struct scsi_qla_host *ha);

void qla4xxx_interrupt_service_routine(struct scsi_qla_host *ha,
@@ -77,13 +69,11 @@ int qla4xxx_init_rings(struct scsi_qla_host *ha); 
void qla4xxx_srb_compl(struct kref *ref);

struct srb *qla4xxx_del_from_active_array(struct scsi_qla_host *ha,

		uint32_t index);

int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host *ha);

int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,

		uint32_t state, uint32_t conn_error);

void qla4xxx_dump_buffer(void *b, uint32_t size);

int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,

	struct ddb_entry *ddb_entry, int lun, uint16_t mrkr_mod);

int qla4_is_relogin_allowed(struct scsi_qla_host *ha, uint32_t conn_err);

int qla4xxx_set_flash(struct scsi_qla_host *ha, dma_addr_t dma_addr,

		      uint32_t offset, uint32_t length, uint32_t options);

int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,

drivers/scsi/qla4xxx/ql4_init.c

+1 −607

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla4xxx/ql4_iocb.c

+0 −2

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla4xxx/ql4_mbx.c

+0 −55

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE