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

Commit 168624d3 authored by Yan He's avatar Yan He Committed by Tony Truong
Browse files

msm: pcie: add the option for client to avoid PCIe suspend 



The PCIe client has the requirement to keep PCIe link on when the
CPUs go to power collapse. Add the support here for client driver
to keep PCIe link up during the system suspend.

Change-Id: I886990072c9c72c57e30c5c0cceb7eaedca071e6
Signed-off-by: default avatarYan He <yanhe@codeaurora.org>
parent cb3919b6

drivers/pci/host/pci-msm.c

+43 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ 


#define RD 0

#define WR 1

#define MSM_PCIE_ERROR -1



#define PERST_PROPAGATION_DELAY_US_MIN	  10000

#define PERST_PROPAGATION_DELAY_US_MAX	  10005
@@ -406,6 +407,7 @@ struct msm_pcie_dev_t { 


	enum msm_pcie_link_status    link_status;

	bool				 user_suspend;

	bool                         disable_pc;

	struct pci_saved_state	     *saved_state;



	struct wakeup_source	     ws;
@@ -2661,6 +2663,7 @@ static int msm_pcie_probe(struct platform_device *pdev) 
	msm_pcie_dev[rc_idx].parf_swing = 0;

	msm_pcie_dev[rc_idx].link_status = MSM_PCIE_LINK_DEINIT;

	msm_pcie_dev[rc_idx].user_suspend = false;

	msm_pcie_dev[rc_idx].disable_pc = false;

	msm_pcie_dev[rc_idx].saved_state = NULL;

	msm_pcie_dev[rc_idx].enumerated = false;

	msm_pcie_dev[rc_idx].linkdown_counter = 0;
@@ -2914,6 +2917,19 @@ static void msm_pcie_fixup_suspend(struct pci_dev *dev) 
	if (pcie_dev->link_status != MSM_PCIE_LINK_ENABLED)

		return;



	spin_lock_irqsave(&pcie_dev->cfg_lock,

				pcie_dev->irqsave_flags);

	if (pcie_dev->disable_pc) {

		PCIE_DBG(pcie_dev,

			"RC%d: Skip suspend because of user request\n",

			pcie_dev->rc_idx);

		spin_unlock_irqrestore(&pcie_dev->cfg_lock,

				pcie_dev->irqsave_flags);

		return;

	}

	spin_unlock_irqrestore(&pcie_dev->cfg_lock,

				pcie_dev->irqsave_flags);



	mutex_lock(&pcie_dev->recovery_lock);



	ret = msm_pcie_pm_suspend(dev, NULL, NULL, 0);
@@ -3102,6 +3118,33 @@ int msm_pcie_pm_control(enum msm_pcie_pm_opt pm_opt, u32 busnr, void *user, 
		mutex_unlock(&msm_pcie_dev[rc_idx].recovery_lock);



		break;

	case MSM_PCIE_DISABLE_PC:

		PCIE_DBG(&msm_pcie_dev[rc_idx],

			"User of RC%d requests to keep the link always alive.\n",

			rc_idx);

		spin_lock_irqsave(&msm_pcie_dev[rc_idx].cfg_lock,

				msm_pcie_dev[rc_idx].irqsave_flags);

		if (msm_pcie_dev[rc_idx].suspending) {

			PCIE_ERR(&msm_pcie_dev[rc_idx],

				"PCIe: RC%d Link has been suspended before request\n",

				rc_idx);

			ret = MSM_PCIE_ERROR;

		} else {

			msm_pcie_dev[rc_idx].disable_pc = true;

		}

		spin_unlock_irqrestore(&msm_pcie_dev[rc_idx].cfg_lock,

				msm_pcie_dev[rc_idx].irqsave_flags);

		break;

	case MSM_PCIE_ENABLE_PC:

		PCIE_DBG(&msm_pcie_dev[rc_idx],

			"User of RC%d cancels the request of alive link.\n",

			rc_idx);

		spin_lock_irqsave(&msm_pcie_dev[rc_idx].cfg_lock,

				msm_pcie_dev[rc_idx].irqsave_flags);

		msm_pcie_dev[rc_idx].disable_pc = false;

		spin_unlock_irqrestore(&msm_pcie_dev[rc_idx].cfg_lock,

				msm_pcie_dev[rc_idx].irqsave_flags);

		break;

	default:

		PCIE_ERR(&msm_pcie_dev[rc_idx],

			"PCIe: RC%d: unsupported pm operation:%d.\n",

include/linux/msm_pcie.h

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ enum msm_pcie_config { 


enum msm_pcie_pm_opt {

	MSM_PCIE_SUSPEND,

	MSM_PCIE_RESUME

	MSM_PCIE_RESUME,

	MSM_PCIE_DISABLE_PC,

	MSM_PCIE_ENABLE_PC,

};



enum msm_pcie_event {