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

Commit 0aad826c authored by Arun Kumar Khandavalli's avatar Arun Kumar Khandavalli Committed by snandini
Browse files

qcacld-3.0: Serialize psoc idle shutdown and restart via PLD 

Serialize psoc interface inactivity idle shutdown and restart via PLD
such that platform driver can serialize psoc idle shutdown and restart
to driver unload and SSR events to avoid any race conditions

Change-Id: I177a60eaf83b1c81f08cab2dc8a6bc1497484809
CRs-Fixed: 2776866
parent 8c92245a

core/pld/src/pld_common.c

+44 −40
Original line number Diff line number Diff line
@@ -2692,9 +2692,11 @@ int pld_idle_shutdown(struct device *dev, 
	switch (type) {

	case PLD_BUS_TYPE_SDIO:

	case PLD_BUS_TYPE_USB:

		case PLD_BUS_TYPE_SNOC:

		errno = shutdown_cb(dev);

		break;

	case PLD_BUS_TYPE_SNOC:

		errno = pld_snoc_idle_shutdown(dev);

		break;

	case PLD_BUS_TYPE_PCIE:

		errno = pld_pcie_idle_shutdown(dev);

		break;
@@ -2728,9 +2730,11 @@ int pld_idle_restart(struct device *dev, 
	switch (type) {

	case PLD_BUS_TYPE_SDIO:

	case PLD_BUS_TYPE_USB:

		case PLD_BUS_TYPE_SNOC:

		errno = restart_cb(dev);

		break;

	case PLD_BUS_TYPE_SNOC:

		errno = pld_snoc_idle_restart(dev);

		break;

	case PLD_BUS_TYPE_PCIE:

		errno = pld_pcie_idle_restart(dev);

		break;

core/pld/src/pld_snoc.c

+42 −0
Original line number Diff line number Diff line
@@ -30,6 +30,46 @@ 
#include "osif_psoc_sync.h"



#ifdef CONFIG_PLD_SNOC_ICNSS

/**

 *

 *pld_snoc_idle_restart_cb() - Perform idle restart

 * @pdev: platform device

 *

 *This function will be called if there is an idle restart request

 *

 * Return: int

 **/

static int pld_snoc_idle_restart_cb(struct device *dev)

{

	struct pld_context *pld_context;



	pld_context = pld_get_global_context();

	if (pld_context->ops->idle_restart)

		return pld_context->ops->idle_restart(dev, PLD_BUS_TYPE_SNOC);



	return -ENODEV;

}



/**

 * pld_snoc_idle_shutdown_cb() - Perform idle shutdown

 * @pdev: PCIE device

 * @id: PCIE device ID

 *

 * This function will be called if there is an idle shutdown request

 *

 * Return: int

 */

static int pld_snoc_idle_shutdown_cb(struct device *dev)

{

	struct pld_context *pld_context;



	pld_context = pld_get_global_context();

	if (pld_context->ops->shutdown)

		return pld_context->ops->idle_shutdown(dev, PLD_BUS_TYPE_SNOC);



	return -ENODEV;

}



/**

 * pld_snoc_probe() - Probe function for platform driver

 * @dev: device
@@ -353,6 +393,8 @@ struct icnss_driver_ops pld_snoc_ops = { 
	.suspend_noirq = pld_snoc_suspend_noirq,

	.resume_noirq = pld_snoc_resume_noirq,

	.uevent = pld_snoc_uevent,

	.idle_restart  = pld_snoc_idle_restart_cb,

	.idle_shutdown = pld_snoc_idle_shutdown_cb,

};



/**

core/pld/src/pld_snoc.h

+20 −0
Original line number Diff line number Diff line
@@ -168,6 +168,16 @@ pld_snoc_get_audio_wlan_timestamp(struct device *dev, 
}

#endif /* FEATURE_WLAN_TIME_SYNC_FTM */



static inline int pld_snoc_idle_restart(struct device *dev)

{

	return 0;

}



static inline int pld_snoc_idle_shutdown(struct device *dev)

{

	return 0;

}



#else

int pld_snoc_register_driver(void);

void pld_snoc_unregister_driver(void);
@@ -350,5 +360,15 @@ static inline void pld_snoc_block_shutdown(bool status) 
{

	icnss_block_shutdown(status);

}



static inline int pld_snoc_idle_restart(struct device *dev)

{

	return icnss_idle_restart(dev);

}



static inline int pld_snoc_idle_shutdown(struct device *dev)

{

	return icnss_idle_shutdown(dev);

}

#endif

#endif