2015-01-29 12:25:27

by Michal Kazior

Subject: [PATCH] ath10k: enable qca6174 hw3.2

The 3.2 revision has a different target BMI
version so it wasn't recognized by ath10k (despite
the chip_id rev being on the supported list
already).

Signed-off-by: Michal Kazior <[email protected]>
---
drivers/net/wireless/ath/ath10k/core.c | 14 ++++++++++++++
drivers/net/wireless/ath/ath10k/hw.h | 1 +
2 files changed, 15 insertions(+)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 5e9e1a6..36a8fcf 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -85,6 +85,20 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
},
},
+ {
+ .id = QCA6174_HW_3_2_VERSION,
+ .name = "qca6174 hw3.2",
+ .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
+ .uart_pin = 6,
+ .fw = {
+ .dir = QCA6174_HW_3_0_FW_DIR,
+ .fw = QCA6174_HW_3_0_FW_FILE,
+ .otp = QCA6174_HW_3_0_OTP_FILE,
+ .board = QCA6174_HW_3_0_BOARD_DATA_FILE,
+ .board_size = QCA6174_BOARD_DATA_SZ,
+ .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
+ },
+ },
};

static void ath10k_send_suspend_complete(struct ath10k *ar)
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 5771278..460771f 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -40,6 +40,7 @@
#define QCA6174_HW_1_3_VERSION 0x05000003
#define QCA6174_HW_2_1_VERSION 0x05010000
#define QCA6174_HW_3_0_VERSION 0x05020000
+#define QCA6174_HW_3_2_VERSION 0x05030000

enum qca6174_pci_rev {
QCA6174_PCI_REV_1_1 = 0x11,
--
1.8.5.3

2015-01-29 12:59:41

by Michal Kazior

Subject: Re: [PATCH] ath10k: enable qca6174 hw3.2

On 29 January 2015 at 13:44, Kalle Valo <[email protected]> wrote:
> Michal Kazior <[email protected]> writes:
>
>> The 3.2 revision has a different target BMI
>> version so it wasn't recognized by ath10k (despite
>> the chip_id rev being on the supported list
>> already).
>>
>> Signed-off-by: Michal Kazior <[email protected]>
>
> But uses the same binaries as hw3.0?

Correct.


[...]
> I added this in pending branch to avoid people wondering why it uses 3.0
> binaries:
>
> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> index 36a8fcf349fa..310e12bc078a 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -91,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
> .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
> .uart_pin = 6,
> .fw = {
> + /* uses same binaries as hw3.0 */

Good point. Thanks!


Michał

2015-01-29 12:45:04

by Kalle Valo

Subject: Re: [PATCH] ath10k: enable qca6174 hw3.2

Michal Kazior <[email protected]> writes:

> The 3.2 revision has a different target BMI
> version so it wasn't recognized by ath10k (despite
> the chip_id rev being on the supported list
> already).
>
> Signed-off-by: Michal Kazior <[email protected]>

But uses the same binaries as hw3.0?

> + {
> + .id = QCA6174_HW_3_2_VERSION,
> + .name = "qca6174 hw3.2",
> + .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
> + .uart_pin = 6,
> + .fw = {
> + .dir = QCA6174_HW_3_0_FW_DIR,
> + .fw = QCA6174_HW_3_0_FW_FILE,
> + .otp = QCA6174_HW_3_0_OTP_FILE,
> + .board = QCA6174_HW_3_0_BOARD_DATA_FILE,
> + .board_size = QCA6174_BOARD_DATA_SZ,
> + .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
> + },
> + },
> };

I added this in pending branch to avoid people wondering why it uses 3.0
binaries:

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 36a8fcf349fa..310e12bc078a 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -91,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
.uart_pin = 6,
.fw = {
+ /* uses same binaries as hw3.0 */
.dir = QCA6174_HW_3_0_FW_DIR,
.fw = QCA6174_HW_3_0_FW_FILE,
.otp = QCA6174_HW_3_0_OTP_FILE,


--
Kalle Valo

2015-02-04 07:23:26

by Kalle Valo

Subject: Re: [PATCH] ath10k: enable qca6174 hw3.2

Michal Kazior <[email protected]> writes:

> The 3.2 revision has a different target BMI
> version so it wasn't recognized by ath10k (despite
> the chip_id rev being on the supported list
> already).
>
> Signed-off-by: Michal Kazior <[email protected]>

Thanks, applied to ath.git.

--
Kalle Valo