Commit 19f6634f authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: add toolaction to sysfs

Move the proc entry for controlling the toolaction field to sysfs. The field
appears in /sys/devices/platform/visorchipset/install/toolaction.

This field is used to tell s-Par which type of recovery tool action to perform
on the next guest boot-up. The meaning of the value is dependent on the type
of installation software used to commission the guest.
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 808bcb4e
...@@ -149,11 +149,6 @@ static ssize_t proc_read_installer(struct file *file, char __user *buf, ...@@ -149,11 +149,6 @@ static ssize_t proc_read_installer(struct file *file, char __user *buf,
static ssize_t proc_write_installer(struct file *file, static ssize_t proc_write_installer(struct file *file,
const char __user *buffer, const char __user *buffer,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
static ssize_t proc_read_toolaction(struct file *file, char __user *buf,
size_t len, loff_t *offset);
static ssize_t proc_write_toolaction(struct file *file,
const char __user *buffer,
size_t count, loff_t *ppos);
static ssize_t proc_read_bootToTool(struct file *file, char __user *buf, static ssize_t proc_read_bootToTool(struct file *file, char __user *buf,
size_t len, loff_t *offset); size_t len, loff_t *offset);
static ssize_t proc_write_bootToTool(struct file *file, static ssize_t proc_write_bootToTool(struct file *file,
...@@ -164,11 +159,6 @@ static const struct file_operations proc_installer_fops = { ...@@ -164,11 +159,6 @@ static const struct file_operations proc_installer_fops = {
.write = proc_write_installer, .write = proc_write_installer,
}; };
static const struct file_operations proc_toolaction_fops = {
.read = proc_read_toolaction,
.write = proc_write_toolaction,
};
static const struct file_operations proc_bootToTool_fops = { static const struct file_operations proc_bootToTool_fops = {
.read = proc_read_bootToTool, .read = proc_read_bootToTool,
.write = proc_write_bootToTool, .write = proc_write_bootToTool,
...@@ -321,10 +311,33 @@ static VISORCHIPSET_BUSDEV_RESPONDERS BusDev_Responders = { ...@@ -321,10 +311,33 @@ static VISORCHIPSET_BUSDEV_RESPONDERS BusDev_Responders = {
/* info for /dev/visorchipset */ /* info for /dev/visorchipset */
static dev_t MajorDev = -1; /**< indicates major num for device */ static dev_t MajorDev = -1; /**< indicates major num for device */
/* prototypes for attributes */
static ssize_t toolaction_show(struct device *dev,
struct device_attribute *attr, char *buf);
static ssize_t toolaction_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count);
static DEVICE_ATTR_RW(toolaction);
static struct attribute *visorchipset_install_attrs[] = {
&dev_attr_toolaction.attr,
NULL
};
static struct attribute_group visorchipset_install_group = {
.name = "install",
.attrs = visorchipset_install_attrs
};
static const struct attribute_group *visorchipset_dev_groups[] = {
&visorchipset_install_group,
NULL
};
/* /sys/devices/platform/visorchipset */ /* /sys/devices/platform/visorchipset */
static struct platform_device Visorchipset_platform_device = { static struct platform_device Visorchipset_platform_device = {
.name = "visorchipset", .name = "visorchipset",
.id = -1, .id = -1,
.dev.groups = visorchipset_dev_groups,
}; };
/* Function prototypes */ /* Function prototypes */
...@@ -336,6 +349,34 @@ static void controlvm_respond_physdev_changestate(CONTROLVM_MESSAGE_HEADER * ...@@ -336,6 +349,34 @@ static void controlvm_respond_physdev_changestate(CONTROLVM_MESSAGE_HEADER *
msgHdr, int response, msgHdr, int response,
ULTRA_SEGMENT_STATE state); ULTRA_SEGMENT_STATE state);
ssize_t toolaction_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
U8 toolAction;
visorchannel_read(ControlVm_channel,
offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
ToolAction), &toolAction, sizeof(U8));
return scnprintf(buf, PAGE_SIZE, "%u\n", toolAction);
}
ssize_t toolaction_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
U8 toolAction;
if (sscanf(buf, "%hhu\n", &toolAction) == 1) {
if (visorchannel_write(ControlVm_channel,
offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
ToolAction),
&toolAction, sizeof(U8)) < 0)
return -EFAULT;
else
return count;
} else
return -EIO;
}
static void static void
show_partition_property(struct seq_file *f, void *ctx, int property) show_partition_property(struct seq_file *f, void *ctx, int property)
{ {
...@@ -2367,83 +2408,6 @@ proc_write_installer(struct file *file, ...@@ -2367,83 +2408,6 @@ proc_write_installer(struct file *file,
return count; return count;
} }
/**
* Reads the ToolAction field of ControlVMChannel.
*/
static ssize_t
proc_read_toolaction(struct file *file, char __user *buf,
size_t len, loff_t *offset)
{
int length = 0;
U8 toolAction;
char *vbuf;
loff_t pos = *offset;
if (pos < 0)
return -EINVAL;
if (pos > 0 || !len)
return 0;
vbuf = kzalloc(len, GFP_KERNEL);
if (!vbuf)
return -ENOMEM;
visorchannel_read(ControlVm_channel,
offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
ToolAction), &toolAction, sizeof(U8));
length = sprintf(vbuf, "%u\n", toolAction);
if (copy_to_user(buf, vbuf, length)) {
kfree(vbuf);
return -EFAULT;
}
kfree(vbuf);
*offset += length;
return length;
}
/**
* Writes to the ToolAction field of ControlVMChannel.
* Input: ToolAction
* Limit 3 characters input
*/
#define UINT8_MAX (255U)
static ssize_t
proc_write_toolaction(struct file *file,
const char __user *buffer, size_t count, loff_t *ppos)
{
char buf[3];
U8 toolAction;
/* Check to make sure there is no buffer overflow */
if (count > (sizeof(buf) - 1))
return -EINVAL;
if (copy_from_user(buf, buffer, count)) {
WARN(1, "Error copying from user space\n");
return -EFAULT;
}
if (sscanf(buf, "%hhd", &toolAction) != 1)
toolAction = UINT8_MAX;
if (toolAction != UINT8_MAX) {
if (visorchannel_write
(ControlVm_channel,
offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL, ToolAction),
&toolAction, sizeof(U8)) < 0)
WARN(1, "Installation ToolAction Write Failed - ToolAction = %d\n",
toolAction);
}
/* So this function isn't called multiple times, must return
* size of buffer
*/
return count;
}
/** /**
* Reads the EfiSparIndication.BootToTool field of ControlVMChannel. * Reads the EfiSparIndication.BootToTool field of ControlVMChannel.
*/ */
...@@ -2534,7 +2498,6 @@ visorchipset_init(void) ...@@ -2534,7 +2498,6 @@ visorchipset_init(void)
int rc = 0, x = 0; int rc = 0, x = 0;
char s[64]; char s[64];
struct proc_dir_entry *installer_file; struct proc_dir_entry *installer_file;
struct proc_dir_entry *toolaction_file;
struct proc_dir_entry *bootToTool_file; struct proc_dir_entry *bootToTool_file;
HOSTADDRESS addr; HOSTADDRESS addr;
...@@ -2612,9 +2575,6 @@ visorchipset_init(void) ...@@ -2612,9 +2575,6 @@ visorchipset_init(void)
/* Setup Installation fields */ /* Setup Installation fields */
installer_file = proc_create("installer", 0644, ProcDir, installer_file = proc_create("installer", 0644, ProcDir,
&proc_installer_fops); &proc_installer_fops);
/* Setup the ToolAction field */
toolaction_file = proc_create("toolaction", 0644, ProcDir,
&proc_toolaction_fops);
/* Setup the BootToTool field */ /* Setup the BootToTool field */
bootToTool_file = proc_create("boottotool", 0644, ProcDir, bootToTool_file = proc_create("boottotool", 0644, ProcDir,
&proc_bootToTool_fops); &proc_bootToTool_fops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment