mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
crypto: ccp - move setting PSP master to earlier in the init
Dynamic boost control needs to use platform access symbols that look for the PSP master as part of initialization. So move the PSP master before psp_init() so that dynamic boost control can be initialized properly. Acked-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
e938b08ad8
commit
b8440d55f7
1 changed files with 7 additions and 3 deletions
|
@ -173,13 +173,14 @@ int psp_dev_init(struct sp_device *sp)
|
|||
goto e_err;
|
||||
}
|
||||
|
||||
/* master device must be set for platform access */
|
||||
if (psp->sp->set_psp_master_device)
|
||||
psp->sp->set_psp_master_device(psp->sp);
|
||||
|
||||
ret = psp_init(psp);
|
||||
if (ret)
|
||||
goto e_irq;
|
||||
|
||||
if (sp->set_psp_master_device)
|
||||
sp->set_psp_master_device(sp);
|
||||
|
||||
/* Enable interrupt */
|
||||
iowrite32(-1, psp->io_regs + psp->vdata->inten_reg);
|
||||
|
||||
|
@ -188,6 +189,9 @@ int psp_dev_init(struct sp_device *sp)
|
|||
return 0;
|
||||
|
||||
e_irq:
|
||||
if (sp->clear_psp_master_device)
|
||||
sp->clear_psp_master_device(sp);
|
||||
|
||||
sp_free_psp_irq(psp->sp, psp);
|
||||
e_err:
|
||||
sp->psp_data = NULL;
|
||||
|
|
Loading…
Reference in a new issue