[SCSI] lpfc 8.2.8 : Add new FCOE hardware support (84774a4d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/lpfc/lpfc.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -613,6 +613,7 @@ struct lpfc_hba {
		unsigned long last_completion_time;
		struct timer_list hb_tmofunc;
		uint8_t hb_outstanding;
		enum hba_temp_state over_temp_state;
		/* ndlp reference management */
		spinlock_t ndlp_lock;
		/*
		@@ -621,7 +622,8 @@ struct lpfc_hba {
		*/
		#define QUE_BUFTAG_BIT (1<<31)
		uint32_t buffer_tag_count;
		enum hba_temp_state over_temp_state;
		int wait_4_mlo_maint_flg;
		wait_queue_head_t wait_4_mlo_m_q;
		};

		static inline struct Scsi_Host *

drivers/scsi/lpfc/lpfc_attr.c

+29 −4

Original line number	Diff line number	Diff line
		@@ -210,6 +210,25 @@ lpfc_programtype_show(struct device dev, struct device_attribute attr,
		return snprintf(buf, PAGE_SIZE, "%s\n",phba->ProgramType);
		}

		/**
		* lpfc_mlomgmt_show: Return the Menlo Maintenance sli flag.
		* @dev: class converted to a Scsi_host structure.
		* @attr: device attribute, not used.
		* @buf: on return contains the Menlo Maintenance sli flag.
		*
		* Returns: size of formatted string.
		**/
		static ssize_t
		lpfc_mlomgmt_show(struct device dev, struct device_attribute attr, char *buf)
		{
		struct Scsi_Host *shost = class_to_shost(dev);
		struct lpfc_vport vport = (struct lpfc_vport )shost->hostdata;
		struct lpfc_hba *phba = vport->phba;

		return snprintf(buf, PAGE_SIZE, "%d\n",
		(phba->sli.sli_flag & LPFC_MENLO_MAINT));
		}

		/**
		* lpfc_vportnum_show: Return the port number in ascii of the hba.
		* @dev: class converted to a Scsi_host structure.
		@@ -352,8 +371,10 @@ lpfc_link_state_show(struct device dev, struct device_attribute attr,
		"Unknown\n");
		break;
		}

		if (phba->fc_topology == TOPOLOGY_LOOP) {
		if (phba->sli.sli_flag & LPFC_MENLO_MAINT)
		len += snprintf(buf + len, PAGE_SIZE-len,
		" Menlo Maint Mode\n");
		else if (phba->fc_topology == TOPOLOGY_LOOP) {
		if (vport->fc_flag & FC_PUBLIC_LOOP)
		len += snprintf(buf + len, PAGE_SIZE-len,
		" Public Loop\n");
		@@ -1476,6 +1497,7 @@ static DEVICE_ATTR(option_rom_version, S_IRUGO,
		lpfc_option_rom_version_show, NULL);
		static DEVICE_ATTR(num_discovered_ports, S_IRUGO,
		lpfc_num_discovered_ports_show, NULL);
		static DEVICE_ATTR(menlo_mgmt_mode, S_IRUGO, lpfc_mlomgmt_show, NULL);
		static DEVICE_ATTR(nport_evt_cnt, S_IRUGO, lpfc_nport_evt_cnt_show, NULL);
		static DEVICE_ATTR(lpfc_drvr_version, S_IRUGO, lpfc_drvr_version_show, NULL);
		static DEVICE_ATTR(board_mode, S_IRUGO \| S_IWUSR,
		@@ -2395,6 +2417,7 @@ struct device_attribute *lpfc_hba_attrs[] = {
		&dev_attr_option_rom_version,
		&dev_attr_link_state,
		&dev_attr_num_discovered_ports,
		&dev_attr_menlo_mgmt_mode,
		&dev_attr_lpfc_drvr_version,
		&dev_attr_lpfc_temp_sensor,
		&dev_attr_lpfc_log_verbose,
		@@ -2763,6 +2786,8 @@ sysfs_mbox_read(struct kobject kobj, struct bin_attribute bin_attr,
		case MBX_DEL_LD_ENTRY:
		case MBX_SET_VARIABLE:
		case MBX_WRITE_WWN:
		case MBX_PORT_CAPABILITIES:
		case MBX_PORT_IOV_CONTROL:
		break;
		case MBX_READ_SPARM64:
		case MBX_READ_LA:
		@@ -2867,7 +2892,7 @@ static struct bin_attribute sysfs_mbox_attr = {
		};

		/**
		* lpfc_alloc_sysfs_attr: Creates the sysfs, ctlreg, menlo and mbox entries.
		* lpfc_alloc_sysfs_attr: Creates the ctlreg and mbox entries.
		* @vport: address of lpfc vport structure.
		*
		* Return codes:
		@@ -2898,7 +2923,7 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)
		}

		/**
		* lpfc_free_sysfs_attr: Removes the sysfs, ctlreg, menlo and mbox entries.
		* lpfc_free_sysfs_attr: Removes the ctlreg and mbox entries.
		* @vport: address of lpfc vport structure.
		**/
		void

drivers/scsi/lpfc/lpfc_hbadisc.c

+56 −10

Original line number	Diff line number	Diff line
		@@ -1013,14 +1013,10 @@ lpfc_mbx_process_link_up(struct lpfc_hba phba, READ_LA_VAR la)
		}

		static void
		lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
		lpfc_enable_la(struct lpfc_hba *phba)
		{
		uint32_t control;
		struct lpfc_sli *psli = &phba->sli;

		lpfc_linkdown(phba);

		/* turn on Link Attention interrupts - no CLEAR_LA needed */
		spin_lock_irq(&phba->hbalock);
		psli->sli_flag \|= LPFC_PROCESS_LA;
		control = readl(phba->HCregaddr);
		@@ -1030,6 +1026,15 @@ lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
		spin_unlock_irq(&phba->hbalock);
		}

		static void
		lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
		{
		lpfc_linkdown(phba);
		lpfc_enable_la(phba);
		/* turn on Link Attention interrupts - no CLEAR_LA needed */
		}


		/*
		* This routine handles processing a READ_LA mailbox
		* command upon completion. It is setup in the LPFC_MBOXQ
		@@ -1077,8 +1082,12 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba phba, LPFC_MBOXQ_t pmb)
		}

		phba->fc_eventTag = la->eventTag;
		if (la->mm)
		phba->sli.sli_flag \|= LPFC_MENLO_MAINT;
		else
		phba->sli.sli_flag &= ~LPFC_MENLO_MAINT;

		if (la->attType == AT_LINK_UP) {
		if (la->attType == AT_LINK_UP && (!la->mm)) {
		phba->fc_stat.LinkUp++;
		if (phba->link_flag & LS_LOOPBACK_MODE) {
		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		@@ -1090,13 +1099,15 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba phba, LPFC_MBOXQ_t pmb)
		} else {
		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		"1303 Link Up Event x%x received "
		"Data: x%x x%x x%x x%x\n",
		"Data: x%x x%x x%x x%x x%x x%x %d\n",
		la->eventTag, phba->fc_eventTag,
		la->granted_AL_PA, la->UlnkSpeed,
		phba->alpa_map[0]);
		phba->alpa_map[0],
		la->mm, la->fa,
		phba->wait_4_mlo_maint_flg);
		}
		lpfc_mbx_process_link_up(phba, la);
		} else {
		} else if (la->attType == AT_LINK_DOWN) {
		phba->fc_stat.LinkDown++;
		if (phba->link_flag & LS_LOOPBACK_MODE) {
		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		@@ -1109,11 +1120,46 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba phba, LPFC_MBOXQ_t pmb)
		else {
		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		"1305 Link Down Event x%x received "
		"Data: x%x x%x x%x x%x x%x\n",
		la->eventTag, phba->fc_eventTag,
		phba->pport->port_state, vport->fc_flag,
		la->mm, la->fa);
		}
		lpfc_mbx_issue_link_down(phba);
		}
		if (la->mm && la->attType == AT_LINK_UP) {
		if (phba->link_state != LPFC_LINK_DOWN) {
		phba->fc_stat.LinkDown++;
		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		"1312 Link Down Event x%x received "
		"Data: x%x x%x x%x\n",
		la->eventTag, phba->fc_eventTag,
		phba->pport->port_state, vport->fc_flag);
		}
		lpfc_mbx_issue_link_down(phba);
		} else
		lpfc_enable_la(phba);

		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
		"1310 Menlo Maint Mode Link up Event x%x rcvd "
		"Data: x%x x%x x%x\n",
		la->eventTag, phba->fc_eventTag,
		phba->pport->port_state, vport->fc_flag);
		/*
		* The cmnd that triggered this will be waiting for this
		* signal.
		*/
		/* WAKEUP for MENLO_SET_MODE or MENLO_RESET command. */
		if (phba->wait_4_mlo_maint_flg) {
		phba->wait_4_mlo_maint_flg = 0;
		wake_up_interruptible(&phba->wait_4_mlo_m_q);
		}
		}

		if (la->fa) {
		if (la->mm)
		lpfc_issue_clear_la(phba, vport);
		lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
		"1311 fa %d\n", la->fa);
		}

		lpfc_mbx_cmpl_read_la_free_mbuf:

