Skip to content

F
FMC Bus
Commit d9b6163e authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

fmc-fakedev: move the work queue out of ff_dev 

The device is freed while its same work queue is running. I don't know
if this is safe, but definitely using a static work queue is.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent b4ae7fe6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
kernel/fmc-fakedev.c
View file @ d9b6163e
...@@ -82,7 +82,6 @@ static char ff_eeimg[FF_MAX_MEZZANINES][FF_EEPROM_SIZE] = { ...@@ -82,7 +82,6 @@ static char ff_eeimg[FF_MAX_MEZZANINES][FF_EEPROM_SIZE] = {
struct ff_dev { struct ff_dev {
struct fmc_device *fmc[FF_MAX_MEZZANINES]; struct fmc_device *fmc[FF_MAX_MEZZANINES];
struct device dev; struct device dev;
struct delayed_work work;
}; };
static struct ff_dev *ff_current_dev; /* We have 1 carrier, 1 slot */ static struct ff_dev *ff_current_dev; /* We have 1 carrier, 1 slot */
...@@ -125,16 +124,14 @@ static int ff_irq_request(struct fmc_device *fmc, irq_handler_t handler, ...@@ -125,16 +124,14 @@ static int ff_irq_request(struct fmc_device *fmc, irq_handler_t handler,
/* /*
* This work function is called when we changed the eeprom. It removes * This work function is called when we changed the eeprom. It removes the
* the current fmc device and registers a new one, probably with different * current fmc device and registers a new one, with different identifiers.
* identifiers.
*/ */
static struct ff_dev *ff_dev_create(void); /* defined later */ static struct ff_dev *ff_dev_create(void); /* defined later */
static void ff_work_fn(struct work_struct *work) static void ff_work_fn(struct work_struct *work)
{ {
struct delayed_work *dw = to_delayed_work(work); struct ff_dev *ff = ff_current_dev;
struct ff_dev *ff = container_of(dw, struct ff_dev, work);
int ret; int ret;
fmc_device_unregister_n(ff->fmc, ff_nr_dev); fmc_device_unregister_n(ff->fmc, ff_nr_dev);
...@@ -156,6 +153,9 @@ static void ff_work_fn(struct work_struct *work) ...@@ -156,6 +153,9 @@ static void ff_work_fn(struct work_struct *work)
ff_current_dev = ff; ff_current_dev = ff;
} }
static DECLARE_DELAYED_WORK(ff_work, ff_work_fn);
/* low-level i2c */ /* low-level i2c */
int ff_eeprom_read(struct fmc_device *fmc, uint32_t offset, int ff_eeprom_read(struct fmc_device *fmc, uint32_t offset,
void *buf, size_t size) void *buf, size_t size)
...@@ -171,8 +171,6 @@ int ff_eeprom_read(struct fmc_device *fmc, uint32_t offset, ...@@ -171,8 +171,6 @@ int ff_eeprom_read(struct fmc_device *fmc, uint32_t offset,
int ff_eeprom_write(struct fmc_device *fmc, uint32_t offset, int ff_eeprom_write(struct fmc_device *fmc, uint32_t offset,
const void *buf, size_t size) const void *buf, size_t size)
{ {
struct ff_dev *ff = fmc->carrier_data;
if (offset > FF_EEPROM_SIZE) if (offset > FF_EEPROM_SIZE)
return -EINVAL; return -EINVAL;
if (offset + size > FF_EEPROM_SIZE) if (offset + size > FF_EEPROM_SIZE)
...@@ -180,7 +178,7 @@ int ff_eeprom_write(struct fmc_device *fmc, uint32_t offset, ...@@ -180,7 +178,7 @@ int ff_eeprom_write(struct fmc_device *fmc, uint32_t offset,
dev_info(&fmc->dev, "write_eeprom: offset %i, size %zi\n", dev_info(&fmc->dev, "write_eeprom: offset %i, size %zi\n",
(int)offset, size); (int)offset, size);
memcpy(fmc->eeprom + offset, buf, size); memcpy(fmc->eeprom + offset, buf, size);
schedule_delayed_work(&ff->work, HZ * 2); /* remove, replug, in 2s */ schedule_delayed_work(&ff_work, HZ * 2); /* remove, replug, in 2s */
return size; return size;
} }
...@@ -288,7 +286,6 @@ static struct ff_dev *ff_dev_create(void) ...@@ -288,7 +286,6 @@ static struct ff_dev *ff_dev_create(void)
/* increment the identifier, each must be different */ /* increment the identifier, each must be different */
ff_template_fmc.device_id++; ff_template_fmc.device_id++;
} }
INIT_DELAYED_WORK(&ff->work, ff_work_fn);
return ff; return ff;
} }
...@@ -339,10 +336,10 @@ int ff_init(void) ...@@ -339,10 +336,10 @@ int ff_init(void)
void ff_exit(void) void ff_exit(void)
{ {
if (ff_current_dev) { if (ff_current_dev) {
cancel_delayed_work_sync(&ff_current_dev->work);
fmc_device_unregister_n(ff_current_dev->fmc, ff_nr_dev); fmc_device_unregister_n(ff_current_dev->fmc, ff_nr_dev);
device_unregister(&ff_current_dev->dev); device_unregister(&ff_current_dev->dev);
} }
cancel_delayed_work_sync(&ff_work);
} }
module_init(ff_init); module_init(ff_init);
......
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