Commit 7d88a258 authored by Vitaly Lubart's avatar Vitaly Lubart Committed by Joonas Lahtinen
Browse files

mei: bus: export common mkhi definitions into a separate header 



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

Signed-off-by: default avatarVitaly Lubart <vitaly.lubart@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907215113.1596567-10-tomas.winkler@intel.com


Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 95953618

drivers/misc/mei/bus-fixup.c

+1 −30
Original line number Diff line number Diff line
@@ -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))

drivers/misc/mei/mkhi.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/* 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_ */