Skip to contentSkip to conversation

net: atlantic: Aquantia driver updates 2019-04

PATCH Superseded Igor Russkikh 3 participants 33 messages Apr 26, 2019 – Apr 27, 2019

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover net: atlantic: Aquantia driver updates 2019-04

This patchset contains various improvements:

- Work targeting link up speedups: link interrupt introduced, some other logic changes to imrove this.
- FW operations securing with mutex
- Counters and statistics logic improved by Dmitry
- read out of chip temperature via hwmon interface implemented by Yana and Nikita.

v3 changes:
- temp ops renamed to phy_temp ops
- mutex commits squashed for better structure

v2 changes:
- use threaded irq for link state handling
- rework hwmon via devm_hwmon_device_register_with_info Extra comments on review from Andrew:
- direct device name pointer is used in hwmon registration. This causes hwmon device to derive possible interface name changes
- Will consider sanity checks for firmware mutex lock separately. Right now there is no single point exsists where such check could be easily added.
- There is no way now to fetch and configure min/max/crit temperatures via FW. Will investigate this separately.

Dmitry Bogdanov (3):
net: aquantia: fetch up to date statistics on ethtool request
net: aquantia: get total counters from DMA block
net: aquantia: fixups on 64bit dma counters

Igor Russkikh (7):
net: aquantia: add link interrupt fields
net: aquantia: link interrupt handling function
net: aquantia: link status irq handling
net: aquantia: improve ifup link detection
net: aquantia: use macros for better visibility
net: aquantia: user correct MSI irq type
net: aquantia: extract timer cb into work job

Nikita Danilov (3):
net: aquantia: create global service workqueue
net: aquantia: introduce fwreq mutex
net: aquantia: remove outdated device ids

Yana Esina (2):
net: aquantia: add infrastructure to readout chip temperature
net: aquantia: implement hwmon api for chip temperature

 .../net/ethernet/aquantia/atlantic/Makefile   |   1 +
 .../ethernet/aquantia/atlantic/aq_common.h    |   3 -
 .../ethernet/aquantia/atlantic/aq_drvinfo.c   | 129 ++++++++++++++++++
 .../ethernet/aquantia/atlantic/aq_drvinfo.h   |  16 +++
 .../ethernet/aquantia/atlantic/aq_ethtool.c   |  22 ++-
 .../net/ethernet/aquantia/atlantic/aq_hw.h    |   4 +
 .../net/ethernet/aquantia/atlantic/aq_main.c  |  41 ++++++
 .../net/ethernet/aquantia/atlantic/aq_main.h  |   2 +
 .../net/ethernet/aquantia/atlantic/aq_nic.c   | 121 ++++++++++++----
 .../net/ethernet/aquantia/atlantic/aq_nic.h   |   6 +-
 .../ethernet/aquantia/atlantic/aq_pci_func.c  |  49 ++++---
 .../ethernet/aquantia/atlantic/aq_pci_func.h  |   7 +-
 .../aquantia/atlantic/hw_atl/hw_atl_a0.c      |   8 +-
 .../aquantia/atlantic/hw_atl/hw_atl_b0.c      |  13 +-
 .../aquantia/atlantic/hw_atl/hw_atl_b0.h      |   3 -
 .../aquantia/atlantic/hw_atl/hw_atl_llh.c     |   5 -
 .../aquantia/atlantic/hw_atl/hw_atl_llh.h     |   3 -
 .../atlantic/hw_atl/hw_atl_llh_internal.h     |   3 -
 .../aquantia/atlantic/hw_atl/hw_atl_utils.c   |  15 +-
 .../atlantic/hw_atl/hw_atl_utils_fw2x.c       |  36 +++++
 20 files changed, 407 insertions(+), 80 deletions(-)
 create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c
 create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/15 net: aquantia: add infrastructure to readout chip temperature

From: Yana Esina <[email protected]>

Ability to read the chip temperature from memory
via hwmon interface

---
 .../net/ethernet/aquantia/atlantic/aq_hw.h    |  2 ++
 .../aquantia/atlantic/hw_atl/hw_atl_utils.c   |  1 +
 .../atlantic/hw_atl/hw_atl_utils_fw2x.c       | 36 +++++++++++++++++++
 3 files changed, 39 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -0
index 81aab73dc22f..f1bc96c6f3b9 100644
@@ -259,6 +259,8 @@ struct aq_fw_ops {
 
 	int (*update_stats)(struct aq_hw_s *self);
 
+	int (*get_phy_temp)(struct aq_hw_s *self, int *temp);
+
 	u32 (*get_flow_control)(struct aq_hw_s *self, u32 *fcmode);
 
 	int (*set_flow_control)(struct aq_hw_s *self);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +1 -0
index eb4b99d56081..b521457434fc 100644
@@ -960,6 +960,7 @@ const struct aq_fw_ops aq_fw_1x_ops = {
 	.set_state = hw_atl_utils_mpi_set_state,
 	.update_link_status = hw_atl_utils_mpi_get_link_status,
 	.update_stats = hw_atl_utils_update_stats,
+	.get_phy_temp = NULL,
 	.set_power = aq_fw1x_set_power,
 	.set_eee_rate = NULL,
 	.get_eee_rate = NULL,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +36 -0
index fe6c5658e016..fbc9d6ac841f 100644
@@ -38,6 +38,7 @@
 #define HW_ATL_FW2X_CTRL_WOL              BIT(CTRL_WOL)
 #define HW_ATL_FW2X_CTRL_LINK_DROP        BIT(CTRL_LINK_DROP)
 #define HW_ATL_FW2X_CTRL_PAUSE            BIT(CTRL_PAUSE)
+#define HW_ATL_FW2X_CTRL_TEMPERATURE      BIT(CTRL_TEMPERATURE)
 #define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE)
 #define HW_ATL_FW2X_CTRL_FORCE_RECONNECT  BIT(CTRL_FORCE_RECONNECT)
 
@@ -310,6 +311,40 @@ static int aq_fw2x_update_stats(struct aq_hw_s *self)
 	return hw_atl_utils_update_stats(self);
 }
 
+static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)
+{
+	u32 mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);
+	u32 temp_val = mpi_opts & HW_ATL_FW2X_CTRL_TEMPERATURE;
+	u32 phy_temp_offset;
+	u32 temp_res;
+	int err = 0;
+	u32 val;
+
+	phy_temp_offset = self->mbox_addr +
+			  offsetof(struct hw_atl_utils_mbox, info) +
+			  offsetof(struct hw_aq_info, phy_temperature);
+	/* Toggle statistics bit for FW to 0x36C.18 (CTRL_TEMPERATURE) */
+	mpi_opts = mpi_opts ^ HW_ATL_FW2X_CTRL_TEMPERATURE;
+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);
+	/* Wait FW to report back */
+	err = readx_poll_timeout_atomic(aq_fw2x_state2_get, self, val,
+					temp_val !=
+					(val & HW_ATL_FW2X_CTRL_TEMPERATURE),
+					1U, 10000U);
+	err = hw_atl_utils_fw_downld_dwords(self, phy_temp_offset,
+					    &temp_res, 1);
+
+	if (err)
+		return err;
+
+	/* Convert PHY temperature from 1/256 degree Celsius
+	 * to 1/1000 degree Celsius.
+	 */
+	*temp = temp_res  * 1000 / 256;
+
+	return 0;
+}
+
 static int aq_fw2x_set_sleep_proxy(struct aq_hw_s *self, u8 *mac)
 {
 	struct hw_atl_utils_fw_rpc *rpc = NULL;
@@ -509,6 +544,7 @@ const struct aq_fw_ops aq_fw_2x_ops = {
 	.set_state = aq_fw2x_set_state,
 	.update_link_status = aq_fw2x_update_link_status,
 	.update_stats = aq_fw2x_update_stats,
+	.get_phy_temp = aq_fw2x_get_phy_temp,
 	.set_power = aq_fw2x_set_power,
 	.set_eee_rate = aq_fw2x_set_eee_rate,
 	.get_eee_rate = aq_fw2x_get_eee_rate,
Signature · 1 line
2.17.1
#3 lore raw

PATCH v3 2/15 net: aquantia: implement hwmon api for chip temperature

In reply to Igor Russkikh

From: Yana Esina <[email protected]>

Added support for hwmon api to fetch out chip temperature

---
 .../net/ethernet/aquantia/atlantic/Makefile   |   1 +
 .../ethernet/aquantia/atlantic/aq_drvinfo.c   | 129 ++++++++++++++++++
 .../ethernet/aquantia/atlantic/aq_drvinfo.h   |  16 +++
 .../ethernet/aquantia/atlantic/aq_pci_func.c  |   4 +
 4 files changed, 150 insertions(+)
 create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c
 create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h
drivers/net/ethernet/aquantia/atlantic/Makefile +1 -0
index 4556630ee286..1f99cf832476 100644
@@ -36,6 +36,7 @@ atlantic-objs := aq_main.o \
 	aq_ring.o \
 	aq_hw_utils.o \
 	aq_ethtool.o \
+	aq_drvinfo.o \
 	aq_filters.o \
 	hw_atl/hw_atl_a0.o \
 	hw_atl/hw_atl_b0.o \
drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c new file +129 -0

129 lines not on this page · raw message

drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h new file +16 -0
new file mode 100644
index 000000000000..4adb1f84f550
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* Copyright (C) 2014-2017 aQuantia Corporation. */
+
+/* File aq_drvinfo.h: Declaration of common code for firmware info in sys.*/
+
+#ifndef AQ_DRVINFO_H
+#define AQ_DRVINFO_H
+
+#include "aq_nic.h"
+#include "aq_hw.h"
+#include "hw_atl/hw_atl_utils.h"
+
+int aq_drvinfo_init(struct net_device *ndev);
+void aq_drvinfo_exit(struct net_device *ndev);
+
+#endif /* AQ_DRVINFO_H */
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +4 -0
index 0217ff4669a4..556b735e5a32 100644
@@ -20,6 +20,7 @@
 #include "hw_atl/hw_atl_a0.h"
 #include "hw_atl/hw_atl_b0.h"
 #include "aq_filters.h"
+#include "aq_drvinfo.h"
 
 static const struct pci_device_id aq_pci_tbl[] = {
 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_0001), },
@@ -289,6 +290,8 @@ static int aq_pci_probe(struct pci_dev *pdev,
 	if (err < 0)
 		goto err_register;
 
+	aq_drvinfo_init(ndev);
+
 	return 0;
 
 err_register:
@@ -317,6 +320,7 @@ static void aq_pci_remove(struct pci_dev *pdev)
 			unregister_netdev(self->ndev);
 		aq_nic_free_vectors(self);
 		aq_pci_free_irq_vectors(self);
+		aq_drvinfo_exit(self->ndev);
 		iounmap(self->aq_hw->mmio);
 		kfree(self->aq_hw);
 		pci_release_regions(pdev);
Signature · 1 line
2.17.1
Reviewed-by on v3 2/15
#4 lore raw

Re: [PATCH v3 net-next 02/15] net: aquantia: implement hwmon api for chip temperature

drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c line 129

Quoted 3 lines
drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c new file +3 -0
+void aq_drvinfo_exit(struct net_device *ndev)
+{
+}

Nit:

I don't think any of the other patches add anything to this. So i suggest killing it.

Andrew

#5 lore raw

Re: [PATCH v3 net-next 02/15] net: aquantia: implement hwmon api for chip temperature

Quoted 8 lines · Andrew Lunn

drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c line 129

Quoted 3 lines
drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c new file +3 -0
+void aq_drvinfo_exit(struct net_device *ndev)
+{
+}

Nit:

I don't think any of the other patches add anything to this. So i suggest killing it.

Ok, indeed. Will fix in v4

Thanks
Igor

#6 lore raw

PATCH v3 3/15 net: aquantia: add link interrupt fields

In reply to Igor Russkikh

Declare macroes and nic fields to support link interrupt handling

---
 drivers/net/ethernet/aquantia/atlantic/aq_hw.h  | 2 ++
 drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -0
index f1bc96c6f3b9..95fd6c852a9d 100644
@@ -88,6 +88,8 @@ struct aq_stats_s {
 #define AQ_HW_IRQ_MSI     2U
 #define AQ_HW_IRQ_MSIX    3U
 
+#define AQ_HW_SERVICE_IRQS   1U
+
 #define AQ_HW_POWER_STATE_D0   0U
 #define AQ_HW_POWER_STATE_D3   3U
 
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +2 -1
index b1372430f62f..0409cf5ca3ab 100644
@@ -26,7 +26,8 @@ struct aq_nic_cfg_s {
 	u64 features;
 	u32 rxds;		/* rx ring size, descriptors # */
 	u32 txds;		/* tx ring size, descriptors # */
-	u32 vecs;		/* vecs==allocated irqs */
+	u32 vecs;		/* allocated rx/tx vectors */
+	u32 link_irq_vec;
 	u32 irq_type;
 	u32 itr;
 	u16 rx_itr;
Signature · 1 line
2.17.1
#8 lore raw

PATCH v3 4/15 net: aquantia: link interrupt handling function

In reply to Igor Russkikh

Define link interrupt handler

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +14 -0
index 059df86e8e37..4851fc0a3ae5 100644
@@ -161,6 +161,20 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)
 	return 0;
 }
 
+static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)
+{
+	struct aq_nic_s *self = private;
+
+	if (!self)
+		return IRQ_NONE;
+
+	aq_nic_update_link_status(self);
+
+	self->aq_hw_ops->hw_irq_enable(self->aq_hw,
+				       BIT(self->aq_nic_cfg.link_irq_vec));
+	return IRQ_HANDLED;
+}
+
 static void aq_nic_service_timer_cb(struct timer_list *t)
 {
 	struct aq_nic_s *self = from_timer(self, t, service_timer);
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH v3 net-next 04/15] net: aquantia: link interrupt handling function

Quoted 17 lines · Igor Russkikh

Define link interrupt handler

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +1 -0
index 059df86e8e37..4851fc0a3ae5 100644
@@ -161,6 +161,20 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)
 	return 0;
 }
 
+static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)

drivers/net/ethernet/aquantia/atlantic/aq_nic.c static int aq_nic_update_link_status(struct aq_nic_s *self) · line 174

