MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-08 18:35:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ionic: no fw read when PCI reset failed

Browse Source 
If there was a failed attempt to reset the PCI connection,
don't later try to read from PCI as the space is unmapped
and will cause a paging request crash.  When clearing the PCI
setup we can clear the dev_info register pointer, and check
it before using it in the fw_running test.

Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shannon Nelson 2023-12-11 10:58:01 -08:00 committed by David S. Miller
parent 13943d6c82
commit 219e183272
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
View File

@ -215,6 +215,11 @@ out:
static void ionic_clear_pci(struct ionic *ionic) static void ionic_clear_pci(struct ionic *ionic)
{ {
ionic->idev.dev_info_regs = NULL;
ionic->idev.dev_cmd_regs = NULL;
ionic->idev.intr_status = NULL;
ionic->idev.intr_ctrl = NULL;
ionic_unmap_bars(ionic); ionic_unmap_bars(ionic);
pci_release_regions(ionic->pdev); pci_release_regions(ionic->pdev);

23
drivers/net/ethernet/pensando/ionic/ionic_dev.c
View File

@ -165,9 +165,19 @@ void ionic_dev_teardown(struct ionic *ionic)
} }
/* Devcmd Interface */ /* Devcmd Interface */
bool ionic_is_fw_running(struct ionic_dev *idev) static bool __ionic_is_fw_running(struct ionic_dev *idev, u8 *status_ptr)
{ {
u8 fw_status = ioread8(&idev->dev_info_regs->fw_status); u8 fw_status;
if (!idev->dev_info_regs) {
if (status_ptr)
*status_ptr = 0xff;
return false;
}
fw_status = ioread8(&idev->dev_info_regs->fw_status);
if (status_ptr)
*status_ptr = fw_status;
/* firmware is useful only if the running bit is set and /* firmware is useful only if the running bit is set and
* fw_status != 0xff (bad PCI read) * fw_status != 0xff (bad PCI read)
@ -175,6 +185,11 @@ bool ionic_is_fw_running(struct ionic_dev *idev)
return (fw_status != 0xff) && (fw_status & IONIC_FW_STS_F_RUNNING); return (fw_status != 0xff) && (fw_status & IONIC_FW_STS_F_RUNNING);
} }
bool ionic_is_fw_running(struct ionic_dev *idev)
{
return __ionic_is_fw_running(idev, NULL);
}
int ionic_heartbeat_check(struct ionic *ionic) int ionic_heartbeat_check(struct ionic *ionic)
{ {
unsigned long check_time, last_check_time; unsigned long check_time, last_check_time;
@ -199,10 +214,8 @@ do_check_time:
goto do_check_time; goto do_check_time;
} }
fw_status = ioread8(&idev->dev_info_regs->fw_status);
/* If fw_status is not ready don't bother with the generation */ /* If fw_status is not ready don't bother with the generation */
if (!ionic_is_fw_running(idev)) { if (!__ionic_is_fw_running(idev, &fw_status)) {
fw_status_ready = false; fw_status_ready = false;
} else { } else {
fw_generation = fw_status & IONIC_FW_STS_F_GENERATION; fw_generation = fw_status & IONIC_FW_STS_F_GENERATION;