nfit, libnvdimm: deprecate the generic SMART ioctl
The kernel's ND_IOCTL_SMART_THRESHOLD command is based on a payload definition that has become broken / out-of-sync with recent versions of the NVDIMM_FAMILY_INTEL definition. Deprecate the use of the ND_IOCTL_SMART_THRESHOLD command in favor of the ND_CMD_CALL approach taken by NVDIMM_FAMILY_{HPE,MSFT}, where we can manage the per-vendor variance in userspace. In a couple years, when the new scheme is widely deployed in userspace packages, the ND_IOCTL_SMART_THRESHOLD support can be removed. For now we prevent new binaries from compiling against the kernel header definitions, but kernel still compatible with old binaries. The libndctl.h [1] header is now the authoritative interface definition for NVDIMM SMART. [1]: https://github.com/pmem/ndctl Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
@@ -15,54 +15,6 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct nd_cmd_smart {
|
||||
__u32 status;
|
||||
__u8 data[128];
|
||||
} __packed;
|
||||
|
||||
#define ND_SMART_HEALTH_VALID (1 << 0)
|
||||
#define ND_SMART_SPARES_VALID (1 << 1)
|
||||
#define ND_SMART_USED_VALID (1 << 2)
|
||||
#define ND_SMART_TEMP_VALID (1 << 3)
|
||||
#define ND_SMART_CTEMP_VALID (1 << 4)
|
||||
#define ND_SMART_ALARM_VALID (1 << 9)
|
||||
#define ND_SMART_SHUTDOWN_VALID (1 << 10)
|
||||
#define ND_SMART_VENDOR_VALID (1 << 11)
|
||||
#define ND_SMART_SPARE_TRIP (1 << 0)
|
||||
#define ND_SMART_TEMP_TRIP (1 << 1)
|
||||
#define ND_SMART_CTEMP_TRIP (1 << 2)
|
||||
#define ND_SMART_NON_CRITICAL_HEALTH (1 << 0)
|
||||
#define ND_SMART_CRITICAL_HEALTH (1 << 1)
|
||||
#define ND_SMART_FATAL_HEALTH (1 << 2)
|
||||
|
||||
struct nd_smart_payload {
|
||||
__u32 flags;
|
||||
__u8 reserved0[4];
|
||||
__u8 health;
|
||||
__u8 spares;
|
||||
__u8 life_used;
|
||||
__u8 alarm_flags;
|
||||
__u16 temperature;
|
||||
__u16 ctrl_temperature;
|
||||
__u8 reserved1[15];
|
||||
__u8 shutdown_state;
|
||||
__u32 vendor_size;
|
||||
__u8 vendor_data[92];
|
||||
} __packed;
|
||||
|
||||
struct nd_cmd_smart_threshold {
|
||||
__u32 status;
|
||||
__u8 data[8];
|
||||
} __packed;
|
||||
|
||||
struct nd_smart_threshold_payload {
|
||||
__u8 alarm_control;
|
||||
__u8 reserved0;
|
||||
__u16 temperature;
|
||||
__u8 spares;
|
||||
__u8 reserved[3];
|
||||
} __packed;
|
||||
|
||||
struct nd_cmd_dimm_flags {
|
||||
__u32 status;
|
||||
__u32 flags;
|
||||
@@ -211,12 +163,6 @@ static inline const char *nvdimm_cmd_name(unsigned cmd)
|
||||
|
||||
#define ND_IOCTL 'N'
|
||||
|
||||
#define ND_IOCTL_SMART _IOWR(ND_IOCTL, ND_CMD_SMART,\
|
||||
struct nd_cmd_smart)
|
||||
|
||||
#define ND_IOCTL_SMART_THRESHOLD _IOWR(ND_IOCTL, ND_CMD_SMART_THRESHOLD,\
|
||||
struct nd_cmd_smart_threshold)
|
||||
|
||||
#define ND_IOCTL_DIMM_FLAGS _IOWR(ND_IOCTL, ND_CMD_DIMM_FLAGS,\
|
||||
struct nd_cmd_dimm_flags)
|
||||
|
||||
|
Reference in New Issue
Block a user