Quoted 10 lines
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +10 -0
+{
+	struct aq_nic_s *self = private;
+
+	if (!self)
+		return IRQ_NONE;
+
+	aq_nic_update_link_status(self);
+
+	self->aq_hw_ops->hw_irq_enable(self->aq_hw,
+				       BIT(self->aq_nic_cfg.link_irq_vec));

So does this mean the hardware disables interrupts when they fire? Is this an ack, not an enable?

Can you loose interrupts this way? Or are the internally level interrupts, so it could immediately fire again if the source has not been services?

Thanks
Andrew

#10 lore raw

Re: [PATCH v3 net-next 04/15] net: aquantia: link interrupt handling function

Quoted 15 lines

drivers/net/ethernet/aquantia/atlantic/aq_nic.c static int aq_nic_update_link_status(struct aq_nic_s *self) · line 174

Quoted 12 lines
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +11 -0
+static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)
+{
+	struct aq_nic_s *self = private;
+
+	if (!self)
+		return IRQ_NONE;
+
+	aq_nic_update_link_status(self);
+
+	self->aq_hw_ops->hw_irq_enable(self->aq_hw,
+				       BIT(self->aq_nic_cfg.link_irq_vec));

So does this mean the hardware disables interrupts when they fire? Is this an ack, not an enable?

Right, hw has a feature of interrupts automasking on trigger. This is essentially an unmasking operation.

Quoted 3 lines

Can you loose interrupts this way? Or are the internally level interrupts, so it could immediately fire again if the source has not been services?

Pending masked ISR will trigger as soon as we enable it again. So it won't be lost.

Regards,
Igor

#11 lore raw

PATCH v3 5/15 net: aquantia: create global service workqueue

In reply to Igor Russkikh

From: Nikita Danilov <[email protected]>

We need this to schedule link interrupt handling and various service tasks.

---
 .../net/ethernet/aquantia/atlantic/aq_main.c  | 41 +++++++++++++++++++
 .../net/ethernet/aquantia/atlantic/aq_main.h  |  2 +
 .../ethernet/aquantia/atlantic/aq_pci_func.c  | 11 ++++-
 .../ethernet/aquantia/atlantic/aq_pci_func.h  |  3 ++
 4 files changed, 56 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_main.c +41 -0
index 2a11c1eefd8f..7f45e9908582 100644
@@ -23,8 +23,17 @@ MODULE_VERSION(AQ_CFG_DRV_VERSION);
 MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR);
 MODULE_DESCRIPTION(AQ_CFG_DRV_DESC);
 
+const char aq_ndev_driver_name[] = AQ_CFG_DRV_NAME;
+
 static const struct net_device_ops aq_ndev_ops;
 
+static struct workqueue_struct *aq_ndev_wq;
+
+void aq_ndev_schedule_work(struct work_struct *work)
+{
+	queue_work(aq_ndev_wq, work);
+}
+
 struct net_device *aq_ndev_alloc(void)
 {
 	struct net_device *ndev = NULL;
@@ -209,3 +218,35 @@ static const struct net_device_ops aq_ndev_ops = {
 	.ndo_vlan_rx_add_vid = aq_ndo_vlan_rx_add_vid,
 	.ndo_vlan_rx_kill_vid = aq_ndo_vlan_rx_kill_vid,
 };
+
+static int __init aq_ndev_init_module(void)
+{
+	int ret;
+
+	aq_ndev_wq = create_singlethread_workqueue(aq_ndev_driver_name);
+	if (!aq_ndev_wq) {
+		pr_err("Failed to create workqueue\n");
+		return -ENOMEM;
+	}
+
+	ret = aq_pci_func_register_driver();
+	if (ret) {
+		destroy_workqueue(aq_ndev_wq);
+		return ret;
+	}
+
+	return 0;
+}
+
+static void __exit aq_ndev_exit_module(void)
+{
+	aq_pci_func_unregister_driver();
+
+	if (aq_ndev_wq) {
+		destroy_workqueue(aq_ndev_wq);
+		aq_ndev_wq = NULL;
+	}
+}
+
+module_init(aq_ndev_init_module);
+module_exit(aq_ndev_exit_module);
drivers/net/ethernet/aquantia/atlantic/aq_main.h +2 -0
index ce92152eb43e..5448b82fb7ea 100644
@@ -13,7 +13,9 @@
 #define AQ_MAIN_H
 
 #include "aq_common.h"
+#include "aq_nic.h"
 
+void aq_ndev_schedule_work(struct work_struct *work);
 struct net_device *aq_ndev_alloc(void);
 
 #endif /* AQ_MAIN_H */
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +10 -1
index 556b735e5a32..151efd8f21d8 100644
@@ -369,4 +369,13 @@ static struct pci_driver aq_pci_ops = {
 	.shutdown = aq_pci_shutdown,
 };
 
-module_pci_driver(aq_pci_ops);
+int aq_pci_func_register_driver(void)
+{
+	return pci_register_driver(&aq_pci_ops);
+}
+
+void aq_pci_func_unregister_driver(void)
+{
+	pci_unregister_driver(&aq_pci_ops);
+}
+
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h +3 -0
index aeee67bf69fa..799c5e0d653b 100644
@@ -29,4 +29,7 @@ int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,
 void aq_pci_func_free_irqs(struct aq_nic_s *self);
 unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self);
 
+int aq_pci_func_register_driver(void);
+void aq_pci_func_unregister_driver(void);
+
 #endif /* AQ_PCI_FUNC_H */
Signature · 1 line
2.17.1
#13 lore raw

PATCH v3 6/15 net: aquantia: link status irq handling

In reply to Igor Russkikh

Here we define and request an extra interrupt line, assign it on link isr handler and restructure abit aq_pci code to better support that.

We also remove logic for using different timer intervals depending on link state, since thats now useless.

---
 .../net/ethernet/aquantia/atlantic/aq_nic.c   | 36 ++++++++++++++-----
 .../ethernet/aquantia/atlantic/aq_pci_func.c  | 24 ++++++++-----
 .../ethernet/aquantia/atlantic/aq_pci_func.h  |  4 +--
 .../aquantia/atlantic/hw_atl/hw_atl_b0.c      |  5 +++
 4 files changed, 50 insertions(+), 19 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +27 -9
index 4851fc0a3ae5..0251566b66af 100644
@@ -14,6 +14,7 @@
 #include "aq_vec.h"
 #include "aq_hw.h"
 #include "aq_pci_func.h"
+#include "aq_main.h"
 
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
@@ -92,7 +93,8 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
 	/*rss rings */
 	cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF);
 	cfg->vecs = min(cfg->vecs, num_online_cpus());
-	cfg->vecs = min(cfg->vecs, self->irqvecs);
+	if (self->irqvecs > AQ_HW_SERVICE_IRQS)
+		cfg->vecs = min(cfg->vecs, self->irqvecs - AQ_HW_SERVICE_IRQS);
 	/* cfg->vecs should be power of 2 for RSS */
 	if (cfg->vecs >= 8U)
 		cfg->vecs = 8U;
@@ -116,6 +118,15 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
 		cfg->vecs = 1U;
 	}
 
