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

Commit 1fe8c06c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-firmware-TLV' 



Sudarsana Reddy Kalluru says:

====================
qed*: Add support for management firmware TLV request.

Management firmware (MFW) requires config and state information from
the driver. It queries this via TLV (type-length-value) request wherein
mfw specificies the list of required TLVs. Driver fills the TLV data
and responds back to MFW.
This patch series adds qed/qede/qedf/qedi driver implementation for
supporting the TLV queries from MFW.

Changes from previous versions:
-------------------------------
v2: Split patch (2) into multiple simpler patches.
v2: Update qed_tlv_parsed_buf->p_val datatype to void pointer to avoid
    bunch of unnecessary typecasts.

Please consider applying this series to "net-next".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9c803cfd 269afb36

drivers/net/ethernet/qlogic/qed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-$(CONFIG_QED) := qed.o 


qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \

	 qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o \

	 qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o

	 qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o qed_mng_tlv.o

qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o

qed-$(CONFIG_QED_LL2) += qed_ll2.o

qed-$(CONFIG_QED_RDMA) += qed_roce.o qed_rdma.o qed_iwarp.o

drivers/net/ethernet/qlogic/qed/qed.h

+13 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ struct qed_eth_cb_ops; 
struct qed_dev_info;

union qed_mcp_protocol_stats;

enum qed_mcp_protocol_type;

enum qed_mfw_tlv_type;

union qed_mfw_tlv_data;



/* helpers */

#define QED_MFW_GET_FIELD(name, field) \
@@ -513,6 +515,10 @@ struct qed_simd_fp_handler { 
	void	(*func)(void *);

};



enum qed_slowpath_wq_flag {

	QED_SLOWPATH_MFW_TLV_REQ,

};



struct qed_hwfn {

	struct qed_dev			*cdev;

