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

Commit 6fd3dd71 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Kalle Valo
Browse files

ath10k: add QCA9887 chipset support 



Add the hardware name, revision, firmware names and update the pci_id
table.

QA9887 HW1.0 is supposed to be similar to QCA988X HW2.0 . Details about
he firmware interface are currently unknown.

Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@open-mesh.com>
[kvalo@qca.qualcomm.com: add a warning about experimental support]
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 280e762e

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

+20 −0
Original line number Diff line number Diff line
@@ -68,6 +68,25 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},

	},

	{

		.id = QCA9887_HW_1_0_VERSION,

		.dev_id = QCA9887_1_0_DEVICE_ID,

		.name = "qca9887 hw1.0",

		.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.has_shifted_cc_wraparound = true,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,

		.cal_data_len = 2116,

		.fw = {

			.dir = QCA9887_HW_1_0_FW_DIR,

			.board = QCA9887_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9887_BOARD_DATA_SZ,

			.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,

		},

	},

	{

		.id = QCA6174_HW_2_1_VERSION,

		.dev_id = QCA6164_2_1_DEVICE_ID,
@@ -2095,6 +2114,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 


	switch (hw_rev) {

	case ATH10K_HW_QCA988X:

	case ATH10K_HW_QCA9887:

		ar->regs = &qca988x_regs;

		ar->hw_values = &qca988x_values;

		break;

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

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define QCA99X0_2_0_DEVICE_ID   (0x0040)

#define QCA9984_1_0_DEVICE_ID	(0x0046)

#define QCA9377_1_0_DEVICE_ID   (0x0042)

#define QCA9887_1_0_DEVICE_ID   (0x0050)



/* QCA988X 1.0 definitions (unsupported) */

#define QCA988X_HW_1_0_CHIP_ID_REV	0x0
@@ -39,6 +40,13 @@ 
#define QCA988X_HW_2_0_BOARD_DATA_FILE	"board.bin"

#define QCA988X_HW_2_0_PATCH_LOAD_ADDR	0x1234



/* QCA9887 1.0 definitions */

#define QCA9887_HW_1_0_VERSION		0x4100016d

#define QCA9887_HW_1_0_CHIP_ID_REV	0

#define QCA9887_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9887/hw1.0"

#define QCA9887_HW_1_0_BOARD_DATA_FILE	"board.bin"

#define QCA9887_HW_1_0_PATCH_LOAD_ADDR	0x1234



/* QCA6174 target BMI version signatures */

#define QCA6174_HW_1_0_VERSION		0x05000000

#define QCA6174_HW_1_1_VERSION		0x05000001
@@ -205,6 +213,7 @@ enum ath10k_hw_rev { 
	ATH10K_HW_QCA9984,

	ATH10K_HW_QCA9377,

	ATH10K_HW_QCA4019,

	ATH10K_HW_QCA9887,

};



struct ath10k_hw_regs {
@@ -257,6 +266,7 @@ void ath10k_hw_fill_survey_time(struct ath10k *ar, struct survey_info *survey, 
				u32 cc, u32 rcc, u32 cc_prev, u32 rcc_prev);



#define QCA_REV_988X(ar) ((ar)->hw_rev == ATH10K_HW_QCA988X)

#define QCA_REV_9887(ar) ((ar)->hw_rev == ATH10K_HW_QCA9887)

#define QCA_REV_6174(ar) ((ar)->hw_rev == ATH10K_HW_QCA6174)

#define QCA_REV_99X0(ar) ((ar)->hw_rev == ATH10K_HW_QCA99X0)

#define QCA_REV_9984(ar) ((ar)->hw_rev == ATH10K_HW_QCA9984)

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

+18 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static const struct pci_device_id ath10k_pci_id_table[] = { 
	{ PCI_VDEVICE(ATHEROS, QCA99X0_2_0_DEVICE_ID) }, /* PCI-E QCA99X0 V2 */

	{ PCI_VDEVICE(ATHEROS, QCA9984_1_0_DEVICE_ID) }, /* PCI-E QCA9984 V1 */

	{ PCI_VDEVICE(ATHEROS, QCA9377_1_0_DEVICE_ID) }, /* PCI-E QCA9377 V1 */

	{ PCI_VDEVICE(ATHEROS, QCA9887_1_0_DEVICE_ID) }, /* PCI-E QCA9887 */

	{0}

};
@@ -87,6 +88,7 @@ static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = { 
	{ QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_0_CHIP_ID_REV },

	{ QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_1_CHIP_ID_REV },



	{ QCA9887_1_0_DEVICE_ID, QCA9887_HW_1_0_CHIP_ID_REV },

};



static void ath10k_pci_buffer_cleanup(struct ath10k *ar);
@@ -841,6 +843,7 @@ static u32 ath10k_pci_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr) 


	switch (ar->hw_rev) {

	case ATH10K_HW_QCA988X:

	case ATH10K_HW_QCA9887:

	case ATH10K_HW_QCA6174:

	case ATH10K_HW_QCA9377:

		val = (ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
@@ -1569,6 +1572,7 @@ static void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar) 


	switch (ar->hw_rev) {

	case ATH10K_HW_QCA988X:

	case ATH10K_HW_QCA9887:

	case ATH10K_HW_QCA6174:

	case ATH10K_HW_QCA9377:

		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
@@ -1593,6 +1597,7 @@ static void ath10k_pci_irq_msi_fw_unmask(struct ath10k *ar) 


	switch (ar->hw_rev) {

	case ATH10K_HW_QCA988X:

	case ATH10K_HW_QCA9887:

	case ATH10K_HW_QCA6174:

	case ATH10K_HW_QCA9377:

		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
@@ -1944,6 +1949,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar) 
	case QCA988X_2_0_DEVICE_ID:

	case QCA99X0_2_0_DEVICE_ID:

	case QCA9984_1_0_DEVICE_ID:

	case QCA9887_1_0_DEVICE_ID:

		return 1;

	case QCA6164_2_1_DEVICE_ID:

	case QCA6174_2_1_DEVICE_ID:
@@ -2998,6 +3004,13 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		pci_soft_reset = ath10k_pci_warm_reset;

		pci_hard_reset = ath10k_pci_qca988x_chip_reset;

		break;

	case QCA9887_1_0_DEVICE_ID:

		dev_warn(&pdev->dev, "QCA9887 support is still experimental, there are likely bugs. You have been warned.\n");

		hw_rev = ATH10K_HW_QCA9887;

		pci_ps = false;

		pci_soft_reset = ath10k_pci_warm_reset;

		pci_hard_reset = ath10k_pci_qca988x_chip_reset;

		break;

	case QCA6164_2_1_DEVICE_ID:

	case QCA6174_2_1_DEVICE_ID:

		hw_rev = ATH10K_HW_QCA6174;
@@ -3210,6 +3223,11 @@ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API5_FILE); 
MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA9887 1.0 firmware files */

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" QCA9887_HW_1_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA6174 2.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API5_FILE);

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

+3 −0
Original line number Diff line number Diff line
@@ -447,6 +447,9 @@ Fw Mode/SubMode Mask 
#define QCA988X_BOARD_DATA_SZ     7168

#define QCA988X_BOARD_EXT_DATA_SZ 0



#define QCA9887_BOARD_DATA_SZ     7168

#define QCA9887_BOARD_EXT_DATA_SZ 0



#define QCA6174_BOARD_DATA_SZ     8192

#define QCA6174_BOARD_EXT_DATA_SZ 0