Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea3ade75 authored by Lior David's avatar Lior David Committed by Kalle Valo
Browse files

wil6210: support for platform specific crash recovery 



Added a simple interface for platform to perform crash
recovery.
When firmware crashes, wil driver can notify the platform
which can trigger a crash recovery process. During
the process the platform can request a ram dump
from the wil driver as well as control when firmware
recovery will start. This interface allows the platform
to implement a more advanced crash recovery, for
example to reset dependent subsystems in proper order, or
to provide its own notifications during the recovery process.

Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent dea16edd

drivers/net/wireless/ath/wil6210/interrupt.c

+6 −2
Original line number Diff line number Diff line
@@ -394,9 +394,13 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie) 
		wil_fw_core_dump(wil);

		wil_notify_fw_error(wil);

		isr &= ~ISR_MISC_FW_ERROR;

		if (wil->platform_ops.notify_crash) {

			wil_err(wil, "notify platform driver about FW crash");

			wil->platform_ops.notify_crash(wil->platform_handle);

		} else {

			wil_fw_error_recovery(wil);

		}



	}

	if (isr & ISR_MISC_MBOX_EVT) {

		wil_dbg_irq(wil, "MBOX event\n");

		wmi_recv_cmd(wil);

drivers/net/wireless/ath/wil6210/pcie_bus.c

+28 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.

 * Copyright (c) 2012-2015 Qualcomm Atheros, Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -125,11 +125,37 @@ static int wil_if_pcie_disable(struct wil6210_priv *wil) 
	return 0;

}



static int wil_platform_rop_ramdump(void *wil_handle, void *buf, uint32_t size)

{

	struct wil6210_priv *wil = wil_handle;



	if (!wil)

		return -EINVAL;



	return wil_fw_copy_crash_dump(wil, buf, size);

}



static int wil_platform_rop_fw_recovery(void *wil_handle)

{

	struct wil6210_priv *wil = wil_handle;



	if (!wil)

		return -EINVAL;



	wil_fw_error_recovery(wil);



	return 0;

}



static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct wil6210_priv *wil;

	struct device *dev = &pdev->dev;

	int rc;

	const struct wil_platform_rops rops = {

		.ramdump = wil_platform_rop_ramdump,

		.fw_recovery = wil_platform_rop_fw_recovery,

	};



	/* check HW */

	dev_info(&pdev->dev, WIL_NAME
@@ -154,7 +180,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* rollback to if_free */



	wil->platform_handle =

			wil_platform_init(&pdev->dev, &wil->platform_ops);

		wil_platform_init(&pdev->dev, &wil->platform_ops, &rops, wil);

	if (!wil->platform_handle) {

		rc = -ENODEV;

		wil_err(wil, "wil_platform_init failed\n");

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ int wil_can_suspend(struct wil6210_priv *wil, bool is_runtime); 
int wil_suspend(struct wil6210_priv *wil, bool is_runtime);

int wil_resume(struct wil6210_priv *wil, bool is_runtime);



int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size);

void wil_fw_core_dump(struct wil6210_priv *wil);



#endif /* __WIL6210_H__ */

drivers/net/wireless/ath/wil6210/wil_crash_dump.c

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ static int wil_fw_get_crash_dump_bounds(struct wil6210_priv *wil, 
	return 0;

}



static int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest,

				  u32 size)

int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size)

{

	int i;

	const struct fw_map *map;

drivers/net/wireless/ath/wil6210/wil_platform.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ void wil_platform_modexit(void) 
 * It returns a handle which is used with the rest of the API

 *

 */

void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops)

void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops,

			const struct wil_platform_rops *rops, void *wil_handle)

{

	void *handle = ops; /* to return some non-NULL for 'void' impl. */