From d41713507eb822395b660417c8b7148d57b7a93e Mon Sep 17 00:00:00 2001 From: TC956X <56059496+TC956X@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:47:33 +0900 Subject: [PATCH] V_01-00-46 1. PCI bus info updated for ethtool get driver version. --- Readme.md | 7 +++++-- tc956x_pci.c | 4 +++- tc956xmac.h | 4 +++- tc956xmac_ethtool.c | 6 +++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index 9695b1d62a36..ba7ca5172df9 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ # Toshiba Electronic Devices & Storage Corporation TC956X PCIe Ethernet Host Driver -Release Date: 09 Mar 2022 +Release Date: 22 Mar 2022 -Release Version: V_01-00-45 : Limited-tested version +Release Version: V_01-00-46 : Limited-tested version TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19". @@ -476,3 +476,6 @@ TC956X PCIe EMAC driver is based on "Fedora 30, kernel-5.4.19". ## TC956X_Host_Driver_20220309_V_01-00-45: 1. Handling of Non S/W path DMA channel abnormal interrupts in Driver and only TI & RI interrupts handled in FW. 2. Reading MSI status for checking interrupt status of SW MSI. + +## TC956X_Host_Driver_20220322_V_01-00-46: +1. PCI bus info updated for ethtool get driver version. diff --git a/tc956x_pci.c b/tc956x_pci.c index dcc192862774..ad5108e93eeb 100644 --- a/tc956x_pci.c +++ b/tc956x_pci.c @@ -149,6 +149,8 @@ * VERSION : 01-00-44 * 09 Mar 2022 : 1. Version update * VERSION : 01-00-45 + * 22 Mar 2022 : 1. Version update + * VERSION : 01-00-46 */ #include @@ -213,7 +215,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, 4, 5}; +static const struct tc956x_version tc956x_drv_version = {0, 1, 0, 0, 4, 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. */ diff --git a/tc956xmac.h b/tc956xmac.h index a848544cb442..b95b86dbf537 100644 --- a/tc956xmac.h +++ b/tc956xmac.h @@ -139,6 +139,8 @@ * VERSION : 01-00-44 * 09 Mar 2022 : 1. Version update * VERSION : 01-00-45 + * 22 Mar 2022 : 1. Version update + * VERSION : 01-00-46 */ #ifndef __TC956XMAC_H__ @@ -194,7 +196,7 @@ #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-45" +#define DRV_MODULE_VERSION "V_01-00-46" #define TC956X_FW_MAX_SIZE (64*1024) #define ATR_AXI4_SLV_BASE 0x0800 diff --git a/tc956xmac_ethtool.c b/tc956xmac_ethtool.c index aa47b6ddc8c3..ca7d25947315 100644 --- a/tc956xmac_ethtool.c +++ b/tc956xmac_ethtool.c @@ -48,8 +48,10 @@ * VERSION : 01-00-24 * 10 Dec 2021 : 1. Added link partner pause frame count debug counters to ethtool statistics. * VERSION : 01-00-31 - * 04 Feb 2021 : 1. Ethtool statistics added to print doorbell SRAM area for all the channels. + * 04 Feb 2022 : 1. Ethtool statistics added to print doorbell SRAM area for all the channels. * VERSION : 01-00-41 + * 22 Mar 2022 : 1. PCI bus info updated for ethtool get driver version + * VERSION : 01-00-46 */ #include @@ -814,6 +816,7 @@ static void tc956xmac_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct tc956xmac_priv *priv = netdev_priv(dev); + struct pci_dev *pdev = to_pci_dev(priv->device); struct tc956x_version *fw_version; int reg = 0; char fw_version_str[32]; @@ -838,6 +841,7 @@ static void tc956xmac_ethtool_getdrvinfo(struct net_device *dev, sizeof(info->driver)); strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); + strlcpy(info->bus_info, pci_name(pdev), sizeof(info->bus_info)); info->n_priv_flags = TC956X_PRIV_FLAGS_STR_LEN; }