Commit 5f09037a authored by Anilkumar Kolli's avatar Anilkumar Kolli Committed by Kalle Valo
Browse files

ath10k: assign proper firmware crash dump structure 



ar->target_version is same for QCA99x0, QCA4019, QCA9888
and QCA9984, this ended up in assigning the wrong hw_mem_layouts.
This patch adds additional hw_rev check to assign correct
hw_mem_layouts.

Tested on:
QCA4019 firmware 10.4-3.2.1.1-00017
QCA9984 firmware 10.4-3.5.3-00057

Signed-off-by: default avatarAnilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent bbcfb343

drivers/net/wireless/ath/ath10k/coredump.c

+14 −1
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ static const struct ath10k_mem_region qca4019_hw10_mem_regions[] = { 
static const struct ath10k_hw_mem_layout hw_mem_layouts[] = {

	{

		.hw_id = QCA6174_HW_1_0_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -972,6 +973,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_1_1_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -979,6 +981,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_1_3_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -986,6 +989,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_2_1_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw21_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw21_mem_regions),
@@ -993,6 +997,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_3_0_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -1000,6 +1005,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_3_2_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -1007,6 +1013,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9377_HW_1_1_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9377,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -1014,6 +1021,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA988X_HW_2_0_VERSION,

		.hw_rev = ATH10K_HW_QCA988X,

		.region_table = {

			.regions = qca988x_hw20_mem_regions,

			.size = ARRAY_SIZE(qca988x_hw20_mem_regions),
@@ -1021,6 +1029,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9984_HW_1_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9984,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),
@@ -1028,6 +1037,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9888_HW_2_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9888,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),
@@ -1035,6 +1045,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA99X0_HW_2_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA99X0,

		.region_table = {

			.regions = qca99x0_hw20_mem_regions,

			.size = ARRAY_SIZE(qca99x0_hw20_mem_regions),
@@ -1042,6 +1053,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA4019_HW_1_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA4019,

		.region_table = {

			.regions = qca4019_hw10_mem_regions,

			.size = ARRAY_SIZE(qca4019_hw10_mem_regions),
@@ -1088,7 +1100,8 @@ const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k 
		return NULL;



	for (i = 0; i < ARRAY_SIZE(hw_mem_layouts); i++) {

		if (ar->target_version == hw_mem_layouts[i].hw_id)

		if (ar->target_version == hw_mem_layouts[i].hw_id &&

		    ar->hw_rev == hw_mem_layouts[i].hw_rev)

			return &hw_mem_layouts[i];

	}

drivers/net/wireless/ath/ath10k/coredump.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ struct ath10k_mem_region { 
 */

struct ath10k_hw_mem_layout {

	u32 hw_id;

	u32 hw_rev;



	struct {

		const struct ath10k_mem_region *regions;

CRA Git | Maintained and supported by SUSTech CRA and CCSE