UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commit Message: Compiling hct.ko when the module mdev is disabled. 

Signed-off-by: Yabin Li <liyabin@hygon.cn>
Signed-off-by: yangdepei <yangdepei@hygon.cn>
This commit is contained in:
Yabin Li 2024-04-25 19:41:51 +08:00 committed by yangdepei
parent f0872dfb71
commit 8dfdf88cb9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/crypto/ccp/hygon/hct.c
View File

@ -23,11 +23,13 @@
#include <linux/ctype.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/mdev.h>
#include <linux/pci.h>
#include <linux/kfifo.h>
#include <linux/eventfd.h>
#include <linux/mem_encrypt.h>
#if IS_ENABLED(CONFIG_VFIO_MDEV)
#include <linux/mdev.h>
#endif
/**
* VERSION_STRING modification instructions:
@ -35,12 +37,13 @@
* 0.2 -- supoort qemu virtualization.
* 0.3 -- support host-noiommu mode memory encryption function,
* and performance optimization in virtual machines (enable caching).
* 0.4 -- support compiling hct.ko when mdev module is disabled.
*/
#undef pr_fmt
#define pr_fmt(fmt) "hct: " fmt
#define VERSION_STRING "0.3"
#define VERSION_STRING "0.4"
#define DRIVER_AUTHOR "HYGON Corporation"
#define VERSION_SIZE 16
@ -191,6 +194,7 @@ struct hct_iommu {
unsigned long ref;
};
#if IS_ENABLED(CONFIG_VFIO_MDEV)
static struct hct_data {
struct hct_iommu iommu[MCCP_DEV_MAX];
struct mutex lock;
@ -2075,6 +2079,7 @@ static void hct_device_release(struct device *dev)
{
dev_dbg(dev, "hct: released\n");
}
#endif /* IS_ENABLED(CONFIG_VFIO_MDEV) */
#define CPUID_VENDOR_HygonGenuine_ebx 0x6f677948
#define CPUID_VENDOR_HygonGenuine_ecx 0x656e6975
@ -2203,7 +2208,7 @@ struct miscdevice hct_noiommu_misc = {
static int __init hct_dev_init(void)
{
int ret = 0;
int __maybe_unused ret = 0;
u32 vendor_ebx = 0;
u32 vendor_ecx = 0;
u32 vendor_edx = 0;
@ -2219,6 +2224,7 @@ static int __init hct_dev_init(void)
return -1;
}
#if IS_ENABLED(CONFIG_VFIO_MDEV)
if (!iommu_present(&pci_bus_type))
return misc_register(&hct_noiommu_misc);
@ -2295,10 +2301,15 @@ failed0:
all_done:
return ret;
#else
pr_info("The module mdev is disabled.\n");
return misc_register(&hct_noiommu_misc);
#endif
}
static void __exit hct_dev_exit(void)
{
#if IS_ENABLED(CONFIG_VFIO_MDEV)
if (!iommu_present(&pci_bus_type)) {
misc_deregister(&hct_noiommu_misc);
return;
@ -2316,6 +2327,9 @@ static void __exit hct_dev_exit(void)
hct_dev.vd_class = NULL;
pci_unregister_driver(&hct_pci_driver);
#else
misc_deregister(&hct_noiommu_misc);
#endif
}
module_init(hct_dev_init)