[v10,16/24] x86/sev: Drop sev_guest_platform_data structure

Commit Message

Nikunj A. Dadhania June 21, 2024, 12:38 p.m. UTC

SEV guest platform data structure was used to pass the secrets page
physical address. As the SNP guest messaging initialization routines are
local and secrets page address is cached in sev.c, use that instead of
sending it to the SEV guest driver and getting the same address back.

Signed-off-by: Nikunj A Dadhania <[e-mail]>
---
 arch/x86/include/asm/sev.h              |  9 ++-------
 arch/x86/coco/sev/core.c                | 10 ++--------
 drivers/virt/coco/sev-guest/sev-guest.c |  8 +-------
 3 files changed, 5 insertions(+), 22 deletions(-)

Patch

diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h
index cdd37ad9e4b8..c5ead3230d18 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h
@@ -116,10 +116,6 @@  struct snp_req_data {
 	unsigned long resp_gpa;
 };
 
-struct sev_guest_platform_data {
-	u64 secrets_gpa;
-};
-
 #define VMPCK_MAX_NUM		4
 
 /*
@@ -443,7 +439,7 @@  void sev_show_status(void);
 void snp_update_svsm_ca(void);
 bool snp_assign_vmpck(struct snp_guest_dev *snp_dev, unsigned int vmpck_id);
 bool snp_is_vmpck_empty(struct snp_guest_dev *snp_dev);
-int snp_guest_messaging_init(struct snp_guest_dev *snp_dev, u64 secrets_gpa);
+int snp_guest_messaging_init(struct snp_guest_dev *snp_dev);
 void snp_guest_messaging_exit(struct snp_guest_dev *snp_dev);
 int snp_send_guest_request(struct snp_guest_dev *snp_dev, struct snp_guest_req *req,
 			   struct snp_guest_request_ioctl *rio);
@@ -520,8 +516,7 @@  static inline void snp_update_svsm_ca(void) { }
 static inline bool snp_assign_vmpck(struct snp_guest_dev *snp_dev,
 				    unsigned int vmpck_id) { return false; }
 static inline bool snp_is_vmpck_empty(struct snp_guest_dev *snp_dev) { return true; }
-static inline int
-snp_guest_messaging_init(struct snp_guest_dev *snp_dev, u64 secrets_gpa) { return -EINVAL; }
+static inline int snp_guest_messaging_init(struct snp_guest_dev *snp_dev) { return -EINVAL; }
 static inline void snp_guest_messaging_exit(struct snp_guest_dev *snp_dev) { }
 static inline int snp_send_guest_request(struct snp_guest_dev *snp_dev, struct snp_guest_req *req,
 					 struct snp_guest_request_ioctl *rio) { return -EINVAL; }
diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c
index 8bf573d44b0c..e0b79e292fcf 100644
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@ -2489,15 +2489,9 @@  static struct platform_device sev_guest_device = {
 
 static int __init snp_init_platform_device(void)
 {
-	struct sev_guest_platform_data data;
-
 	if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP))
 		return -ENODEV;
 
-	data.secrets_gpa = secrets_pa;
-	if (platform_device_add_data(&sev_guest_device, &data, sizeof(data)))
-		return -ENODEV;
-
 	if (platform_device_register(&sev_guest_device))
 		return -ENODEV;
 
@@ -2902,11 +2896,11 @@  int snp_send_guest_request(struct snp_guest_dev *snp_dev,
 }
 EXPORT_SYMBOL_GPL(snp_send_guest_request);
 
-int snp_guest_messaging_init(struct snp_guest_dev *snp_dev, u64 secrets_gpa)
+int snp_guest_messaging_init(struct snp_guest_dev *snp_dev)
 {
 	int ret = -ENOMEM;
 
-	snp_dev->secrets = (__force void *)ioremap_encrypted(secrets_gpa, PAGE_SIZE);
+	snp_dev->secrets = (__force void *)ioremap_encrypted(secrets_pa, PAGE_SIZE);
 	if (!snp_dev->secrets) {
 		pr_err("Failed to map SNP secrets page.\n");
 		return ret;
diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c
index 0631271e5b9c..76be49da08de 100644
--- a/drivers/virt/coco/sev-guest/sev-guest.c
+++ b/drivers/virt/coco/sev-guest/sev-guest.c
@@ -591,7 +591,6 @@  static void unregister_sev_tsm(void *data)
 
 static int __init sev_guest_probe(struct platform_device *pdev)
 {
-	struct sev_guest_platform_data *data;
 	struct device *dev = &pdev->dev;
 	struct snp_guest_dev *snp_dev;
 	struct miscdevice *misc;
@@ -600,11 +599,6 @@  static int __init sev_guest_probe(struct platform_device *pdev)
 	if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP))
 		return -ENODEV;
 
-	if (!dev->platform_data)
-		return -ENODEV;
-
-	data = (struct sev_guest_platform_data *)dev->platform_data;
-
 	snp_dev = devm_kzalloc(&pdev->dev, sizeof(struct snp_guest_dev), GFP_KERNEL);
 	if (!snp_dev)
 		return -ENOMEM;
@@ -619,7 +613,7 @@  static int __init sev_guest_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	if (snp_guest_messaging_init(snp_dev, data->secrets_gpa)) {
+	if (snp_guest_messaging_init(snp_dev)) {
 		dev_err(dev, "Unable to setup SNP Guest messaging using VMPCK%u\n",
 			snp_dev->vmpck_id);
 		return ret;