	u8				my_id;          /* ID inside the PF */
@@ -642,6 +648,9 @@ struct qed_hwfn { 
#endif



	struct z_stream_s		*stream;

	struct workqueue_struct *slowpath_wq;

	struct delayed_work slowpath_task;

	unsigned long slowpath_task_flags;

};



struct pci_params {
@@ -906,5 +915,9 @@ void qed_get_protocol_stats(struct qed_dev *cdev, 
			    union qed_mcp_protocol_stats *stats);

int qed_slowpath_irq_req(struct qed_hwfn *hwfn);

void qed_slowpath_irq_sync(struct qed_hwfn *p_hwfn);

int qed_mfw_tlv_req(struct qed_hwfn *hwfn);



int qed_mfw_fill_tlv_data(struct qed_hwfn *hwfn,

			  enum qed_mfw_tlv_type type,

			  union qed_mfw_tlv_data *tlv_data);

#endif /* _QED_H */

drivers/net/ethernet/qlogic/qed/qed_hsi.h

+231 −0
Original line number Diff line number Diff line
@@ -11863,6 +11863,8 @@ struct public_global { 
	u32 running_bundle_id;

	s32 external_temperature;

	u32 mdump_reason;

	u32 data_ptr;

	u32 data_size;

};



struct fw_flr_mb {
@@ -12322,6 +12324,7 @@ struct public_drv_mb { 
#define DRV_MSG_CODE_BIST_TEST			0x001e0000

#define DRV_MSG_CODE_SET_LED_MODE		0x00200000

#define DRV_MSG_CODE_RESOURCE_CMD	0x00230000

#define DRV_MSG_CODE_GET_TLV_DONE		0x002f0000



#define RESOURCE_CMD_REQ_RESC_MASK		0x0000001F

#define RESOURCE_CMD_REQ_RESC_SHIFT		0
@@ -12523,6 +12526,7 @@ enum MFW_DRV_MSG_TYPE { 
	MFW_DRV_MSG_TRANSCEIVER_STATE_CHANGE,

	MFW_DRV_MSG_BW_UPDATE11,

	MFW_DRV_MSG_OEM_CFG_UPDATE,

	MFW_DRV_MSG_GET_TLV_REQ,

	MFW_DRV_MSG_MAX

};
@@ -12558,6 +12562,233 @@ struct mcp_public_data { 
	struct public_func func[MCP_GLOB_FUNC_MAX];

};



/* OCBB definitions */

enum tlvs {

	/* Category 1: Device Properties */

	DRV_TLV_CLP_STR,

	DRV_TLV_CLP_STR_CTD,

	/* Category 6: Device Configuration */

	DRV_TLV_SCSI_TO,

	DRV_TLV_R_T_TOV,

	DRV_TLV_R_A_TOV,

	DRV_TLV_E_D_TOV,

	DRV_TLV_CR_TOV,

	DRV_TLV_BOOT_TYPE,

	/* Category 8: Port Configuration */

	DRV_TLV_NPIV_ENABLED,

	/* Category 10: Function Configuration */

	DRV_TLV_FEATURE_FLAGS,

	DRV_TLV_LOCAL_ADMIN_ADDR,

	DRV_TLV_ADDITIONAL_MAC_ADDR_1,

	DRV_TLV_ADDITIONAL_MAC_ADDR_2,

	DRV_TLV_LSO_MAX_OFFLOAD_SIZE,

	DRV_TLV_LSO_MIN_SEGMENT_COUNT,

	DRV_TLV_PROMISCUOUS_MODE,

	DRV_TLV_TX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_RX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_NUM_OF_NET_QUEUE_VMQ_CFG,

	DRV_TLV_FLEX_NIC_OUTER_VLAN_ID,

	DRV_TLV_OS_DRIVER_STATES,

	DRV_TLV_PXE_BOOT_PROGRESS,

	/* Category 12: FC/FCoE Configuration */

	DRV_TLV_NPIV_STATE,

	DRV_TLV_NUM_OF_NPIV_IDS,

	DRV_TLV_SWITCH_NAME,

	DRV_TLV_SWITCH_PORT_NUM,

	DRV_TLV_SWITCH_PORT_ID,

	DRV_TLV_VENDOR_NAME,

	DRV_TLV_SWITCH_MODEL,

	DRV_TLV_SWITCH_FW_VER,

	DRV_TLV_QOS_PRIORITY_PER_802_1P,

	DRV_TLV_PORT_ALIAS,

	DRV_TLV_PORT_STATE,

	DRV_TLV_FIP_TX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_FCOE_RX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_LINK_FAILURE_COUNT,

	DRV_TLV_FCOE_BOOT_PROGRESS,

	/* Category 13: iSCSI Configuration */

	DRV_TLV_TARGET_LLMNR_ENABLED,

	DRV_TLV_HEADER_DIGEST_FLAG_ENABLED,

	DRV_TLV_DATA_DIGEST_FLAG_ENABLED,

	DRV_TLV_AUTHENTICATION_METHOD,

	DRV_TLV_ISCSI_BOOT_TARGET_PORTAL,

	DRV_TLV_MAX_FRAME_SIZE,

	DRV_TLV_PDU_TX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_PDU_RX_DESCRIPTORS_QUEUE_SIZE,

	DRV_TLV_ISCSI_BOOT_PROGRESS,

	/* Category 20: Device Data */

	DRV_TLV_PCIE_BUS_RX_UTILIZATION,

	DRV_TLV_PCIE_BUS_TX_UTILIZATION,

	DRV_TLV_DEVICE_CPU_CORES_UTILIZATION,

	DRV_TLV_LAST_VALID_DCC_TLV_RECEIVED,

	DRV_TLV_NCSI_RX_BYTES_RECEIVED,

	DRV_TLV_NCSI_TX_BYTES_SENT,

	/* Category 22: Base Port Data */

	DRV_TLV_RX_DISCARDS,

	DRV_TLV_RX_ERRORS,

	DRV_TLV_TX_ERRORS,

	DRV_TLV_TX_DISCARDS,

	DRV_TLV_RX_FRAMES_RECEIVED,

	DRV_TLV_TX_FRAMES_SENT,

	/* Category 23: FC/FCoE Port Data */

	DRV_TLV_RX_BROADCAST_PACKETS,

	DRV_TLV_TX_BROADCAST_PACKETS,

	/* Category 28: Base Function Data */

	DRV_TLV_NUM_OFFLOADED_CONNECTIONS_TCP_IPV4,

	DRV_TLV_NUM_OFFLOADED_CONNECTIONS_TCP_IPV6,

	DRV_TLV_TX_DESCRIPTOR_QUEUE_AVG_DEPTH,

	DRV_TLV_RX_DESCRIPTORS_QUEUE_AVG_DEPTH,

	DRV_TLV_PF_RX_FRAMES_RECEIVED,

	DRV_TLV_RX_BYTES_RECEIVED,

	DRV_TLV_PF_TX_FRAMES_SENT,

	DRV_TLV_TX_BYTES_SENT,

	DRV_TLV_IOV_OFFLOAD,

	DRV_TLV_PCI_ERRORS_CAP_ID,

	DRV_TLV_UNCORRECTABLE_ERROR_STATUS,

	DRV_TLV_UNCORRECTABLE_ERROR_MASK,

	DRV_TLV_CORRECTABLE_ERROR_STATUS,

	DRV_TLV_CORRECTABLE_ERROR_MASK,

	DRV_TLV_PCI_ERRORS_AECC_REGISTER,

	DRV_TLV_TX_QUEUES_EMPTY,

	DRV_TLV_RX_QUEUES_EMPTY,

	DRV_TLV_TX_QUEUES_FULL,

	DRV_TLV_RX_QUEUES_FULL,

	/* Category 29: FC/FCoE Function Data */

	DRV_TLV_FCOE_TX_DESCRIPTOR_QUEUE_AVG_DEPTH,

	DRV_TLV_FCOE_RX_DESCRIPTORS_QUEUE_AVG_DEPTH,

	DRV_TLV_FCOE_RX_FRAMES_RECEIVED,

	DRV_TLV_FCOE_RX_BYTES_RECEIVED,

	DRV_TLV_FCOE_TX_FRAMES_SENT,

	DRV_TLV_FCOE_TX_BYTES_SENT,

	DRV_TLV_CRC_ERROR_COUNT,

	DRV_TLV_CRC_ERROR_1_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_CRC_ERROR_1_TIMESTAMP,

	DRV_TLV_CRC_ERROR_2_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_CRC_ERROR_2_TIMESTAMP,

	DRV_TLV_CRC_ERROR_3_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_CRC_ERROR_3_TIMESTAMP,

	DRV_TLV_CRC_ERROR_4_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_CRC_ERROR_4_TIMESTAMP,

	DRV_TLV_CRC_ERROR_5_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_CRC_ERROR_5_TIMESTAMP,

	DRV_TLV_LOSS_OF_SYNC_ERROR_COUNT,

	DRV_TLV_LOSS_OF_SIGNAL_ERRORS,

	DRV_TLV_PRIMITIVE_SEQUENCE_PROTOCOL_ERROR_COUNT,

	DRV_TLV_DISPARITY_ERROR_COUNT,

	DRV_TLV_CODE_VIOLATION_ERROR_COUNT,

	DRV_TLV_LAST_FLOGI_ISSUED_COMMON_PARAMETERS_WORD_1,

	DRV_TLV_LAST_FLOGI_ISSUED_COMMON_PARAMETERS_WORD_2,

	DRV_TLV_LAST_FLOGI_ISSUED_COMMON_PARAMETERS_WORD_3,

	DRV_TLV_LAST_FLOGI_ISSUED_COMMON_PARAMETERS_WORD_4,

	DRV_TLV_LAST_FLOGI_TIMESTAMP,

	DRV_TLV_LAST_FLOGI_ACC_COMMON_PARAMETERS_WORD_1,

	DRV_TLV_LAST_FLOGI_ACC_COMMON_PARAMETERS_WORD_2,

	DRV_TLV_LAST_FLOGI_ACC_COMMON_PARAMETERS_WORD_3,

	DRV_TLV_LAST_FLOGI_ACC_COMMON_PARAMETERS_WORD_4,

	DRV_TLV_LAST_FLOGI_ACC_TIMESTAMP,

	DRV_TLV_LAST_FLOGI_RJT,

	DRV_TLV_LAST_FLOGI_RJT_TIMESTAMP,

	DRV_TLV_FDISCS_SENT_COUNT,

	DRV_TLV_FDISC_ACCS_RECEIVED,

	DRV_TLV_FDISC_RJTS_RECEIVED,

	DRV_TLV_PLOGI_SENT_COUNT,

	DRV_TLV_PLOGI_ACCS_RECEIVED,

	DRV_TLV_PLOGI_RJTS_RECEIVED,

	DRV_TLV_PLOGI_1_SENT_DESTINATION_FC_ID,

	DRV_TLV_PLOGI_1_TIMESTAMP,

	DRV_TLV_PLOGI_2_SENT_DESTINATION_FC_ID,

	DRV_TLV_PLOGI_2_TIMESTAMP,

	DRV_TLV_PLOGI_3_SENT_DESTINATION_FC_ID,

	DRV_TLV_PLOGI_3_TIMESTAMP,

	DRV_TLV_PLOGI_4_SENT_DESTINATION_FC_ID,

	DRV_TLV_PLOGI_4_TIMESTAMP,

	DRV_TLV_PLOGI_5_SENT_DESTINATION_FC_ID,

	DRV_TLV_PLOGI_5_TIMESTAMP,

	DRV_TLV_PLOGI_1_ACC_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_PLOGI_1_ACC_TIMESTAMP,

	DRV_TLV_PLOGI_2_ACC_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_PLOGI_2_ACC_TIMESTAMP,

	DRV_TLV_PLOGI_3_ACC_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_PLOGI_3_ACC_TIMESTAMP,

	DRV_TLV_PLOGI_4_ACC_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_PLOGI_4_ACC_TIMESTAMP,

	DRV_TLV_PLOGI_5_ACC_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_PLOGI_5_ACC_TIMESTAMP,

	DRV_TLV_LOGOS_ISSUED,

	DRV_TLV_LOGO_ACCS_RECEIVED,

	DRV_TLV_LOGO_RJTS_RECEIVED,

	DRV_TLV_LOGO_1_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_LOGO_1_TIMESTAMP,

	DRV_TLV_LOGO_2_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_LOGO_2_TIMESTAMP,

	DRV_TLV_LOGO_3_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_LOGO_3_TIMESTAMP,

	DRV_TLV_LOGO_4_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_LOGO_4_TIMESTAMP,

	DRV_TLV_LOGO_5_RECEIVED_SOURCE_FC_ID,

	DRV_TLV_LOGO_5_TIMESTAMP,

	DRV_TLV_LOGOS_RECEIVED,

	DRV_TLV_ACCS_ISSUED,

	DRV_TLV_PRLIS_ISSUED,

	DRV_TLV_ACCS_RECEIVED,

	DRV_TLV_ABTS_SENT_COUNT,

	DRV_TLV_ABTS_ACCS_RECEIVED,

	DRV_TLV_ABTS_RJTS_RECEIVED,

	DRV_TLV_ABTS_1_SENT_DESTINATION_FC_ID,

	DRV_TLV_ABTS_1_TIMESTAMP,

	DRV_TLV_ABTS_2_SENT_DESTINATION_FC_ID,

	DRV_TLV_ABTS_2_TIMESTAMP,

	DRV_TLV_ABTS_3_SENT_DESTINATION_FC_ID,

	DRV_TLV_ABTS_3_TIMESTAMP,

	DRV_TLV_ABTS_4_SENT_DESTINATION_FC_ID,

	DRV_TLV_ABTS_4_TIMESTAMP,

	DRV_TLV_ABTS_5_SENT_DESTINATION_FC_ID,

	DRV_TLV_ABTS_5_TIMESTAMP,

	DRV_TLV_RSCNS_RECEIVED,

	DRV_TLV_LAST_RSCN_RECEIVED_N_PORT_1,

	DRV_TLV_LAST_RSCN_RECEIVED_N_PORT_2,

	DRV_TLV_LAST_RSCN_RECEIVED_N_PORT_3,

	DRV_TLV_LAST_RSCN_RECEIVED_N_PORT_4,

	DRV_TLV_LUN_RESETS_ISSUED,

	DRV_TLV_ABORT_TASK_SETS_ISSUED,

	DRV_TLV_TPRLOS_SENT,

	DRV_TLV_NOS_SENT_COUNT,

	DRV_TLV_NOS_RECEIVED_COUNT,

	DRV_TLV_OLS_COUNT,

	DRV_TLV_LR_COUNT,

	DRV_TLV_LRR_COUNT,

	DRV_TLV_LIP_SENT_COUNT,

	DRV_TLV_LIP_RECEIVED_COUNT,

	DRV_TLV_EOFA_COUNT,

	DRV_TLV_EOFNI_COUNT,

	DRV_TLV_SCSI_STATUS_CHECK_CONDITION_COUNT,

	DRV_TLV_SCSI_STATUS_CONDITION_MET_COUNT,

	DRV_TLV_SCSI_STATUS_BUSY_COUNT,

	DRV_TLV_SCSI_STATUS_INTERMEDIATE_COUNT,

	DRV_TLV_SCSI_STATUS_INTERMEDIATE_CONDITION_MET_COUNT,

	DRV_TLV_SCSI_STATUS_RESERVATION_CONFLICT_COUNT,

	DRV_TLV_SCSI_STATUS_TASK_SET_FULL_COUNT,

	DRV_TLV_SCSI_STATUS_ACA_ACTIVE_COUNT,

	DRV_TLV_SCSI_STATUS_TASK_ABORTED_COUNT,

	DRV_TLV_SCSI_CHECK_CONDITION_1_RECEIVED_SK_ASC_ASCQ,

	DRV_TLV_SCSI_CHECK_1_TIMESTAMP,

	DRV_TLV_SCSI_CHECK_CONDITION_2_RECEIVED_SK_ASC_ASCQ,

	DRV_TLV_SCSI_CHECK_2_TIMESTAMP,

	DRV_TLV_SCSI_CHECK_CONDITION_3_RECEIVED_SK_ASC_ASCQ,

	DRV_TLV_SCSI_CHECK_3_TIMESTAMP,

	DRV_TLV_SCSI_CHECK_CONDITION_4_RECEIVED_SK_ASC_ASCQ,

	DRV_TLV_SCSI_CHECK_4_TIMESTAMP,

	DRV_TLV_SCSI_CHECK_CONDITION_5_RECEIVED_SK_ASC_ASCQ,

	DRV_TLV_SCSI_CHECK_5_TIMESTAMP,

	/* Category 30: iSCSI Function Data */

	DRV_TLV_PDU_TX_DESCRIPTOR_QUEUE_AVG_DEPTH,

	DRV_TLV_PDU_RX_DESCRIPTORS_QUEUE_AVG_DEPTH,

	DRV_TLV_ISCSI_PDU_RX_FRAMES_RECEIVED,

	DRV_TLV_ISCSI_PDU_RX_BYTES_RECEIVED,

	DRV_TLV_ISCSI_PDU_TX_FRAMES_SENT,

	DRV_TLV_ISCSI_PDU_TX_BYTES_SENT

};



struct nvm_cfg_mac_address {

	u32 mac_addr_hi;

#define NVM_CFG_MAC_ADDRESS_HI_MASK	0x0000FFFF

drivers/net/ethernet/qlogic/qed/qed_main.c

+155 −0
Original line number Diff line number Diff line
@@ -946,6 +946,68 @@ static void qed_update_pf_params(struct qed_dev *cdev, 
	}

}



static void qed_slowpath_wq_stop(struct qed_dev *cdev)

{

	int i;



	if (IS_VF(cdev))

		return;



	for_each_hwfn(cdev, i) {

		if (!cdev->hwfns[i].slowpath_wq)

			continue;



		flush_workqueue(cdev->hwfns[i].slowpath_wq);

		destroy_workqueue(cdev->hwfns[i].slowpath_wq);

	}

}



static void qed_slowpath_task(struct work_struct *work)

{

	struct qed_hwfn *hwfn = container_of(work, struct qed_hwfn,

					     slowpath_task.work);

	struct qed_ptt *ptt = qed_ptt_acquire(hwfn);



	if (!ptt) {

		queue_delayed_work(hwfn->slowpath_wq, &hwfn->slowpath_task, 0);

		return;

	}



	if (test_and_clear_bit(QED_SLOWPATH_MFW_TLV_REQ,

			       &hwfn->slowpath_task_flags))

		qed_mfw_process_tlv_req(hwfn, ptt);



	qed_ptt_release(hwfn, ptt);

}



static int qed_slowpath_wq_start(struct qed_dev *cdev)

{

	struct qed_hwfn *hwfn;

	char name[NAME_SIZE];

	int i;



	if (IS_VF(cdev))

		return 0;



	for_each_hwfn(cdev, i) {

		hwfn = &cdev->hwfns[i];



		snprintf(name, NAME_SIZE, "slowpath-%02x:%02x.%02x",

			 cdev->pdev->bus->number,

			 PCI_SLOT(cdev->pdev->devfn), hwfn->abs_pf_id);



		hwfn->slowpath_wq = alloc_workqueue(name, 0, 0);

		if (!hwfn->slowpath_wq) {

			DP_NOTICE(hwfn, "Cannot create slowpath workqueue\n");

			return -ENOMEM;

		}



		INIT_DELAYED_WORK(&hwfn->slowpath_task, qed_slowpath_task);

	}



	return 0;

}



static int qed_slowpath_start(struct qed_dev *cdev,

			      struct qed_slowpath_params *params)

{
@@ -961,6 +1023,9 @@ static int qed_slowpath_start(struct qed_dev *cdev, 
	if (qed_iov_wq_start(cdev))

		goto err;



	if (qed_slowpath_wq_start(cdev))

		goto err;



	if (IS_PF(cdev)) {

		rc = request_firmware(&cdev->firmware, QED_FW_FILE_NAME,

				      &cdev->pdev->dev);
@@ -1095,6 +1160,8 @@ static int qed_slowpath_start(struct qed_dev *cdev, 


	qed_iov_wq_stop(cdev, false);



	qed_slowpath_wq_stop(cdev);



	return rc;

}
@@ -1103,6 +1170,8 @@ static int qed_slowpath_stop(struct qed_dev *cdev) 
	if (!cdev)

		return -ENODEV;



	qed_slowpath_wq_stop(cdev);



	qed_ll2_dealloc_if(cdev);



	if (IS_PF(cdev)) {
@@ -2088,3 +2157,89 @@ void qed_get_protocol_stats(struct qed_dev *cdev, 
		return;

	}

}



int qed_mfw_tlv_req(struct qed_hwfn *hwfn)

{

	DP_VERBOSE(hwfn->cdev, NETIF_MSG_DRV,

		   "Scheduling slowpath task [Flag: %d]\n",

		   QED_SLOWPATH_MFW_TLV_REQ);

	smp_mb__before_atomic();

	set_bit(QED_SLOWPATH_MFW_TLV_REQ, &hwfn->slowpath_task_flags);

	smp_mb__after_atomic();

	queue_delayed_work(hwfn->slowpath_wq, &hwfn->slowpath_task, 0);



	return 0;

}



static void

qed_fill_generic_tlv_data(struct qed_dev *cdev, struct qed_mfw_tlv_generic *tlv)

{

	struct qed_common_cb_ops *op = cdev->protocol_ops.common;

	struct qed_eth_stats_common *p_common;

	struct qed_generic_tlvs gen_tlvs;

	struct qed_eth_stats stats;

	int i;



	memset(&gen_tlvs, 0, sizeof(gen_tlvs));

	op->get_generic_tlv_data(cdev->ops_cookie, &gen_tlvs);



	if (gen_tlvs.feat_flags & QED_TLV_IP_CSUM)

		tlv->flags.ipv4_csum_offload = true;

	if (gen_tlvs.feat_flags & QED_TLV_LSO)

		tlv->flags.lso_supported = true;

	tlv->flags.b_set = true;



	for (i = 0; i < QED_TLV_MAC_COUNT; i++) {

		if (is_valid_ether_addr(gen_tlvs.mac[i])) {

			ether_addr_copy(tlv->mac[i], gen_tlvs.mac[i]);

			tlv->mac_set[i] = true;

		}

	}



	qed_get_vport_stats(cdev, &stats);

	p_common = &stats.common;

	tlv->rx_frames = p_common->rx_ucast_pkts + p_common->rx_mcast_pkts +

			 p_common->rx_bcast_pkts;

	tlv->rx_frames_set = true;

	tlv->rx_bytes = p_common->rx_ucast_bytes + p_common->rx_mcast_bytes +

			p_common->rx_bcast_bytes;

	tlv->rx_bytes_set = true;

	tlv->tx_frames = p_common->tx_ucast_pkts + p_common->tx_mcast_pkts +

			 p_common->tx_bcast_pkts;

	tlv->tx_frames_set = true;

	tlv->tx_bytes = p_common->tx_ucast_bytes + p_common->tx_mcast_bytes +

			p_common->tx_bcast_bytes;

	tlv->rx_bytes_set = true;

}



int qed_mfw_fill_tlv_data(struct qed_hwfn *hwfn, enum qed_mfw_tlv_type type,

			  union qed_mfw_tlv_data *tlv_buf)

{

	struct qed_dev *cdev = hwfn->cdev;

	struct qed_common_cb_ops *ops;



	ops = cdev->protocol_ops.common;

	if (!ops || !ops->get_protocol_tlv_data || !ops->get_generic_tlv_data) {

		DP_NOTICE(hwfn, "Can't collect TLV management info\n");

		return -EINVAL;

	}



	switch (type) {

	case QED_MFW_TLV_GENERIC:

		qed_fill_generic_tlv_data(hwfn->cdev, &tlv_buf->generic);

		break;

	case QED_MFW_TLV_ETH:

		ops->get_protocol_tlv_data(cdev->ops_cookie, &tlv_buf->eth);

		break;

	case QED_MFW_TLV_FCOE:

		ops->get_protocol_tlv_data(cdev->ops_cookie, &tlv_buf->fcoe);

		break;

	case QED_MFW_TLV_ISCSI:

		ops->get_protocol_tlv_data(cdev->ops_cookie, &tlv_buf->iscsi);

		break;

	default:

		break;

	}



	return 0;

}

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+2 −0
Original line number Diff line number Diff line
@@ -1622,6 +1622,8 @@ int qed_mcp_handle_events(struct qed_hwfn *p_hwfn, 
		case MFW_DRV_MSG_S_TAG_UPDATE:

			qed_mcp_update_stag(p_hwfn, p_ptt);

			break;

		case MFW_DRV_MSG_GET_TLV_REQ:

			qed_mfw_tlv_req(p_hwfn);

			break;

		default:

			DP_INFO(p_hwfn, "Unimplemented MFW message %d\n", i);