mailbox: tegra: hsp: add noirq resume
Subsystems (2)
PATCH v2 1/2 mailbox: tegra: hsp: add noirq resume
Add noirq resume instead of resume callback for Tegra HSP. Tegra HSP resume needs tegra_hsp_doorbell_startup() call to fix timeout error for tegra_bpmp_transfer() during genpd resume noirq on Jetson TX2.
Signed-off-by Bitan Biswas <[email protected]>
--- drivers/mailbox/tegra-hsp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mailbox/tegra-hsp.c +9 -1
@@ -775,6 +775,12 @@ static int __maybe_unused tegra_hsp_resume(struct device *dev) {struct tegra_hsp *hsp =dev_get_drvdata (dev);unsigned int i; +struct tegra_hsp_doorbell *db; + +list_for_each_entry (db, &hsp->doorbells, list) { +if (db && db->channel.chan) +tegra_hsp_doorbell_startup (db->channel.chan); + }for (i =0 ; i < hsp->num_sm; i++) {struct tegra_hsp_mailbox *mb = &hsp->mailboxes[i];
@@ -786,7 +792,9 @@ static int __maybe_unused tegra_hsp_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(tegra_hsp_pm_ops, NULL, tegra_hsp_resume); +static const struct dev_pm_ops tegra_hsp_pm_ops = { + .resume_noirq = tegra_hsp_resume, +};static const struct tegra_hsp_db_map tegra186_hsp_db_map[] = { {"ccplex" ,TEGRA_HSP_DB_MASTER_CCPLEX ,HSP_DB_CCPLEX , },
Signature · 1 line
2.7.4
PATCH v2 2/2 mailbox: tegra: avoid resume NULL mailboxes
If Tegra HSP device tree does not have 'shared irqs', mailboxes pointer is NULL. Add non-NULL HSP mailboxes check in resume callback before tegra_hsp_mailbox_startup() call and prevent NULL pointer exception.
Signed-off-by Bitan Biswas <[email protected]>
--- drivers/mailbox/tegra-hsp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mailbox/tegra-hsp.c +6 -4
@@ -782,11 +782,13 @@ static int __maybe_unused tegra_hsp_resume(struct device *dev)tegra_hsp_doorbell_startup (db->channel.chan); } -for (i =0 ; i < hsp->num_sm; i++) { -struct tegra_hsp_mailbox *mb = &hsp->mailboxes[i]; +if (hsp->mailboxes) { +for (i =0 ; i < hsp->num_sm; i++) { +struct tegra_hsp_mailbox *mb = &hsp->mailboxes[i]; -if (mb->channel.chan->cl) -tegra_hsp_mailbox_startup (mb->channel.chan); +if (mb->channel.chan->cl) +tegra_hsp_mailbox_startup (mb->channel.chan); + } }return 0 ;
Signature · 1 line
2.7.4