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

Commit fbd8a6ba authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Add 64G link speed support 



The G7 adapter supports 64G link speeds. Add support to the driver.

In addition, a small cleanup to replace the odd bitmap logic with
a switch case.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c238b9b6

drivers/scsi/lpfc/lpfc.h

+4 −10
Original line number Diff line number Diff line
@@ -544,16 +544,10 @@ struct unsol_rcv_ct_ctx { 
#define LPFC_USER_LINK_SPEED_10G	10	/* 10 Gigabaud */

#define LPFC_USER_LINK_SPEED_16G	16	/* 16 Gigabaud */

#define LPFC_USER_LINK_SPEED_32G	32	/* 32 Gigabaud */

#define LPFC_USER_LINK_SPEED_MAX	LPFC_USER_LINK_SPEED_32G

#define LPFC_USER_LINK_SPEED_BITMAP  ((1ULL << LPFC_USER_LINK_SPEED_32G) | \

				     (1 << LPFC_USER_LINK_SPEED_16G) | \

				     (1 << LPFC_USER_LINK_SPEED_10G) | \

				     (1 << LPFC_USER_LINK_SPEED_8G) | \

				     (1 << LPFC_USER_LINK_SPEED_4G) | \

				     (1 << LPFC_USER_LINK_SPEED_2G) | \

				     (1 << LPFC_USER_LINK_SPEED_1G) | \

				     (1 << LPFC_USER_LINK_SPEED_AUTO))

#define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8, 10, 16, 32"

#define LPFC_USER_LINK_SPEED_64G	64	/* 64 Gigabaud */

#define LPFC_USER_LINK_SPEED_MAX	LPFC_USER_LINK_SPEED_64G



#define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8, 10, 16, 32, 64"



enum nemb_type {

	nemb_mse = 1,

drivers/scsi/lpfc/lpfc_attr.c

+44 −18
Original line number Diff line number Diff line
@@ -4115,14 +4115,15 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr, 
	    ((val == LPFC_USER_LINK_SPEED_8G) && !(phba->lmt & LMT_8Gb)) ||

	    ((val == LPFC_USER_LINK_SPEED_10G) && !(phba->lmt & LMT_10Gb)) ||

	    ((val == LPFC_USER_LINK_SPEED_16G) && !(phba->lmt & LMT_16Gb)) ||

	    ((val == LPFC_USER_LINK_SPEED_32G) && !(phba->lmt & LMT_32Gb))) {

	    ((val == LPFC_USER_LINK_SPEED_32G) && !(phba->lmt & LMT_32Gb)) ||

	    ((val == LPFC_USER_LINK_SPEED_64G) && !(phba->lmt & LMT_64Gb))) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"2879 lpfc_link_speed attribute cannot be set "

				"to %d. Speed is not supported by this port.\n",

				val);

		return -EINVAL;

	}

	if (val == LPFC_USER_LINK_SPEED_16G &&

	if (val >= LPFC_USER_LINK_SPEED_16G &&

	    phba->fc_topology == LPFC_TOPOLOGY_LOOP) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"3112 lpfc_link_speed attribute cannot be set "
@@ -4130,8 +4131,16 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr, 
				val);

		return -EINVAL;

	}

	if ((val >= 0) && (val <= LPFC_USER_LINK_SPEED_MAX) &&

	    (LPFC_USER_LINK_SPEED_BITMAP & (1 << val))) {



	switch (val) {

	case LPFC_USER_LINK_SPEED_AUTO:

	case LPFC_USER_LINK_SPEED_1G:

	case LPFC_USER_LINK_SPEED_2G:

	case LPFC_USER_LINK_SPEED_4G:

	case LPFC_USER_LINK_SPEED_8G:

	case LPFC_USER_LINK_SPEED_16G:

	case LPFC_USER_LINK_SPEED_32G:

	case LPFC_USER_LINK_SPEED_64G:

		prev_val = phba->cfg_link_speed;

		phba->cfg_link_speed = val;

		if (nolip)
@@ -4141,13 +4150,18 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr, 
		if (err) {

			phba->cfg_link_speed = prev_val;

			return -EINVAL;

		} else

		}

		return strlen(buf);

	default:

		break;

	}



	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

			"0469 lpfc_link_speed attribute cannot be set to %d, "

		"allowed values are ["LPFC_LINK_SPEED_STRING"]\n", val);

			"allowed values are [%s]\n",

			val, LPFC_LINK_SPEED_STRING);

	return -EINVAL;



}



