[PATCH 1/4] ath11k: use hw_params to access board_size and cal_offset

[akolli at codeaurora.org]

On 2021-09-24 20:19, Kalle Valo wrote:
> Jouni Malinen <jouni at codeaurora.org> writes:
> 
>> From: Anilkumar Kolli <akolli at codeaurora.org>
>> 
>> Reuse board_size from hw_params, add cal_offset to hw params.
>> This patch is clean up only, there is no change in functionality.
>> 
>> Tested-on: IPQ8074 hw2.0 AHB 
>> WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1
>> Tested-on: QCN9074 hw1.0 PCI 
>> WLAN.HK.2.4.0.1-01838-QCAHKSWPL_SILICONZ-1
>> 
>> Signed-off-by: Anilkumar Kolli <akolli at codeaurora.org>
>> Signed-off-by: Jouni Malinen <jouni at codeaurora.org>
>> ---
>>  drivers/net/wireless/ath/ath11k/core.c | 10 +++++-----
>>  drivers/net/wireless/ath/ath11k/hw.h   |  2 +-
>>  drivers/net/wireless/ath/ath11k/qmi.c  |  4 ++--
>>  drivers/net/wireless/ath/ath11k/qmi.h  |  2 --
>>  4 files changed, 8 insertions(+), 10 deletions(-)
>> 
>> diff --git a/drivers/net/wireless/ath/ath11k/core.c 
>> b/drivers/net/wireless/ath/ath11k/core.c
>> index c97830633f1f..d2ab3b134632 100644
>> --- a/drivers/net/wireless/ath/ath11k/core.c
>> +++ b/drivers/net/wireless/ath/ath11k/core.c
>> @@ -37,7 +37,7 @@ static const struct ath11k_hw_params 
>> ath11k_hw_params[] = {
>>  		.fw = {
>>  			.dir = "IPQ8074/hw2.0",
>>  			.board_size = 256 * 1024,
>> -			.cal_size = 256 * 1024,
>> +			.cal_offset = 128 * 1024,
>>  		},
>>  		.max_radios = 3,
>>  		.bdf_addr = 0x4B0C0000,
>> @@ -87,7 +87,7 @@ static const struct ath11k_hw_params 
>> ath11k_hw_params[] = {
>>  		.fw = {
>>  			.dir = "IPQ6018/hw1.0",
>>  			.board_size = 256 * 1024,
>> -			.cal_size = 256 * 1024,
>> +			.cal_offset = 128 * 1024,
>>  		},
>>  		.max_radios = 2,
>>  		.bdf_addr = 0x4ABC0000,
>> @@ -134,7 +134,7 @@ static const struct ath11k_hw_params 
>> ath11k_hw_params[] = {
>>  		.fw = {
>>  			.dir = "QCA6390/hw2.0",
>>  			.board_size = 256 * 1024,
>> -			.cal_size = 256 * 1024,
>> +			.cal_offset = 128 * 1024,
>>  		},
>>  		.max_radios = 3,
>>  		.bdf_addr = 0x4B0C0000,
>> @@ -180,7 +180,7 @@ static const struct ath11k_hw_params 
>> ath11k_hw_params[] = {
>>  		.fw = {
>>  			.dir = "QCN9074/hw1.0",
>>  			.board_size = 256 * 1024,
>> -			.cal_size = 256 * 1024,
>> +			.cal_offset = 128 * 1024,
>>  		},
>>  		.max_radios = 1,
>>  		.single_pdev_only = false,
>> @@ -226,7 +226,7 @@ static const struct ath11k_hw_params 
>> ath11k_hw_params[] = {
>>  		.fw = {
>>  			.dir = "WCN6855/hw2.0",
>>  			.board_size = 256 * 1024,
>> -			.cal_size = 256 * 1024,
>> +			.cal_offset = 128 * 1024,
>>  		},
>>  		.max_radios = 3,
>>  		.bdf_addr = 0x4B0C0000,
>> diff --git a/drivers/net/wireless/ath/ath11k/hw.h 
>> b/drivers/net/wireless/ath/ath11k/hw.h
>> index 5d150cd793b2..3a03e09563e7 100644
>> --- a/drivers/net/wireless/ath/ath11k/hw.h
>> +++ b/drivers/net/wireless/ath/ath11k/hw.h
>> @@ -128,7 +128,7 @@ struct ath11k_hw_params {
>>  	struct {
>>  		const char *dir;
>>  		size_t board_size;
>> -		size_t cal_size;
>> +		size_t cal_offset;
> 
> You don't mention anything about cal_size. I'll add this to the commit
> log:
> 
> cal_size was unused, so remove that.

Yes. Thanks for adding.

- Anil.