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

Commit ff02bf94 authored by Alexei Avshalom Lazar's avatar Alexei Avshalom Lazar
Browse files

wil6210: take mem_lock for writing in crash dump collection 



On some crash dump cases mem_lock is already taken, error
returns and crash dump copy fails.
In this case wait until mem_lock available instead of failing
the operation.
Also take the mem_lock for writing to prevent other threads from
altering the state of the device while collecting crash dump.

Change-Id: I2ae74fba77e39161e33a7c5302916d1c9254fa05
Signed-off-by: default avatarAlexei Avshalom Lazar <ailizaro@codeaurora.org>
parent 68aa288f

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

+13 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (c) 2015,2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

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

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "wil6210.h"
@@ -57,7 +46,7 @@ static int wil_fw_get_crash_dump_bounds(struct wil6210_priv *wil, 


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

{

	int i, rc;

	int i;

	const struct fw_map *map;

	void *data;

	u32 host_min, dump_size, offset, len;
@@ -73,9 +62,15 @@ int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size) 
		return -EINVAL;

	}



	rc = wil_mem_access_lock(wil);

	if (rc)

		return rc;

	down_write(&wil->mem_lock);



	if (test_bit(wil_status_suspending, wil->status) ||

	    test_bit(wil_status_suspended, wil->status)) {

		wil_err(wil,

			"suspend/resume in progress. cannot copy crash dump\n");

		up_write(&wil->mem_lock);

		return -EBUSY;

	}



	/* copy to crash dump area */

	for (i = 0; i < ARRAY_SIZE(fw_mapping); i++) {
@@ -95,7 +90,8 @@ int wil_fw_copy_crash_dump(struct wil6210_priv *wil, void *dest, u32 size) 
		wil_memcpy_fromio_32((void * __force)(dest + offset),

				     (const void __iomem * __force)data, len);

	}

	wil_mem_access_unlock(wil);



	up_write(&wil->mem_lock);



	return 0;

}