static int lpfc_link_speed = 0;
@@ -4174,18 +4188,26 @@ lpfc_param_show(link_speed) 
static int

lpfc_link_speed_init(struct lpfc_hba *phba, int val)

{

	if (val == LPFC_USER_LINK_SPEED_16G && phba->cfg_topology == 4) {

	if (val >= LPFC_USER_LINK_SPEED_16G && phba->cfg_topology == 4) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

			"3111 lpfc_link_speed of %d cannot "

			"support loop mode, setting topology to default.\n",

			 val);

		phba->cfg_topology = 0;

	}

	if ((val >= 0) && (val <= LPFC_USER_LINK_SPEED_MAX) &&

	    (LPFC_USER_LINK_SPEED_BITMAP & (1 << val))) {



	switch (val) {

	case LPFC_USER_LINK_SPEED_AUTO:

	case LPFC_USER_LINK_SPEED_1G:

	case LPFC_USER_LINK_SPEED_2G:

	case LPFC_USER_LINK_SPEED_4G:

	case LPFC_USER_LINK_SPEED_8G:

	case LPFC_USER_LINK_SPEED_16G:

	case LPFC_USER_LINK_SPEED_32G:

	case LPFC_USER_LINK_SPEED_64G:

		phba->cfg_link_speed = val;

		return 0;

	}

	default:

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"0405 lpfc_link_speed attribute cannot "

				"be set to %d, allowed values are "
@@ -4193,6 +4215,7 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val) 
		phba->cfg_link_speed = LPFC_USER_LINK_SPEED_AUTO;

		return -EINVAL;

	}

}



static DEVICE_ATTR_RW(lpfc_link_speed);
@@ -5716,6 +5739,9 @@ lpfc_get_host_speed(struct Scsi_Host *shost) 
		case LPFC_LINK_SPEED_32GHZ:

			fc_host_speed(shost) = FC_PORTSPEED_32GBIT;

			break;

		case LPFC_LINK_SPEED_64GHZ:

			fc_host_speed(shost) = FC_PORTSPEED_64GBIT;

			break;

		default:

			fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;

			break;

drivers/scsi/lpfc/lpfc_ct.c

+5 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,8 @@ lpfc_fdmi_port_attr_support_speed(struct lpfc_vport *vport, 


	ae->un.AttrInt = 0;

	if (!(phba->hba_flag & HBA_FCOE_MODE)) {

		if (phba->lmt & LMT_64Gb)

			ae->un.AttrInt |= HBA_PORTSPEED_64GFC;

		if (phba->lmt & LMT_32Gb)

			ae->un.AttrInt |= HBA_PORTSPEED_32GFC;

		if (phba->lmt & LMT_16Gb)
@@ -2201,6 +2203,9 @@ lpfc_fdmi_port_attr_speed(struct lpfc_vport *vport, 
		case LPFC_LINK_SPEED_32GHZ:

			ae->un.AttrInt = HBA_PORTSPEED_32GFC;

			break;

		case LPFC_LINK_SPEED_64GHZ:

			ae->un.AttrInt = HBA_PORTSPEED_64GFC;

			break;

		default:

			ae->un.AttrInt = HBA_PORTSPEED_UNKNOWN;

			break;

drivers/scsi/lpfc/lpfc_els.c

+5 −0
Original line number Diff line number Diff line
@@ -5270,6 +5270,9 @@ lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) 
	case LPFC_LINK_SPEED_32GHZ:

		rdp_speed = RDP_PS_32GB;

		break;

	case LPFC_LINK_SPEED_64GHZ:

		rdp_speed = RDP_PS_64GB;

		break;

	default:

		rdp_speed = RDP_PS_UNKNOWN;

		break;
@@ -5277,6 +5280,8 @@ lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) 


	desc->info.port_speed.speed = cpu_to_be16(rdp_speed);



	if (phba->lmt & LMT_64Gb)

		rdp_cap |= RDP_PS_64GB;

	if (phba->lmt & LMT_32Gb)

		rdp_cap |= RDP_PS_32GB;

	if (phba->lmt & LMT_16Gb)

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −0
Original line number Diff line number Diff line
@@ -3084,6 +3084,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la) 
		case LPFC_LINK_SPEED_10GHZ:

		case LPFC_LINK_SPEED_16GHZ:

		case LPFC_LINK_SPEED_32GHZ:

		case LPFC_LINK_SPEED_64GHZ:

			break;

		default:

			phba->fc_linkspeed = LPFC_LINK_SPEED_UNKNOWN;