bus: fsl-mc: add autorescan sysfs

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>

diff --git a/Documentation/ABI/stable/sysfs-bus-fsl-mc b/Documentation/ABI/stable/sysfs-bus-fsl-mc
index a4d384d..58f06c7 100644 (file)
--- a/Documentation/ABI/stable/sysfs-bus-fsl-mc
+++ b/Documentation/ABI/stable/sysfs-bus-fsl-mc
@@ -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

diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 4adb6f3..e3e2ae4 100644 (file)
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -458,8 +458,9 @@ out:
 /*
  * 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;
 
@@ -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;
@@ -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;
 
        /*
@@ -554,6 +565,8 @@ static int enable_dprc_irq(struct fsl_mc_device *mc_dev)
                return error;
        }
 
+       mc_bus->irq_enabled = 1;
+
        return 0;
 }
 

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index ee3e625..70f4b69 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -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,
 };
 

diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h
index 42bdb86..1958fa0 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-private.h
+++ b/drivers/bus/fsl-mc/fsl-mc-private.h
@@ -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) \
@@ -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_ */