+	/* Check if we have enough vectors allocated for
+	 * link status IRQ. If no - we'll know link state from
+	 * slower service task.
+	 */
+	if (AQ_HW_SERVICE_IRQS > 0 && cfg->vecs + 1 <= self->irqvecs)
+		cfg->link_irq_vec = cfg->vecs;
+	else
+		cfg->link_irq_vec = 0;
+
 	cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk;
 	cfg->features = cfg->aq_hw_caps->hw_features;
 }
@@ -178,7 +189,6 @@ static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)
 static void aq_nic_service_timer_cb(struct timer_list *t)
 {
 	struct aq_nic_s *self = from_timer(self, t, service_timer);
-	int ctimer = AQ_CFG_SERVICE_TIMER_INTERVAL;
 	int err = 0;
 
 	if (aq_utils_obj_test(&self->flags, AQ_NIC_FLAGS_IS_NOT_READY))
@@ -193,12 +203,8 @@ static void aq_nic_service_timer_cb(struct timer_list *t)
 
 	aq_nic_update_ndev_stats(self);
 
-	/* If no link - use faster timer rate to detect link up asap */
-	if (!netif_carrier_ok(self->ndev))
-		ctimer = max(ctimer / 2, 1);
-
 err_exit:
-	mod_timer(&self->service_timer, jiffies + ctimer);
+	mod_timer(&self->service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);
 }
 
 static void aq_nic_polling_timer_cb(struct timer_list *t)
@@ -359,13 +365,25 @@ int aq_nic_start(struct aq_nic_s *self)
 	} else {
 		for (i = 0U, aq_vec = self->aq_vec[0];
 			self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) {
-			err = aq_pci_func_alloc_irq(self, i,
-						    self->ndev->name, aq_vec,
+			err = aq_pci_func_alloc_irq(self, i, self->ndev->name,
+						    aq_vec_isr, aq_vec,
 						    aq_vec_get_affinity_mask(aq_vec));
 			if (err < 0)
 				goto err_exit;
 		}
 
+		if (self->aq_nic_cfg.link_irq_vec) {
+			int irqvec = pci_irq_vector(self->pdev,
+						   self->aq_nic_cfg.link_irq_vec);
+			err = request_threaded_irq(irqvec, NULL,
+						   aq_linkstate_threaded_isr,
+						   IRQF_SHARED,
+						   self->ndev->name, self);
+			if (err < 0)
+				goto err_exit;
+			self->msix_entry_mask |= (1 << self->aq_nic_cfg.link_irq_vec);
+		}
+
 		err = self->aq_hw_ops->hw_irq_enable(self->aq_hw,
 						     AQ_CFG_IRQ_MASK);
 		if (err < 0)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +16 -8
index 151efd8f21d8..9cb8dc7656aa 100644
@@ -140,26 +140,27 @@ int aq_pci_func_init(struct pci_dev *pdev)
 }
 
 int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,
-			  char *name, void *aq_vec, cpumask_t *affinity_mask)
+			  char *name, irq_handler_t irq_handler,
+			  void *irq_arg, cpumask_t *affinity_mask)
 {
 	struct pci_dev *pdev = self->pdev;
 	int err;
 
 	if (pdev->msix_enabled || pdev->msi_enabled)
-		err = request_irq(pci_irq_vector(pdev, i), aq_vec_isr, 0,
-				  name, aq_vec);
+		err = request_irq(pci_irq_vector(pdev, i), irq_handler, 0,
+				  name, irq_arg);
 	else
 		err = request_irq(pci_irq_vector(pdev, i), aq_vec_isr_legacy,
-				  IRQF_SHARED, name, aq_vec);
+				  IRQF_SHARED, name, irq_arg);
 
 	if (err >= 0) {
 		self->msix_entry_mask |= (1 << i);
-		self->aq_vec[i] = aq_vec;
 
-		if (pdev->msix_enabled)
+		if (pdev->msix_enabled && affinity_mask)
 			irq_set_affinity_hint(pci_irq_vector(pdev, i),
 					      affinity_mask);
 	}
+
 	return err;
 }
 
@@ -167,16 +168,22 @@ void aq_pci_func_free_irqs(struct aq_nic_s *self)
 {
 	struct pci_dev *pdev = self->pdev;
 	unsigned int i;
+	void *irq_data;
 
 	for (i = 32U; i--;) {
 		if (!((1U << i) & self->msix_entry_mask))
 			continue;
-		if (i >= AQ_CFG_VECS_MAX)
+		if (self->aq_nic_cfg.link_irq_vec &&
+		    i == self->aq_nic_cfg.link_irq_vec)
+			irq_data = self;
+		else if (i < AQ_CFG_VECS_MAX)
+			irq_data = self->aq_vec[i];
+		else
 			continue;
 
 		if (pdev->msix_enabled)
 			irq_set_affinity_hint(pci_irq_vector(pdev, i), NULL);
-		free_irq(pci_irq_vector(pdev, i), self->aq_vec[i]);
+		free_irq(pci_irq_vector(pdev, i), irq_data);
 		self->msix_entry_mask &= ~(1U << i);
 	}
 }
@@ -269,6 +276,7 @@ static int aq_pci_probe(struct pci_dev *pdev,
 	numvecs = min((u8)AQ_CFG_VECS_DEF,
 		      aq_nic_get_cfg(self)->aq_hw_caps->msix_irqs);
 	numvecs = min(numvecs, num_online_cpus());
+	numvecs += AQ_HW_SERVICE_IRQS;
 	/*enable interrupts */
 #if !AQ_CFG_FORCE_LEGACY_INT
 	err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h +2 -2
index 799c5e0d653b..670f9a940d65 100644
@@ -24,8 +24,8 @@ struct aq_board_revision_s {
 
 int aq_pci_func_init(struct pci_dev *pdev);
 int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,
-			  char *name, void *aq_vec,
-			  cpumask_t *affinity_mask);
+			  char *name, irq_handler_t irq_handler,
+			  void *irq_arg, cpumask_t *affinity_mask);
 void aq_pci_func_free_irqs(struct aq_nic_s *self);
 unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self);
 
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +5 -0
index 7e95804e2180..d54566bab0e9 100644
@@ -443,6 +443,11 @@ static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)
 				   ((HW_ATL_B0_ERR_INT << 0x18) | (1U << 0x1F)) |
 			    ((HW_ATL_B0_ERR_INT << 0x10) | (1U << 0x17)), 0U);
 
+	/* Enable link interrupt */
+	if (aq_nic_cfg->link_irq_vec)
+		hw_atl_reg_gen_irq_map_set(self, BIT(7) |
+					   aq_nic_cfg->link_irq_vec, 3U);
+
 	hw_atl_b0_hw_offload_set(self, aq_nic_cfg);
 
 err_exit:
Signature · 1 line
2.17.1
Reviewed-by on v3 6/15
#14 lore raw

Re: [PATCH v3 net-next 06/15] net: aquantia: link status irq handling

drivers/net/ethernet/aquantia/atlantic/aq_nic.c int aq_nic_start(struct aq_nic_s *self) · line 381

