ath10k: Add support for Ubiquiti-branded QCA988X
Subsystems (2)
v2 cover ath10k: Add support for Ubiquiti-branded QCA988X
A lot of more modern Ubiquiti AirMAX wireless devices contain a rebranded QCA988X with changed PCI vendor and device id.
This patch adds support for those chips by treating them as QCA988X rev2 radios.
Changes since v1:
* Send patch to more people and lists
Tobias Schramm (2):
pci: Add vendor id of Ubiquiti Networks
ath10k: Add support for Uiquiti rebranded QCA988X v2
drivers/net/wireless/ath/ath10k/core.c | 24 ++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/pci.c | 4 ++++ include/linux/pci_ids.h | 2 ++ 4 files changed, 31 insertions(+)
Signature · 1 line
2.16.0
PATCH v2 1/2 pci: Add vendor id of Ubiquiti Networks
--- include/linux/pci_ids.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/pci_ids.h +2 -0
@@ -149,6 +149,8 @@#define PCI_VENDOR_ID_DYNALINK 0x0675#define PCI_DEVICE_ID_DYNALINK_IS64PH 0x1702 +#define PCI_VENDOR_ID_UBNT 0x0777 +#define PCI_VENDOR_ID_BERKOM 0x0871#define PCI_DEVICE_ID_BERKOM_A1T 0xffa1#define PCI_DEVICE_ID_BERKOM_T_CONCEPT 0xffa2
Signature · 1 line
2.16.0
PATCH v2 2/2 ath10k: Add support for Uiquiti rebranded QCA988X v2
In reply to Tobias SchrammSome modern Ubiquiti devices contain a rebranded QCA988X rev2 with a custom Ubiquiti vendor and device id. This patch adds support for those devices, treating them as a QCA988X v2.
--- drivers/net/wireless/ath/ath10k/core.c | 24 ++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/pci.c | 4 ++++ 3 files changed, 29 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +24 -0
@@ -52,6 +52,30 @@ MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");MODULE_PARM_DESC (rawmode,"Use raw 802.11 frame datapath" );static const struct ath10k_hw_params ath10k_hw_params_list[] = { + { + .id =QCA988X_HW_2_0_VERSION , + .dev_id =QCA988X_2_0_DEVICE_ID_UBNT , + .name ="qca988x hw2.0" , + .patch_load_addr =QCA988X_HW_2_0_PATCH_LOAD_ADDR , + .uart_pin =7 , + .cc_wraparound_type =ATH10K_HW_CC_WRAP_SHIFTED_ALL , + .otp_exe_param =0 , + .channel_counters_freq_hz =88000 , + .max_probe_resp_desc_thres =0 , + .cal_data_len =2116 , + .fw = { + .dir =QCA988X_HW_2_0_FW_DIR , + .board =QCA988X_HW_2_0_BOARD_DATA_FILE , + .board_size =QCA988X_BOARD_DATA_SZ , + .board_ext_size =QCA988X_BOARD_EXT_DATA_SZ , + }, + .hw_ops = &qca988x_ops, + .decap_align_bytes =4 , + .spectral_bin_discard =0 , + .vht160_mcs_rx_highest =0 , + .vht160_mcs_tx_highest =0 , + .n_cipher_suites =8 , + }, { .id =QCA988X_HW_2_0_VERSION , .dev_id =QCA988X_2_0_DEVICE_ID ,
drivers/net/wireless/ath/ath10k/hw.h +1 -0
@@ -22,6 +22,7 @@#define ATH10K_FW_DIR "ath10k" +#define QCA988X_2_0_DEVICE_ID_UBNT (0x11ac)#define QCA988X_2_0_DEVICE_ID (0x003c)#define QCA6164_2_1_DEVICE_ID (0x0041)#define QCA6174_2_1_DEVICE_ID (0x003e)
drivers/net/wireless/ath/ath10k/pci.c +4 -0
@@ -52,6 +52,7 @@ MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)");#define ATH10K_PCI_NUM_WARM_RESET_ATTEMPTS 3static const struct pci_device_id ath10k_pci_id_table[] = { + {PCI_VDEVICE (UBNT ,QCA988X_2_0_DEVICE_ID_UBNT ) },/* PCI-E QCA988X V2 (Ubiquiti branded) */ {PCI_VDEVICE (ATHEROS ,QCA988X_2_0_DEVICE_ID ) },/* PCI-E QCA988X V2 */ {PCI_VDEVICE (ATHEROS ,QCA6164_2_1_DEVICE_ID ) },/* PCI-E QCA6164 V2.1 */ {PCI_VDEVICE (ATHEROS ,QCA6174_2_1_DEVICE_ID ) },/* PCI-E QCA6174 V2.1 */
@@ -68,6 +69,7 @@ static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = {* hacks. ath10k doesn't have them and these devices crash horribly * because of that. */ + { QCA988X_2_0_DEVICE_ID_UBNT, QCA988X_HW_2_0_CHIP_ID_REV }, { QCA988X_2_0_DEVICE_ID, QCA988X_HW_2_0_CHIP_ID_REV }, { QCA6164_2_1_DEVICE_ID, QCA6174_HW_2_1_CHIP_ID_REV },
@@ -1977,6 +1979,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar)struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);switch (ar_pci->pdev->device) { +case QCA988X_2_0_DEVICE_ID_UBNT :case QCA988X_2_0_DEVICE_ID :case QCA99X0_2_0_DEVICE_ID :case QCA9888_2_0_DEVICE_ID :
@@ -3208,6 +3211,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,u32 (*targ_cpu_to_ce_addr)(struct ath10k *ar,u32 addr);switch (pci_dev->device) { +case QCA988X_2_0_DEVICE_ID_UBNT :case QCA988X_2_0_DEVICE_ID : hw_rev =ATH10K_HW_QCA988X ; pci_ps = false;
Signature · 1 line
2.16.0
Re: [PATCH v2 1/2] pci: Add vendor id of Ubiquiti Networks
In reply to Tobias SchrammQuoted 10 lines · Tobias Schramm
Signed-off-by Tobias Schramm <[email protected]>--- include/linux/pci_ids.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/pci_ids.h +0
-0
include/linux/pci_ids.h line 152
Quoted 4 lines
include/linux/pci_ids.h +1
-0@@ -149,6 +149,8 @@#define PCI_VENDOR_ID_DYNALINK 0x0675#define PCI_DEVICE_ID_DYNALINK_IS64PH 0x1702 +#define PCI_VENDOR_ID_UBNT 0x0777
Guess this is the stock symbol, but that does not seem a common approach here. Why not just PCI_VENDOR_ID_UBIQUITI?
Regards,
Arend
Re: [PATCH v2 2/2] ath10k: Add support for Uiquiti rebranded QCA988X v2
In reply to Tobias SchrammQuoted 1 line · Tobias Schramm
Some modern Ubiquiti devices contain a rebranded QCA988X rev2 with
You dropped a 'b' in the subject, ie. Uiquiti.
Regards,
Arend
Re: [PATCH v2 1/2] pci: Add vendor id of Ubiquiti Networks
In reply to Arend van SprielOk, will change that to PCI_VENDOR_ID_UBIQUITI in v3
Re: [PATCH v2 2/2] ath10k: Add support for Uiquiti rebranded QCA988X v2
In reply to Arend van SprielTrue, I'll fix it in v3
2018-01-25 11:49 GMT+01:00 Arend van Spriel <[email protected]>:
Quoted 10 lines · Tobias Schramm
Quoted 2 lines
Some modern Ubiquiti devices contain a rebranded QCA988X rev2 with
You dropped a 'b' in the subject, ie. Uiquiti.
Regards,
Arend