driver core: Replace dev->of_node_reused with dev_of_node_reused()

In C, bitfields are not necessarily safe to modify from multiple
threads without locking. Switch "of_node_reused" over to the "flags"
field so modifications are safe.

Cc: Johan Hovold <johan@kernel.org>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Rafael J. Wysocki (Intel) <rafael@kernel.org>
Reviewed-by: Danilo Krummrich <dakr@kernel.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Johan Hovold <johan@kernel.org>
Acked-by: Manivannan Sadhasivam <mani@kernel.org> # PCI_PWRCTRL
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://patch.msgid.link/20260406162231.v5.8.I806b8636cd3724f6cd1f5e199318ab8694472d90@changeid
Signed-off-by: Danilo Krummrich <dakr@kernel.org>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index ed5ec21edbea6d489a96bb750a330591e4dc141f..62140ec6c49ef33f019894458bf1b4fc3da828e4 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -5279,7 +5279,7 @@ void device_set_of_node_from_dev(struct device *dev, const struct device *dev2)
 {
        of_node_put(dev->of_node);
        dev->of_node = of_node_get(dev2->of_node);
-       dev->of_node_reused = true;
+       dev_set_of_node_reused(dev);
 }
 EXPORT_SYMBOL_GPL(device_set_of_node_from_dev);
 