Quoted 7 lines
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +7 -0
+		if (self->aq_nic_cfg.link_irq_vec) {
+			int irqvec = pci_irq_vector(self->pdev,
+						   self->aq_nic_cfg.link_irq_vec);
+			err = request_threaded_irq(irqvec, NULL,
+						   aq_linkstate_threaded_isr,
+						   IRQF_SHARED,
+						   self->ndev->name, self);

At some point you should consider using the devm_* API. It will make your cleanup code simpler.

Andrew

#15 lore raw

PATCH v3 7/15 net: aquantia: improve ifup link detection

In reply to Igor Russkikh

Original code detected link only after 1 sec is passed after up. Here we replace this with direct service callback which updates link status immediately

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +1 -2
index 0251566b66af..6de0d1c0ed79 100644
@@ -355,8 +355,7 @@ int aq_nic_start(struct aq_nic_s *self)
 	if (err)
 		goto err_exit;
 	timer_setup(&self->service_timer, aq_nic_service_timer_cb, 0);
-	mod_timer(&self->service_timer, jiffies +
-		  AQ_CFG_SERVICE_TIMER_INTERVAL);
+	aq_nic_service_timer_cb(&self->service_timer);
 
 	if (self->aq_nic_cfg.is_polling) {
 		timer_setup(&self->polling_timer, aq_nic_polling_timer_cb, 0);
Signature · 1 line
2.17.1
#16 lore raw

PATCH v3 8/15 net: aquantia: use macros for better visibility

In reply to Igor Russkikh

Improve for better readability

---
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 8 ++++----
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +4 -4
index 65ffaa7ad69e..9fe507fe2d7f 100644
@@ -350,10 +350,10 @@ static int hw_atl_a0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr)
 static int hw_atl_a0_hw_init(struct aq_hw_s *self, u8 *mac_addr)
 {
 	static u32 aq_hw_atl_igcr_table_[4][2] = {
-		{ 0x20000000U, 0x20000000U }, /* AQ_IRQ_INVALID */
-		{ 0x20000080U, 0x20000080U }, /* AQ_IRQ_LEGACY */
-		{ 0x20000021U, 0x20000025U }, /* AQ_IRQ_MSI */
-		{ 0x20000022U, 0x20000026U }  /* AQ_IRQ_MSIX */
+		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },
+		[AQ_HW_IRQ_LEGACY]  = { 0x20000080U, 0x20000080U },
+		[AQ_HW_IRQ_MSI]     = { 0x20000021U, 0x20000025U },
+		[AQ_HW_IRQ_MSIX]    = { 0x20000022U, 0x20000026U },
 	};
 
 	int err = 0;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +4 -4
index d54566bab0e9..bfcda12d73de 100644
@@ -388,10 +388,10 @@ static int hw_atl_b0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr)
 static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)
 {
 	static u32 aq_hw_atl_igcr_table_[4][2] = {
-		{ 0x20000000U, 0x20000000U }, /* AQ_IRQ_INVALID */
-		{ 0x20000080U, 0x20000080U }, /* AQ_IRQ_LEGACY */
-		{ 0x20000021U, 0x20000025U }, /* AQ_IRQ_MSI */
-		{ 0x20000022U, 0x20000026U }  /* AQ_IRQ_MSIX */
+		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },
+		[AQ_HW_IRQ_LEGACY]  = { 0x20000080U, 0x20000080U },
+		[AQ_HW_IRQ_MSI]     = { 0x20000021U, 0x20000025U },
+		[AQ_HW_IRQ_MSIX]    = { 0x20000022U, 0x20000026U },
 	};
 
 	int err = 0;
Signature · 1 line
2.17.1
#18 lore raw

PATCH v3 9/15 net: aquantia: user correct MSI irq type

In reply to Igor Russkikh

Typo in msi code. No much impact though.

---
 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +1 -1
index 9cb8dc7656aa..961e9777e66b 100644
@@ -193,7 +193,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)
 	if (self->pdev->msix_enabled)
 		return AQ_HW_IRQ_MSIX;
 	if (self->pdev->msi_enabled)
-		return AQ_HW_IRQ_MSIX;
+		return AQ_HW_IRQ_MSI;
 	return AQ_HW_IRQ_LEGACY;
 }
 
Signature · 1 line
2.17.1
#20 lore raw

PATCH v3 10/15 net: aquantia: introduce fwreq mutex

In reply to Igor Russkikh

From: Nikita Danilov <[email protected]>

Some of FW operations could be invoked simultaneously, from f.e. ethtool context and from service service activity work. Here we introduce a fw mutex to secure and serialize access to FW logic.

---
 .../ethernet/aquantia/atlantic/aq_ethtool.c   | 22 +++++++++++++---
 .../net/ethernet/aquantia/atlantic/aq_nic.c   | 26 ++++++++++++++-----
 .../net/ethernet/aquantia/atlantic/aq_nic.h   |  2 ++
 .../ethernet/aquantia/atlantic/aq_pci_func.c  |  2 ++
 4 files changed, 42 insertions(+), 10 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +18 -4
index a718d7a1f76c..79da48094770 100644
@@ -405,8 +405,10 @@ static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_eee *eee)
 	if (!aq_nic->aq_fw_ops->get_eee_rate)
 		return -EOPNOTSUPP;
 
+	mutex_lock(&aq_nic->fwreq_mutex);
 	err = aq_nic->aq_fw_ops->get_eee_rate(aq_nic->aq_hw, &rate,
 					      &supported_rates);
+	mutex_unlock(&aq_nic->fwreq_mutex);
 	if (err < 0)
 		return err;
 
@@ -439,8 +441,10 @@ static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_eee *eee)
 		     !aq_nic->aq_fw_ops->set_eee_rate))
 		return -EOPNOTSUPP;
 
+	mutex_lock(&aq_nic->fwreq_mutex);
 	err = aq_nic->aq_fw_ops->get_eee_rate(aq_nic->aq_hw, &rate,
 					      &supported_rates);
+	mutex_unlock(&aq_nic->fwreq_mutex);
 	if (err < 0)
 		return err;
 
@@ -452,20 +456,28 @@ static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_eee *eee)
 		cfg->eee_speeds = 0;
 	}
 
