staging: qlge: use qlge_* prefix to avoid namespace clashes with other qlogic drivers
Subsystems (4)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 1/8 staging: qlge: use qlge_* prefix to avoid namespace clashes with other qlogic drivers
To avoid namespace clashes with other qlogic drivers and also for the sake of naming consistency, use the "qlge_" prefix as suggested in drivers/staging/qlge/TODO,
- For existing ql_ prefix,
sed -i "s/ql_/qlge_/g" *.{c,h}
- for structs not having a prefix
1. get a list of structs
grep "struct.*{" qlge.
2. add qlge_ for each struct, e.g.,
sed -i "s/ib_ae_iocb_rsp/qlge_ib_ae_iocb_rsp/g" *.{c,h}--- drivers/staging/qlge/TODO | 4 - drivers/staging/qlge/qlge.h | 210 ++--- drivers/staging/qlge/qlge_dbg.c | 1075 ++++++++++++----------- drivers/staging/qlge/qlge_ethtool.c | 230 ++--- drivers/staging/qlge/qlge_main.c | 1268 +++++++++++++-------------- drivers/staging/qlge/qlge_mpi.c | 352 ++++---- 6 files changed, 1567 insertions(+), 1572 deletions(-)
drivers/staging/qlge/TODO +0 -4
@@ -28,10 +28,6 @@ * the driver has a habit of using runtime checks where compile time checks are possible (ex. ql_free_rx_buffers(), ql_alloc_rx_buffers()) * reorder struct members to avoid holes if it doesn't impact performance -* in terms of namespace, the driver uses either qlge_, ql_ (used by - other qlogic drivers, with clashes, ex: ql_sem_spinlock) or nothing (with - clashes, ex: struct ob_mac_iocb_req). Rename everything to use the "qlge_" - prefix. * avoid legacy/deprecated apis (ex. replace pci_dma_*, replace pci_enable_msi, use pci_iomap) * some "while" loops could be rewritten with simple "for", ex.
drivers/staging/qlge/qlge.h +105 -105
419 lines not on this page · raw message
drivers/staging/qlge/qlge_dbg.c +537 -538
1,854 lines not on this page · raw message
drivers/staging/qlge/qlge_ethtool.c +115 -115
530 lines not on this page · raw message
drivers/staging/qlge/qlge_main.c +634 -634
187 lines not on this page · raw message
drivers/staging/qlge/qlge_mpi.c +176 -176
352 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
PATCH v4 2/8 staging: qlge: Initialize devlink health dump framework
In reply to a message not in the archiveInitialize devlink health dump framework for the qlge driver so the coredump could be done via devlink.
struct qlge_adapter is now used as the private data structure of struct devlink so it could exist independently of struct net_device and devlink reload could be supported in the future. The private data of PCIe driver now points to qlge_adapter.
Since devlink_alloc will zero out struct qlge_adapter, memset in qlge_init_device is not necessary.
--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 13 +++ drivers/staging/qlge/qlge_devlink.c | 31 +++++++ drivers/staging/qlge/qlge_devlink.h | 9 ++ drivers/staging/qlge/qlge_ethtool.c | 36 ++++---- drivers/staging/qlge/qlge_main.c | 125 +++++++++++++++++----------- 7 files changed, 151 insertions(+), 66 deletions(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.h
drivers/staging/qlge/Kconfig +1 -0
@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
drivers/staging/qlge/Makefile +1 -1
@@ -5,4 +5,4 @@ obj-$(CONFIG_QLGE) += qlge.o -qlge-objs := qlge_main.o qlge_dbg.o qlge_mpi.o qlge_ethtool.o +qlge-objs := qlge_main.o qlge_dbg.o qlge_mpi.o qlge_ethtool.o qlge_devlink.o
drivers/staging/qlge/qlge.h +13 -0
@@ -2060,6 +2060,18 @@ struct nic_operations {int (*port_initialize)(struct qlge_adapter *qdev); }; +struct qlge_netdev_priv { +struct qlge_adapter *qdev; +struct net_device *ndev; +}; + +static inline +struct qlge_adapter *netdev_to_qdev (struct net_device *ndev) +{ +struct qlge_netdev_priv *ndev_priv =netdev_priv (ndev); + +return ndev_priv->qdev; +}/* * The main Adapter structure definition. * This structure has all fields relevant to the hardware.
@@ -2077,6 +2089,7 @@ struct qlge_adapter {struct pci_dev *pdev;struct net_device *ndev;/* Parent NET device */ +struct devlink_health_reporter *reporter;/* Hardware information */ u32 chip_rev_id;u32 fw_rev_id;
drivers/staging/qlge/qlge_devlink.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include "qlge.h" +#include "qlge_devlink.h" + +static int +qlge_reporter_coredump (struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +return 0 ; +} + +static const struct devlink_health_reporter_ops qlge_reporter_ops = { + .name ="dummy" , + .dump = qlge_reporter_coredump, +}; + +void qlge_health_create_reporters (struct qlge_adapter *priv) +{ +struct devlink_health_reporter *reporter; +struct devlink *devlink; + + devlink =priv_to_devlink (priv); + priv->reporter = +devlink_health_reporter_create (devlink, &qlge_reporter_ops, +0 , priv); +if (IS_ERR (priv->reporter)) +netdev_warn (priv->ndev, +"Failed to create reporter, err = %ld\n" , +PTR_ERR (reporter)); +}
drivers/staging/qlge/qlge_devlink.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef QLGE_DEVLINK_H +#define QLGE_DEVLINK_H + +#include <net/devlink.h> + +void qlge_health_create_reporters (struct qlge_adapter *priv); + +#endif /* QLGE_DEVLINK_H */
drivers/staging/qlge/qlge_ethtool.c +18 -18
@@ -366,7 +366,7 @@ static void qlge_get_ethtool_stats(struct net_device *ndev, struct ethtool_stats *stats, u64 *data) { - struct qlge_adapter *qdev = netdev_priv(ndev); + struct qlge_adapter *qdev = netdev_to_qdev(ndev);int index, length; length =QLGE_STATS_LEN ;
@@ -383,7 +383,7 @@ qlge_get_ethtool_stats(struct net_device *ndev,static int qlge_get_link_ksettings (struct net_device *ndev,struct ethtool_link_ksettings *ecmd) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);u32 supported, advertising; supported = SUPPORTED_10000baseT_Full;
@@ -415,7 +415,7 @@ static int qlge_get_link_ksettings(struct net_device *ndev,static void qlge_get_drvinfo (struct net_device *ndev,struct ethtool_drvinfo *drvinfo) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);strlcpy (drvinfo->driver, qlge_driver_name,sizeof (drvinfo->driver)); strlcpy(drvinfo->version, qlge_driver_version,
@@ -431,7 +431,7 @@ static void qlge_get_drvinfo(struct net_device *ndev,static void qlge_get_wol (struct net_device *ndev,struct ethtool_wolinfo *wol) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);unsigned short ssys_dev = qdev->pdev->subsystem_device;/* WOL is only supported for mezz card. */
@@ -444,7 +444,7 @@ static void qlge_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)static int qlge_set_wol (struct net_device *ndev,struct ethtool_wolinfo *wol) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);unsigned short ssys_dev = qdev->pdev->subsystem_device;/* WOL is only supported for mezz card. */
@@ -466,7 +466,7 @@ static int qlge_set_phys_id(struct net_device *ndev, enum ethtool_phys_id_state state) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);switch (state) {case ETHTOOL_ID_ACTIVE :
@@ -574,7 +574,7 @@ static int qlge_loopback_test(struct qlge_adapter *qdev, u64 *data)static void qlge_self_test (struct net_device *ndev,struct ethtool_test *eth_test,u64 *data) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);memset (data,0 ,sizeof (u64) *QLGE_TEST_LEN );
@@ -603,7 +603,7 @@ static void qlge_self_test(struct net_device *ndev,static int qlge_get_regs_len (struct net_device *ndev) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);if (!test_bit (QL_FRC_COREDUMP , &qdev->flags))return sizeof (struct qlge_mpi_coredump );
@@ -614,7 +614,7 @@ static int qlge_get_regs_len(struct net_device *ndev)static void qlge_get_regs (struct net_device *ndev,struct ethtool_regs *regs,void *p) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);qlge_get_dump (qdev, p); qdev->core_is_dumped =0 ;
@@ -624,9 +624,9 @@ static void qlge_get_regs(struct net_device *ndev, regs->len =sizeof (struct qlge_reg_dump ); } -static int qlge_get_coalesce (struct net_device *dev,struct ethtool_coalesce *c) +static int qlge_get_coalesce (struct net_device *ndev,struct ethtool_coalesce *c) { -struct qlge_adapter *qdev =netdev_priv (dev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev); c->rx_coalesce_usecs = qdev->rx_coalesce_usecs; c->tx_coalesce_usecs = qdev->tx_coalesce_usecs;
@@ -649,7 +649,7 @@ static int qlge_get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)static int qlge_set_coalesce (struct net_device *ndev,struct ethtool_coalesce *c) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);/* Validate user parameters. */ if (c->rx_coalesce_usecs > qdev->rx_ring_size /2 )
@@ -677,10 +677,10 @@ static int qlge_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *creturn qlge_update_ring_coalescing (qdev); } -static void qlge_get_pauseparam (struct net_device *netdev, +static void qlge_get_pauseparam (struct net_device *ndev,struct ethtool_pauseparam *pause) { -struct qlge_adapter *qdev =netdev_priv (netdev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);qlge_mb_get_port_cfg (qdev);if (qdev->link_config &CFG_PAUSE_STD ) {
@@ -689,10 +689,10 @@ static void qlge_get_pauseparam(struct net_device *netdev, } } -static int qlge_set_pauseparam (struct net_device *netdev, +static int qlge_set_pauseparam (struct net_device *ndev,struct ethtool_pauseparam *pause) { -struct qlge_adapter *qdev =netdev_priv (netdev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);if ((pause->rx_pause) && (pause->tx_pause)) qdev->link_config |=CFG_PAUSE_STD ;
@@ -706,14 +706,14 @@ static int qlge_set_pauseparam(struct net_device *netdev,static u32 qlge_get_msglevel (struct net_device *ndev) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev);return qdev->msg_enable; }static void qlge_set_msglevel (struct net_device *ndev,u32 value) { -struct qlge_adapter *qdev =netdev_priv (ndev); +struct qlge_adapter *qdev =netdev_to_qdev (ndev); qdev->msg_enable = value; }
drivers/staging/qlge/qlge_main.c +78 -47
319 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v4 3/8 staging: qlge: re-write qlge_init_device
In reply to a message not in the archiveStop calling ql_release_all in qlge_init_device and free things one step at a time.
struct qlge_adapter *qdev is now a private structure of struct devlink and memset is not necessary.
--- drivers/staging/qlge/qlge_main.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/staging/qlge/qlge_main.c +20 -12
@@ -4394,13 +4394,13 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, err =pcie_set_readrq (pdev,4096 );if (err) {dev_err (&pdev->dev,"Set readrq failed.\n" ); - goto err_out1; + goto err_disable_pci; } err =pci_request_regions (pdev,DRV_NAME );if (err) {dev_err (&pdev->dev,"PCI region request failed.\n" ); -return err; + goto err_disable_pci; }pci_set_master (pdev);
@@ -4416,7 +4416,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev,if (err) {dev_err (&pdev->dev,"No usable DMA configuration.\n" ); - goto err_out2; + goto err_release_pci; }/* Set PCIe reset type for EEH to fundamental. */
@@ -4427,7 +4427,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev,if (!qdev->reg_base) {dev_err (&pdev->dev,"Register mapping failed.\n" ); err = -ENOMEM ; - goto err_out2; + goto err_release_pci; } qdev->doorbell_area_size =pci_resource_len (pdev,3 );
@@ -4436,14 +4436,14 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev,if (!qdev->doorbell_area) {dev_err (&pdev->dev,"Doorbell register mapping failed.\n" ); err = -ENOMEM ; - goto err_out2; + goto err_iounmap_base; } err =qlge_get_board_info (qdev);if (err) {dev_err (&pdev->dev,"Register access failed.\n" ); err = -EIO ; - goto err_out2; + goto err_iounmap_doorbell; } qdev->msg_enable =netif_msg_init (debug, default_msg);spin_lock_init (&qdev->stats_lock);
@@ -4453,7 +4453,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev,vmalloc (sizeof (struct qlge_mpi_coredump ));if (!qdev->mpi_coredump) { err = -ENOMEM ; - goto err_out2; + goto err_iounmap_doorbell; }if (qlge_force_coredump)set_bit (QL_FRC_COREDUMP , &qdev->flags);
@@ -4462,7 +4462,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, err = qdev->nic_ops->get_flash (qdev);if (err) {dev_err (&pdev->dev,"Invalid FLASH.\n" ); - goto err_out2; + goto err_free_mpi_coredump; }/* Keep local copy of current mac address. */
@@ -4485,7 +4485,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, ndev->name);if (!qdev->workqueue) { err = -ENOMEM ; - goto err_out2; + goto err_free_mpi_coredump; }INIT_DELAYED_WORK (&qdev->asic_reset_work, qlge_asic_reset_work);
@@ -4503,10 +4503,18 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, DRV_NAME, DRV_VERSION); }return 0 ; -err_out2: -qlge_release_all (pdev); -err_out1: + +err_free_mpi_coredump: +vfree (qdev->mpi_coredump); +err_iounmap_doorbell: +iounmap (qdev->doorbell_area); +err_iounmap_base: +iounmap (qdev->reg_base); +err_release_pci: +pci_release_regions (pdev); +err_disable_pci:pci_disable_device (pdev); +return err; }
Signature · 1 line
2.29.2
PATCH v4 4/8 staging: qlge: coredump via devlink health reporter
In reply to a message not in the archive $ devlink health dump show DEVICE reporter coredump -p -j
{
"Core Registers": {
"segment": 1,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
"Test Logic Regs": {
"segment": 2,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
"RMII Registers": {
"segment": 3,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
...
"Sem Registers": {
"segment": 50,
"values": [ 0,0,0,0 ]
}
}--- drivers/staging/qlge/qlge_devlink.c | 132 ++++++++++++++++++++++++++-- 1 file changed, 126 insertions(+), 6 deletions(-)
drivers/staging/qlge/qlge_devlink.c +126 -6
@@ -2,16 +2,136 @@#include "qlge.h" #include "qlge_devlink.h" -static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int qlge_fill_seg_ (struct devlink_fmsg *fmsg, +struct mpi_coredump_segment_header *seg_header, +u32 *reg_data) { -return 0 ; +int regs_num = (seg_header->seg_size + -sizeof (struct mpi_coredump_segment_header )) /sizeof (u32); +int err; +int i; + + err =devlink_fmsg_pair_nest_start (fmsg, seg_header->description); +if (err) +return err; + err =devlink_fmsg_obj_nest_start (fmsg); +if (err) +return err; + err =devlink_fmsg_u32_pair_put (fmsg,"segment" , seg_header->seg_num); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_start (fmsg,"values" ); +if (err) +return err; +for (i =0 ; i < regs_num; i++) { + err =devlink_fmsg_u32_put (fmsg, *reg_data); +if (err) +return err; + reg_data++; + } + err =devlink_fmsg_obj_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_pair_nest_end (fmsg); +return err; +} + +#define FILL_SEG (seg_hdr, seg_regs) \ + do { \ + err = qlge_fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs); \ + if (err) { \ + kvfree(dump); \ + return err; \ + } \ + } while (0) + +static int qlge_reporter_coredump (struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +int err =0 ; + +struct qlge_adapter *qdev =devlink_health_reporter_priv (reporter); +struct qlge_mpi_coredump *dump; + +if (!netif_running (qdev->ndev)) +return 0 ; + + dump =kvmalloc (sizeof (*dump),GFP_KERNEL ); +if (!dump) +return -ENOMEM ; + + err =qlge_core_dump (qdev, dump); +if (err) { +kvfree (dump); +return err; + } + +qlge_soft_reset_mpi_risc (qdev); + +FILL_SEG (core_regs_seg_hdr, mpi_core_regs); +FILL_SEG (test_logic_regs_seg_hdr, test_logic_regs); +FILL_SEG (rmii_regs_seg_hdr, rmii_regs); +FILL_SEG (fcmac1_regs_seg_hdr, fcmac1_regs); +FILL_SEG (fcmac2_regs_seg_hdr, fcmac2_regs); +FILL_SEG (fc1_mbx_regs_seg_hdr, fc1_mbx_regs); +FILL_SEG (ide_regs_seg_hdr, ide_regs); +FILL_SEG (nic1_mbx_regs_seg_hdr, nic1_mbx_regs); +FILL_SEG (smbus_regs_seg_hdr, smbus_regs); +FILL_SEG (fc2_mbx_regs_seg_hdr, fc2_mbx_regs); +FILL_SEG (nic2_mbx_regs_seg_hdr, nic2_mbx_regs); +FILL_SEG (i2c_regs_seg_hdr, i2c_regs); +FILL_SEG (memc_regs_seg_hdr, memc_regs); +FILL_SEG (pbus_regs_seg_hdr, pbus_regs); +FILL_SEG (mde_regs_seg_hdr, mde_regs); +FILL_SEG (nic_regs_seg_hdr, nic_regs); +FILL_SEG (nic2_regs_seg_hdr, nic2_regs); +FILL_SEG (xgmac1_seg_hdr, xgmac1); +FILL_SEG (xgmac2_seg_hdr, xgmac2); +FILL_SEG (code_ram_seg_hdr, code_ram); +FILL_SEG (memc_ram_seg_hdr, memc_ram); +FILL_SEG (xaui_an_hdr, serdes_xaui_an); +FILL_SEG (xaui_hss_pcs_hdr, serdes_xaui_hss_pcs); +FILL_SEG (xfi_an_hdr, serdes_xfi_an); +FILL_SEG (xfi_train_hdr, serdes_xfi_train); +FILL_SEG (xfi_hss_pcs_hdr, serdes_xfi_hss_pcs); +FILL_SEG (xfi_hss_tx_hdr, serdes_xfi_hss_tx); +FILL_SEG (xfi_hss_rx_hdr, serdes_xfi_hss_rx); +FILL_SEG (xfi_hss_pll_hdr, serdes_xfi_hss_pll); + + err =qlge_fill_seg_ (fmsg, &dump->misc_nic_seg_hdr, + (u32 *)&dump->misc_nic_info); +if (err) { +kvfree (dump); +return err; + } + +FILL_SEG (intr_states_seg_hdr, intr_states); +FILL_SEG (cam_entries_seg_hdr, cam_entries); +FILL_SEG (nic_routing_words_seg_hdr, nic_routing_words); +FILL_SEG (ets_seg_hdr, ets); +FILL_SEG (probe_dump_seg_hdr, probe_dump); +FILL_SEG (routing_reg_seg_hdr, routing_regs); +FILL_SEG (mac_prot_reg_seg_hdr, mac_prot_regs); +FILL_SEG (xaui2_an_hdr, serdes2_xaui_an); +FILL_SEG (xaui2_hss_pcs_hdr, serdes2_xaui_hss_pcs); +FILL_SEG (xfi2_an_hdr, serdes2_xfi_an); +FILL_SEG (xfi2_train_hdr, serdes2_xfi_train); +FILL_SEG (xfi2_hss_pcs_hdr, serdes2_xfi_hss_pcs); +FILL_SEG (xfi2_hss_tx_hdr, serdes2_xfi_hss_tx); +FILL_SEG (xfi2_hss_rx_hdr, serdes2_xfi_hss_rx); +FILL_SEG (xfi2_hss_pll_hdr, serdes2_xfi_hss_pll); +FILL_SEG (sem_regs_seg_hdr, sem_regs); + +kvfree (dump); +return err; }static const struct devlink_health_reporter_ops qlge_reporter_ops = { - .name ="dummy" , + .name ="coredump" , .dump = qlge_reporter_coredump, };
Signature · 1 line
2.29.2
PATCH v4 5/8 staging: qlge: support force_coredump option for devlink health dump
In reply to a message not in the archiveWith force_coredump module parameter set, devlink health dump will reset the MPI RISC first which takes 5 secs to be finished.
Note that only NIC function that owns the firmware can do the force_dumping. Otherwise devlink will receive an EPERM error.
--- drivers/staging/qlge/qlge_devlink.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/staging/qlge/qlge_devlink.c +13 -0
@@ -56,10 +56,23 @@ static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,struct qlge_adapter *qdev =devlink_health_reporter_priv (reporter);struct qlge_mpi_coredump *dump; +wait_queue_head_t wait;if (!netif_running (qdev->ndev))return 0 ; +if (test_bit (QL_FRC_COREDUMP , &qdev->flags)) { +if (qlge_own_firmware (qdev)) { +qlge_queue_fw_error (qdev); +init_waitqueue_head (&wait); +wait_event_timeout (wait,0 ,5 *HZ ); + }else { +netif_err (qdev, ifup, qdev->ndev, +"Force Coredump failed because this NIC function doesn't own the firmware\n" ); +return -EPERM ; + } + } + dump =kvmalloc (sizeof (*dump),GFP_KERNEL );if (!dump)return -ENOMEM ;
Signature · 1 line
2.29.2
PATCH v4 6/8 staging: qlge: remove mpi_core_to_log which sends coredump to the kernel ring buffer
In reply to a message not in the archivedevlink health could be used to get coredump. No need to send so much data to the kernel ring buffer.
--- drivers/staging/qlge/TODO | 2 -- drivers/staging/qlge/qlge.h | 3 --- drivers/staging/qlge/qlge_dbg.c | 11 ----------- drivers/staging/qlge/qlge_ethtool.c | 1 - drivers/staging/qlge/qlge_main.c | 2 -- drivers/staging/qlge/qlge_mpi.c | 6 ------ 6 files changed, 25 deletions(-)
drivers/staging/qlge/TODO +0 -2
@@ -18,8 +18,6 @@ of questionable value. In particular, qlge_dbg.c has hundreds of lines of code bitrotting away in ifdef land (doesn't compile since commit 18c49b91777c ("qlge: do vlan cleanup", v3.1-rc1), 8 years ago). -* triggering an ethtool regdump will hexdump a 176k struct to dmesg depending - on some module parameters. * the flow control implementation in firmware is buggy (sends a flood of pause frames, resets the link, device and driver buffer queues become desynchronized), disable it by default
drivers/staging/qlge/qlge.h +0 -3
@@ -2153,7 +2153,6 @@ struct qlge_adapter {u32 port_init;u32 link_status;struct qlge_mpi_coredump *mpi_coredump; -u32 core_is_dumped;u32 link_config;u32 led_config;u32 max_frame_size;
@@ -2166,7 +2165,6 @@ struct qlge_adapter {struct delayed_work mpi_work;struct delayed_work mpi_port_cfg_work;struct delayed_work mpi_idc_work; -struct delayed_work mpi_core_to_log;struct completion ide_completion;const struct nic_operations *nic_ops;u16 device_id;
@@ -2257,7 +2255,6 @@ int qlge_write_cfg(struct qlge_adapter *qdev, void *ptr, int size, u32 bit,void qlge_queue_fw_error (struct qlge_adapter *qdev);void qlge_mpi_work (struct work_struct *work);void qlge_mpi_reset_work (struct work_struct *work); -void qlge_mpi_core_to_log (struct work_struct *work);int qlge_wait_reg_rdy (struct qlge_adapter *qdev,u32 reg,u32 bit,u32 ebit);void qlge_queue_asic_error (struct qlge_adapter *qdev);void qlge_set_ethtool_ops (struct net_device *ndev);
drivers/staging/qlge/qlge_dbg.c +0 -11
@@ -1313,17 +1313,6 @@ void qlge_get_dump(struct qlge_adapter *qdev, void *buff) } } -/* Coredump to messages log file using separate worker thread */ -void qlge_mpi_core_to_log (struct work_struct *work) -{ -struct qlge_adapter *qdev = - container_of(work, struct qlge_adapter, mpi_core_to_log.work); - -print_hex_dump (KERN_DEBUG ,"Core is dumping to log file!\n" , -DUMP_PREFIX_OFFSET ,32 ,4 , qdev->mpi_coredump, -sizeof (*qdev->mpi_coredump), false); -} -#ifdef QL_REG_DUMP static void qlge_dump_intr_states (struct qlge_adapter *qdev) {
drivers/staging/qlge/qlge_ethtool.c +0 -1
@@ -617,7 +617,6 @@ static void qlge_get_regs(struct net_device *ndev,struct qlge_adapter *qdev =netdev_to_qdev (ndev);qlge_get_dump (qdev, p); - qdev->core_is_dumped =0 ;if (!test_bit (QL_FRC_COREDUMP , &qdev->flags)) regs->len =sizeof (struct qlge_mpi_coredump );else
drivers/staging/qlge/qlge_main.c +0 -2
@@ -3800,7 +3800,6 @@ static void qlge_cancel_all_work_sync(struct qlge_adapter *qdev)cancel_delayed_work_sync (&qdev->mpi_reset_work);cancel_delayed_work_sync (&qdev->mpi_work);cancel_delayed_work_sync (&qdev->mpi_idc_work); -cancel_delayed_work_sync (&qdev->mpi_core_to_log);cancel_delayed_work_sync (&qdev->mpi_port_cfg_work); }
@@ -4493,7 +4492,6 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev,INIT_DELAYED_WORK (&qdev->mpi_work, qlge_mpi_work);INIT_DELAYED_WORK (&qdev->mpi_port_cfg_work, qlge_mpi_port_cfg_work);INIT_DELAYED_WORK (&qdev->mpi_idc_work, qlge_mpi_idc_work); -INIT_DELAYED_WORK (&qdev->mpi_core_to_log, qlge_mpi_core_to_log);init_completion (&qdev->ide_completion);mutex_init (&qdev->mpi_mutex);
drivers/staging/qlge/qlge_mpi.c +0 -6
@@ -1269,11 +1269,5 @@ void qlge_mpi_reset_work(struct work_struct *work)return ; } -if (qdev->mpi_coredump && !qlge_core_dump (qdev, qdev->mpi_coredump)) { -netif_err (qdev, drv, qdev->ndev,"Core is dumped!\n" ); - qdev->core_is_dumped =1 ; -queue_delayed_work (qdev->workqueue, - &qdev->mpi_core_to_log,5 *HZ ); - }qlge_soft_reset_mpi_risc (qdev); }
Signature · 1 line
2.29.2
PATCH v4 7/8 staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
In reply to a message not in the archiveThe debugging code in the following ifdef land
- QL_ALL_DUMP
- QL_REG_DUMP
- QL_DEV_DUMP
- QL_CB_DUMP
- QL_IB_DUMP
- QL_OB_DUMP
becomes unnecessary because,
- Device status and general registers can be obtained by ethtool.
- Coredump can be done via devlink health reporter.
- Structure related to the hardware (struct ql_adapter) can be obtained by crash or drgn.
--- drivers/staging/qlge/TODO | 4 - drivers/staging/qlge/qlge.h | 82 ---- drivers/staging/qlge/qlge_dbg.c | 688 ---------------------------- drivers/staging/qlge/qlge_ethtool.c | 2 - drivers/staging/qlge/qlge_main.c | 7 +- 5 files changed, 1 insertion(+), 782 deletions(-)
drivers/staging/qlge/TODO +0 -4
@@ -14,10 +14,6 @@ queues" is confusing. * struct rx_ring is used for rx and tx completions, with some members relevant to one case only -* there is an inordinate amount of disparate debugging code, most of which is - of questionable value. In particular, qlge_dbg.c has hundreds of lines of - code bitrotting away in ifdef land (doesn't compile since commit - 18c49b91777c ("qlge: do vlan cleanup", v3.1-rc1), 8 years ago). * the flow control implementation in firmware is buggy (sends a flood of pause frames, resets the link, device and driver buffer queues become desynchronized), disable it by default
drivers/staging/qlge/qlge.h +0 -82
86 lines not on this page · raw message
drivers/staging/qlge/qlge_dbg.c +0 -688
691 lines not on this page · raw message
drivers/staging/qlge/qlge_ethtool.c +0 -2
@@ -328,8 +328,6 @@ static void qlge_update_stats(struct qlge_adapter *qdev)qlge_sem_unlock (qdev, qdev->xg_sem_mask); quit:spin_unlock (&qdev->stats_lock); - -QL_DUMP_STAT (qdev); }static void qlge_get_strings (struct net_device *dev,u32 stringset,u8 *buf)
drivers/staging/qlge/qlge_main.c +1 -6
@@ -1855,8 +1855,6 @@ static void qlge_process_mac_split_rx_intr(struct qlge_adapter *qdev,struct net_device *ndev = qdev->ndev;struct sk_buff *skb =NULL ; -QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp); - skb =qlge_build_rx_skb (qdev, rx_ring, ib_mac_rsp);if (unlikely (!skb)) { netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
@@ -1953,8 +1951,6 @@ static unsigned long qlge_process_mac_rx_intr(struct qlge_adapter *qdev, ((le16_to_cpu (ib_mac_rsp->vlan_id) & IB_MAC_IOCB_RSP_VLAN_MASK)) : 0xffff; -QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp); -if (ib_mac_rsp->flags4 &IB_MAC_IOCB_RSP_HV ) {/* The data and headers are split into * separate buffers.
@@ -2000,7 +1996,6 @@ static void qlge_process_mac_tx_intr(struct qlge_adapter *qdev,struct tx_ring *tx_ring;struct tx_ring_desc *tx_ring_desc; -QL_DUMP_OB_MAC_RSP (qdev, mac_rsp); tx_ring = &qdev->tx_ring[mac_rsp->txq_idx]; tx_ring_desc = &tx_ring->q[mac_rsp->tid];qlge_unmap_send (qdev, tx_ring_desc, tx_ring_desc->map_cnt);
@@ -2587,7 +2582,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev) tx_ring->tx_errors++;return NETDEV_TX_BUSY ; } -QL_DUMP_OB_MAC_IOCB (qdev, mac_iocb_ptr); + tx_ring->prod_idx++;if (tx_ring->prod_idx == tx_ring->wq_len) tx_ring->prod_idx =0 ;
Signature · 1 line
2.29.2
PATCH v4 8/8 staging: qlge: add documentation for debugging qlge
In reply to a message not in the archiveInstructions and examples on kernel data structures dumping and coredump.
--- .../networking/device_drivers/index.rst | 1 + .../device_drivers/qlogic/index.rst | 18 +++ .../networking/device_drivers/qlogic/qlge.rst | 118 ++++++++++++++++++ MAINTAINERS | 6 + 4 files changed, 143 insertions(+) create mode 100644 Documentation/networking/device_drivers/qlogic/index.rst create mode 100644 Documentation/networking/device_drivers/qlogic/qlge.rst
Documentation/networking/device_drivers/index.rst +1 -0
@@ -15,6 +15,7 @@ Contents: ethernet/index fddi/index hamradio/index + qlogic/index wan/index wifi/index
Documentation/networking/device_drivers/qlogic/index.rst new file +18 -0
@@ -0,0 +1,18 @@ +.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) + +QLogic QLGE Device Drivers +=============================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + qlge + +.. only:: subproject and html + + Indices + ======= + + * :ref:`genindex`
Documentation/networking/device_drivers/qlogic/qlge.rst new file +118 -0
118 lines not on this page · raw message
MAINTAINERS +6 -0
@@ -14606,6 +14606,12 @@ L: [email protected] S: Supported F: drivers/staging/qlge/ +QLOGIC QLGE 10Gb ETHERNET DRIVER +M: Coiby Xu <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/networking/device_drivers/qlogic/qlge.rst + QM1D1B0004 MEDIA DRIVER M: Akihiro Tsukada <[email protected]> L: [email protected]
Signature · 1 line
2.29.2