drm/amd/pm: disallow the fan setting if there is no fan on smu 13.0.0

[linux-2.6-microblaze.git] / drivers / soundwire / bus.c

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 1ea6a64..cf78839 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -69,8 +69,17 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
                return -EINVAL;
        }
 
-       mutex_init(&bus->msg_lock);
-       mutex_init(&bus->bus_lock);
+       /*
+        * Give each bus_lock and msg_lock a unique key so that lockdep won't
+        * trigger a deadlock warning when the locks of several buses are
+        * grabbed during configuration of a multi-bus stream.
+        */
+       lockdep_register_key(&bus->msg_lock_key);
+       __mutex_init(&bus->msg_lock, "msg_lock", &bus->msg_lock_key);
+
+       lockdep_register_key(&bus->bus_lock_key);
+       __mutex_init(&bus->bus_lock, "bus_lock", &bus->bus_lock_key);
+
        INIT_LIST_HEAD(&bus->slaves);
        INIT_LIST_HEAD(&bus->m_rt_list);
 
@@ -181,6 +190,8 @@ void sdw_bus_master_delete(struct sdw_bus *bus)
        sdw_master_device_del(bus);
 
        sdw_bus_debugfs_exit(bus);
+       lockdep_unregister_key(&bus->bus_lock_key);
+       lockdep_unregister_key(&bus->msg_lock_key);
        ida_free(&sdw_bus_ida, bus->id);
 }
 EXPORT_SYMBOL(sdw_bus_master_delete);
@@ -769,6 +780,9 @@ static int sdw_assign_device_num(struct sdw_slave *slave)
        /* After xfer of msg, restore dev_num */
        slave->dev_num = slave->dev_num_sticky;
 
+       if (bus->ops && bus->ops->new_peripheral_assigned)
+               bus->ops->new_peripheral_assigned(bus, dev_num);
+
        return 0;
 }
 
@@ -908,8 +922,8 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,
                        "initializing enumeration and init completion for Slave %d\n",
                        slave->dev_num);
 
-               init_completion(&slave->enumeration_complete);
-               init_completion(&slave->initialization_complete);
+               reinit_completion(&slave->enumeration_complete);
+               reinit_completion(&slave->initialization_complete);
 
        } else if ((status == SDW_SLAVE_ATTACHED) &&
                   (slave->status == SDW_SLAVE_UNATTACHED)) {
@@ -917,7 +931,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,
                        "signaling enumeration completion for Slave %d\n",
                        slave->dev_num);
 
-               complete(&slave->enumeration_complete);
+               complete_all(&slave->enumeration_complete);
        }
        slave->status = status;
        mutex_unlock(&bus->bus_lock);
@@ -1588,7 +1602,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
        unsigned long port;
        bool slave_notify;
        u8 sdca_cascade = 0;
-       u8 buf, buf2[2], _buf, _buf2[2];
+       u8 buf, buf2[2];
        bool parity_check;
        bool parity_quirk;
 
@@ -1745,9 +1759,9 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
                                "SDW_SCP_INT1 recheck read failed:%d\n", ret);
                        goto io_err;
                }
-               _buf = ret;
+               buf = ret;
 
-               ret = sdw_nread_no_pm(slave, SDW_SCP_INTSTAT2, 2, _buf2);
+               ret = sdw_nread_no_pm(slave, SDW_SCP_INTSTAT2, 2, buf2);
                if (ret < 0) {
                        dev_err(&slave->dev,
                                "SDW_SCP_INT2/3 recheck read failed:%d\n", ret);
@@ -1765,12 +1779,8 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
                }
 
                /*
-                * Make sure no interrupts are pending, but filter to limit loop
-                * to interrupts identified in the first status read
+                * Make sure no interrupts are pending
                 */
-               buf &= _buf;
-               buf2[0] &= _buf2[0];
-               buf2[1] &= _buf2[1];
                stat = buf || buf2[0] || buf2[1] || sdca_cascade;
 
                /*
@@ -1941,7 +1951,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
                                "signaling initialization completion for Slave %d\n",
                                slave->dev_num);
 
-                       complete(&slave->initialization_complete);
+                       complete_all(&slave->initialization_complete);
 
                        /*
                         * If the manager became pm_runtime active, the peripherals will be