| Message ID | 20200303135724.14060-3-john.allen@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto/ccp: Properly NULL variables on sev exit | expand |
On 3/3/20 7:57 AM, John Allen wrote: > Introduce clear_psp_master_device() to ensure that sp_dev_master gets > properly cleared on the release of a psp device. > > Fixes: 2a6170dfe755 ("crypto: ccp: Add Platform Security Processor (PSP) device support") > Signed-off-by: John Allen <john.allen@amd.com> Acked-by: Tom Lendacky <thomas.lendacky@amd.com> > --- > drivers/crypto/ccp/psp-dev.c | 3 +++ > drivers/crypto/ccp/sp-dev.h | 1 + > drivers/crypto/ccp/sp-pci.c | 9 +++++++++ > 3 files changed, 13 insertions(+) > > diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c > index e95e7aa5dbf1..ae7b44599914 100644 > --- a/drivers/crypto/ccp/psp-dev.c > +++ b/drivers/crypto/ccp/psp-dev.c > @@ -215,6 +215,9 @@ void psp_dev_destroy(struct sp_device *sp) > tee_dev_destroy(psp); > > sp_free_psp_irq(sp, psp); > + > + if (sp->clear_psp_master_device) > + sp->clear_psp_master_device(sp); > } > > void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler, > diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h > index 423594608ad1..f913f1494af9 100644 > --- a/drivers/crypto/ccp/sp-dev.h > +++ b/drivers/crypto/ccp/sp-dev.h > @@ -90,6 +90,7 @@ struct sp_device { > /* get and set master device */ > struct sp_device*(*get_psp_master_device)(void); > void (*set_psp_master_device)(struct sp_device *); > + void (*clear_psp_master_device)(struct sp_device *); > > bool irq_registered; > bool use_tasklet; > diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c > index 56c1f61c0f84..cb6cb47053f4 100644 > --- a/drivers/crypto/ccp/sp-pci.c > +++ b/drivers/crypto/ccp/sp-pci.c > @@ -146,6 +146,14 @@ static struct sp_device *psp_get_master(void) > return sp_dev_master; > } > > +static void psp_clear_master(struct sp_device *sp) > +{ > + if (sp == sp_dev_master) { > + sp_dev_master = NULL; > + dev_dbg(sp->dev, "Cleared sp_dev_master\n"); > + } > +} > + > static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > { > struct sp_device *sp; > @@ -206,6 +214,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > pci_set_master(pdev); > sp->set_psp_master_device = psp_set_master; > sp->get_psp_master_device = psp_get_master; > + sp->clear_psp_master_device = psp_clear_master; > > ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); > if (ret) { >
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index e95e7aa5dbf1..ae7b44599914 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -215,6 +215,9 @@ void psp_dev_destroy(struct sp_device *sp) tee_dev_destroy(psp); sp_free_psp_irq(sp, psp); + + if (sp->clear_psp_master_device) + sp->clear_psp_master_device(sp); } void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler, diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h index 423594608ad1..f913f1494af9 100644 --- a/drivers/crypto/ccp/sp-dev.h +++ b/drivers/crypto/ccp/sp-dev.h @@ -90,6 +90,7 @@ struct sp_device { /* get and set master device */ struct sp_device*(*get_psp_master_device)(void); void (*set_psp_master_device)(struct sp_device *); + void (*clear_psp_master_device)(struct sp_device *); bool irq_registered; bool use_tasklet; diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index 56c1f61c0f84..cb6cb47053f4 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -146,6 +146,14 @@ static struct sp_device *psp_get_master(void) return sp_dev_master; } +static void psp_clear_master(struct sp_device *sp) +{ + if (sp == sp_dev_master) { + sp_dev_master = NULL; + dev_dbg(sp->dev, "Cleared sp_dev_master\n"); + } +} + static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct sp_device *sp; @@ -206,6 +214,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_master(pdev); sp->set_psp_master_device = psp_set_master; sp->get_psp_master_device = psp_get_master; + sp->clear_psp_master_device = psp_clear_master; ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); if (ret) {
Introduce clear_psp_master_device() to ensure that sp_dev_master gets properly cleared on the release of a psp device. Fixes: 2a6170dfe755 ("crypto: ccp: Add Platform Security Processor (PSP) device support") Signed-off-by: John Allen <john.allen@amd.com> --- drivers/crypto/ccp/psp-dev.c | 3 +++ drivers/crypto/ccp/sp-dev.h | 1 + drivers/crypto/ccp/sp-pci.c | 9 +++++++++ 3 files changed, 13 insertions(+)