2022-09-07 21:54:02

by Winkler, Tomas

[permalink] [raw]
Subject: [PATCH v9 09/16] mei: bus: export common mkhi definitions into a separate header

From: Vitaly Lubart <[email protected]>

Exported common mkhi definitions from bus-fixup.c into a separate
header file mkhi.h for other driver usage.


Signed-off-by: Vitaly Lubart <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Alexander Usyskin <[email protected]>
---
V8:
1. <linux/types.h> is enough for mkhi header.
2. drop MCHI_GROUP_ID definition it is not used
V9:
1. Fix duplicated definition caused by wrong --ammend

drivers/misc/mei/bus-fixup.c | 31 +-------------------------
drivers/misc/mei/mkhi.h | 43 ++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 30 deletions(-)
create mode 100644 drivers/misc/mei/mkhi.h

diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index 344598fcf8e9..c4e527803299 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -15,6 +15,7 @@

#include "mei_dev.h"
#include "client.h"
+#include "mkhi.h"

#define MEI_UUID_NFC_INFO UUID_LE(0xd2de1625, 0x382d, 0x417d, \
0x48, 0xa4, 0xef, 0xab, 0xba, 0x8a, 0x12, 0x06)
@@ -89,20 +90,6 @@ struct mei_os_ver {
u8 reserved2;
} __packed;

-#define MKHI_FEATURE_PTT 0x10
-
-struct mkhi_rule_id {
- __le16 rule_type;
- u8 feature_id;
- u8 reserved;
-} __packed;
-
-struct mkhi_fwcaps {
- struct mkhi_rule_id id;
- u8 len;
- u8 data[];
-} __packed;
-
struct mkhi_fw_ver_block {
u16 minor;
u8 major;
@@ -115,22 +102,6 @@ struct mkhi_fw_ver {
struct mkhi_fw_ver_block ver[MEI_MAX_FW_VER_BLOCKS];
} __packed;

-#define MKHI_FWCAPS_GROUP_ID 0x3
-#define MKHI_FWCAPS_SET_OS_VER_APP_RULE_CMD 6
-#define MKHI_GEN_GROUP_ID 0xFF
-#define MKHI_GEN_GET_FW_VERSION_CMD 0x2
-struct mkhi_msg_hdr {
- u8 group_id;
- u8 command;
- u8 reserved;
- u8 result;
-} __packed;
-
-struct mkhi_msg {
- struct mkhi_msg_hdr hdr;
- u8 data[];
-} __packed;
-
#define MKHI_OSVER_BUF_LEN (sizeof(struct mkhi_msg_hdr) + \
sizeof(struct mkhi_fwcaps) + \
sizeof(struct mei_os_ver))
diff --git a/drivers/misc/mei/mkhi.h b/drivers/misc/mei/mkhi.h
new file mode 100644
index 000000000000..c3fa3c5d5cb6
--- /dev/null
+++ b/drivers/misc/mei/mkhi.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2003-2022, Intel Corporation. All rights reserved.
+ * Intel Management Engine Interface (Intel MEI) Linux driver
+ */
+
+#ifndef _MEI_MKHI_H_
+#define _MEI_MKHI_H_
+
+#include <linux/types.h>
+
+#define MKHI_FEATURE_PTT 0x10
+
+#define MKHI_FWCAPS_GROUP_ID 0x3
+#define MKHI_FWCAPS_SET_OS_VER_APP_RULE_CMD 6
+#define MKHI_GEN_GROUP_ID 0xFF
+#define MKHI_GEN_GET_FW_VERSION_CMD 0x2
+
+struct mkhi_rule_id {
+ __le16 rule_type;
+ u8 feature_id;
+ u8 reserved;
+} __packed;
+
+struct mkhi_fwcaps {
+ struct mkhi_rule_id id;
+ u8 len;
+ u8 data[];
+} __packed;
+
+struct mkhi_msg_hdr {
+ u8 group_id;
+ u8 command;
+ u8 reserved;
+ u8 result;
+} __packed;
+
+struct mkhi_msg {
+ struct mkhi_msg_hdr hdr;
+ u8 data[];
+} __packed;
+
+#endif /* _MEI_MKHI_H_ */
--
2.37.2


2022-09-08 01:56:13

by Daniele Ceraolo Spurio

[permalink] [raw]
Subject: Re: [Intel-gfx] [PATCH v9 09/16] mei: bus: export common mkhi definitions into a separate header



