Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <591083d2-d1cd-e60d-5331-5a0032bae94b@intel.com>
Date:   Wed, 7 Sep 2022 17:51:12 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.12.0
Subject: Re: [Intel-gfx] [PATCH v9 09/16] mei: bus: export common mkhi
 definitions into a separate header
Content-Language: en-US
To:     Tomas Winkler <tomas.winkler@intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>
CC:     <intel-gfx@lists.freedesktop.org>,
        Alexander Usyskin <alexander.usyskin@intel.com>,
        <linux-kernel@vger.kernel.org>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Vitaly Lubart <vitaly.lubart@intel.com>
References: <20220907215113.1596567-1-tomas.winkler@intel.com>
 <20220907215113.1596567-10-tomas.winkler@intel.com>
From:   "Ceraolo Spurio, Daniele" <daniele.ceraolospurio@intel.com>
In-Reply-To: <20220907215113.1596567-10-tomas.winkler@intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QUcrcVBvam5LU1RnUjlZM2F4K2hBb2ZaWUhSd3RYbjAxK1BCek51UUg2R2dh?=
 =?utf-8?B?UVY0QzNLNlpweitNU2JQc21RMTZsK0lXL3BTcEszVDZjMzZQMW9zcExoOVpW?=
 =?utf-8?B?aUtZdFhGeTlvZjY1M3JWM0lnNG93Mlo3UGovNytEcjhrOFF1UGxxZXFjbGJU?=
 =?utf-8?B?V0NTeUUzcEcyRjlEMm9ySnZnejVFbU42MUlaNWcwVVRvNGhEcnZyQk1sNFdS?=
 =?utf-8?B?TEM2K0ozTU1nRXE4ZUVHVnY0d2xrM2wzLy8wRVc4a1NOYTZRTXpMRHkyN2Fy?=
 =?utf-8?B?V0RMa3ZlVDZacUYwOVRsMGRLU3FFT1FqSFl6SUtxeGJ1QlZSM1UzY2NCb0FW?=
 =?utf-8?B?akc5aHZKSFE1bEdLYy9kOTY3dHF6c2FsK00zNmVPekpVd3hKUG1FRE9HUW5H?=
 =?utf-8?B?OW1XRklSUkd0NHJremRkRWhiOEtpRXZodGJmY0FhaDFFSjYyUEhxREJkZmdu?=
 =?utf-8?B?ZVRhZmQ3dDBuTEJPZDB0ZmJwRlVIL0FQRnh3SzlOYi9HVWZIUHBGUUFHQUVW?=
 =?utf-8?B?Y1BBS1lYVFBKK1F1cnNVdE8wQW4rVjIrS042aW5VN21XbkVpZzYwRGNJV2hK?=
 =?utf-8?B?WjIyRUlaR0dhdGFaNE5MMFBCcUt0b3JSQ21wN1d3L2tOREJPTFh2c21jcUZh?=
 =?utf-8?B?RXlEK2FKOWR1dmRld3NaVlpiS3ZQMjR2akhTdEtOTkZXblI4OXVaa2phNUZF?=
 =?utf-8?B?d1BFeE9BZ0tXakdUaWc3c0NBYWdXclJKTDVMYzZVOXBlaGNBUnBxdE1HWG1T?=
 =?utf-8?B?MWNEQ1JQd3FpNm1JYXVoaEtpUllacW5DVllXTWV0V2dpMklFVVlkWjJRczRT?=
 =?utf-8?B?c3A3OHRWTHlOUy9HQnNqWGpEQVlLa0laOGJkelIwTGMrVFMwblp1cUlUT2x3?=
 =?utf-8?B?WG5MWS9yR0pySmhlUWtodFNLUUtKUVlLczB1b1FrSU8raTd5Z3h6dE10OXNW?=
 =?utf-8?B?V245OWJGM0hqNEJsVHd4Z3BzTEJhVEVVaTJhWm8vZWl3MVdNMmY2ZHprSDdM?=
 =?utf-8?B?S2l1SGh1b1doRjBPMS9QTm9jNVMyZGFFeWpVZVlvK3Jndy9IUXA5YitsME9t?=
 =?utf-8?B?V0tkcXY0RVZNZnNRYTh6VkhkR1F3YmtCNGxBNmJadDNscHp5R2IvSGRoeCtH?=
 =?utf-8?B?ZHZLQVBmVE9UTmRCcDhLRnpzSnRpTUhVZEZNQ3BuTk9wZDB2V0dqNy93NFh2?=
 =?utf-8?B?Y0lmcUw1ZnR4QkdXQ1VhYWdqT2EwKytEZGRhQXg2OVhDOVBiSklkU1k3SEJH?=
 =?utf-8?B?T0wxZFhlbVVtWWdsaDlUb0x3UHV4cVVVempJYjVrTDlaNmJUNnZ2VGhQTDJW?=
 =?utf-8?B?UGM4TllScExibEM1Zm5aNDhlZ3JJUm9VanZoWUJHd2hYU2VmSlUrdGVOT3ln?=
 =?utf-8?B?MGdJeDFodjcrU0JVMGY5S1o5SDM5SGV5ZDN0R2tVN2UxazBUdldrQ25raytr?=
 =?utf-8?B?dkkrQWdhQkJKdGsxblR2aTJFUEhvZDhURVpsVmQ1UFErd2t6RkNPV0duVmVV?=
 =?utf-8?B?NlJFUE53L3NiR1lvU1F2ZXJNaGFCWDkrbzBYSzMzS1gyR09TK05VcGVXQzM2?=
 =?utf-8?B?RnErTFlaQ3kzeGdwVC9xTE9TTzVyRlV4ZkNNdGhvMUpMWitpUVlTZ2grUXFt?=
 =?utf-8?B?VDNET2s5R3dUMDErTjJ6Ynk2RkozN21NVG1jOVNTclRyMVFsSXQ0Q2xjZXND?=
 =?utf-8?B?N0hiZUZFQ0x4bHNBR0d0Yk44SkxUbTdqYit2UFFFd3ZZa1UyeGpUdkZNOTlY?=
 =?utf-8?B?NmJkZlowMFV6bE5nbkhnaG5xMUNwa05tTmw2TzFiemRhN1h0RW9tbWxzbmtE?=
 =?utf-8?B?TTN4ZXpHVHRMcHdMYXJzRTV2QWxsanNxYUN4RnFXU1I2R2NyRUhJWncra1dG?=
 =?utf-8?B?blBSZlZsd0RtWHltTkEvTW1wUjM1YldKSDdweVRySmpLeEFKcVFZem4zL3lw?=
 =?utf-8?B?Q3hodGJQMzdrcXdtOExRbWRmaDBseDdMdFdVQUlHQTJpc2FkanBSQ3VrdW9x?=
 =?utf-8?B?ek1iWFBhc2svZUk5RHoxN2dsV2JURHhqbWpFakZaL2hJK0pRTFNjUzMyN2Nn?=
 =?utf-8?B?TmNQTFNOVnFGeWZnQjA2NS9DOFU3MzRJdFVMM21yMzVKLzZqU2JGZTBZZW12?=
 =?utf-8?B?ZUF6dHpWNVZVc1NTMmgvS2tlQXdWREJET2c5YjRVTjU0N0VmRjNGVjBkUFU1?=
 =?utf-8?Q?FKXy/aaxSEqeNTezmbvr8No=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 906b96b5-1aab-4430-e78f-08da91343bb0
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5488.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 00:51:16.8837
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9K9EsPA6RGfbrfikxlCZEK8Iez3VJzUtoG3t3kHleSOBIxXfvPlzdbdOkvooVTccDH4+VYzk2YFKJnzitQu5dZj17ID62lKguhU8ZWnCSDY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4717
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 9/7/2022 2:51 PM, Tomas Winkler wrote:
> From: Vitaly Lubart <vitaly.lubart@intel.com>
>
> Exported common mkhi definitions from bus-fixup.c into a separate
> header file mkhi.h for other driver usage.
>
>
> Signed-off-by: Vitaly Lubart <vitaly.lubart@intel.com>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

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