Skip to content

Z
ZIO
Commit 61e2aadb authored by Federico Vaga's avatar Federico Vaga Committed by Federico Vaga
Browse files
Options

sysfs: [FIX] ti *must* be disabled on ti configuration 

The trigger *must* be disable while a configuration operation is
running. It was not the case. Before this patch the behavior was:

config -> disable -> propagate -> enable

With this path

disable -> config -> propagate -> enable
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
Acked-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent db372f60
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 15 deletions
sysfs.c
View file @ 61e2aadb
......@@ -149,7 +149,7 @@ void __zio_attr_propagate_value(struct zio_obj_head *head,
struct zio_attribute *zattr)
{
int i, j;
unsigned long flags, tflags;
unsigned long flags;
struct zio_ti *ti;
struct zio_device *zdev;
struct zio_channel *chan;
......@@ -183,11 +183,6 @@ void __zio_attr_propagate_value(struct zio_obj_head *head,
break;
case ZIO_TI:
ti = to_zio_ti(&head->dev);
/*
* If trigger params change, we need to abort ongoing I/O.
* Disable, temporarily, while we change configuration.
*/
tflags = zio_trigger_abort_disable(ti->cset, 1);
/*
* It is disabled, nobody can enable since that is only
* possible through sysfs and we hold the config lock.
......@@ -201,14 +196,7 @@ void __zio_attr_propagate_value(struct zio_obj_head *head,
ctrl = chan->current_ctrl;
__zattr_valcpy(&ctrl->attr_trigger, zattr);
}
/* If it was enabled, re-enable it */
if ((tflags & ZIO_STATUS) == ZIO_ENABLED)
ti->flags = (ti->flags & ~ZIO_STATUS) | ZIO_ENABLED;
spin_unlock_irqrestore(&ti->cset->lock, flags);
/* Finally, if the trigger was armed, re-arm */
if (tflags & ZIO_TI_ARMED)
zio_arm_trigger(ti);
break;
default:
return;
......@@ -624,11 +612,10 @@ int __zio_conf_set(struct zio_obj_head *head, struct zio_attribute *zattr,
err = zattr->s_op->conf_set(&head->dev, zattr, val);
if (err)
return err;
return err;
zattr->value = (uint32_t)val;
__zio_attr_propagate_value(head, zattr);
return 0;
}
......@@ -637,6 +624,8 @@ static ssize_t zattr_store(struct device *dev, struct device_attribute *attr,
{
struct zio_obj_head *head = to_zio_head(dev);
struct zio_attribute *zattr = to_zio_zattr(attr);
struct zio_ti *ti = NULL;
unsigned long tflags = 0;
spinlock_t *lock;
long val;
int err;
......@@ -658,7 +647,24 @@ static ssize_t zattr_store(struct device *dev, struct device_attribute *attr,
lock = __zio_get_dev_spinlock(head);
spin_lock(lock);
/* cannot modify trigger's attributes while is armed */
if (head->zobj_type == ZIO_TI) {
ti = to_zio_ti(&head->dev);
tflags = zio_trigger_abort_disable(ti->cset, 1);
}
/* Configure the attribute */
err = __zio_conf_set(head, zattr, (uint32_t)val);
if (head->zobj_type == ZIO_TI) {
/* restore trigger status */
if (ti && ((tflags & ZIO_STATUS) == ZIO_ENABLED))
ti->flags = (ti->flags & ~ZIO_STATUS) | ZIO_ENABLED;
if (ti && (tflags & ZIO_TI_ARMED))
zio_arm_trigger(ti);
}
spin_unlock(lock);
return err ? err : count;
......
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