Skip to content

Commit

Permalink
bus: fsl-mc: add autorescan sysfs
Browse files Browse the repository at this point in the history
Add the autorescan sysfs in order to enable/disable the DPRC IRQs on
which automatic rescan of the bus is performed. This is important when
dynamic creation of objects is needed to happen in a timely manner because
object creation can be bundled together.

Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/20210114170752.2927915-6-ciorneiioana@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ioana Ciornei authored and Greg Kroah-Hartman committed Jan 27, 2021
1 parent 3f60994 commit 296c626
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 2 deletions.
10 changes: 10 additions & 0 deletions Documentation/ABI/stable/sysfs-bus-fsl-mc
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@ Description: Writing a non-zero value to this attribute will
synchronize the objects under fsl-mc bus and the
Management Complex firmware.
Users: Userspace drivers and management tools

What: /sys/bus/fsl-mc/autorescan
Date: January 2021
KernelVersion: 5.12
Contact: Ioana Ciornei <ioana.ciornei@nxp.com>
Description: Writing a zero value to this attribute will
disable the DPRC IRQs on which automatic rescan
of the fsl-mc bus is performed. A non-zero value
will enable the DPRC IRQs.
Users: Userspace drivers and management tools
17 changes: 15 additions & 2 deletions drivers/bus/fsl-mc/dprc-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,9 @@ static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg)
/*
* Disable and clear interrupt for a given DPRC object
*/
static int disable_dprc_irq(struct fsl_mc_device *mc_dev)
int disable_dprc_irq(struct fsl_mc_device *mc_dev)
{
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
int error;
struct fsl_mc_io *mc_io = mc_dev->mc_io;

Expand Down Expand Up @@ -496,9 +497,18 @@ static int disable_dprc_irq(struct fsl_mc_device *mc_dev)
return error;
}

mc_bus->irq_enabled = 0;

return 0;
}

int get_dprc_irq_state(struct fsl_mc_device *mc_dev)
{
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);

return mc_bus->irq_enabled;
}

static int register_dprc_irq_handler(struct fsl_mc_device *mc_dev)
{
int error;
Expand All @@ -525,8 +535,9 @@ static int register_dprc_irq_handler(struct fsl_mc_device *mc_dev)
return 0;
}

static int enable_dprc_irq(struct fsl_mc_device *mc_dev)
int enable_dprc_irq(struct fsl_mc_device *mc_dev)
{
struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
int error;

/*
Expand Down Expand Up @@ -554,6 +565,8 @@ static int enable_dprc_irq(struct fsl_mc_device *mc_dev)
return error;
}

mc_bus->irq_enabled = 1;

return 0;
}

Expand Down
55 changes: 55 additions & 0 deletions drivers/bus/fsl-mc/fsl-mc-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,63 @@ static ssize_t rescan_store(struct bus_type *bus,
}
static BUS_ATTR_WO(rescan);

static int fsl_mc_bus_set_autorescan(struct device *dev, void *data)
{
struct fsl_mc_device *root_mc_dev;
unsigned long val;
char *buf = data;

if (!fsl_mc_is_root_dprc(dev))
goto exit;

root_mc_dev = to_fsl_mc_device(dev);

if (kstrtoul(buf, 0, &val) < 0)
return -EINVAL;

if (val)
enable_dprc_irq(root_mc_dev);
else
disable_dprc_irq(root_mc_dev);

exit:
return 0;
}

static int fsl_mc_bus_get_autorescan(struct device *dev, void *data)
{
struct fsl_mc_device *root_mc_dev;
char *buf = data;

if (!fsl_mc_is_root_dprc(dev))
goto exit;

root_mc_dev = to_fsl_mc_device(dev);

sprintf(buf, "%d\n", get_dprc_irq_state(root_mc_dev));
exit:
return 0;
}

static ssize_t autorescan_store(struct bus_type *bus,
const char *buf, size_t count)
{
bus_for_each_dev(bus, NULL, (void *)buf, fsl_mc_bus_set_autorescan);

return count;
}

static ssize_t autorescan_show(struct bus_type *bus, char *buf)
{
bus_for_each_dev(bus, NULL, (void *)buf, fsl_mc_bus_get_autorescan);
return strlen(buf);
}

static BUS_ATTR_RW(autorescan);

static struct attribute *fsl_mc_bus_attrs[] = {
&bus_attr_rescan.attr,
&bus_attr_autorescan.attr,
NULL,
};

Expand Down
5 changes: 5 additions & 0 deletions drivers/bus/fsl-mc/fsl-mc-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ struct fsl_mc_bus {
struct mutex scan_mutex; /* serializes bus scanning */
struct dprc_attributes dprc_attr;
struct fsl_mc_uapi uapi_misc;
int irq_enabled;
};

#define to_fsl_mc_bus(_mc_dev) \
Expand Down Expand Up @@ -656,4 +657,8 @@ static inline void fsl_mc_uapi_remove_device_file(struct fsl_mc_bus *mc_bus)

#endif

int disable_dprc_irq(struct fsl_mc_device *mc_dev);
int enable_dprc_irq(struct fsl_mc_device *mc_dev);
int get_dprc_irq_state(struct fsl_mc_device *mc_dev);

#endif /* _FSL_MC_PRIVATE_H_ */

0 comments on commit 296c626

Please sign in to comment.