mei: Move uuid.h to the MEI namespace
There is only a single user of the UUID uAPI, let's make it part of that user. The way it's done is to prevent compilation time breakage for the user space that does #include <linux/uuid.h> In the future MEI user space tools can switch over to use mei_uuid.h. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230310170747.22782-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko
Greg Kroah-Hartman
parent
abae262640
commit
1fb1ea0d9c
|
|
@ -10459,6 +10459,7 @@ F: drivers/watchdog/mei_wdt.c
|
|||
F: include/linux/mei_aux.h
|
||||
F: include/linux/mei_cl_bus.h
|
||||
F: include/uapi/linux/mei.h
|
||||
F: include/uapi/linux/mei_uuid.h
|
||||
F: include/uapi/linux/uuid.h
|
||||
F: samples/mei/*
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/uuid.h>
|
||||
|
||||
#include <linux/mei.h>
|
||||
#include <linux/mei_cl_bus.h>
|
||||
|
||||
#include "mei_dev.h"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/mei.h>
|
||||
#include <linux/mei_cl_bus.h>
|
||||
#include <linux/component.h>
|
||||
#include <drm/drm_connector.h>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef _MEI_HW_TYPES_H_
|
||||
#define _MEI_HW_TYPES_H_
|
||||
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/mei.h>
|
||||
|
||||
/*
|
||||
* Timeouts in Seconds
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <linux/ioctl.h>
|
||||
#include <linux/cdev.h>
|
||||
#include <linux/sched/signal.h>
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/compat.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/mei.h>
|
||||
#include <linux/mei_cl_bus.h>
|
||||
#include <linux/component.h>
|
||||
#include <drm/drm_connector.h>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#define LINUX_MOD_DEVICETABLE_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/mei.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/uuid.h>
|
||||
typedef unsigned long kernel_ulong_t;
|
||||
|
|
|
|||
|
|
@ -107,7 +107,4 @@ extern const u8 uuid_index[16];
|
|||
int guid_parse(const char *uuid, guid_t *u);
|
||||
int uuid_parse(const char *uuid, uuid_t *u);
|
||||
|
||||
/* MEI UUID type, don't use anywhere else */
|
||||
#include <uapi/linux/uuid.h>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef _LINUX_MEI_H
|
||||
#define _LINUX_MEI_H
|
||||
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/mei_uuid.h>
|
||||
|
||||
/*
|
||||
* This IOCTL is used to associate the current file descriptor with a
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
/*
|
||||
* MEI UUID definition
|
||||
*
|
||||
* Copyright (C) 2010, Intel Corp.
|
||||
* Huang Ying <ying.huang@intel.com>
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_MEI_UUID_H_
|
||||
#define _UAPI_LINUX_MEI_UUID_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
typedef struct {
|
||||
__u8 b[16];
|
||||
} uuid_le;
|
||||
|
||||
#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
|
||||
((uuid_le) \
|
||||
{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
|
||||
(b) & 0xff, ((b) >> 8) & 0xff, \
|
||||
(c) & 0xff, ((c) >> 8) & 0xff, \
|
||||
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
|
||||
|
||||
#define NULL_UUID_LE \
|
||||
UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \
|
||||
0x00, 0x00, 0x00, 0x00)
|
||||
|
||||
#endif /* _UAPI_LINUX_MEI_UUID_H_ */
|
||||
|
|
@ -1,30 +1 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
/* DO NOT USE in new code! This is solely for MEI due to legacy reasons */
|
||||
/*
|
||||
* MEI UUID definition
|
||||
*
|
||||
* Copyright (C) 2010, Intel Corp.
|
||||
* Huang Ying <ying.huang@intel.com>
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_UUID_H_
|
||||
#define _UAPI_LINUX_UUID_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
typedef struct {
|
||||
__u8 b[16];
|
||||
} uuid_le;
|
||||
|
||||
#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
|
||||
((uuid_le) \
|
||||
{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
|
||||
(b) & 0xff, ((b) >> 8) & 0xff, \
|
||||
(c) & 0xff, ((c) >> 8) & 0xff, \
|
||||
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
|
||||
|
||||
#define NULL_UUID_LE \
|
||||
UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \
|
||||
0x00, 0x00, 0x00, 0x00)
|
||||
|
||||
#endif /* _UAPI_LINUX_UUID_H_ */
|
||||
#include <linux/mei_uuid.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue