Commit 884e4d57 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Only stop control channel when entering freeze 



According to the kernel power management documentation freeze phase
should only quiesce the device, no need to configure wakes or put it to
low power state. For this reason we simply stop the control channel and
in case of Software Connection Manager also mark the hotplug disabled.
This should align the driver better with the PM framework expectations.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 77e4907f

drivers/thunderbolt/domain.c

+27 −0
Original line number Diff line number Diff line
@@ -546,6 +546,33 @@ int tb_domain_suspend(struct tb *tb) 
	return tb->cm_ops->suspend ? tb->cm_ops->suspend(tb) : 0;

}



int tb_domain_freeze_noirq(struct tb *tb)

{

	int ret = 0;



	mutex_lock(&tb->lock);

	if (tb->cm_ops->freeze_noirq)

		ret = tb->cm_ops->freeze_noirq(tb);

	if (!ret)

		tb_ctl_stop(tb->ctl);

	mutex_unlock(&tb->lock);



	return ret;

}



int tb_domain_thaw_noirq(struct tb *tb)

{

	int ret = 0;



	mutex_lock(&tb->lock);

	tb_ctl_start(tb->ctl);

	if (tb->cm_ops->thaw_noirq)

		ret = tb->cm_ops->thaw_noirq(tb);

	mutex_unlock(&tb->lock);



	return ret;

}



void tb_domain_complete(struct tb *tb)

{

	if (tb->cm_ops->complete)

drivers/thunderbolt/nhi.c

+18 −3
Original line number Diff line number Diff line
@@ -864,6 +864,22 @@ static int nhi_suspend_noirq(struct device *dev) 
	return __nhi_suspend_noirq(dev, device_may_wakeup(dev));

}



static int nhi_freeze_noirq(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct tb *tb = pci_get_drvdata(pdev);



	return tb_domain_freeze_noirq(tb);

}



static int nhi_thaw_noirq(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct tb *tb = pci_get_drvdata(pdev);



	return tb_domain_thaw_noirq(tb);

}



static bool nhi_wake_supported(struct pci_dev *pdev)

{

	u8 val;
@@ -1255,14 +1271,13 @@ static void nhi_remove(struct pci_dev *pdev) 
static const struct dev_pm_ops nhi_pm_ops = {

	.suspend_noirq = nhi_suspend_noirq,

	.resume_noirq = nhi_resume_noirq,

	.freeze_noirq = nhi_suspend_noirq, /*

	.freeze_noirq = nhi_freeze_noirq,  /*

					    * we just disable hotplug, the

					    * pci-tunnels stay alive.

					    */

	.thaw_noirq = nhi_resume_noirq,

	.thaw_noirq = nhi_thaw_noirq,

	.restore_noirq = nhi_resume_noirq,

	.suspend = nhi_suspend,

	.freeze = nhi_suspend,

	.poweroff_noirq = nhi_poweroff_noirq,

	.poweroff = nhi_suspend,

	.complete = nhi_complete,

drivers/thunderbolt/tb.c

+18 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,22 @@ static int tb_free_unplugged_xdomains(struct tb_switch *sw) 
	return ret;

}



static int tb_freeze_noirq(struct tb *tb)

{

	struct tb_cm *tcm = tb_priv(tb);



	tcm->hotplug_active = false;

	return 0;

}



static int tb_thaw_noirq(struct tb *tb)

{

	struct tb_cm *tcm = tb_priv(tb);



	tcm->hotplug_active = true;

	return 0;

}



static void tb_complete(struct tb *tb)

{

	/*
@@ -1490,6 +1506,8 @@ static const struct tb_cm_ops tb_cm_ops = { 
	.stop = tb_stop,

	.suspend_noirq = tb_suspend_noirq,

	.resume_noirq = tb_resume_noirq,

	.freeze_noirq = tb_freeze_noirq,

	.thaw_noirq = tb_thaw_noirq,

	.complete = tb_complete,

	.runtime_suspend = tb_runtime_suspend,

	.runtime_resume = tb_runtime_resume,

drivers/thunderbolt/tb.h

+6 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ struct tb_path { 
 * @suspend_noirq: Connection manager specific suspend_noirq

 * @resume_noirq: Connection manager specific resume_noirq

 * @suspend: Connection manager specific suspend

 * @freeze_noirq: Connection manager specific freeze_noirq

 * @thaw_noirq: Connection manager specific thaw_noirq

 * @complete: Connection manager specific complete

 * @runtime_suspend: Connection manager specific runtime_suspend

 * @runtime_resume: Connection manager specific runtime_resume
@@ -373,6 +375,8 @@ struct tb_cm_ops { 
	int (*suspend_noirq)(struct tb *tb);

	int (*resume_noirq)(struct tb *tb);

	int (*suspend)(struct tb *tb);

	int (*freeze_noirq)(struct tb *tb);

	int (*thaw_noirq)(struct tb *tb);

	void (*complete)(struct tb *tb);

	int (*runtime_suspend)(struct tb *tb);

	int (*runtime_resume)(struct tb *tb);
@@ -607,6 +611,8 @@ void tb_domain_remove(struct tb *tb); 
int tb_domain_suspend_noirq(struct tb *tb);

int tb_domain_resume_noirq(struct tb *tb);

int tb_domain_suspend(struct tb *tb);

int tb_domain_freeze_noirq(struct tb *tb);

int tb_domain_thaw_noirq(struct tb *tb);

void tb_domain_complete(struct tb *tb);

int tb_domain_runtime_suspend(struct tb *tb);

int tb_domain_runtime_resume(struct tb *tb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE