| Message ID | 57c6797e99b1f62ff13222c8f0ee4687e8617a48.1575438845.git.Rijo-john.Thomas@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | Add TEE interface support to AMD Secure Processor driver | expand |
On 12/4/19 12:18 AM, Rijo Thomas wrote: > This is a preliminary patch for creating a generic PSP device driver > file, which will have support for both SEV and TEE (Trusted Execution > Environment) interface. > > This patch does not introduce any new functionality, but simply renames > psp-dev.c and psp-dev.h files to sev-dev.c and sev-dev.h files > respectively. > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Tom Lendacky <thomas.lendacky@amd.com> > Cc: Jens Wiklander <jens.wiklander@linaro.org> > Co-developed-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com> > Signed-off-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com> > Signed-off-by: Rijo Thomas <Rijo-john.Thomas@amd.com> > --- > drivers/crypto/ccp/Makefile | 2 +- > drivers/crypto/ccp/{psp-dev.c => sev-dev.c} | 6 +++--- > drivers/crypto/ccp/{psp-dev.h => sev-dev.h} | 8 ++++---- > drivers/crypto/ccp/sp-pci.c | 2 +- > 4 files changed, 9 insertions(+), 9 deletions(-) > rename drivers/crypto/ccp/{psp-dev.c => sev-dev.c} (99%) > rename drivers/crypto/ccp/{psp-dev.h => sev-dev.h} (90%) > > diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile > index 6b86f1e..9dafcf2 100644 > --- a/drivers/crypto/ccp/Makefile > +++ b/drivers/crypto/ccp/Makefile > @@ -8,7 +8,7 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ > ccp-dmaengine.o > ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o > ccp-$(CONFIG_PCI) += sp-pci.o > -ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o > +ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += sev-dev.o > > obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o > ccp-crypto-objs := ccp-crypto-main.o \ > diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/sev-dev.c > similarity index 99% > rename from drivers/crypto/ccp/psp-dev.c > rename to drivers/crypto/ccp/sev-dev.c > index 5ff842c..9a8c523 100644 > --- a/drivers/crypto/ccp/psp-dev.c > +++ b/drivers/crypto/ccp/sev-dev.c > @@ -1,8 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * AMD Platform Security Processor (PSP) interface > + * AMD Secure Encrypted Virtualization (SEV) interface > * > - * Copyright (C) 2016,2018 Advanced Micro Devices, Inc. > + * Copyright (C) 2016,2019 Advanced Micro Devices, Inc. > * > * Author: Brijesh Singh <brijesh.singh@amd.com> > */ > @@ -22,7 +22,7 @@ > #include <linux/firmware.h> > > #include "sp-dev.h" > -#include "psp-dev.h" > +#include "sev-dev.h" > > #define DEVICE_NAME "sev" > #define SEV_FW_FILE "amd/sev.fw" > diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/sev-dev.h > similarity index 90% > rename from drivers/crypto/ccp/psp-dev.h > rename to drivers/crypto/ccp/sev-dev.h > index dd516b3..e861647 100644 > --- a/drivers/crypto/ccp/psp-dev.h > +++ b/drivers/crypto/ccp/sev-dev.h > @@ -2,13 +2,13 @@ > /* > * AMD Platform Security Processor (PSP) interface driver > * > - * Copyright (C) 2017-2018 Advanced Micro Devices, Inc. > + * Copyright (C) 2017-2019 Advanced Micro Devices, Inc. Minor nit, for next time: the copyright dates should be <first year>,<current year>. I got this wrong the last time I updated it. :-( The change above, for sev-dev.c, is correct. > * > * Author: Brijesh Singh <brijesh.singh@amd.com> > */ > > -#ifndef __PSP_DEV_H__ > -#define __PSP_DEV_H__ > +#ifndef __SEV_DEV_H__ > +#define __SEV_DEV_H__ > > #include <linux/device.h> > #include <linux/spinlock.h> > @@ -64,4 +64,4 @@ struct psp_device { > u8 build; > }; > > -#endif /* __PSP_DEV_H */ > +#endif /* __SEV_DEV_H */ > diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c > index b29d2e6..473cf14 100644 > --- a/drivers/crypto/ccp/sp-pci.c > +++ b/drivers/crypto/ccp/sp-pci.c > @@ -22,7 +22,7 @@ > #include <linux/ccp.h> > > #include "ccp-dev.h" > -#include "psp-dev.h" > +#include "sev-dev.h" > > #define MSIX_VECTORS 2 > >
On 12/4/19 12:18 AM, Rijo Thomas wrote: > This is a preliminary patch for creating a generic PSP device driver > file, which will have support for both SEV and TEE (Trusted Execution > Environment) interface. > > This patch does not introduce any new functionality, but simply renames > psp-dev.c and psp-dev.h files to sev-dev.c and sev-dev.h files > respectively. > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Tom Lendacky <thomas.lendacky@amd.com> > Cc: Jens Wiklander <jens.wiklander@linaro.org> > Co-developed-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com> > Signed-off-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com> > Signed-off-by: Rijo Thomas <Rijo-john.Thomas@amd.com> Acked-by: Gary R Hook <gary.hook@amd.com> > --- > drivers/crypto/ccp/Makefile | 2 +- > drivers/crypto/ccp/{psp-dev.c => sev-dev.c} | 6 +++--- > drivers/crypto/ccp/{psp-dev.h => sev-dev.h} | 8 ++++---- > drivers/crypto/ccp/sp-pci.c | 2 +- > 4 files changed, 9 insertions(+), 9 deletions(-) > rename drivers/crypto/ccp/{psp-dev.c => sev-dev.c} (99%) > rename drivers/crypto/ccp/{psp-dev.h => sev-dev.h} (90%) > > diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile > index 6b86f1e..9dafcf2 100644 > --- a/drivers/crypto/ccp/Makefile > +++ b/drivers/crypto/ccp/Makefile > @@ -8,7 +8,7 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ > ccp-dmaengine.o > ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o > ccp-$(CONFIG_PCI) += sp-pci.o > -ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o > +ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += sev-dev.o > > obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o > ccp-crypto-objs := ccp-crypto-main.o \ > diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/sev-dev.c > similarity index 99% > rename from drivers/crypto/ccp/psp-dev.c > rename to drivers/crypto/ccp/sev-dev.c > index 5ff842c..9a8c523 100644 > --- a/drivers/crypto/ccp/psp-dev.c > +++ b/drivers/crypto/ccp/sev-dev.c > @@ -1,8 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * AMD Platform Security Processor (PSP) interface > + * AMD Secure Encrypted Virtualization (SEV) interface > * > - * Copyright (C) 2016,2018 Advanced Micro Devices, Inc. > + * Copyright (C) 2016,2019 Advanced Micro Devices, Inc. > * > * Author: Brijesh Singh <brijesh.singh@amd.com> > */ > @@ -22,7 +22,7 @@ > #include <linux/firmware.h> > > #include "sp-dev.h" > -#include "psp-dev.h" > +#include "sev-dev.h" > > #define DEVICE_NAME "sev" > #define SEV_FW_FILE "amd/sev.fw" > diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/sev-dev.h > similarity index 90% > rename from drivers/crypto/ccp/psp-dev.h > rename to drivers/crypto/ccp/sev-dev.h > index dd516b3..e861647 100644 > --- a/drivers/crypto/ccp/psp-dev.h > +++ b/drivers/crypto/ccp/sev-dev.h > @@ -2,13 +2,13 @@ > /* > * AMD Platform Security Processor (PSP) interface driver > * > - * Copyright (C) 2017-2018 Advanced Micro Devices, Inc. > + * Copyright (C) 2017-2019 Advanced Micro Devices, Inc. > * > * Author: Brijesh Singh <brijesh.singh@amd.com> > */ > > -#ifndef __PSP_DEV_H__ > -#define __PSP_DEV_H__ > +#ifndef __SEV_DEV_H__ > +#define __SEV_DEV_H__ > > #include <linux/device.h> > #include <linux/spinlock.h> > @@ -64,4 +64,4 @@ struct psp_device { > u8 build; > }; > > -#endif /* __PSP_DEV_H */ > +#endif /* __SEV_DEV_H */ > diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c > index b29d2e6..473cf14 100644 > --- a/drivers/crypto/ccp/sp-pci.c > +++ b/drivers/crypto/ccp/sp-pci.c > @@ -22,7 +22,7 @@ > #include <linux/ccp.h> > > #include "ccp-dev.h" > -#include "psp-dev.h" > +#include "sev-dev.h" > > #define MSIX_VECTORS 2 > >
diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile index 6b86f1e..9dafcf2 100644 --- a/drivers/crypto/ccp/Makefile +++ b/drivers/crypto/ccp/Makefile @@ -8,7 +8,7 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ ccp-dmaengine.o ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o ccp-$(CONFIG_PCI) += sp-pci.o -ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o +ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += sev-dev.o obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o ccp-crypto-objs := ccp-crypto-main.o \ diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/sev-dev.c similarity index 99% rename from drivers/crypto/ccp/psp-dev.c rename to drivers/crypto/ccp/sev-dev.c index 5ff842c..9a8c523 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * AMD Platform Security Processor (PSP) interface + * AMD Secure Encrypted Virtualization (SEV) interface * - * Copyright (C) 2016,2018 Advanced Micro Devices, Inc. + * Copyright (C) 2016,2019 Advanced Micro Devices, Inc. * * Author: Brijesh Singh <brijesh.singh@amd.com> */ @@ -22,7 +22,7 @@ #include <linux/firmware.h> #include "sp-dev.h" -#include "psp-dev.h" +#include "sev-dev.h" #define DEVICE_NAME "sev" #define SEV_FW_FILE "amd/sev.fw" diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/sev-dev.h similarity index 90% rename from drivers/crypto/ccp/psp-dev.h rename to drivers/crypto/ccp/sev-dev.h index dd516b3..e861647 100644 --- a/drivers/crypto/ccp/psp-dev.h +++ b/drivers/crypto/ccp/sev-dev.h @@ -2,13 +2,13 @@ /* * AMD Platform Security Processor (PSP) interface driver * - * Copyright (C) 2017-2018 Advanced Micro Devices, Inc. + * Copyright (C) 2017-2019 Advanced Micro Devices, Inc. * * Author: Brijesh Singh <brijesh.singh@amd.com> */ -#ifndef __PSP_DEV_H__ -#define __PSP_DEV_H__ +#ifndef __SEV_DEV_H__ +#define __SEV_DEV_H__ #include <linux/device.h> #include <linux/spinlock.h> @@ -64,4 +64,4 @@ struct psp_device { u8 build; }; -#endif /* __PSP_DEV_H */ +#endif /* __SEV_DEV_H */ diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index b29d2e6..473cf14 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -22,7 +22,7 @@ #include <linux/ccp.h> #include "ccp-dev.h" -#include "psp-dev.h" +#include "sev-dev.h" #define MSIX_VECTORS 2