V_01-00-34

1. During emac resume, attach the net device after initializing the queues
This commit is contained in:
TC956X 2022-01-07 20:04:09 +09:00 committed by jianzhou
parent e6417b1a08
commit 8f8ea68fd4
4 changed files with 17 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# Toshiba Electronic Devices & Storage Corporation TC956X PCIe Ethernet Host Driver
Release Date: 06 Jan 2022
Release Date: 07 Jan 2022
Release Version: V_01-00-33 : Limited-tested version
Release Version: V_01-00-34 : Limited-tested version
TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19".
@ -423,3 +423,7 @@ TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19".
1. Null check added while freeing skb buff data
2. Code comments corrected for flow control configuration
## TC956X_Host_Driver_20220107_V_01-00-34:
1. During emac resume, attach the net device after initializing the queues

View File

@ -119,6 +119,8 @@
* 06 Jan 2022 : 1. Code comments corrected for flow control configuration
2. Version update.
* VERSION : 01-00-33
* 07 Jan 2022 : 1. Version update
* VERSION : 01-00-34
*/
#include <linux/clk-provider.h>
@ -177,7 +179,7 @@ static unsigned int mac1_txq1_size = TX_QUEUE1_SIZE;
unsigned int mac0_en_lp_pause_frame_cnt = DISABLE;
unsigned int mac1_en_lp_pause_frame_cnt = DISABLE;
static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 3, 3};
static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 3, 4};
static int tc956xmac_pm_usage_counter; /* Device Usage Counter */
struct mutex tc956x_pm_suspend_lock; /* This mutex is shared between all available EMAC ports. */

View File

@ -111,6 +111,8 @@
* VERSION : 01-00-32
* 06 Jan 2022 : 1. Version update
* VERSION : 01-00-33
* 07 Jan 2022 : 1. Version update
* VERSION : 01-00-34
*/
#ifndef __TC956XMAC_H__
@ -163,7 +165,7 @@
#ifdef TC956X
#define TC956X_RESOURCE_NAME "tc956x_pci-eth"
#define DRV_MODULE_VERSION "V_01-00-33"
#define DRV_MODULE_VERSION "V_01-00-34"
#define TC956X_FW_MAX_SIZE (64*1024)
#define ATR_AXI4_SLV_BASE 0x0800

View File

@ -92,6 +92,8 @@
* VERSION : 01-00-32
* 06 Jan 2022 : 1. Null check added while freeing skb buff data
* VERSION : 01-00-33
* 07 Jan 2022 : 1. During emac resume, attach the net device after initializing the queues
* VERSION : 01-00-34
*/
#include <linux/clk.h>
@ -10953,9 +10955,6 @@ int tc956xmac_resume(struct device *dev)
// KPRINT_INFO("%s : Port %d - Phy Speed Up", __func__, priv->port_num);
// phy_speed_up(phydev);
//}
/* Attach network device */
netif_device_attach(ndev);
#ifndef TC956X
/* Reset Parameters. */
tc956xmac_reset_queues_param(priv);
@ -10967,6 +10966,9 @@ int tc956xmac_resume(struct device *dev)
tc956xmac_open(ndev);
rtnl_unlock();
/* Attach network device */
netif_device_attach(ndev);
clean_exit:
if (priv->tc956xmac_pm_wol_interrupt) {
KPRINT_INFO("%s : Port %d Clearing WOL and queuing phy work", __func__, priv->port_num);