On 9/7/2022 2:51 PM, Tomas Winkler wrote:
> From: Vitaly Lubart <[email protected]>
>
> Exported common mkhi definitions from bus-fixup.c into a separate
> header file mkhi.h for other driver usage.
>
>
> Signed-off-by: Vitaly Lubart <[email protected]>
> Signed-off-by: Tomas Winkler <[email protected]>
> Signed-off-by: Alexander Usyskin <[email protected]>

Reviewed-by: Daniele Ceraolo Spurio <[email protected]>

Daniele

> ---
> V8:
> 1. <linux/types.h> is enough for mkhi header.
> 2. drop MCHI_GROUP_ID definition it is not used
> V9:
> 1. Fix duplicated definition caused by wrong --ammend
>
> drivers/misc/mei/bus-fixup.c | 31 +-------------------------
> drivers/misc/mei/mkhi.h | 43 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 44 insertions(+), 30 deletions(-)
> create mode 100644 drivers/misc/mei/mkhi.h
>
> diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
> index 344598fcf8e9..c4e527803299 100644
> --- a/drivers/misc/mei/bus-fixup.c
> +++ b/drivers/misc/mei/bus-fixup.c
> @@ -15,6 +15,7 @@
>
> #include "mei_dev.h"
> #include "client.h"
> +#include "mkhi.h"
>
> #define MEI_UUID_NFC_INFO UUID_LE(0xd2de1625, 0x382d, 0x417d, \
> 0x48, 0xa4, 0xef, 0xab, 0xba, 0x8a, 0x12, 0x06)
> @@ -89,20 +90,6 @@ struct mei_os_ver {
> u8 reserved2;
> } __packed;
>
> -#define MKHI_FEATURE_PTT 0x10
> -
> -struct mkhi_rule_id {
> - __le16 rule_type;
> - u8 feature_id;
> - u8 reserved;
> -} __packed;
> -
> -struct mkhi_fwcaps {
> - struct mkhi_rule_id id;
> - u8 len;
> - u8 data[];
> -} __packed;
> -
> struct mkhi_fw_ver_block {
> u16 minor;
> u8 major;
> @@ -115,22 +102,6 @@ struct mkhi_fw_ver {
> struct mkhi_fw_ver_block ver[MEI_MAX_FW_VER_BLOCKS];
> } __packed;
>
> -#define MKHI_FWCAPS_GROUP_ID 0x3
> -#define MKHI_FWCAPS_SET_OS_VER_APP_RULE_CMD 6
> -#define MKHI_GEN_GROUP_ID 0xFF
> -#define MKHI_GEN_GET_FW_VERSION_CMD 0x2
> -struct mkhi_msg_hdr {
> - u8 group_id;
> - u8 command;
> - u8 reserved;
> - u8 result;
> -} __packed;
> -
> -struct mkhi_msg {
> - struct mkhi_msg_hdr hdr;
> - u8 data[];
> -} __packed;
> -
> #define MKHI_OSVER_BUF_LEN (sizeof(struct mkhi_msg_hdr) + \
> sizeof(struct mkhi_fwcaps) + \
> sizeof(struct mei_os_ver))
> diff --git a/drivers/misc/mei/mkhi.h b/drivers/misc/mei/mkhi.h
> new file mode 100644
> index 000000000000..c3fa3c5d5cb6
> --- /dev/null
> +++ b/drivers/misc/mei/mkhi.h
> @@ -0,0 +1,43 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (c) 2003-2022, Intel Corporation. All rights reserved.
> + * Intel Management Engine Interface (Intel MEI) Linux driver
> + */
> +
> +#ifndef _MEI_MKHI_H_
> +#define _MEI_MKHI_H_
> +
> +#include <linux/types.h>
> +
> +#define MKHI_FEATURE_PTT 0x10
> +
> +#define MKHI_FWCAPS_GROUP_ID 0x3
> +#define MKHI_FWCAPS_SET_OS_VER_APP_RULE_CMD 6
> +#define MKHI_GEN_GROUP_ID 0xFF
> +#define MKHI_GEN_GET_FW_VERSION_CMD 0x2
> +
> +struct mkhi_rule_id {
> + __le16 rule_type;
> + u8 feature_id;
> + u8 reserved;
> +} __packed;
> +
> +struct mkhi_fwcaps {
> + struct mkhi_rule_id id;
> + u8 len;
> + u8 data[];
> +} __packed;
> +
> +struct mkhi_msg_hdr {
> + u8 group_id;
> + u8 command;
> + u8 reserved;
> + u8 result;
> +} __packed;
> +
> +struct mkhi_msg {
> + struct mkhi_msg_hdr hdr;
> + u8 data[];
> +} __packed;
> +
> +#endif /* _MEI_MKHI_H_ */