[v2,1/9] crypto: ccp: Drop TEE support for IRQ handler

Message ID 20230302194235.1724-2-mario.limonciello@amd.com
State New
Headers
Series Export platform features from ccp driver |

Commit Message

Mario Limonciello March 2, 2023, 7:42 p.m. UTC
  The only PSP mailbox that currently supports interrupt on completion
is the SEV mailbox.  Drop the dead code for the TEE subdriver to
potentially call it.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/crypto/ccp/psp-dev.c | 15 ---------------
 drivers/crypto/ccp/psp-dev.h |  7 -------
 2 files changed, 22 deletions(-)
  

Comments

Rijo Thomas March 3, 2023, 10:31 a.m. UTC | #1
On 3/3/2023 1:12 AM, Mario Limonciello wrote:
> The only PSP mailbox that currently supports interrupt on completion
> is the SEV mailbox.  Drop the dead code for the TEE subdriver to
> potentially call it.
> 
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Looks good.

Acked-by: Rijo Thomas <Rijo-john.Thomas@amd.com>

Thanks,
Rijo

> ---
>  drivers/crypto/ccp/psp-dev.c | 15 ---------------
>  drivers/crypto/ccp/psp-dev.h |  7 -------
>  2 files changed, 22 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
> index c9c741ac8442..cd8d1974726a 100644
> --- a/drivers/crypto/ccp/psp-dev.c
> +++ b/drivers/crypto/ccp/psp-dev.c
> @@ -46,9 +46,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
>  	if (status) {
>  		if (psp->sev_irq_handler)
>  			psp->sev_irq_handler(irq, psp->sev_irq_data, status);
> -
> -		if (psp->tee_irq_handler)
> -			psp->tee_irq_handler(irq, psp->tee_irq_data, status);
>  	}
>  
>  	/* Clear the interrupt status by writing the same value we read. */
> @@ -219,18 +216,6 @@ void psp_clear_sev_irq_handler(struct psp_device *psp)
>  	psp_set_sev_irq_handler(psp, NULL, NULL);
>  }
>  
> -void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
> -			     void *data)
> -{
> -	psp->tee_irq_data = data;
> -	psp->tee_irq_handler = handler;
> -}
> -
> -void psp_clear_tee_irq_handler(struct psp_device *psp)
> -{
> -	psp_set_tee_irq_handler(psp, NULL, NULL);
> -}
> -
>  struct psp_device *psp_get_master_device(void)
>  {
>  	struct sp_device *sp = sp_get_psp_master_device();
> diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
> index d528eb04c3ef..06e1f317216d 100644
> --- a/drivers/crypto/ccp/psp-dev.h
> +++ b/drivers/crypto/ccp/psp-dev.h
> @@ -40,9 +40,6 @@ struct psp_device {
>  	psp_irq_handler_t sev_irq_handler;
>  	void *sev_irq_data;
>  
> -	psp_irq_handler_t tee_irq_handler;
> -	void *tee_irq_data;
> -
>  	void *sev_data;
>  	void *tee_data;
>  
> @@ -53,10 +50,6 @@ void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
>  			     void *data);
>  void psp_clear_sev_irq_handler(struct psp_device *psp);
>  
> -void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
> -			     void *data);
> -void psp_clear_tee_irq_handler(struct psp_device *psp);
> -
>  struct psp_device *psp_get_master_device(void);
>  
>  #define PSP_CAPABILITY_SEV			BIT(0)
  

Patch

diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index c9c741ac8442..cd8d1974726a 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -46,9 +46,6 @@  static irqreturn_t psp_irq_handler(int irq, void *data)
 	if (status) {
 		if (psp->sev_irq_handler)
 			psp->sev_irq_handler(irq, psp->sev_irq_data, status);
-
-		if (psp->tee_irq_handler)
-			psp->tee_irq_handler(irq, psp->tee_irq_data, status);
 	}
 
 	/* Clear the interrupt status by writing the same value we read. */
@@ -219,18 +216,6 @@  void psp_clear_sev_irq_handler(struct psp_device *psp)
 	psp_set_sev_irq_handler(psp, NULL, NULL);
 }
 
-void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
-			     void *data)
-{
-	psp->tee_irq_data = data;
-	psp->tee_irq_handler = handler;
-}
-
-void psp_clear_tee_irq_handler(struct psp_device *psp)
-{
-	psp_set_tee_irq_handler(psp, NULL, NULL);
-}
-
 struct psp_device *psp_get_master_device(void)
 {
 	struct sp_device *sp = sp_get_psp_master_device();
diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
index d528eb04c3ef..06e1f317216d 100644
--- a/drivers/crypto/ccp/psp-dev.h
+++ b/drivers/crypto/ccp/psp-dev.h
@@ -40,9 +40,6 @@  struct psp_device {
 	psp_irq_handler_t sev_irq_handler;
 	void *sev_irq_data;
 
-	psp_irq_handler_t tee_irq_handler;
-	void *tee_irq_data;
-
 	void *sev_data;
 	void *tee_data;
 
@@ -53,10 +50,6 @@  void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
 			     void *data);
 void psp_clear_sev_irq_handler(struct psp_device *psp);
 
-void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
-			     void *data);
-void psp_clear_tee_irq_handler(struct psp_device *psp);
-
 struct psp_device *psp_get_master_device(void);
 
 #define PSP_CAPABILITY_SEV			BIT(0)