drivers/scsi/lpfc/lpfc_hw.h

+24 −2

Original line number	Diff line number	Diff line
		@@ -1107,6 +1107,8 @@ typedef struct {
		/* Start FireFly Register definitions */
		#define PCI_VENDOR_ID_EMULEX 0x10df
		#define PCI_DEVICE_ID_FIREFLY 0x1ae5
		#define PCI_DEVICE_ID_PROTEUS_VF 0xe100
		#define PCI_DEVICE_ID_PROTEUS_PF 0xe180
		#define PCI_DEVICE_ID_SAT_SMB 0xf011
		#define PCI_DEVICE_ID_SAT_MID 0xf015
		#define PCI_DEVICE_ID_RFLY 0xf095
		@@ -1133,10 +1135,12 @@ typedef struct {
		#define PCI_DEVICE_ID_LP11000S 0xfc10
		#define PCI_DEVICE_ID_LPE11000S 0xfc20
		#define PCI_DEVICE_ID_SAT_S 0xfc40
		#define PCI_DEVICE_ID_PROTEUS_S 0xfc50
		#define PCI_DEVICE_ID_HELIOS 0xfd00
		#define PCI_DEVICE_ID_HELIOS_SCSP 0xfd11
		#define PCI_DEVICE_ID_HELIOS_DCSP 0xfd12
		#define PCI_DEVICE_ID_ZEPHYR 0xfe00
		#define PCI_DEVICE_ID_HORNET 0xfe05
		#define PCI_DEVICE_ID_ZEPHYR_SCSP 0xfe11
		#define PCI_DEVICE_ID_ZEPHYR_DCSP 0xfe12

		@@ -1154,6 +1158,7 @@ typedef struct {
		#define ZEPHYR_JEDEC_ID 0x0577
		#define VIPER_JEDEC_ID 0x4838
		#define SATURN_JEDEC_ID 0x1004
		#define HORNET_JDEC_ID 0x2057706D

		#define JEDEC_ID_MASK 0x0FFFF000
		#define JEDEC_ID_SHIFT 12
		@@ -1289,6 +1294,9 @@ typedef struct { /* FireFly BIU registers */
		#define MBX_WRITE_VPARMS 0x32
		#define MBX_ASYNCEVT_ENABLE 0x33

		#define MBX_PORT_CAPABILITIES 0x3B
		#define MBX_PORT_IOV_CONTROL 0x3C

		#define MBX_CONFIG_HBQ 0x7C
		#define MBX_LOAD_AREA 0x81
		#define MBX_RUN_BIU_DIAG64 0x84
		@@ -2195,7 +2203,10 @@ typedef struct {
		typedef struct {
		uint32_t eventTag; /* Event tag */
		#ifdef __BIG_ENDIAN_BITFIELD
		uint32_t rsvd1:22;
		uint32_t rsvd1:19;
		uint32_t fa:1;
		uint32_t mm:1; /* Menlo Maintenance mode enabled */
		uint32_t rx:1;
		uint32_t pb:1;
		uint32_t il:1;
		uint32_t attType:8;
		@@ -2203,7 +2214,10 @@ typedef struct {
		uint32_t attType:8;
		uint32_t il:1;
		uint32_t pb:1;
		uint32_t rsvd1:22;
		uint32_t rx:1;
		uint32_t mm:1;
		uint32_t fa:1;
		uint32_t rsvd1:19;
		#endif

		#define AT_RESERVED 0x00 /* Reserved - attType */
		@@ -2224,6 +2238,7 @@ typedef struct {

		#define TOPOLOGY_PT_PT 0x01 /* Topology is pt-pt / pt-fabric */
		#define TOPOLOGY_LOOP 0x02 /* Topology is FC-AL */
		#define TOPOLOGY_LNK_MENLO_MAINTENANCE 0x05 /* maint mode zephtr to menlo */

		union {
		struct ulp_bde lilpBde; /* This BDE points to a 128 byte buffer
		@@ -3346,3 +3361,10 @@ lpfc_error_lost_link(IOCB_t *iocbp)
		iocbp->un.ulpWord[4] == IOERR_LINK_DOWN \|\|
		iocbp->un.ulpWord[4] == IOERR_SLI_DOWN));
		}

		#define MENLO_TRANSPORT_TYPE 0xfe
		#define MENLO_CONTEXT 0
		#define MENLO_PU 3
		#define MENLO_TIMEOUT 30
		#define SETVAR_MLOMNT 0x103107
		#define SETVAR_MLORST 0x103007

drivers/scsi/lpfc/lpfc_init.c

+28 −2

Original line number	Diff line number	Diff line
		@@ -1130,6 +1130,7 @@ lpfc_get_hba_model_desc(struct lpfc_hba phba, uint8_t mdp, uint8_t *descp)
		lpfc_vpd_t *vp;
		uint16_t dev_id = phba->pcidev->device;
		int max_speed;
		int GE = 0;
		struct {
		char * name;
		int max_speed;
		@@ -1261,6 +1262,19 @@ lpfc_get_hba_model_desc(struct lpfc_hba phba, uint8_t mdp, uint8_t *descp)
		case PCI_DEVICE_ID_SAT_S:
		m = (typeof(m)){"LPe12000-S", max_speed, "PCIe"};
		break;
		case PCI_DEVICE_ID_HORNET:
		m = (typeof(m)){"LP21000", max_speed, "PCIe"};
		GE = 1;
		break;
		case PCI_DEVICE_ID_PROTEUS_VF:
		m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};
		break;
		case PCI_DEVICE_ID_PROTEUS_PF:
		m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};
		break;
		case PCI_DEVICE_ID_PROTEUS_S:
		m = (typeof(m)) {"LPemv12002-S", max_speed, "PCIe IOV"};
		break;
		default:
		m = (typeof(m)){ NULL };
		break;
		@@ -1270,8 +1284,11 @@ lpfc_get_hba_model_desc(struct lpfc_hba phba, uint8_t mdp, uint8_t *descp)
		snprintf(mdp, 79,"%s", m.name);
		if (descp && descp[0] == '\0')
		snprintf(descp, 255,
		"Emulex %s %dGb %s Fibre Channel Adapter",
		m.name, m.max_speed, m.bus);
		"Emulex %s %d%s %s %s",
		m.name, m.max_speed,
		(GE) ? "GE" : "Gb",
		m.bus,
		(GE) ? "FCoE Adapter" : "Fibre Channel Adapter");
		}

		/**
		@@ -2248,6 +2265,7 @@ lpfc_pci_probe_one(struct pci_dev pdev, const struct pci_device_id pid)
		goto out_free_phba;

		INIT_LIST_HEAD(&phba->port_list);
		init_waitqueue_head(&phba->wait_4_mlo_m_q);
		/*
		* Get all the module params for configuring this host and then
		* establish the host.
		@@ -2796,6 +2814,8 @@ static struct pci_device_id lpfc_id_table[] = {
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
		@@ -2826,6 +2846,12 @@ static struct pci_device_id lpfc_id_table[] = {
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
		PCI_ANY_ID, PCI_ANY_ID, },
		{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
		PCI_ANY_ID, PCI_ANY_ID, },
		{ 0 }
		};