Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (fb53905c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,13 @@ config ATH10K_AHB
		---help---
		This module adds support for AHB bus

		config ATH10K_SDIO
		tristate "Atheros ath10k SDIO support (EXPERIMENTAL)"
		depends on ATH10K && MMC
		---help---
		This module adds experimental support for SDIO/MMC bus. Currently
		work in progress and will not fully work.

		config ATH10K_DEBUG
		bool "Atheros ath10k debugging"
		depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,5 +27,8 @@ ath10k_pci-y += pci.o \

		ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o

		obj-$(CONFIG_ATH10K_SDIO) += ath10k_sdio.o
		ath10k_sdio-y += sdio.o

		# for tracing framework to find trace.h
		CFLAGS_trace.o := -I$(src)

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

+71 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,77 @@ int ath10k_bmi_get_target_info(struct ath10k *ar,
		return 0;
		}

		#define TARGET_VERSION_SENTINAL 0xffffffffu

		int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,
		struct bmi_target_info *target_info)
		{
		struct bmi_cmd cmd;
		union bmi_resp resp;
		u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.get_target_info);
		u32 resplen, ver_len;
		__le32 tmp;
		int ret;

		ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi get target info SDIO\n");

		if (ar->bmi.done_sent) {
		ath10k_warn(ar, "BMI Get Target Info Command disallowed\n");
		return -EBUSY;
		}

		cmd.id = __cpu_to_le32(BMI_GET_TARGET_INFO);

		/* Step 1: Read 4 bytes of the target info and check if it is
		* the special sentinal version word or the first word in the
		* version response.
		*/
		resplen = sizeof(u32);
		ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, &tmp, &resplen);
		if (ret) {
		ath10k_warn(ar, "unable to read from device\n");
		return ret;
		}

		/* Some SDIO boards have a special sentinal byte before the real
		* version response.
		*/
		if (__le32_to_cpu(tmp) == TARGET_VERSION_SENTINAL) {
		/* Step 1b: Read the version length */
		resplen = sizeof(u32);
		ret = ath10k_hif_exchange_bmi_msg(ar, NULL, 0, &tmp,
		&resplen);
		if (ret) {
		ath10k_warn(ar, "unable to read from device\n");
		return ret;
		}
		}

		ver_len = __le32_to_cpu(tmp);

		/* Step 2: Check the target info length */
		if (ver_len != sizeof(resp.get_target_info)) {
		ath10k_warn(ar, "Unexpected target info len: %u. Expected: %zu\n",
		ver_len, sizeof(resp.get_target_info));
		return -EINVAL;
		}

		/* Step 3: Read the rest of the version response */
		resplen = sizeof(resp.get_target_info) - sizeof(u32);
		ret = ath10k_hif_exchange_bmi_msg(ar, NULL, 0,
		&resp.get_target_info.version,
		&resplen);
		if (ret) {
		ath10k_warn(ar, "unable to read from device\n");
		return ret;
		}

		target_info->version = __le32_to_cpu(resp.get_target_info.version);
		target_info->type = __le32_to_cpu(resp.get_target_info.type);

		return 0;
		}

		int ath10k_bmi_read_memory(struct ath10k *ar,
		u32 address, void *buffer, u32 length)
		{

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,8 @@ void ath10k_bmi_start(struct ath10k *ar);
		int ath10k_bmi_done(struct ath10k *ar);
		int ath10k_bmi_get_target_info(struct ath10k *ar,
		struct bmi_target_info *target_info);
		int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,
		struct bmi_target_info *target_info);
		int ath10k_bmi_read_memory(struct ath10k *ar, u32 address,
		void *buffer, u32 length);
		int ath10k_bmi_write_memory(struct ath10k *ar, u32 address,

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

+34 −2

Original line number	Diff line number	Diff line
		@@ -389,6 +389,21 @@ static void ath10k_send_suspend_complete(struct ath10k *ar)
		complete(&ar->target_suspend);
		}

		static void ath10k_init_sdio(struct ath10k *ar)
		{
		u32 param = 0;

		ath10k_bmi_write32(ar, hi_mbox_io_block_sz, 256);
		ath10k_bmi_write32(ar, hi_mbox_isr_yield_limit, 99);
		ath10k_bmi_read32(ar, hi_acs_flags, &param);

		param \|= (HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET \|
		HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET \|
		HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE);

		ath10k_bmi_write32(ar, hi_acs_flags, param);
		}

		static int ath10k_init_configure_target(struct ath10k *ar)
		{
		u32 param_host;
		@@ -1395,7 +1410,18 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k ar, const char name,
		static void ath10k_core_get_fw_name(struct ath10k ar, char fw_name,
		size_t fw_name_len, int fw_api)
		{
		scnprintf(fw_name, fw_name_len, "%s-%d.bin", ATH10K_FW_FILE_BASE, fw_api);
		switch (ar->hif.bus) {
		case ATH10K_BUS_SDIO:
		scnprintf(fw_name, fw_name_len, "%s-%s-%d.bin",
		ATH10K_FW_FILE_BASE, ath10k_bus_str(ar->hif.bus),
		fw_api);
		break;
		case ATH10K_BUS_PCI:
		case ATH10K_BUS_AHB:
		scnprintf(fw_name, fw_name_len, "%s-%d.bin",
		ATH10K_FW_FILE_BASE, fw_api);
		break;
		}
		}

		static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
		@@ -1953,6 +1979,9 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
		if (status)
		goto err;

		if (ar->hif.bus == ATH10K_BUS_SDIO)
		ath10k_init_sdio(ar);

		ar->htc.htc_ops.target_send_suspend_complete =
		ath10k_send_suspend_complete;

		@@ -2200,6 +2229,9 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
		}

		memset(&target_info, 0, sizeof(target_info));
		if (ar->hif.bus == ATH10K_BUS_SDIO)
		ret = ath10k_bmi_get_target_info_sdio(ar, &target_info);
		else
		ret = ath10k_bmi_get_target_info(ar, &target_info);
		if (ret) {
		ath10k_err(ar, "could not get target info (%d)\n", ret);