diff --git a/drivers/base/pinctrl.c b/drivers/base/pinctrl.c
index 6e250272c843933ae84e331796c5e466b7c7646d..0bbc83231234e624e5e3999cf877d1f7a15a8435 100644 (file)
--- a/drivers/base/pinctrl.c
+++ b/drivers/base/pinctrl.c
@@ -24,7 +24,7 @@ int pinctrl_bind_pins(struct device *dev)
 {
        int ret;
 
-       if (dev->of_node_reused)
+       if (dev_of_node_reused(dev))
                return 0;
 
        dev->pins = devm_kzalloc(dev, sizeof(*(dev->pins)), GFP_KERNEL);

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 75b4698d0e582e67adafa78c312d75c72fd654cf..c04641501ab44e2feb9590e1c5d4d724ee3d10d8 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -858,7 +858,7 @@ struct platform_device *platform_device_register_full(const struct platform_devi
        pdev->dev.parent = pdevinfo->parent;
        pdev->dev.fwnode = pdevinfo->fwnode;
        pdev->dev.of_node = of_node_get(to_of_node(pdev->dev.fwnode));
-       pdev->dev.of_node_reused = pdevinfo->of_node_reused;
+       dev_assign_of_node_reused(&pdev->dev, pdevinfo->of_node_reused);
 
        if (pdevinfo->dma_mask) {
                pdev->platform_dma_mask = pdevinfo->dma_mask;

diff --git a/drivers/net/pcs/pcs-xpcs-plat.c b/drivers/net/pcs/pcs-xpcs-plat.c
index b8c48f9effbf7885b6f429cc236a741cabcbdd3d..f4b1b8246ce9685ed6b4a5011fa6a1196d90a806 100644 (file)
--- a/drivers/net/pcs/pcs-xpcs-plat.c
+++ b/drivers/net/pcs/pcs-xpcs-plat.c
@@ -349,7 +349,7 @@ static int xpcs_plat_init_dev(struct dw_xpcs_plat *pxpcs)
         * up later. Make sure DD-core is aware of the OF-node being re-used.
         */
        device_set_node(&mdiodev->dev, fwnode_handle_get(dev_fwnode(dev)));
-       mdiodev->dev.of_node_reused = true;
+       dev_set_of_node_reused(&mdiodev->dev);
 
        /* Pass the data further so the DW XPCS driver core could use it */
        mdiodev->dev.platform_data = (void *)device_get_match_data(dev);

diff --git a/drivers/of/device.c b/drivers/of/device.c
index f7e75e5276677e1d9101975e07769a5e20e6d0df..be4e1584e0afb9a3a5c26d65eae894970785af76 100644 (file)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -26,7 +26,7 @@
 const struct of_device_id *of_match_device(const struct of_device_id *matches,
                                           const struct device *dev)
 {
-       if (!matches || !dev->of_node || dev->of_node_reused)
+       if (!matches || !dev->of_node || dev_of_node_reused(dev))
                return NULL;
        return of_match_node(matches, dev->of_node);
 }
@@ -192,7 +192,7 @@ ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len)
 {
        ssize_t sl;
 
-       if (!dev || !dev->of_node || dev->of_node_reused)
+       if (!dev || !dev->of_node || dev_of_node_reused(dev))
                return -ENODEV;
 
        sl = of_modalias(dev->of_node, str, len - 2);
@@ -254,7 +254,7 @@ int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *
 {
        int sl;
 
-       if ((!dev) || (!dev->of_node) || dev->of_node_reused)
+       if ((!dev) || (!dev->of_node) || dev_of_node_reused(dev))
                return -ENODEV;
 
        /* Devicetree modalias is tricky, we add it in 2 steps */

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 6da569fd3b8f6c5cc2038608a0687a436a760568..8b18c4ba845cfdc57cc64aa4d5c578bb151dd9ba 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -38,7 +38,7 @@ int pci_set_of_node(struct pci_dev *dev)
        struct device *pdev __free(put_device) =
                bus_find_device_by_of_node(&platform_bus_type, node);
        if (pdev)
-               dev->bus->dev.of_node_reused = true;
+               dev_set_of_node_reused(&dev->bus->dev);
 
        device_set_node(&dev->dev, of_fwnode_handle(no_free_ptr(node)));
        return 0;

diff --git a/drivers/pci/pwrctrl/core.c b/drivers/pci/pwrctrl/core.c
index 97cff5b8ca88525b092447cbfe2b588350b896af..31246bac84f11b14eee11c813ea383119cb7da3f 100644 (file)
--- a/drivers/pci/pwrctrl/core.c
+++ b/drivers/pci/pwrctrl/core.c
@@ -39,7 +39,7 @@ static int pci_pwrctrl_notify(struct notifier_block *nb, unsigned long action,
                 * If we got here then the PCI device is the second after the
                 * power control platform device. Mark its OF node as reused.
                 */
-               dev->of_node_reused = true;
+               dev_set_of_node_reused(dev);
                break;
        }
 

diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c
index a12935f6b9922a2d535471ab78d8b9c925fd115e..5f23284a8778b219f169eb2e1ea343efd7781feb 100644 (file)
--- a/drivers/tty/serial/serial_base_bus.c
+++ b/drivers/tty/serial/serial_base_bus.c
@@ -74,7 +74,7 @@ static int serial_base_device_init(struct uart_port *port,
        dev->parent = parent_dev;
        dev->bus = &serial_base_bus_type;
        dev->release = release;
-       dev->of_node_reused = true;
+       dev_set_of_node_reused(dev);
 
        device_set_node(dev, fwnode_handle_get(dev_fwnode(parent_dev)));
 

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
index 2ecd049dacc2d02b0687cdc416ff348e694656ca..8b9449d16324e33a29bf4793ce0f1ec514b80b3a 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
@@ -593,7 +593,7 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx)
                d->gadget.max_speed = USB_SPEED_HIGH;
        d->gadget.speed = USB_SPEED_UNKNOWN;
        d->gadget.dev.of_node = vhub->pdev->dev.of_node;
-       d->gadget.dev.of_node_reused = true;
+       dev_set_of_node_reused(&d->gadget.dev);
 
        rc = usb_add_gadget_udc(d->port_dev, &d->gadget);
        if (rc != 0)

diff --git a/include/linux/device.h b/include/linux/device.h
index bab4315f4f61a4298a0f967c6caf03b891c01689..cc6ef0ca0d2579a5f64c5ed6830799d9a5382e55 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -529,6 +529,8 @@ struct device_physical_location {
  *             driver/bus sync_state() callback.
  * @DEV_FLAG_DMA_COHERENT: This particular device is dma coherent, even if the
  *             architecture supports non-coherent devices.
+ * @DEV_FLAG_OF_NODE_REUSED: Set if the device-tree node is shared with an
+ *             ancestor device.
  * @DEV_FLAG_COUNT: Number of defined struct_device_flags.
  */
 enum struct_device_flags {
@@ -539,6 +541,7 @@ enum struct_device_flags {
        DEV_FLAG_DMA_OPS_BYPASS = 4,
        DEV_FLAG_STATE_SYNCED = 5,
        DEV_FLAG_DMA_COHERENT = 6,
+       DEV_FLAG_OF_NODE_REUSED = 7,
 
        DEV_FLAG_COUNT
 };
@@ -620,8 +623,6 @@ enum struct_device_flags {
  *
  * @offline_disabled: If set, the device is permanently online.
  * @offline:   Set after successful invocation of bus type's .offline().
- * @of_node_reused: Set if the device-tree node is shared with an ancestor
- *              device.
  * @flags:     DEV_FLAG_XXX flags. Use atomic bitfield operations to modify.
  *
  * At the lowest level, every device in a Linux system is represented by an
@@ -728,7 +729,6 @@ struct device {
 
        bool                    offline_disabled:1;
        bool                    offline:1;
-       bool                    of_node_reused:1;
 
        DECLARE_BITMAP(flags, DEV_FLAG_COUNT);
 };
@@ -762,6 +762,7 @@ __create_dev_flag_accessors(dma_skip_sync, DEV_FLAG_DMA_SKIP_SYNC);
 __create_dev_flag_accessors(dma_ops_bypass, DEV_FLAG_DMA_OPS_BYPASS);
 __create_dev_flag_accessors(state_synced, DEV_FLAG_STATE_SYNCED);
 __create_dev_flag_accessors(dma_coherent, DEV_FLAG_DMA_COHERENT);
+__create_dev_flag_accessors(of_node_reused, DEV_FLAG_OF_NODE_REUSED);
 
 #undef __create_dev_flag_accessors