Commit afc3de92 authored by David S. Miller's avatar David S. Miller

Merge branch 'qed-next'

Yuval Mintz says:

====================
qed: update series

This patch series tries to improve general configuration by changing
configuration to better suit B0 boards and allow more available
resources to each physical function.
In additition, it contains some small fixes and semantic changes.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fb653ebd 619db46b
...@@ -146,9 +146,6 @@ struct qed_hw_info { ...@@ -146,9 +146,6 @@ struct qed_hw_info {
u16 ovlan; u16 ovlan;
u32 part_num[4]; u32 part_num[4];
u32 vendor_id;
u32 device_id;
unsigned char hw_mac_addr[ETH_ALEN]; unsigned char hw_mac_addr[ETH_ALEN];
struct qed_igu_info *p_igu_info; struct qed_igu_info *p_igu_info;
......
This diff is collapsed.
...@@ -77,6 +77,15 @@ int qed_hw_init(struct qed_dev *cdev, ...@@ -77,6 +77,15 @@ int qed_hw_init(struct qed_dev *cdev,
bool allow_npar_tx_switch, bool allow_npar_tx_switch,
const u8 *bin_fw_data); const u8 *bin_fw_data);
/**
* @brief qed_hw_timers_stop_all - stop the timers HW block
*
* @param cdev
*
* @return void
*/
void qed_hw_timers_stop_all(struct qed_dev *cdev);
/** /**
* @brief qed_hw_stop - * @brief qed_hw_stop -
* *
...@@ -156,8 +165,6 @@ struct qed_ptt *qed_ptt_acquire(struct qed_hwfn *p_hwfn); ...@@ -156,8 +165,6 @@ struct qed_ptt *qed_ptt_acquire(struct qed_hwfn *p_hwfn);
*/ */
void qed_ptt_release(struct qed_hwfn *p_hwfn, void qed_ptt_release(struct qed_hwfn *p_hwfn,
struct qed_ptt *p_ptt); struct qed_ptt *p_ptt);
void qed_get_vport_stats(struct qed_dev *cdev,
struct qed_eth_stats *stats);
void qed_reset_vport_stats(struct qed_dev *cdev); void qed_reset_vport_stats(struct qed_dev *cdev);
enum qed_dmae_address_type_t { enum qed_dmae_address_type_t {
......
...@@ -968,7 +968,7 @@ struct igu_msix_vector { ...@@ -968,7 +968,7 @@ struct igu_msix_vector {
enum init_modes { enum init_modes {
MODE_BB_A0, MODE_BB_A0,
MODE_RESERVED, MODE_BB_B0,
MODE_RESERVED2, MODE_RESERVED2,
MODE_ASIC, MODE_ASIC,
MODE_RESERVED3, MODE_RESERVED3,
......
This diff is collapsed.
...@@ -779,7 +779,7 @@ static int qed_slowpath_start(struct qed_dev *cdev, ...@@ -779,7 +779,7 @@ static int qed_slowpath_start(struct qed_dev *cdev,
rc = qed_hw_init(cdev, true, cdev->int_params.out.int_mode, rc = qed_hw_init(cdev, true, cdev->int_params.out.int_mode,
true, data); true, data);
if (rc) if (rc)
goto err3; goto err2;
DP_INFO(cdev, DP_INFO(cdev,
"HW initialization and function start completed successfully\n"); "HW initialization and function start completed successfully\n");
...@@ -798,12 +798,14 @@ static int qed_slowpath_start(struct qed_dev *cdev, ...@@ -798,12 +798,14 @@ static int qed_slowpath_start(struct qed_dev *cdev,
return rc; return rc;
} }
qed_reset_vport_stats(cdev);
return 0; return 0;
err3:
qed_free_stream_mem(cdev);
qed_slowpath_irq_free(cdev);
err2: err2:
qed_hw_timers_stop_all(cdev);
qed_slowpath_irq_free(cdev);
qed_free_stream_mem(cdev);
qed_disable_msix(cdev); qed_disable_msix(cdev);
err1: err1:
qed_resc_free(cdev); qed_resc_free(cdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment