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

Commit e39aa29d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: support for platform specific crash recovery"

parents f7aef8fc 391e771c

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/main.c

+1 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ int __wil_down(struct wil6210_priv *wil) 
	}

	mutex_lock(&wil->mutex);



	if (!iter)

	if (iter < 0)

		wil_err(wil, "timeout waiting for idle FW/HW\n");



	wil_reset(wil, false);

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/rx_reorder.c

+11 −1
Original line number Diff line number Diff line
@@ -261,9 +261,19 @@ struct wil_tid_ampdu_rx *wil_tid_ampdu_rx_alloc(struct wil6210_priv *wil, 
void wil_tid_ampdu_rx_free(struct wil6210_priv *wil,

			   struct wil_tid_ampdu_rx *r)

{

	int i;



	if (!r)

		return;

	wil_release_reorder_frames(wil, r, r->head_seq_num + r->buf_size);



	/* Do not pass remaining frames to the network stack - it may be

	 * not expecting to get any more Rx. Rx from here may lead to

	 * kernel OOPS since some per-socket accounting info was already

	 * released.

	 */

	for (i = 0; i < r->buf_size; i++)

		kfree_skb(r->reorder_buf[i]);



	kfree(r->reorder_buf);

	kfree(r->reorder_time);

	kfree(r);

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

+1 −0
Original line number Diff line number Diff line
@@ -824,6 +824,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__ */