-	return aq_nic->aq_fw_ops->set_eee_rate(aq_nic->aq_hw, rate);
+	mutex_lock(&aq_nic->fwreq_mutex);
+	err = aq_nic->aq_fw_ops->set_eee_rate(aq_nic->aq_hw, rate);
+	mutex_unlock(&aq_nic->fwreq_mutex);
+
+	return err;
 }
 
 static int aq_ethtool_nway_reset(struct net_device *ndev)
 {
 	struct aq_nic_s *aq_nic = netdev_priv(ndev);
+	int err = 0;
 
 	if (unlikely(!aq_nic->aq_fw_ops->renegotiate))
 		return -EOPNOTSUPP;
 
-	if (netif_running(ndev))
-		return aq_nic->aq_fw_ops->renegotiate(aq_nic->aq_hw);
+	if (netif_running(ndev)) {
+		mutex_lock(&aq_nic->fwreq_mutex);
+		err = aq_nic->aq_fw_ops->renegotiate(aq_nic->aq_hw);
+		mutex_unlock(&aq_nic->fwreq_mutex);
+	}
 
-	return 0;
+	return err;
 }
 
 static void aq_ethtool_get_pauseparam(struct net_device *ndev,
@@ -503,7 +515,9 @@ static int aq_ethtool_set_pauseparam(struct net_device *ndev,
 	else
 		aq_nic->aq_hw->aq_nic_cfg->flow_control &= ~AQ_NIC_FC_TX;
 
+	mutex_lock(&aq_nic->fwreq_mutex);
 	err = aq_nic->aq_fw_ops->set_flow_control(aq_nic->aq_hw);
+	mutex_unlock(&aq_nic->fwreq_mutex);
 
 	return err;
 }
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +20 -6
index 6de0d1c0ed79..b038e2e9af3a 100644
@@ -234,8 +234,10 @@ int aq_nic_ndev_register(struct aq_nic_s *self)
 	if (err)
 		goto err_exit;
 
+	mutex_lock(&self->fwreq_mutex);
 	err = self->aq_fw_ops->get_mac_permanent(self->aq_hw,
 			    self->ndev->dev_addr);
+	mutex_unlock(&self->fwreq_mutex);
 	if (err)
 		goto err_exit;
 
@@ -304,7 +306,9 @@ int aq_nic_init(struct aq_nic_s *self)
 	unsigned int i = 0U;
 
 	self->power_state = AQ_HW_POWER_STATE_D0;
+	mutex_lock(&self->fwreq_mutex);
 	err = self->aq_hw_ops->hw_reset(self->aq_hw);
+	mutex_unlock(&self->fwreq_mutex);
 	if (err < 0)
 		goto err_exit;
 
@@ -871,7 +875,9 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,
 		self->aq_nic_cfg.is_autoneg = false;
 	}
 
+	mutex_lock(&self->fwreq_mutex);
 	err = self->aq_fw_ops->set_link_speed(self->aq_hw, rate);
+	mutex_unlock(&self->fwreq_mutex);
 	if (err < 0)
 		goto err_exit;
 
@@ -931,14 +937,22 @@ void aq_nic_deinit(struct aq_nic_s *self)
 		self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])
 		aq_vec_deinit(aq_vec);
 
-	self->aq_fw_ops->deinit(self->aq_hw);
+	if (likely(self->aq_fw_ops->deinit)) {
+		mutex_lock(&self->fwreq_mutex);
+		self->aq_fw_ops->deinit(self->aq_hw);
+		mutex_unlock(&self->fwreq_mutex);
+	}
 
 	if (self->power_state != AQ_HW_POWER_STATE_D0 ||
-	    self->aq_hw->aq_nic_cfg->wol) {
-		self->aq_fw_ops->set_power(self->aq_hw,
-					   self->power_state,
-					   self->ndev->dev_addr);
-	}
+	    self->aq_hw->aq_nic_cfg->wol)
+		if (likely(self->aq_fw_ops->set_power)) {
+			mutex_lock(&self->fwreq_mutex);
+			self->aq_fw_ops->set_power(self->aq_hw,
+						   self->power_state,
+						   self->ndev->dev_addr);
+			mutex_unlock(&self->fwreq_mutex);
+		}
+
 
 err_exit:;
 }
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +2 -0
index 0409cf5ca3ab..be56ace6274b 100644
@@ -105,6 +105,8 @@ struct aq_nic_s {
 	struct pci_dev *pdev;
 	unsigned int msix_entry_mask;
 	u32 irqvecs;
+	/* mutex to serialize FW interface access operations */
+	struct mutex fwreq_mutex;
 	struct aq_hw_rx_fltrs_s aq_hw_rx_fltrs;
 };
 
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +2 -0
index 961e9777e66b..a607e25dfbff 100644
@@ -231,6 +231,8 @@ static int aq_pci_probe(struct pci_dev *pdev,
 	SET_NETDEV_DEV(ndev, &pdev->dev);
 	pci_set_drvdata(pdev, self);
 
+	mutex_init(&self->fwreq_mutex);
+
 	err = aq_pci_probe_get_hw_by_id(pdev, &self->aq_hw_ops,
 					&aq_nic_get_cfg(self)->aq_hw_caps);
 	if (err)
Signature · 1 line
2.17.1
Reviewed-by on v3 10/15
#21 lore raw

Re: [PATCH v3 net-next 10/15] net: aquantia: introduce fwreq mutex

Quoted 9 lines · Igor Russkikh

From: Nikita Danilov <[email protected]>

Some of FW operations could be invoked simultaneously, from f.e. ethtool context and from service service activity work. Here we introduce a fw mutex to secure and serialize access to FW logic.

I still think it would be a good idea to put in the low level code a check that the mutex is actually held when talking to the firmware.

Andrew

#22 lore raw

Re: [PATCH v3 net-next 10/15] net: aquantia: introduce fwreq mutex

Quoted 8 lines · Andrew Lunn
Quoted 7 lines · Igor Russkikh

From: Nikita Danilov <[email protected]>

Some of FW operations could be invoked simultaneously, from f.e. ethtool context and from service service activity work. Here we introduce a fw mutex to secure and serialize access to FW logic.

Quoted 5 lines
Quoted 2 lines

I still think it would be a good idea to put in the low level code a check that the mutex is actually held when talking to the firmware.

Will do that separately after extra investigation and evaluation.

Igor

#23 lore raw

PATCH v3 11/15 net: aquantia: extract timer cb into work job

In reply to Igor Russkikh

Service timer callback fetches statistics from FW and that may cause a long delay in error cases. We also now need to use fw mutex to prevent concurrent access to FW, thus - extract that logic from timer callback into the job in the separate work queue.

---
 .../net/ethernet/aquantia/atlantic/aq_nic.c   | 25 ++++++++++++++-----
 .../net/ethernet/aquantia/atlantic/aq_nic.h   |  1 +
 2 files changed, 20 insertions(+), 6 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +19 -6
index b038e2e9af3a..454a44bb148e 100644
@@ -186,25 +186,34 @@ static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)
 	return IRQ_HANDLED;
 }
 
-static void aq_nic_service_timer_cb(struct timer_list *t)
+static void aq_nic_service_task(struct work_struct *work)
 {
-	struct aq_nic_s *self = from_timer(self, t, service_timer);
-	int err = 0;
+	struct aq_nic_s *self = container_of(work, struct aq_nic_s,
+					     service_task);
+	int err;
 
 	if (aq_utils_obj_test(&self->flags, AQ_NIC_FLAGS_IS_NOT_READY))
-		goto err_exit;
+		return;
 
 	err = aq_nic_update_link_status(self);
 	if (err)
-		goto err_exit;
+		return;
 
+	mutex_lock(&self->fwreq_mutex);
 	if (self->aq_fw_ops->update_stats)
 		self->aq_fw_ops->update_stats(self->aq_hw);
+	mutex_unlock(&self->fwreq_mutex);
 
 	aq_nic_update_ndev_stats(self);
+}
+
+static void aq_nic_service_timer_cb(struct timer_list *t)
+{
+	struct aq_nic_s *self = from_timer(self, t, service_timer);
 
-err_exit:
 	mod_timer(&self->service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);
+
+	aq_ndev_schedule_work(&self->service_task);
 }
 
 static void aq_nic_polling_timer_cb(struct timer_list *t)
@@ -358,6 +367,9 @@ int aq_nic_start(struct aq_nic_s *self)
 	err = aq_nic_update_interrupt_moderation_settings(self);
 	if (err)
 		goto err_exit;
