From 8956dc309bfb8c65d4be526d327f851c1ddb03c0 Mon Sep 17 00:00:00 2001 From: lingmingqiang Date: Thu, 11 Jul 2019 14:41:47 +0800 Subject: [PATCH] ACC: optimize the lisence for accelerate modules driver inclusion category: bugfix bugzilla: NA CVE: NA 1. add copyright state. 2. modify some nonstandard, as (2018-2023) -> (2018-2019) Hisilicon -> HiSilicon GPL -> GPL v2 Signed-off-by: Hao Fang Reviewed-by: huangdaode Signed-off-by: lingmingqiang Signed-off-by: Yang Yingliang --- drivers/crypto/hisilicon/hpre/hpre.h | 10 ++++++++++ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 10 ++++++++++ drivers/crypto/hisilicon/hpre/hpre_main.c | 10 ++++++++++ drivers/crypto/hisilicon/qm.c | 2 +- drivers/crypto/hisilicon/qm.h | 2 +- drivers/crypto/hisilicon/qm_usr_if.h | 1 + drivers/crypto/hisilicon/rde/rde.h | 12 +++++++++++- drivers/crypto/hisilicon/rde/rde_main.c | 9 +++++++++ drivers/crypto/hisilicon/rde/rde_usr_if.h | 10 ++++++++++ drivers/crypto/hisilicon/sec2/sec.h | 10 ++++++++++ drivers/crypto/hisilicon/sec2/sec_crypto.c | 10 ++++++++++ drivers/crypto/hisilicon/sec2/sec_crypto.h | 2 +- drivers/crypto/hisilicon/sec2/sec_main.c | 11 ++++++++++- drivers/crypto/hisilicon/sec2/sec_usr_if.h | 10 ++++++++++ drivers/crypto/hisilicon/zip/zip.h | 12 +++++++++++- drivers/crypto/hisilicon/zip/zip_crypto.c | 11 ++++++++++- drivers/crypto/hisilicon/zip/zip_crypto.h | 2 +- drivers/crypto/hisilicon/zip/zip_main.c | 11 ++++++++++- drivers/crypto/hisilicon/zip/zip_usr_if.h | 10 ++++++++++ drivers/uacce/dummy_drv/dummy_hw_usr_if.h | 1 + drivers/uacce/dummy_drv/dummy_wd_dev.c | 3 ++- drivers/uacce/dummy_drv/dummy_wd_v2.c | 3 ++- drivers/uacce/dummy_drv/wd_dummy_usr_if.h | 1 + drivers/uacce/uacce.c | 5 +++-- include/linux/uacce.h | 1 + include/uapi/linux/uacce.h | 1 + 26 files changed, 157 insertions(+), 13 deletions(-) diff --git a/drivers/crypto/hisilicon/hpre/hpre.h b/drivers/crypto/hisilicon/hpre/hpre.h index db9ab338b4bc..848c33e76ce4 100644 --- a/drivers/crypto/hisilicon/hpre/hpre.h +++ b/drivers/crypto/hisilicon/hpre/hpre.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef __HISI_HPRE_H #define __HISI_HPRE_H diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c index 8285bc4f660e..67aa98f8c905 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c +++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c index e52afb20207d..042d0e778d8d 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_main.c +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index edb8e7a1b058..b48fd61a0242 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #include #include #include diff --git a/drivers/crypto/hisilicon/qm.h b/drivers/crypto/hisilicon/qm.h index 643eb3d91d3f..a488ab7bb924 100644 --- a/drivers/crypto/hisilicon/qm.h +++ b/drivers/crypto/hisilicon/qm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0+ */ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef HISI_ACC_QM_H #define HISI_ACC_QM_H diff --git a/drivers/crypto/hisilicon/qm_usr_if.h b/drivers/crypto/hisilicon/qm_usr_if.h index 75c7f7897210..e12ef6399547 100644 --- a/drivers/crypto/hisilicon/qm_usr_if.h +++ b/drivers/crypto/hisilicon/qm_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef HISI_QM_USR_IF_H #define HISI_QM_USR_IF_H diff --git a/drivers/crypto/hisilicon/rde/rde.h b/drivers/crypto/hisilicon/rde/rde.h index 5ffeb4fd13a8..858a14473fc7 100644 --- a/drivers/crypto/hisilicon/rde/rde.h +++ b/drivers/crypto/hisilicon/rde/rde.h @@ -1,5 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2019 Hisilicon Limited. */ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + + #ifndef HISI_RDE_H #define HISI_RDE_H diff --git a/drivers/crypto/hisilicon/rde/rde_main.c b/drivers/crypto/hisilicon/rde/rde_main.c index 8bd3c3ac3c89..28faba0d9ffb 100644 --- a/drivers/crypto/hisilicon/rde/rde_main.c +++ b/drivers/crypto/hisilicon/rde/rde_main.c @@ -1,4 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/rde/rde_usr_if.h b/drivers/crypto/hisilicon/rde/rde_usr_if.h index c07ac814e30f..b18ee848f3c5 100644 --- a/drivers/crypto/hisilicon/rde/rde_usr_if.h +++ b/drivers/crypto/hisilicon/rde/rde_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef __RDE_USR_IF_H__ #define __RDE_USR_IF_H__ diff --git a/drivers/crypto/hisilicon/sec2/sec.h b/drivers/crypto/hisilicon/sec2/sec.h index c40cb1d95f74..bddf5fa31f17 100644 --- a/drivers/crypto/hisilicon/sec2/sec.h +++ b/drivers/crypto/hisilicon/sec2/sec.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef HISI_SEC_H #define HISI_SEC_H diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index bbd86e73c101..0c6815e6d4cf 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.h b/drivers/crypto/hisilicon/sec2/sec_crypto.h index 9a631ac6fc57..31e1223cd242 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.h +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (c) 2018 HiSilicon Limited. + * Copyright (c) 2018-2019 HiSilicon Limited. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c index 7e5c66f07c2a..3eb793e54447 100644 --- a/drivers/crypto/hisilicon/sec2/sec_main.c +++ b/drivers/crypto/hisilicon/sec2/sec_main.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/sec2/sec_usr_if.h b/drivers/crypto/hisilicon/sec2/sec_usr_if.h index 451a243a225c..3d7c8cc7dd89 100644 --- a/drivers/crypto/hisilicon/sec2/sec_usr_if.h +++ b/drivers/crypto/hisilicon/sec2/sec_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef HISI_SEC_USR_IF_H #define HISI_SEC_USR_IF_H diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h index 50ab9e02c584..05132a27a9d3 100644 --- a/drivers/crypto/hisilicon/zip/zip.h +++ b/drivers/crypto/hisilicon/zip/zip.h @@ -1,5 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0+ */ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018 HiSilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef HISI_ZIP_H #define HISI_ZIP_H diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c index f84b3b608a41..2a37b2eef03f 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.c +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include "zip.h" diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.h b/drivers/crypto/hisilicon/zip/zip_crypto.h index 6fae34b4df3a..814220606740 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.h +++ b/drivers/crypto/hisilicon/zip/zip_crypto.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (c) 2018 HiSilicon Limited. + * Copyright (c) 2018-2019 HiSilicon Limited. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c index e00add263b08..a1f2d26f876e 100644 --- a/drivers/crypto/hisilicon/zip/zip_main.c +++ b/drivers/crypto/hisilicon/zip/zip_main.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #include #include #include diff --git a/drivers/crypto/hisilicon/zip/zip_usr_if.h b/drivers/crypto/hisilicon/zip/zip_usr_if.h index 8734491ca6a2..74e59e970bf8 100644 --- a/drivers/crypto/hisilicon/zip/zip_usr_if.h +++ b/drivers/crypto/hisilicon/zip/zip_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + #ifndef HISI_ZIP_USR_IF_H #define HISI_ZIP_USR_IF_H diff --git a/drivers/uacce/dummy_drv/dummy_hw_usr_if.h b/drivers/uacce/dummy_drv/dummy_hw_usr_if.h index 03509b03dfce..f925aabeabab 100644 --- a/drivers/uacce/dummy_drv/dummy_hw_usr_if.h +++ b/drivers/uacce/dummy_drv/dummy_hw_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /* * This file defines the dummy hardware/driver interface between the user and * kernel space diff --git a/drivers/uacce/dummy_drv/dummy_wd_dev.c b/drivers/uacce/dummy_drv/dummy_wd_dev.c index 0cbe387f8764..d748999ebf7f 100644 --- a/drivers/uacce/dummy_drv/dummy_wd_dev.c +++ b/drivers/uacce/dummy_drv/dummy_wd_dev.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /** * This module is used to test the framework of WarpDrive. * @@ -427,4 +428,4 @@ module_init(dummy_uacce_init); module_exit(dummy_uacce_exit); MODULE_AUTHOR("Kenneth Lee"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/uacce/dummy_drv/dummy_wd_v2.c b/drivers/uacce/dummy_drv/dummy_wd_v2.c index 11378f1d4233..d32f3ad55f8f 100644 --- a/drivers/uacce/dummy_drv/dummy_wd_v2.c +++ b/drivers/uacce/dummy_drv/dummy_wd_v2.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /** * This module is used to test the framework of WarpDrive. * @@ -516,4 +517,4 @@ module_init(dummy_wd2_init); module_exit(dummy_wd2_exit); MODULE_AUTHOR("Kenneth Lee"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/uacce/dummy_drv/wd_dummy_usr_if.h b/drivers/uacce/dummy_drv/wd_dummy_usr_if.h index 71a3330f6618..50ad81fd00c4 100644 --- a/drivers/uacce/dummy_drv/wd_dummy_usr_if.h +++ b/drivers/uacce/dummy_drv/wd_dummy_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /* * This file defines the dummy algo interface between the user and kernel space */ diff --git a/drivers/uacce/uacce.c b/drivers/uacce/uacce.c index 2344b2a2a9f2..a3457c754bcb 100644 --- a/drivers/uacce/uacce.c +++ b/drivers/uacce/uacce.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018 HiSilicon Limited. */ #include #include #include @@ -1364,6 +1365,6 @@ static __exit void uacce_exit(void) subsys_initcall(uacce_init); module_exit(uacce_exit); -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Hisilicon Tech. Co., Ltd."); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("HiSilicon Tech. Co., Ltd."); MODULE_DESCRIPTION("Accelerator interface for Userland applications"); diff --git a/include/linux/uacce.h b/include/linux/uacce.h index e90442ff3fbf..cfdd8237294f 100644 --- a/include/linux/uacce.h +++ b/include/linux/uacce.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef __UACCE_H #define __UACCE_H diff --git a/include/uapi/linux/uacce.h b/include/uapi/linux/uacce.h index 2085969bade7..f1495b25b5c2 100644 --- a/include/uapi/linux/uacce.h +++ b/include/uapi/linux/uacce.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef _UAPIUUACCE_H #define _UAPIUUACCE_H -- GitLab