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

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

lpfc: Use new FDMI speed definitions for 10G, 25G and 40G FCoE. 



Use new FDMI speed definitions for 10G, 25G and 40G FCoE.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: default avatarJames Smart <james.smart@avagotech.com>
Reviewed-by: default avatarHannes Reinicke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5afab6bb

drivers/scsi/lpfc/lpfc_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -5255,7 +5255,7 @@ lpfc_get_host_speed(struct Scsi_Host *shost) 


	spin_lock_irq(shost->host_lock);



	if (lpfc_is_link_up(phba)) {

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

		switch(phba->fc_linkspeed) {

		case LPFC_LINK_SPEED_1GHZ:

			fc_host_speed(shost) = FC_PORTSPEED_1GBIT;

drivers/scsi/lpfc/lpfc_ct.c

+98 −48
Original line number Diff line number Diff line
@@ -48,15 +48,26 @@ 
#include "lpfc_vport.h"

#include "lpfc_debugfs.h"



/* FDMI Port Speed definitions */

#define HBA_PORTSPEED_1GBIT		0x0001	/* 1 GBit/sec */

#define HBA_PORTSPEED_2GBIT		0x0002	/* 2 GBit/sec */

#define HBA_PORTSPEED_4GBIT		0x0008	/* 4 GBit/sec */

#define HBA_PORTSPEED_10GBIT		0x0004	/* 10 GBit/sec */

#define HBA_PORTSPEED_8GBIT		0x0010	/* 8 GBit/sec */

#define HBA_PORTSPEED_16GBIT		0x0020	/* 16 GBit/sec */

#define HBA_PORTSPEED_32GBIT		0x0040  /* 32 GBit/sec */

#define HBA_PORTSPEED_UNKNOWN		0x0800	/* Unknown */

/* FDMI Port Speed definitions - FC-GS-7 */

#define HBA_PORTSPEED_1GFC		0x00000001	/* 1G FC */

#define HBA_PORTSPEED_2GFC		0x00000002	/* 2G FC */

#define HBA_PORTSPEED_4GFC		0x00000008	/* 4G FC */

#define HBA_PORTSPEED_10GFC		0x00000004	/* 10G FC */

#define HBA_PORTSPEED_8GFC		0x00000010	/* 8G FC */

#define HBA_PORTSPEED_16GFC		0x00000020	/* 16G FC */

#define HBA_PORTSPEED_32GFC		0x00000040	/* 32G FC */

#define HBA_PORTSPEED_20GFC		0x00000080	/* 20G FC */

#define HBA_PORTSPEED_40GFC		0x00000100	/* 40G FC */

#define HBA_PORTSPEED_128GFC		0x00000200	/* 128G FC */

#define HBA_PORTSPEED_64GFC		0x00000400	/* 64G FC */

#define HBA_PORTSPEED_256GFC		0x00000800	/* 256G FC */

#define HBA_PORTSPEED_UNKNOWN		0x00008000	/* Unknown */

#define HBA_PORTSPEED_10GE		0x00010000	/* 10G E */

#define HBA_PORTSPEED_40GE		0x00020000	/* 40G E */

#define HBA_PORTSPEED_100GE		0x00040000	/* 100G E */

#define HBA_PORTSPEED_25GE		0x00080000	/* 25G E */

#define HBA_PORTSPEED_50GE		0x00100000	/* 50G E */

#define HBA_PORTSPEED_400GE		0x00200000	/* 400G E */



#define FOURBYTES	4
@@ -1921,20 +1932,38 @@ lpfc_fdmi_port_attr_support_speed(struct lpfc_vport *vport, 
	ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;



	ae->un.AttrInt = 0;

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

		if (phba->lmt & LMT_32Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_32GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_32GFC;

		if (phba->lmt & LMT_16Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_16GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_16GFC;

		if (phba->lmt & LMT_10Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_10GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_10GFC;

		if (phba->lmt & LMT_8Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_8GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_8GFC;

		if (phba->lmt & LMT_4Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_4GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_4GFC;

		if (phba->lmt & LMT_2Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_2GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_2GFC;

		if (phba->lmt & LMT_1Gb)

		ae->un.AttrInt |= HBA_PORTSPEED_1GBIT;

			ae->un.AttrInt |= HBA_PORTSPEED_1GFC;

	} else {

		/* FCoE links support only one speed */

		switch (phba->fc_linkspeed) {

		case LPFC_ASYNC_LINK_SPEED_10GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_10GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_25GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_25GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_40GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_40GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_100GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_100GE;

			break;

		}

	}

	ae->un.AttrInt = cpu_to_be32(ae->un.AttrInt);

	size = FOURBYTES + sizeof(uint32_t);

	ad->AttrLen = cpu_to_be16(size);
@@ -1952,32 +1981,53 @@ lpfc_fdmi_port_attr_speed(struct lpfc_vport *vport, 


	ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;



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

		switch (phba->fc_linkspeed) {

		case LPFC_LINK_SPEED_1GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_1GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_1GFC;

			break;

		case LPFC_LINK_SPEED_2GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_2GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_2GFC;

			break;

		case LPFC_LINK_SPEED_4GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_4GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_4GFC;

			break;

		case LPFC_LINK_SPEED_8GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_8GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_8GFC;

			break;

		case LPFC_LINK_SPEED_10GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_10GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_10GFC;

			break;

		case LPFC_LINK_SPEED_16GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_16GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_16GFC;

			break;

		case LPFC_LINK_SPEED_32GHZ:

		ae->un.AttrInt = HBA_PORTSPEED_32GBIT;

			ae->un.AttrInt = HBA_PORTSPEED_32GFC;

			break;

		default:

			ae->un.AttrInt = HBA_PORTSPEED_UNKNOWN;

			break;

		}

	} else {

		switch (phba->fc_linkspeed) {

		case LPFC_ASYNC_LINK_SPEED_10GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_10GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_25GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_25GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_40GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_40GE;

			break;

		case LPFC_ASYNC_LINK_SPEED_100GBPS:

			ae->un.AttrInt = HBA_PORTSPEED_100GE;

			break;

		default:

			ae->un.AttrInt = HBA_PORTSPEED_UNKNOWN;

			break;

		}

	}



	ae->un.AttrInt = cpu_to_be32(ae->un.AttrInt);

	size = FOURBYTES + sizeof(uint32_t);

	ad->AttrLen = cpu_to_be16(size);

drivers/scsi/lpfc/lpfc_els.c

+3 −0
Original line number Diff line number Diff line
@@ -4749,6 +4749,9 @@ lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba) 
	case LPFC_LINK_SPEED_16GHZ:

		rdp_speed = RDP_PS_16GB;

		break;

	case LPFC_LINK_SPEED_32GHZ:

		rdp_speed = RDP_PS_32GB;

		break;

	default:

		rdp_speed = RDP_PS_UNKNOWN;

		break;

drivers/scsi/lpfc/lpfc_hbadisc.c

+16 −13
Original line number Diff line number Diff line
@@ -3037,6 +3037,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la) 
	uint32_t fc_flags = 0;



	spin_lock_irq(&phba->hbalock);

	phba->fc_linkspeed = bf_get(lpfc_mbx_read_top_link_spd, la);



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

		switch (bf_get(lpfc_mbx_read_top_link_spd, la)) {

		case LPFC_LINK_SPEED_1GHZ:

		case LPFC_LINK_SPEED_2GHZ:
@@ -3045,12 +3048,12 @@ 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:

		phba->fc_linkspeed = bf_get(lpfc_mbx_read_top_link_spd, la);

			break;

		default:

			phba->fc_linkspeed = LPFC_LINK_SPEED_UNKNOWN;

			break;

		}

	}



	if (phba->fc_topology &&

	    phba->fc_topology != bf_get(lpfc_mbx_read_top_topology, la)) {

drivers/scsi/lpfc/lpfc_hw4.h

+1 −0
Original line number Diff line number Diff line
@@ -3317,6 +3317,7 @@ struct lpfc_acqe_link { 
#define LPFC_ASYNC_LINK_SPEED_20GBPS		0x5

#define LPFC_ASYNC_LINK_SPEED_25GBPS		0x6

#define LPFC_ASYNC_LINK_SPEED_40GBPS		0x7

#define LPFC_ASYNC_LINK_SPEED_100GBPS		0x8

#define lpfc_acqe_link_duplex_SHIFT		16

#define lpfc_acqe_link_duplex_MASK		0x000000FF

#define lpfc_acqe_link_duplex_WORD		word0