V_01-00-36

1. IRQ device name modified to differentiate between WOL and EMAC interrupt IRQs
This commit is contained in:
TC956X 2022-01-18 16:56:23 +09:00 committed by jianzhou
parent 3b4d9767c5
commit 6fdf8ab2d7
4 changed files with 21 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# Toshiba Electronic Devices & Storage Corporation TC956X PCIe Ethernet Host Driver
Release Date: 11 Jan 2022
Release Date: 18 Jan 2022
Release Version: V_01-00-35 : Limited-tested version
Release Version: V_01-00-36 : Limited-tested version
TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19".
@ -431,4 +431,8 @@ TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19".
## TC956X_Host_Driver_20220111_V_01-00-35:
1. Fixed phy mode support
2. Error return when no phy driver found during ISR work queue execution
2. Error return when no phy driver found during ISR work queue execution
## TC956X_Host_Driver_20220118_V_01-00-36:
1. IRQ device name modified to differentiate between WOL and EMAC interrupt IRQs

View File

@ -124,6 +124,8 @@
* 11 Jan 2022 : 1. Module parameter added to configure fixed phy mode
* 2. Version update.
* VERSION : 01-00-35
* 18 Jan 2022 : 1. Version update
* VERSION : 01-00-36
*/
#include <linux/clk-provider.h>
@ -188,7 +190,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, 5};
static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 3, 6};
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

@ -115,6 +115,9 @@
* VERSION : 01-00-34
* 11 Jan 2022 : 1. Version update
* VERSION : 01-00-35
* 18 Jan 2022 : 1. IRQ device name change
* 2. Version update
* VERSION : 01-00-36
*/
#ifndef __TC956XMAC_H__
@ -167,7 +170,10 @@
#ifdef TC956X
#define TC956X_RESOURCE_NAME "tc956x_pci-eth"
#define DRV_MODULE_VERSION "V_01-00-35"
#define IRQ_DEV_NAME(x) (((x) == RM_PF0_ID) ? ("eth0") : ("eth1"))
#define WOL_IRQ_DEV_NAME(x) (((x) == RM_PF0_ID) ? ("eth0_wol") : ("eth1_wol"))
#define DRV_MODULE_VERSION "V_01-00-36"
#define TC956X_FW_MAX_SIZE (64*1024)
#define ATR_AXI4_SLV_BASE 0x0800

View File

@ -97,6 +97,8 @@
* 11 Jan 2022 : 1. Fixed phymode support added
* 2. Error return when no phy driver found during ISR work queue execution
* VERSION : 01-00-35
* 18 Jan 2022 : 1. IRQ device name change
* VERSION : 01-00-36
*/
#include <linux/clk.h>
@ -4413,7 +4415,7 @@ static int tc956xmac_open(struct net_device *dev)
/* Request the IRQ lines */
ret = request_irq(dev->irq, tc956xmac_interrupt,
IRQF_NO_SUSPEND, dev->name, dev);
IRQF_NO_SUSPEND, IRQ_DEV_NAME(priv->port_num), dev);
if (unlikely(ret < 0)) {
netdev_err(priv->dev,
"%s: ERROR: allocating the IRQ %d (error: %d)\n",
@ -4426,7 +4428,7 @@ static int tc956xmac_open(struct net_device *dev)
/* Request the Wake IRQ in case of another line is used for WoL */
if (priv->wol_irq != dev->irq) {
ret = request_irq(priv->wol_irq, tc956xmac_wol_interrupt,
IRQF_NO_SUSPEND, dev->name, dev);
IRQF_NO_SUSPEND, WOL_IRQ_DEV_NAME(priv->port_num), dev);
if (unlikely(ret < 0)) {
netdev_err(priv->dev,
"%s: ERROR: allocating the WoL IRQ %d (%d)\n",