diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 29 | 
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 92b95d92d599..dcb8e7520471 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -1251,32 +1251,6 @@ ice_handle_link_event(struct ice_pf *pf, struct ice_rq_event_info *event)  }  /** - * ice_get_fwlog_data - copy the FW log data from ARQ event - * @pf: PF that the FW log event is associated with - * @event: event structure containing FW log data - */ -static void -ice_get_fwlog_data(struct ice_pf *pf, struct ice_rq_event_info *event) -{ -	struct ice_fwlog_data *fwlog; -	struct ice_hw *hw = &pf->hw; - -	fwlog = &hw->fwlog_ring.rings[hw->fwlog_ring.tail]; - -	memset(fwlog->data, 0, PAGE_SIZE); -	fwlog->data_size = le16_to_cpu(event->desc.datalen); - -	memcpy(fwlog->data, event->msg_buf, fwlog->data_size); -	ice_fwlog_ring_increment(&hw->fwlog_ring.tail, hw->fwlog_ring.size); - -	if (ice_fwlog_ring_full(&hw->fwlog_ring)) { -		/* the rings are full so bump the head to create room */ -		ice_fwlog_ring_increment(&hw->fwlog_ring.head, -					 hw->fwlog_ring.size); -	} -} - -/**   * ice_aq_prep_for_event - Prepare to wait for an AdminQ event from firmware   * @pf: pointer to the PF private structure   * @task: intermediate helper storage and identifier for waiting @@ -1566,7 +1540,8 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)  			}  			break;  		case ice_aqc_opc_fw_logs_event: -			ice_get_fwlog_data(pf, &event); +			ice_get_fwlog_data(hw, event.msg_buf, +					   le16_to_cpu(event.desc.datalen));  			break;  		case ice_aqc_opc_lldp_set_mib_change:  			ice_dcb_process_lldp_set_mib_change(pf, &event);  | 
