Merge tag 'wireless-drivers-next-2021-04-23' of... (e40fa65c) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

+107 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,90 @@ properties:
		led-sources:
		maxItems: 1

		power-limits:
		type: object
		additionalProperties: false
		patternProperties:
		"^r[0-9]+":
		type: object
		additionalProperties: false
		properties:
		regdomain:
		$ref: /schemas/types.yaml#/definitions/string
		description:
		Regdomain refers to a legal regulatory region. Different
		countries define different levels of allowable transmitter
		power, time that a channel can be occupied, and different
		available channels
		enum:
		- FCC
		- ETSI
		- JP

		patternProperties:
		"^txpower-[256]g$":
		type: object
		additionalProperties: false
		patternProperties:
		"^b[0-9]+$":
		type: object
		additionalProperties: false
		properties:
		channels:
		$ref: /schemas/types.yaml#/definitions/uint32-array
		minItems: 2
		maxItems: 2
		description:
		Pairs of first and last channel number of the selected
		band

		rates-cck:
		$ref: /schemas/types.yaml#/definitions/uint8-array
		minItems: 4
		maxItems: 4
		description:
		4 half-dBm per-rate power limit values

		rates-ofdm:
		$ref: /schemas/types.yaml#/definitions/uint8-array
		minItems: 8
		maxItems: 8
		description:
		8 half-dBm per-rate power limit values

		rates-mcs:
		$ref: /schemas/types.yaml#/definitions/uint8-matrix
		description:
		Sets of per-rate power limit values for 802.11n/802.11ac
		rates for multiple channel bandwidth settings.
		Each set starts with the number of channel bandwidth
		settings for which the rate set applies, followed by
		either 8 or 10 power limit values. The order of the
		channel bandwidth settings is 20, 40, 80 and 160 MHz.
		maxItems: 4
		items:
		minItems: 9
		maxItems: 11

		rates-ru:
		$ref: /schemas/types.yaml#/definitions/uint8-matrix
		description:
		Sets of per-rate power limit values for 802.11ax rates
		for multiple channel bandwidth or resource unit settings.
		Each set starts with the number of channel bandwidth or
		resource unit settings for which the rate set applies,
		followed by 12 power limit values. The order of the
		channel resource unit settings is RU26, RU52, RU106,
		RU242/SU20, RU484/SU40, RU996/SU80 and RU2x996/SU160.
		items:
		minItems: 13
		maxItems: 13

		txs-delta:
		$ref: /schemas/types.yaml#/definitions/uint32-array
		description:
		Half-dBm power delta for different numbers of antennas

		required:
		- compatible
		- reg
		@@ -93,6 +177,29 @@ examples:
		led {
		led-sources = <2>;
		};

		power-limits {
		r0 {
		regdomain = "FCC";
		txpower-5g {
		b0 {
		channels = <36 48>;
		rates-ofdm = /bits/ 8 <23 23 23 23 23 23 23 23>;
		rates-mcs = /bits/ 8 <1 23 23 23 23 23 23 23 23 23 23>,
		<3 22 22 22 22 22 22 22 22 22 22>;
		rates-ru = /bits/ 8 <3 22 22 22 22 22 22 22 22 22 22 22 22>,
		<4 20 20 20 20 20 20 20 20 20 20 20 20>;
		};
		b1 {
		channels = <100 181>;
		rates-ofdm = /bits/ 8 <14 14 14 14 14 14 14 14>;
		rates-mcs = /bits/ 8 <4 14 14 14 14 14 14 14 14 14 14>;
		txs-delta = <12 9 6>;
		rates-ru = /bits/ 8 <7 14 14 14 14 14 14 14 14 14 14 14 14>;
		};
		};
		};
		};
		};
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -669,7 +669,7 @@ static int ath10k_htc_send_bundle(struct ath10k_htc_ep *ep,

		ath10k_dbg(ar, ATH10K_DBG_HTC,
		"bundle tx status %d eid %d req count %d count %d len %d\n",
		ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, bundle_skb->len);
		ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, skb_len);
		return ret;
		}

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,9 @@ static void ath10k_wmi_event_tdls_peer(struct ath10k ar, struct sk_buff skb)
		GFP_ATOMIC
		);
		break;
		default:
		kfree(tb);
		return;
		}

		exit:

drivers/net/wireless/ath/ath11k/mhi.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -349,10 +349,19 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
		mhi_ctrl->read_reg = ath11k_mhi_op_read_reg;
		mhi_ctrl->write_reg = ath11k_mhi_op_write_reg;

		if (ab->hw_rev == ATH11K_HW_QCA6390_HW20)
		ath11k_mhi_config = &ath11k_mhi_config_qca6390;
		else if (ab->hw_rev == ATH11K_HW_QCN9074_HW10)
		switch (ab->hw_rev) {
		case ATH11K_HW_QCN9074_HW10:
		ath11k_mhi_config = &ath11k_mhi_config_qcn9074;
		break;
		case ATH11K_HW_QCA6390_HW20:
		ath11k_mhi_config = &ath11k_mhi_config_qca6390;
		break;
		default:
		ath11k_err(ab, "failed assign mhi_config for unknown hw rev %d\n",
		ab->hw_rev);
		mhi_free_controller(mhi_ctrl);
		return -EINVAL;
		}

		ret = mhi_register_controller(mhi_ctrl, ath11k_mhi_config);
		if (ret) {

drivers/net/wireless/ath/ath11k/qmi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2514,7 +2514,7 @@ static int ath11k_qmi_event_load_bdf(struct ath11k_qmi *qmi)

		ret = ath11k_qmi_request_target_cap(ab);
		if (ret < 0) {
		ath11k_warn(ab, "failed to requeqst qmi target capabilities: %d\n",
		ath11k_warn(ab, "failed to request qmi target capabilities: %d\n",
		ret);
		return ret;
		}