+
+	INIT_WORK(&self->service_task, aq_nic_service_task);
+
 	timer_setup(&self->service_timer, aq_nic_service_timer_cb, 0);
 	aq_nic_service_timer_cb(&self->service_timer);
 
@@ -910,6 +922,7 @@ int aq_nic_stop(struct aq_nic_s *self)
 	netif_carrier_off(self->ndev);
 
 	del_timer_sync(&self->service_timer);
+	cancel_work_sync(&self->service_task);
 
 	self->aq_hw_ops->hw_irq_disable(self->aq_hw, AQ_CFG_IRQ_MASK);
 
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +1 -0
index be56ace6274b..c03d38ed105d 100644
@@ -93,6 +93,7 @@ struct aq_nic_s {
 	const struct aq_fw_ops *aq_fw_ops;
 	struct aq_nic_cfg_s aq_nic_cfg;
 	struct timer_list service_timer;
+	struct work_struct service_task;
 	struct timer_list polling_timer;
 	struct aq_hw_link_status_s link_status;
 	struct {
Signature · 1 line
2.17.1
#24 lore raw

PATCH v3 12/15 net: aquantia: fetch up to date statistics on ethtool request

In reply to Igor Russkikh

From: Dmitry Bogdanov <[email protected]>

This improves ethtool -S usage, where stats are now actual on each request. Before that stats only were updated at service timer period.

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +9 -1
index 454a44bb148e..1893ba7fcd2b 100644
@@ -700,7 +700,15 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
 	unsigned int i = 0U;
 	unsigned int count = 0U;
 	struct aq_vec_s *aq_vec = NULL;
-	struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);
+	struct aq_stats_s *stats;
+
+	if (self->aq_fw_ops->update_stats) {
+		mutex_lock(&self->fwreq_mutex);
+		self->aq_fw_ops->update_stats(self->aq_hw);
+		mutex_unlock(&self->fwreq_mutex);
+	}
+	stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);
+
 
 	if (!stats)
 		goto err_exit;
Signature · 1 line
2.17.1
#25 lore raw

Re: [PATCH v3 net-next 12/15] net: aquantia: fetch up to date statistics on ethtool request

Quoted 22 lines · Igor Russkikh

From: Dmitry Bogdanov <[email protected]>

This improves ethtool -S usage, where stats are now actual on each request. Before that stats only were updated at service timer period.

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +0 -1
index 454a44bb148e..1893ba7fcd2b 100644
@@ -700,7 +700,15 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
 	unsigned int i = 0U;
 	unsigned int count = 0U;
 	struct aq_vec_s *aq_vec = NULL;
-	struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);

drivers/net/ethernet/aquantia/atlantic/aq_nic.c void aq_nic_get_stats(struct aq_nic_s *self, u64 *data) · line 712

Quoted 10 lines
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +9 -0
+	struct aq_stats_s *stats;
+
+	if (self->aq_fw_ops->update_stats) {
+		mutex_lock(&self->fwreq_mutex);
+		self->aq_fw_ops->update_stats(self->aq_hw);
+		mutex_unlock(&self->fwreq_mutex);
+	}
+	stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);
+
 

nit: unnecessary empty line here.

BTW the mutex/wq patches look good now, thanks!

Quoted 2 lines
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +0 -0
 	if (!stats)
 		goto err_exit;
#26 lore raw

PATCH v3 13/15 net: aquantia: get total counters from DMA block

In reply to Igor Russkikh

From: Dmitry Bogdanov <[email protected]>

aq_nic_update_ndev_stats pushes statistics to ndev->stats from system interface. This is not always good because it counts packets/bytes before any of rx filters (including mac filter).

Its better to report the packet/bytes statistics from DMA counters which gives actual values of data transferred over pci. System level stats is still available via ethtool.

---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +5 -4
index 1893ba7fcd2b..b94c58bf1d2f 100644
@@ -754,11 +754,12 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self)
 	struct net_device *ndev = self->ndev;
 	struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);
 
-	ndev->stats.rx_packets = stats->uprc + stats->mprc + stats->bprc;
-	ndev->stats.rx_bytes = stats->ubrc + stats->mbrc + stats->bbrc;
+	ndev->stats.rx_packets = stats->dma_pkt_rc;
+	ndev->stats.rx_bytes = stats->dma_oct_rc;
 	ndev->stats.rx_errors = stats->erpr;
-	ndev->stats.tx_packets = stats->uptc + stats->mptc + stats->bptc;
-	ndev->stats.tx_bytes = stats->ubtc + stats->mbtc + stats->bbtc;
+	ndev->stats.rx_dropped = stats->dpc;
+	ndev->stats.tx_packets = stats->dma_pkt_tc;
+	ndev->stats.tx_bytes = stats->dma_oct_tc;
 	ndev->stats.tx_errors = stats->erpt;
 	ndev->stats.multicast = stats->mprc;
 }
Signature · 1 line
2.17.1
#27 lore raw

PATCH v3 14/15 net: aquantia: fixups on 64bit dma counters

In reply to Igor Russkikh

From: Dmitry Bogdanov <[email protected]>

DMA counters are 64 bit and we can fetch that to reduce counter overflow, espesially on byte counters.

---
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c |  5 -----
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h |  3 ---
 .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h |  3 ---
 .../aquantia/atlantic/hw_atl/hw_atl_utils.c        | 14 +++++++++-----
 4 files changed, 9 insertions(+), 16 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +0 -5
index 9442deff98a8..9876122991a7 100644
@@ -49,11 +49,6 @@ u32 hw_atl_glb_soft_res_get(struct aq_hw_s *aq_hw)
 				  HW_ATL_GLB_SOFT_RES_SHIFT);
 }
 
-u32 hw_atl_reg_rx_dma_stat_counter7get(struct aq_hw_s *aq_hw)
-{
-	return aq_hw_read_reg(aq_hw, HW_ATL_RX_DMA_STAT_COUNTER7_ADR);
-}
-
 u32 hw_atl_reg_glb_mif_id_get(struct aq_hw_s *aq_hw)
 {
 	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MIF_ID_ADR);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +0 -3
index 4cfa4bd80ad3..3cef151633d4 100644
@@ -82,9 +82,6 @@ u32 hw_atl_reg_mac_msm_rx_bcst_octets_counter1get(struct aq_hw_s *aq_hw);
 /* get msm rx unicast octets counter register 0 */
 u32 hw_atl_reg_mac_msm_rx_ucst_octets_counter0get(struct aq_hw_s *aq_hw);
 
-/* get rx dma statistics counter 7 */
-u32 hw_atl_reg_rx_dma_stat_counter7get(struct aq_hw_s *aq_hw);
-
 /* get msm tx errors counter register */
 u32 hw_atl_reg_mac_msm_tx_errs_cnt_get(struct aq_hw_s *aq_hw);
 
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +0 -3
index 430bbd45b2f0..b64140924a02 100644
@@ -58,9 +58,6 @@
 /* preprocessor definitions for msm rx unicast octets counter register 0 */
 #define HW_ATL_MAC_MSM_RX_UCST_OCTETS_COUNTER0_ADR 0x000001b8u
 
