2022-08-06 12:48:38

by Winkler, Tomas

Subject: [PATCH v7 09/15] 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]>
---
drivers/misc/mei/bus-fixup.c | 31 +------------------------
drivers/misc/mei/mkhi.h | 45 ++++++++++++++++++++++++++++++++++++
2 files changed, 46 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 24e91a9ea558..811c94ebf250 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..27a9b476904e
--- /dev/null
+++ b/drivers/misc/mei/mkhi.h
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.
+ * Intel Management Engine Interface (Intel MEI) Linux driver
+ */
+
+#ifndef _MEI_MKHI_H_
+#define _MEI_MKHI_H_
+
+#include "mei_dev.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
+
+#define MCHI_GROUP_ID 0xA
+
+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.1

2022-09-01 21:00:08

by Daniele Ceraolo Spurio

Subject: Re: [Intel-gfx] [PATCH v7 09/15] mei: bus: export common mkhi definitions into a separate header

On 8/6/2022 5:26 AM, 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]>
> ---
> drivers/misc/mei/bus-fixup.c | 31 +------------------------
> drivers/misc/mei/mkhi.h | 45 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 46 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 24e91a9ea558..811c94ebf250 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..27a9b476904e
> --- /dev/null
> +++ b/drivers/misc/mei/mkhi.h
> @@ -0,0 +1,45 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.

2022 (can fix when merging)

> + * Intel Management Engine Interface (Intel MEI) Linux driver
> + */
> +
> +#ifndef _MEI_MKHI_H_
> +#define _MEI_MKHI_H_
> +
> +#include "mei_dev.h"

Any reason you need the full mei_dev.h and not just 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
> +
> +#define MCHI_GROUP_ID 0xA

This is new and doesn't seem to be used in follow-up patches. Any reason
for adding it in?

Daniele

> +
> +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_ */

2022-09-03 10:32:49

by Winkler, Tomas

Subject: RE: [Intel-gfx] [PATCH v7 09/15] mei: bus: export common mkhi definitions into a separate header

>
>
> On 8/6/2022 5:26 AM, 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]>
> > ---
> > drivers/misc/mei/bus-fixup.c | 31 +------------------------
> > drivers/misc/mei/mkhi.h | 45
> ++++++++++++++++++++++++++++++++++++
> > 2 files changed, 46 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 24e91a9ea558..811c94ebf250 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..27a9b476904e
> > --- /dev/null
> > +++ b/drivers/misc/mei/mkhi.h
> > @@ -0,0 +1,45 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +/*
> > + * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.
>
> 2022 (can fix when merging)
>
> > + * Intel Management Engine Interface (Intel MEI) Linux driver */
> > +
> > +#ifndef _MEI_MKHI_H_
> > +#define _MEI_MKHI_H_
> > +
> > +#include "mei_dev.h"
>
> Any reason you need the full mei_dev.h and not just linux/types.h ?
<linux/types.h> is enough
>
> > +
> > +#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
> > +
> > +#define MCHI_GROUP_ID 0xA
>
> This is new and doesn't seem to be used in follow-up patches. Any reason for
> adding it in?


Will drop.

>
> Daniele
>