From: Arun Kumar Prakash Device and admin queue command waits, and the firmware heartbeat check interval, use the compile-time DEVCMD_TIMEOUT. Make the timeout a per-device value, so that it can be made configurable through a devlink parameter, and export it to the RDMA driver through ionic_cmd_timeout(). No functional change. Signed-off-by: Arun Kumar Prakash Reviewed-by: Brett Creeley Signed-off-by: Nikhil P. Rao --- drivers/net/ethernet/pensando/ionic/ionic.h | 3 ++- drivers/net/ethernet/pensando/ionic/ionic_api.h | 8 ++++++++ drivers/net/ethernet/pensando/ionic/ionic_aux.c | 8 +++++++- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 11 ++++++----- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 12 ++++++------ drivers/net/ethernet/pensando/ionic/ionic_fw.c | 8 ++++---- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 10 +++++----- drivers/net/ethernet/pensando/ionic/ionic_main.c | 16 ++++++++-------- 9 files changed, 47 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index 814d70b8623bd..39999bdbca55e 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -18,7 +18,7 @@ struct ionic_lif; #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003 -#define DEVCMD_TIMEOUT 5 +#define IONIC_CMD_TIMEOUT_DEF 5 #define IONIC_ADMINQ_TIME_SLICE msecs_to_jiffies(100) #define IONIC_PHC_UPDATE_NS 10000000000 /* 10s in nanoseconds */ @@ -66,6 +66,7 @@ struct ionic { int watchdog_period; void *hwmon_caps_buf; dma_addr_t hwmon_caps_pa; + u8 cmd_timeout; }; int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_api.h b/drivers/net/ethernet/pensando/ionic/ionic_api.h index bd88666836b80..28e6b5e2a2cc0 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_api.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_api.h @@ -86,6 +86,14 @@ int ionic_error_to_errno(enum ionic_status_code code); */ void ionic_request_rdma_reset(struct ionic_lif *lif); +/** + * ionic_cmd_timeout - Get the device and admin queue command timeout + * @lif: Logical interface + * + * Return: the command timeout in seconds + */ +u8 ionic_cmd_timeout(struct ionic_lif *lif); + /** * ionic_intr_alloc - Reserve a device interrupt * @lif: Logical interface diff --git a/drivers/net/ethernet/pensando/ionic/ionic_aux.c b/drivers/net/ethernet/pensando/ionic/ionic_aux.c index 521f3bd9aee15..70f193ebb7ea2 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_aux.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_aux.c @@ -239,7 +239,7 @@ void ionic_request_rdma_reset(struct ionic_lif *lif) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_go(&ionic->idev, &cmd); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); @@ -247,3 +247,9 @@ void ionic_request_rdma_reset(struct ionic_lif *lif) pr_warn("%s request_reset: error %d\n", __func__, err); } EXPORT_SYMBOL_NS(ionic_request_rdma_reset, "NET_IONIC"); + +u8 ionic_cmd_timeout(struct ionic_lif *lif) +{ + return lif->ionic->cmd_timeout; +} +EXPORT_SYMBOL_NS(ionic_cmd_timeout, "NET_IONIC"); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 9bedcb7224abc..abadfa11ebdbd 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -239,6 +239,7 @@ static int ionic_setup_one(struct ionic *ionic) struct device *dev = ionic->dev; int err; + ionic->cmd_timeout = IONIC_CMD_TIMEOUT_DEF; ionic_debugfs_add_dev(ionic); /* Setup PCI device */ diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c index 648d9d24be856..f14fff4a74278 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_dev.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.c @@ -212,7 +212,7 @@ static void ionic_map_disc_cmb(struct ionic *ionic) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_discover_cmb(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); if (!err) { sz = min(sizeof(ident->cmb_layout), sizeof(idev->dev_cmd_regs->data)); @@ -590,10 +590,11 @@ int ionic_heartbeat_check(struct ionic *ionic) return -ENXIO; /* Because of some variability in the actual FW heartbeat, we - * wait longer than the DEVCMD_TIMEOUT before checking again. + * wait longer than the command timeout before checking again. */ last_check_time = idev->last_hb_time; - if (time_before(check_time, last_check_time + DEVCMD_TIMEOUT * 2 * HZ)) + if (time_before(check_time, + last_check_time + ionic->cmd_timeout * 2 * HZ)) return 0; fw_hb = ioread32(&idev->dev_info_regs->fw_heartbeat); @@ -795,7 +796,7 @@ int ionic_set_vf_config(struct ionic *ionic, int vf, mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_go(&ionic->idev, &cmd); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); return err; @@ -812,7 +813,7 @@ void ionic_vf_start(struct ionic *ionic) return; ionic_dev_cmd_go(&ionic->idev, &cmd); - ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); } /* LIF commands */ diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c index 119ac720c0787..29b9a8502b8ed 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -351,7 +351,7 @@ static int ionic_set_link_ksettings(struct net_device *netdev, if (ks->base.autoneg != idev->port_info->config.an_enable) { mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_autoneg(idev, ks->base.autoneg); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) return err; @@ -361,7 +361,7 @@ static int ionic_set_link_ksettings(struct net_device *netdev, if (ks->base.speed != le32_to_cpu(idev->port_info->config.speed)) { mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_speed(idev, ks->base.speed); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) return err; @@ -411,7 +411,7 @@ static int ionic_set_pauseparam(struct net_device *netdev, mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_pause(&lif->ionic->idev, requested_pause); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) return err; @@ -479,7 +479,7 @@ static int ionic_set_fecparam(struct net_device *netdev, if (fec_type != lif->ionic->idev.port_info->config.fec_type) { mutex_lock(&lif->ionic->dev_cmd_lock); ionic_dev_cmd_port_fec(&lif->ionic->idev, fec_type); - ret = ionic_dev_cmd_wait(lif->ionic, DEVCMD_TIMEOUT); + ret = ionic_dev_cmd_wait(lif->ionic, lif->ionic->cmd_timeout); mutex_unlock(&lif->ionic->dev_cmd_lock); } @@ -1131,11 +1131,11 @@ static int ionic_nway_reset(struct net_device *netdev) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_state(&ionic->idev, IONIC_PORT_ADMIN_STATE_DOWN); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); if (!err) { ionic_dev_cmd_port_state(&ionic->idev, IONIC_PORT_ADMIN_STATE_UP); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); } mutex_unlock(&ionic->dev_cmd_lock); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_fw.c b/drivers/net/ethernet/pensando/ionic/ionic_fw.c index 3c209c1a23373..ceb9751475088 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_fw.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_fw.c @@ -75,7 +75,7 @@ static int ionic_fw_status_long_wait(struct ionic *ionic, do { mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_go(&ionic->idev, &cmd); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); msleep(20); @@ -135,7 +135,7 @@ int ionic_firmware_update(struct ionic_lif *lif, const struct firmware *fw, ionic_dev_cmd_firmware_download(idev, offsetof(union ionic_dev_cmd_regs, data), offset, copy_sz); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) { netdev_err(netdev, @@ -155,7 +155,7 @@ int ionic_firmware_update(struct ionic_lif *lif, const struct firmware *fw, mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_firmware_install(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); ionic_dev_cmd_comp(idev, (union ionic_dev_cmd_comp *)&comp); fw_slot = comp.fw_control.slot; mutex_unlock(&ionic->dev_cmd_lock); @@ -176,7 +176,7 @@ int ionic_firmware_update(struct ionic_lif *lif, const struct firmware *fw, mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_firmware_activate(idev, fw_slot); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) { NL_SET_ERR_MSG_MOD(extack, "Failed to start firmware select"); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 22d1e4b6d61be..267049b768509 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -3382,7 +3382,7 @@ static void ionic_lif_reset(struct ionic_lif *lif) mutex_lock(&lif->ionic->dev_cmd_lock); ionic_dev_cmd_lif_reset(idev, lif->index); - ionic_dev_cmd_wait(lif->ionic, DEVCMD_TIMEOUT); + ionic_dev_cmd_wait(lif->ionic, lif->ionic->cmd_timeout); mutex_unlock(&lif->ionic->dev_cmd_lock); } @@ -3589,7 +3589,7 @@ static int ionic_lif_adminq_init(struct ionic_lif *lif) mutex_lock(&lif->ionic->dev_cmd_lock); ionic_dev_cmd_adminq_init(idev, qcq, lif->index, qcq->intr.index); - err = ionic_dev_cmd_wait(lif->ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(lif->ionic, lif->ionic->cmd_timeout); ionic_dev_cmd_comp(idev, (union ionic_dev_cmd_comp *)&comp); mutex_unlock(&lif->ionic->dev_cmd_lock); if (err) { @@ -3749,7 +3749,7 @@ int ionic_lif_init(struct ionic_lif *lif) mutex_lock(&lif->ionic->dev_cmd_lock); ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa); - err = ionic_dev_cmd_wait(lif->ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(lif->ionic, lif->ionic->cmd_timeout); ionic_dev_cmd_comp(idev, (union ionic_dev_cmd_comp *)&comp); mutex_unlock(&lif->ionic->dev_cmd_lock); if (err) @@ -3937,7 +3937,7 @@ static void ionic_lif_queue_identify(struct ionic_lif *lif) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_queue_identify(idev, lif->lif_type, qtype, ionic_qtype_versions[qtype]); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); if (!err) { qti->version = readb(&q_ident->version); qti->supported = readb(&q_ident->supported); @@ -4003,7 +4003,7 @@ int ionic_lif_identify(struct ionic *ionic, u8 lif_type, mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_lif_identify(idev, lif_type, IONIC_IDENTITY_VERSION_1); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); memcpy_fromio(lid, &idev->dev_cmd_regs->data, sz); mutex_unlock(&ionic->dev_cmd_lock); if (err) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index 9955ab77d86d0..507281f3fc8bb 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -439,7 +439,7 @@ int ionic_adminq_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx, } time_start = jiffies; - time_limit = time_start + HZ * (ulong)DEVCMD_TIMEOUT; + time_limit = time_start + HZ * (ulong)lif->ionic->cmd_timeout; do { remaining = wait_for_completion_timeout(&ctx->work, IONIC_ADMINQ_TIME_SLICE); @@ -635,7 +635,7 @@ int ionic_identify(struct ionic *ionic) memcpy_toio(&idev->dev_cmd_regs->data, &ident->drv, sz); ionic_dev_cmd_identify(idev, IONIC_DEV_IDENTITY_VERSION_2); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); if (!err) { sz = min(sizeof(ident->dev), sizeof(idev->dev_cmd_regs->data)); memcpy_fromio(&ident->dev, &idev->dev_cmd_regs->data, sz); @@ -679,7 +679,7 @@ int ionic_init(struct ionic *ionic) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_init(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); return err; @@ -695,7 +695,7 @@ int ionic_reset(struct ionic *ionic) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_reset(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); return err; @@ -711,7 +711,7 @@ int ionic_port_identify(struct ionic *ionic) mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_identify(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); if (!err) { sz = min(sizeof(ident->port), sizeof(idev->dev_cmd_regs->data)); memcpy_fromio(&ident->port, &idev->dev_cmd_regs->data, sz); @@ -756,10 +756,10 @@ int ionic_port_init(struct ionic *ionic) memcpy_toio(&idev->dev_cmd_regs->data, &ident->port.config, sz); ionic_dev_cmd_port_init(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); ionic_dev_cmd_port_state(&ionic->idev, IONIC_PORT_ADMIN_STATE_UP); - ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); if (err) { @@ -786,7 +786,7 @@ int ionic_port_reset(struct ionic *ionic) if (ionic_is_fw_running(idev)) { mutex_lock(&ionic->dev_cmd_lock); ionic_dev_cmd_port_reset(idev); - err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait(ionic, ionic->cmd_timeout); mutex_unlock(&ionic->dev_cmd_lock); } -- 2.43.0