Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (2a13513f) · Commits · 戴 / test

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ Optional properties:
		entry in clock-names.
		- clock-names: Should contain the clock names "wifi_wcss_cmd", "wifi_wcss_ref",
		"wifi_wcss_rtc" for "qcom,ipq4019-wifi" compatible target and
		"cxo_ref_clk_pin" for "qcom,wcn3990-wifi"
		"cxo_ref_clk_pin" and optionally "qdss" for "qcom,wcn3990-wifi"
		compatible target.
		- qcom,msi_addr: MSI interrupt address.
		- qcom,msi_base: Base value to add before writing MSI data into
		@@ -88,6 +88,9 @@ Optional properties:
		of the host capability QMI request
		- qcom,xo-cal-data: xo cal offset to be configured in xo trim register.

		- qcom,msa-fixed-perm: Boolean context flag to disable SCM call for statically
		mapped msa region.

		Example (to supply PCI based wifi block details):

		In this example, the node is defined as child node of the PCI controller.
		@@ -185,4 +188,5 @@ wifi@18000000 {
		vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
		memory-region = <&wifi_msa_mem>;
		iommus = <&apps_smmu 0x0040 0x1>;
		qcom,msa-fixed-perm;
		};

+3 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static void ar5523_read_reply(struct ar5523 ar, struct ar5523_cmd_hdr hdr,

		if (cmd->odata) {
		if (cmd->olen < olen) {
		ar5523_err(ar, "olen to small %d < %d\n",
		ar5523_err(ar, "olen too small %d < %d\n",
		cmd->olen, olen);
		cmd->olen = 0;
		cmd->res = -EOVERFLOW;
		@@ -1770,6 +1770,8 @@ static const struct usb_device_id ar5523_id_table[] = {
		AR5523_DEVICE_UX(0x0846, 0x4300), /* Netgear / WG111U */
		AR5523_DEVICE_UG(0x0846, 0x4250), /* Netgear / WG111T */
		AR5523_DEVICE_UG(0x0846, 0x5f00), /* Netgear / WPN111 */
		AR5523_DEVICE_UG(0x083a, 0x4506), /* SMC / EZ Connect
		SMCWUSBT-G2 */
		AR5523_DEVICE_UG(0x157e, 0x3006), /* Umedia / AR5523_1 */
		AR5523_DEVICE_UX(0x157e, 0x3205), /* Umedia / AR5523_2 */
		AR5523_DEVICE_UG(0x157e, 0x3006), /* Umedia / TEW444UBEU */

+1 −1

Original line number	Diff line number	Diff line
		@@ -2140,7 +2140,7 @@ static bool ath10k_htt_rx_pn_check_replay_hl(struct ath10k *ar,
		if (last_pn_valid)
		pn_invalid = ath10k_htt_rx_pn_cmp48(&new_pn, last_pn);
		else
		peer->tids_last_pn_valid[tid] = 1;
		peer->tids_last_pn_valid[tid] = true;

		if (!pn_invalid)
		last_pn->pn48 = new_pn.pn48;

+1 −1

Original line number	Diff line number	Diff line
		@@ -816,7 +816,7 @@ ath10k_is_rssi_enable(struct ath10k_hw_params *hw,

		#define TARGET_10_4_TX_DBG_LOG_SIZE 1024
		#define TARGET_10_4_NUM_WDS_ENTRIES 32
		#define TARGET_10_4_DMA_BURST_SIZE 0
		#define TARGET_10_4_DMA_BURST_SIZE 1
		#define TARGET_10_4_MAC_AGGR_DELIM 0
		#define TARGET_10_4_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1
		#define TARGET_10_4_VOW_CONFIG 0

+18 −3

Original line number	Diff line number	Diff line
		@@ -1578,7 +1578,7 @@ static int ath10k_pci_set_ram_config(struct ath10k *ar, u32 config)
		return 0;
		}

		/* if an error happened returns < 0, otherwise the length */
		/* Always returns the length */
		static int ath10k_pci_dump_memory_sram(struct ath10k *ar,
		const struct ath10k_mem_region *region,
		u8 *buf)
		@@ -1604,11 +1604,22 @@ static int ath10k_pci_dump_memory_reg(struct ath10k *ar,
		{
		struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
		u32 i;
		int ret;

		mutex_lock(&ar->conf_mutex);
		if (ar->state != ATH10K_STATE_ON) {
		ath10k_warn(ar, "Skipping pci_dump_memory_reg invalid state\n");
		ret = -EIO;
		goto done;
		}

		for (i = 0; i < region->len; i += 4)
		(u32 )(buf + i) = ioread32(ar_pci->mem + region->start + i);

		return region->len;
		ret = region->len;
		done:
		mutex_unlock(&ar->conf_mutex);
		return ret;
		}

		/* if an error happened returns < 0, otherwise the length */
		@@ -1704,7 +1715,11 @@ static void ath10k_pci_dump_memory(struct ath10k *ar,
		count = ath10k_pci_dump_memory_sram(ar, current_region, buf);
		break;
		case ATH10K_MEM_REGION_TYPE_IOREG:
		count = ath10k_pci_dump_memory_reg(ar, current_region, buf);
		ret = ath10k_pci_dump_memory_reg(ar, current_region, buf);
		if (ret < 0)
		break;

		count = ret;
		break;
		default:
		ret = ath10k_pci_dump_memory_generic(ar, current_region, buf);