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

Commit f8813d26 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc: Removed obsolete fcp_eq_count and fcp_wq_count driver attributes 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 43c5fdaf

drivers/scsi/lpfc/lpfc.h

+0 −2
Original line number Diff line number Diff line
@@ -711,8 +711,6 @@ struct lpfc_hba { 
	uint32_t cfg_use_msi;

	uint32_t cfg_fcp_imax;

	uint32_t cfg_fcp_cpu_map;

	uint32_t cfg_fcp_wq_count;

	uint32_t cfg_fcp_eq_count;

	uint32_t cfg_fcp_io_channel;

	uint32_t cfg_total_seg_cnt;

	uint32_t cfg_sg_seg_cnt;

drivers/scsi/lpfc/lpfc_attr.c

+0 −23
Original line number Diff line number Diff line
@@ -4120,25 +4120,6 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255, 
LPFC_ATTR_R(use_msi, 2, 0, 2, "Use Message Signaled Interrupts (1) or "

	    "MSI-X (2), if possible");



/*

# lpfc_fcp_wq_count: Set the number of fast-path FCP work queues

# This parameter is ignored and will eventually be depricated

#

# Value range is [1,7]. Default value is 4.

*/

LPFC_ATTR_R(fcp_wq_count, LPFC_FCP_IO_CHAN_DEF, LPFC_FCP_IO_CHAN_MIN,

	    LPFC_FCP_IO_CHAN_MAX,

	    "Set the number of fast-path FCP work queues, if possible");



/*

# lpfc_fcp_eq_count: Set the number of FCP EQ/CQ/WQ IO channels

#

# Value range is [1,7]. Default value is 4.

*/

LPFC_ATTR_R(fcp_eq_count, LPFC_FCP_IO_CHAN_DEF, LPFC_FCP_IO_CHAN_MIN,

	    LPFC_FCP_IO_CHAN_MAX,

	    "Set the number of fast-path FCP event queues, if possible");



/*

# lpfc_fcp_io_channel: Set the number of FCP EQ/CQ/WQ IO channels

#
@@ -4317,8 +4298,6 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_use_msi,

	&dev_attr_lpfc_fcp_imax,

	&dev_attr_lpfc_fcp_cpu_map,

	&dev_attr_lpfc_fcp_wq_count,

	&dev_attr_lpfc_fcp_eq_count,

	&dev_attr_lpfc_fcp_io_channel,

	&dev_attr_lpfc_enable_bg,

	&dev_attr_lpfc_soft_wwnn,
@@ -5301,8 +5280,6 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	lpfc_use_msi_init(phba, lpfc_use_msi);

	lpfc_fcp_imax_init(phba, lpfc_fcp_imax);

	lpfc_fcp_cpu_map_init(phba, lpfc_fcp_cpu_map);

	lpfc_fcp_wq_count_init(phba, lpfc_fcp_wq_count);

	lpfc_fcp_eq_count_init(phba, lpfc_fcp_eq_count);

	lpfc_fcp_io_channel_init(phba, lpfc_fcp_io_channel);

	lpfc_enable_hba_reset_init(phba, lpfc_enable_hba_reset);

	lpfc_enable_hba_heartbeat_init(phba, lpfc_enable_hba_heartbeat);

drivers/scsi/lpfc/lpfc_init.c

+0 −7
Original line number Diff line number Diff line
@@ -4913,9 +4913,6 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
	lpfc_get_cfgparam(phba);

	phba->max_vpi = LPFC_MAX_VPI;



	/* Eventually cfg_fcp_eq_count / cfg_fcp_wq_count will be depricated */

	phba->cfg_fcp_io_channel = phba->cfg_fcp_eq_count;



	/* This will be set to correct value after the read_config mbox */

	phba->max_vports = 0;
@@ -6873,11 +6870,7 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba) 
		cfg_fcp_io_channel = phba->sli4_hba.max_cfg_param.max_eq;

	}



	/* Eventually cfg_fcp_eq_count / cfg_fcp_wq_count will be depricated */



	/* The actual number of FCP event queues adopted */

	phba->cfg_fcp_eq_count = cfg_fcp_io_channel;

	phba->cfg_fcp_wq_count = cfg_fcp_io_channel;

	phba->cfg_fcp_io_channel = cfg_fcp_io_channel;



	/* Get EQ depth from module parameter, fake the default for now */