Commit 3e75e25f authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git fixes for 5.11. Major changes:

ath11k

* add null check for skb allocation

* fix crash found during connect/disconnect stress testing

* fix for HT disabled case

* brown paperbag fixes for my bugs in suspend code

* fix an unnecessary qmi allocation during firmware bootup

* disable ASPM during firmware bootup to avoid issues
parents 4dfde294 e9603f4b

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int ath11k_core_suspend(struct ath11k_base *ab) 
	ath11k_hif_ce_irq_disable(ab);



	ret = ath11k_hif_suspend(ab);

	if (!ret) {

	if (ret) {

		ath11k_warn(ab, "failed to suspend hif: %d\n", ret);

		return ret;

	}

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

+7 −3
Original line number Diff line number Diff line
@@ -2294,6 +2294,7 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc, 
{

	u8 channel_num;

	u32 center_freq;

	struct ieee80211_channel *channel;



	rx_status->freq = 0;

	rx_status->rate_idx = 0;
@@ -2314,9 +2315,12 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc, 
		rx_status->band = NL80211_BAND_5GHZ;

	} else {

		spin_lock_bh(&ar->data_lock);

		rx_status->band = ar->rx_channel->band;

		channel = ar->rx_channel;

		if (channel) {

			rx_status->band = channel->band;

			channel_num =

			ieee80211_frequency_to_channel(ar->rx_channel->center_freq);

				ieee80211_frequency_to_channel(channel->center_freq);

		}

		spin_unlock_bh(&ar->data_lock);

		ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "rx_desc: ",

				rx_desc, sizeof(struct hal_rx_desc));

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

+6 −2
Original line number Diff line number Diff line
@@ -3021,6 +3021,7 @@ static int ath11k_mac_station_add(struct ath11k *ar, 
	}



	if (ab->hw_params.vdev_start_delay &&

	    !arvif->is_started &&

	    arvif->vdev_type != WMI_VDEV_TYPE_AP) {

		ret = ath11k_start_vdev_delay(ar->hw, vif);

		if (ret) {
@@ -5284,7 +5285,8 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, 
	/* for QCA6390 bss peer must be created before vdev_start */

	if (ab->hw_params.vdev_start_delay &&

	    arvif->vdev_type != WMI_VDEV_TYPE_AP &&

	    arvif->vdev_type != WMI_VDEV_TYPE_MONITOR) {

	    arvif->vdev_type != WMI_VDEV_TYPE_MONITOR &&

	    !ath11k_peer_find_by_vdev_id(ab, arvif->vdev_id)) {

		memcpy(&arvif->chanctx, ctx, sizeof(*ctx));

		ret = 0;

		goto out;
@@ -5295,7 +5297,9 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, 
		goto out;

	}



	if (ab->hw_params.vdev_start_delay) {

	if (ab->hw_params.vdev_start_delay &&

	    (arvif->vdev_type == WMI_VDEV_TYPE_AP ||

	    arvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) {

		param.vdev_id = arvif->vdev_id;

		param.peer_type = WMI_PEER_TYPE_DEFAULT;

		param.peer_addr = ar->mac_addr;

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

+40 −4
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int ath11k_pci_fix_l1ss(struct ath11k_base *ab) 
				      PCIE_QSERDES_COM_SYSCLK_EN_SEL_REG,

				      PCIE_QSERDES_COM_SYSCLK_EN_SEL_VAL,

				      PCIE_QSERDES_COM_SYSCLK_EN_SEL_MSK);

	if (!ret) {

	if (ret) {

		ath11k_warn(ab, "failed to set sysclk: %d\n", ret);

		return ret;

	}
@@ -283,7 +283,7 @@ static int ath11k_pci_fix_l1ss(struct ath11k_base *ab) 
				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG1_REG,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG1_VAL,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG_MSK);

	if (!ret) {

	if (ret) {

		ath11k_warn(ab, "failed to set dtct config1 error: %d\n", ret);

		return ret;

	}
@@ -292,7 +292,7 @@ static int ath11k_pci_fix_l1ss(struct ath11k_base *ab) 
				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG2_REG,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG2_VAL,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG_MSK);

	if (!ret) {

	if (ret) {

		ath11k_warn(ab, "failed to set dtct config2: %d\n", ret);

		return ret;

	}
@@ -301,7 +301,7 @@ static int ath11k_pci_fix_l1ss(struct ath11k_base *ab) 
				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG4_REG,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG4_VAL,

				      PCIE_USB3_PCS_MISC_OSC_DTCT_CONFIG_MSK);

	if (!ret) {

	if (ret) {

		ath11k_warn(ab, "failed to set dtct config4: %d\n", ret);

		return ret;

	}
@@ -886,6 +886,32 @@ static void ath11k_pci_free_region(struct ath11k_pci *ab_pci) 
		pci_disable_device(pci_dev);

}



static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)

{

	struct ath11k_base *ab = ab_pci->ab;



	pcie_capability_read_word(ab_pci->pdev, PCI_EXP_LNKCTL,

				  &ab_pci->link_ctl);



	ath11k_dbg(ab, ATH11K_DBG_PCI, "pci link_ctl 0x%04x L0s %d L1 %d\n",

		   ab_pci->link_ctl,

		   u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L0S),

		   u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1));



	/* disable L0s and L1 */

	pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL,

				   ab_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC);



	set_bit(ATH11K_PCI_ASPM_RESTORE, &ab_pci->flags);

}



static void ath11k_pci_aspm_restore(struct ath11k_pci *ab_pci)

{

	if (test_and_clear_bit(ATH11K_PCI_ASPM_RESTORE, &ab_pci->flags))

		pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL,

					   ab_pci->link_ctl);

}



static int ath11k_pci_power_up(struct ath11k_base *ab)

{

	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);
@@ -895,6 +921,11 @@ static int ath11k_pci_power_up(struct ath11k_base *ab) 
	clear_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags);

	ath11k_pci_sw_reset(ab_pci->ab, true);



	/* Disable ASPM during firmware download due to problems switching

	 * to AMSS state.

	 */

	ath11k_pci_aspm_disable(ab_pci);



	ret = ath11k_mhi_start(ab_pci);

	if (ret) {

		ath11k_err(ab, "failed to start mhi: %d\n", ret);
@@ -908,6 +939,9 @@ static void ath11k_pci_power_down(struct ath11k_base *ab) 
{

	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);



	/* restore aspm in case firmware bootup fails */

	ath11k_pci_aspm_restore(ab_pci);



	ath11k_pci_force_wake(ab_pci->ab);

	ath11k_mhi_stop(ab_pci);

	clear_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags);
@@ -965,6 +999,8 @@ static int ath11k_pci_start(struct ath11k_base *ab) 


	set_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags);



	ath11k_pci_aspm_restore(ab_pci);



	ath11k_pci_ce_irqs_enable(ab);

	ath11k_ce_rx_post_buf(ab);

drivers/net/wireless/ath/ath11k/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct ath11k_msi_config { 
enum ath11k_pci_flags {

	ATH11K_PCI_FLAG_INIT_DONE,

	ATH11K_PCI_FLAG_IS_MSI_64,

	ATH11K_PCI_ASPM_RESTORE,

};



struct ath11k_pci {
@@ -80,6 +81,7 @@ struct ath11k_pci { 


	/* enum ath11k_pci_flags */

	unsigned long flags;

	u16 link_ctl;

};



static inline struct ath11k_pci *ath11k_pci_priv(struct ath11k_base *ab)