-/* preprocessor definitions for rx dma statistics counter 7 */
-#define HW_ATL_RX_DMA_STAT_COUNTER7_ADR 0x00006818u
-
 /* preprocessor definitions for msm tx unicast frames counter register */
 #define HW_ATL_MAC_MSM_TX_UCST_FRM_CNT_ADR 0x00000108u
 
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +9 -5
index b521457434fc..55d37b644a1b 100644
@@ -545,7 +545,7 @@ void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
 		pmbox->stats.ubtc = pmbox->stats.uptc * mtu;
 		pmbox->stats.dpc = atomic_read(&self->dpc);
 	} else {
-		pmbox->stats.dpc = hw_atl_reg_rx_dma_stat_counter7get(self);
+		pmbox->stats.dpc = hw_atl_rpb_rx_dma_drop_pkt_cnt_get(self);
 	}
 
 err_exit:;
@@ -789,10 +789,14 @@ int hw_atl_utils_update_stats(struct aq_hw_s *self)
 		AQ_SDELTA(dpc);
 	}
 #undef AQ_SDELTA
-	self->curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self);
-	self->curr_stats.dma_pkt_tc = hw_atl_stats_tx_dma_good_pkt_counterlsw_get(self);
-	self->curr_stats.dma_oct_rc = hw_atl_stats_rx_dma_good_octet_counterlsw_get(self);
-	self->curr_stats.dma_oct_tc = hw_atl_stats_tx_dma_good_octet_counterlsw_get(self);
+	self->curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);
+	self->curr_stats.dma_pkt_tc = hw_atl_stats_tx_dma_good_pkt_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_tx_dma_good_pkt_countermsw_get(self) << 32);
+	self->curr_stats.dma_oct_rc = hw_atl_stats_rx_dma_good_octet_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_rx_dma_good_octet_countermsw_get(self) << 32);
+	self->curr_stats.dma_oct_tc = hw_atl_stats_tx_dma_good_octet_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_tx_dma_good_octet_countermsw_get(self) << 32);
 
 	memcpy(&self->last_stats, &mbox.stats, sizeof(mbox.stats));
 
Signature · 1 line
2.17.1
#28 lore raw

Re: [PATCH v3 net-next 14/15] net: aquantia: fixups on 64bit dma counters

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c int hw_atl_utils_update_stats(struct aq_hw_s *self) · line 793

Quoted 2 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
+	self->curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);

Don't you need to do something to avoid issue with overflow from lsw into msw? I've often seen code get the msw, the lsw and then the msm again. If the two msw reads are different, it repeats it all again.

Andrew

#29 lore raw

Re: [PATCH v3 net-next 14/15] net: aquantia: fixups on 64bit dma counters

Quoted 6 lines · Andrew Lunn

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c int hw_atl_utils_update_stats(struct aq_hw_s *self) · line 793

Quoted 2 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
+	self->curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);

Don't you need to do something to avoid issue with overflow from lsw into msw? I've often seen code get the msw, the lsw and then the msm again. If the two msw reads are different, it repeats it all again.

Hardware latches msw when host reads lsw register. So thats safe.

However looking into spec it says to always read lsw first. The syntax above does not guarantee that in general. I'll change that with something like

dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self); dma_pkt_rc |= ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);

Thanks for the note,

Igor

#30 lore raw

Re: [PATCH v3 net-next 14/15] net: aquantia: fixups on 64bit dma counters

Quoted 10 lines · Igor Russkikh
Quoted 6 lines · Andrew Lunn

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c int hw_atl_utils_update_stats(struct aq_hw_s *self) · line 793

Quoted 2 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
+	self->curr_stats.dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self) +
+				      ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);

Don't you need to do something to avoid issue with overflow from lsw into msw? I've often seen code get the msw, the lsw and then the msm again. If the two msw reads are different, it repeats it all again.

Quoted 8 lines

Hardware latches msw when host reads lsw register. So thats safe.

However looking into spec it says to always read lsw first. The syntax above does not guarantee that in general. I'll change that with something like

dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counterlsw_get(self); dma_pkt_rc |= ((u64)hw_atl_stats_rx_dma_good_pkt_countermsw_get(self) << 32);

Hi Igor

I think i would probably have a hw_atl_stats_rx_dma_good_pkt_counter() which returns a u64.

Under that, have a aq_hw_read_reg64() which does things in the correct ordering, and a comment about reading the lsw latches the msw.

Andrew

#31 lore raw

PATCH v3 15/15 net: aquantia: remove outdated device ids

In reply to Igor Russkikh

From: Nikita Danilov <[email protected]>

Some device ids were never released and does not exist. Cleanup these.

---
 drivers/net/ethernet/aquantia/atlantic/aq_common.h        | 3 ---
 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c      | 6 ------
 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 3 ---
 3 files changed, 12 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_common.h +0 -3
index 6b6d1724676e..235bb3a72d66 100644
@@ -41,9 +41,6 @@
 #define AQ_DEVICE_ID_AQC111S	0x91B1
 #define AQ_DEVICE_ID_AQC112S	0x92B1
 
-#define AQ_DEVICE_ID_AQC111E	0x51B1
-#define AQ_DEVICE_ID_AQC112E	0x52B1
-
 #define HW_ATL_NIC_NAME "aQuantia AQtion 10Gbit Network Adapter"
 
 #define AQ_HWREV_ANY	0
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +0 -6
index a607e25dfbff..efd90ea575f1 100644
@@ -43,9 +43,6 @@ static const struct pci_device_id aq_pci_tbl[] = {
 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC111S), },
 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC112S), },
 
-	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC111E), },
-	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC112E), },
-
 	{}
 };
 
@@ -75,9 +72,6 @@ static const struct aq_board_revision_s hw_atl_boards[] = {
 	{ AQ_DEVICE_ID_AQC109S,	AQ_HWREV_ANY,	&hw_atl_ops_b1, &hw_atl_b0_caps_aqc109s, },
 	{ AQ_DEVICE_ID_AQC111S,	AQ_HWREV_ANY,	&hw_atl_ops_b1, &hw_atl_b0_caps_aqc111s, },
 	{ AQ_DEVICE_ID_AQC112S,	AQ_HWREV_ANY,	&hw_atl_ops_b1, &hw_atl_b0_caps_aqc112s, },
-
-	{ AQ_DEVICE_ID_AQC111E,	AQ_HWREV_ANY,	&hw_atl_ops_b1, &hw_atl_b0_caps_aqc111e, },
-	{ AQ_DEVICE_ID_AQC112E,	AQ_HWREV_ANY,	&hw_atl_ops_b1, &hw_atl_b0_caps_aqc112e, },
 };
 
 MODULE_DEVICE_TABLE(pci, aq_pci_tbl);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h +0 -3
index 2cc8dacfdc27..b1c0b6850e60 100644
@@ -32,9 +32,6 @@ extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc109;
 #define hw_atl_b0_caps_aqc111s hw_atl_b0_caps_aqc108
 #define hw_atl_b0_caps_aqc112s hw_atl_b0_caps_aqc109
 
-#define hw_atl_b0_caps_aqc111e hw_atl_b0_caps_aqc108
-#define hw_atl_b0_caps_aqc112e hw_atl_b0_caps_aqc109
-
 extern const struct aq_hw_ops hw_atl_ops_b0;
 
 #define hw_atl_ops_b1 hw_atl_ops_b0
Signature · 1 line
2.17.1