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

Commit a91bb7b1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 6bffcedd on remote branch 

Change-Id: Id4e214ce362aaeb516872b91c1b9c35c3fdc43f2
parents abadbdc8 6bffcedd

hif/src/dispatcher/multibus.c

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2018, 2020-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -477,7 +478,6 @@ int hif_apps_irqs_disable(struct hif_opaque_softc *hif_ctx) 
		return -EINVAL;



	/* if the wake_irq is shared, don't disable it twice */

	disable_irq(scn->wake_irq);

	for (i = 0; i < scn->ce_count; ++i) {

		int irq = scn->bus_ops.hif_map_ce_to_irq(scn, i);
@@ -499,7 +499,6 @@ int hif_apps_irqs_enable(struct hif_opaque_softc *hif_ctx) 
		return -EINVAL;



	/* if the wake_irq is shared, don't enable it twice */

	enable_irq(scn->wake_irq);

	for (i = 0; i < scn->ce_count; ++i) {

		int irq = scn->bus_ops.hif_map_ce_to_irq(scn, i);

hif/src/hif_main.c

+2 −4
Original line number Diff line number Diff line
@@ -2047,10 +2047,8 @@ irqreturn_t hif_wake_interrupt_handler(int irq, void *context) 


	hif_info("wake interrupt received on irq %d", irq);



	if (hif_pm_runtime_get_monitor_wake_intr(hif_ctx)) {

	hif_pm_runtime_set_monitor_wake_intr(hif_ctx, 0);

	hif_pm_runtime_request_resume(hif_ctx);

	}



	if (scn->initial_wakeup_cb)

		scn->initial_wakeup_cb(scn->initial_wakeup_priv);

hif/src/pcie/if_pci.c

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -2403,8 +2404,6 @@ int hif_pci_bus_suspend_noirq(struct hif_softc *scn) 
	if (hif_can_suspend_link(GET_HIF_OPAQUE_HDL(scn)))

		qdf_atomic_set(&scn->link_suspended, 1);



	hif_apps_wake_irq_enable(GET_HIF_OPAQUE_HDL(scn));



	return 0;

}
@@ -2419,8 +2418,6 @@ int hif_pci_bus_suspend_noirq(struct hif_softc *scn) 
 */

int hif_pci_bus_resume_noirq(struct hif_softc *scn)

{

	hif_apps_wake_irq_disable(GET_HIF_OPAQUE_HDL(scn));



	/* a vote for link up can come in the middle of the ongoing resume

	 * process. hence, clear the link suspend flag once

	 * hif_bus_resume_noirq() succeeds since PCIe link is already resumed

os_if/linux/qca_vendor.h

+38 −0
Original line number Diff line number Diff line
@@ -3241,6 +3241,41 @@ enum qca_vendor_attr_roam_candidate_selection_criteria { 
 *	threshold value specified by the

 *	QCA_ATTR_ROAM_CONTROL_CANDIDATE_RSSI_THRESHOLD attribute shall be used.

 *

 * @QCA_ATTR_ROAM_CONTROL_HO_DELAY_FOR_RX: u16 value in milliseconds.

 *	Optional parameter. This configuration delays hand-off (in msec) by the

 *	specified duration to receive pending rx frames from current BSS.

 *

 * @QCA_ATTR_ROAM_CONTROL_FULL_SCAN_NO_REUSE_PARTIAL_SCAN_FREQ: Unsigned 8-bit

 *	value.

 *	During the roam scan, if there are no desired APs found in the partial

 *	frequency list, an immediate full scan on all the supported frequencies

 *	is initiated as a fallback. This flag controls the frequency list

 *	creation for the full scan on the following lines.

 *	1 - Full scan to exclude the frequencies that were already scanned by

 *	    the previous partial scan.

 *	0 - Full scan to include all the supported frequencies irrespective of

 *	    the ones part of the earlier partial scan.

 *	If this flag is not specified, a full scan shall include all the

 *	supported frequencies irrespective of the ones part of an earlier

 *	partial scan.

 *

 * @QCA_ATTR_ROAM_CONTROL_FULL_SCAN_6GHZ_ONLY_ON_PRIOR_DISCOVERY: Unsigned 8-bit

 *	value.

 *	During the roam scan, if there are no desired APs found in the partial

 *	frequency list, an immediate full scan on all the supported frequencies

 *	is initiated as a fallback. This full scan would add the 2.4/5/6 GHz

 *	frequencies, including all PSC frequencies by default. This attribute

 *	controls the inclusion of the 6 GHz PSC frequencies for the full scan

 *	as following.

 *	1 - Full scan to include the supported 6 GHz PSC frequencies only on the

 *	    prior discovery of any 6 GHz frequency support in the environment.

 *	    This discovery can happen through a prior RNR, 11k neighbor

 *	    request, 11v BTM request, host scan, etc.

 *	0 - Default behavior. Full scan to include all the supported 6 GHz

 *	    PSC frequencies regardless of whether 6 GHz BSSs have been

 *	    discovered.

 *	The default behavior if this flag is not specified is to include all

 *	the supported 6 GHz PSC frequencies in the roam full scan.

 */

enum qca_vendor_attr_roam_control {

	QCA_ATTR_ROAM_CONTROL_ENABLE = 1,
@@ -3259,6 +3294,9 @@ enum qca_vendor_attr_roam_control { 
	QCA_ATTR_ROAM_CONTROL_CANDIDATE_RSSI_THRESHOLD_2P4GHZ = 14,

	QCA_ATTR_ROAM_CONTROL_CANDIDATE_RSSI_THRESHOLD_5GHZ = 15,

	QCA_ATTR_ROAM_CONTROL_CANDIDATE_RSSI_THRESHOLD_6GHZ = 16,

	QCA_ATTR_ROAM_CONTROL_HO_DELAY_FOR_RX = 25,

	QCA_ATTR_ROAM_CONTROL_FULL_SCAN_NO_REUSE_PARTIAL_SCAN_FREQ = 26,

	QCA_ATTR_ROAM_CONTROL_FULL_SCAN_6GHZ_ONLY_ON_PRIOR_DISCOVERY = 27,



	/* keep last */

	QCA_ATTR_ROAM_CONTROL_AFTER_LAST,

target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h

+12 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -69,6 +70,17 @@ target_if_vdev_mgr_get_tx_ops(struct wlan_objmgr_psoc *psoc) 
QDF_STATUS

target_if_vdev_mgr_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops);



/**

 * target_if_vdev_mgr_send_fd_tmpl() - sends fils discovery template

 * to wmi layer.

 * @vdev: pointer to wlan objmgr vdev.

 * @param: pointer to fils discovery template parameter

 *

 * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error

 */

QDF_STATUS target_if_vdev_mgr_send_fd_tmpl(struct wlan_objmgr_vdev *vdev,

					   struct fils_discovery_tmpl_params *param);



/**

 * target_if_vdev_mgr_assert_mgmt() - vdev assert mgmt api

 * @PSOC: pointer to objmgr psoc