Commit 1e525507 authored by Tom Lendacky's avatar Tom Lendacky Committed by Borislav Petkov (AMD)
Browse files

x86/sev: Shorten struct name snp_secrets_page_layout to snp_secrets_page 



Ending a struct name with "layout" is a little redundant, so shorten the
snp_secrets_page_layout name to just snp_secrets_page.

No functional change.

  [ bp: Rename the local pointer to "secrets" too for more clarity. ]

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/bc8d58302c6ab66c3beeab50cce3ec2c6bd72d6c.1713974291.git.thomas.lendacky@amd.com
parent ed30a4a5

arch/x86/include/asm/sev.h

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ struct secrets_os_area { 
#define VMPCK_KEY_LEN		32



/* See the SNP spec version 0.9 for secrets page format */

struct snp_secrets_page_layout {

struct snp_secrets_page {

	u32 version;

	u32 imien	: 1,

	    rsvd1	: 31;

arch/x86/kernel/sev.c

+3 −3
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static u64 __init get_secrets_page(void) 


static u64 __init get_snp_jump_table_addr(void)

{

	struct snp_secrets_page_layout *layout;

	struct snp_secrets_page *secrets;

	void __iomem *mem;

	u64 pa, addr;
@@ -662,9 +662,9 @@ static u64 __init get_snp_jump_table_addr(void) 
		return 0;

	}



	layout = (__force struct snp_secrets_page_layout *)mem;

	secrets = (__force struct snp_secrets_page *)mem;



	addr = layout->os_area.ap_jump_table_pa;

	addr = secrets->os_area.ap_jump_table_pa;

	iounmap(mem);



	return addr;

drivers/virt/coco/sev-guest/sev-guest.c

+14 −14
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct snp_guest_dev { 
	 */

	struct snp_guest_msg secret_request, secret_response;



	struct snp_secrets_page_layout *layout;

	struct snp_secrets_page *secrets;

	struct snp_req_data input;

	union {

		struct snp_report_req report;
@@ -743,26 +743,26 @@ static const struct file_operations snp_guest_fops = { 
	.unlocked_ioctl = snp_guest_ioctl,

};



static u8 *get_vmpck(int id, struct snp_secrets_page_layout *layout, u32 **seqno)

static u8 *get_vmpck(int id, struct snp_secrets_page *secrets, u32 **seqno)

{

	u8 *key = NULL;



	switch (id) {

	case 0:

		*seqno = &layout->os_area.msg_seqno_0;

		key = layout->vmpck0;

		*seqno = &secrets->os_area.msg_seqno_0;

		key = secrets->vmpck0;

		break;

	case 1:

		*seqno = &layout->os_area.msg_seqno_1;

		key = layout->vmpck1;

		*seqno = &secrets->os_area.msg_seqno_1;

		key = secrets->vmpck1;

		break;

	case 2:

		*seqno = &layout->os_area.msg_seqno_2;

		key = layout->vmpck2;

		*seqno = &secrets->os_area.msg_seqno_2;

		key = secrets->vmpck2;

		break;

	case 3:

		*seqno = &layout->os_area.msg_seqno_3;

		key = layout->vmpck3;

		*seqno = &secrets->os_area.msg_seqno_3;

		key = secrets->vmpck3;

		break;

	default:

		break;
@@ -897,8 +897,8 @@ static void unregister_sev_tsm(void *data) 


static int __init sev_guest_probe(struct platform_device *pdev)

{

	struct snp_secrets_page_layout *layout;

	struct sev_guest_platform_data *data;

	struct snp_secrets_page *secrets;

	struct device *dev = &pdev->dev;

	struct snp_guest_dev *snp_dev;

	struct miscdevice *misc;
@@ -916,7 +916,7 @@ static int __init sev_guest_probe(struct platform_device *pdev) 
	if (!mapping)

		return -ENODEV;



	layout = (__force void *)mapping;

	secrets = (__force void *)mapping;



	ret = -ENOMEM;

	snp_dev = devm_kzalloc(&pdev->dev, sizeof(struct snp_guest_dev), GFP_KERNEL);
@@ -924,7 +924,7 @@ static int __init sev_guest_probe(struct platform_device *pdev) 
		goto e_unmap;



	ret = -EINVAL;

	snp_dev->vmpck = get_vmpck(vmpck_id, layout, &snp_dev->os_area_msg_seqno);

	snp_dev->vmpck = get_vmpck(vmpck_id, secrets, &snp_dev->os_area_msg_seqno);

	if (!snp_dev->vmpck) {

		dev_err(dev, "invalid vmpck id %d\n", vmpck_id);

		goto e_unmap;
@@ -938,7 +938,7 @@ static int __init sev_guest_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, snp_dev);

	snp_dev->dev = dev;

	snp_dev->layout = layout;

	snp_dev->secrets = secrets;



	/* Allocate the shared page used for the request and response message. */

	snp_dev->request = alloc_shared_pages(dev, sizeof(struct snp_guest_msg));