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

Commit 8f169b9c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: print error in FW and board files load failures"

parents 424d4665 7a4249f9

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

+1 −0
Original line number Diff line number Diff line
@@ -2568,6 +2568,7 @@ static const struct dbg_off dbg_wil_regs[] = { 
	{"RGF_MAC_MTRL_COUNTER_0", 0444, HOSTADDR(RGF_MAC_MTRL_COUNTER_0),

		doff_io32},

	{"RGF_USER_USAGE_1", 0444, HOSTADDR(RGF_USER_USAGE_1), doff_io32},

	{"RGF_USER_USAGE_2", 0444, HOSTADDR(RGF_USER_USAGE_2), doff_io32},

	{},

};

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

+5 −1
Original line number Diff line number Diff line 
/*

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

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

 * 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
@@ -647,6 +647,8 @@ int wil_request_firmware(struct wil6210_priv *wil, const char *name, 


out:

	release_firmware(fw);

	if (rc)

		wil_err_fw(wil, "Loading <%s> failed, rc %d\n", name, rc);

	return rc;

}
@@ -741,6 +743,8 @@ int wil_request_board(struct wil6210_priv *wil, const char *name) 


out:

	release_firmware(brd);

	if (rc)

		wil_err_fw(wil, "Loading <%s> failed, rc %d\n", name, rc);

	return rc;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct RGF_ICR { 


/* registers - FW addresses */

#define RGF_USER_USAGE_1		(0x880004)

#define RGF_USER_USAGE_2		(0x880008)

#define RGF_USER_USAGE_6		(0x880018)

	#define BIT_USER_OOB_MODE		BIT(31)

	#define BIT_USER_OOB_R2_MODE		BIT(30)