| Message ID | 1510314556-13002-4-git-send-email-vinod.koul@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/11/17 11:49, Vinod Koul wrote: > A Master registers with SoundWire bus and scans the firmware provided > for device description. In this patch we scan the ACPI namespaces and > create the SoundWire Slave devices based on the ACPI description > > Signed-off-by: Sanyog Kale <sanyog.r.kale@intel.com> > Signed-off-by: Vinod Koul <vinod.koul@intel.com> > --- > drivers/soundwire/Makefile | 2 +- > drivers/soundwire/bus.c | 163 +++++++++++++++++++++++++++++++++++++++ > drivers/soundwire/bus.h | 20 +++++ > drivers/soundwire/slave.c | 172 ++++++++++++++++++++++++++++++++++++++++++ > include/linux/soundwire/sdw.h | 11 +++ > 5 files changed, 367 insertions(+), 1 deletion(-) > create mode 100644 drivers/soundwire/bus.c > create mode 100644 drivers/soundwire/slave.c > > diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile > index d1281def7662..c875e434f8b3 100644 > --- a/drivers/soundwire/Makefile > +++ b/drivers/soundwire/Makefile > @@ -3,5 +3,5 @@ > # > > #Bus Objs > -soundwire-bus-objs := bus_type.o > +soundwire-bus-objs := bus_type.o bus.o slave.o > + > +#include <linux/delay.h> > +#include <linux/device.h> > +#include <linux/pm_runtime.h> Does this belong to this patch. > +#include <linux/soundwire/sdw.h> > +#include "bus.h" > + > +/** > + * sdw_add_bus_master: add a bus Master instance > + * > + * @bus: bus instance > + * > + * Initializes the bus instance, read properties and create child > + * devices. > + */ > +int sdw_add_bus_master(struct sdw_bus *bus) > +{ > + int ret; > + > + if (!bus->dev) { > + pr_err("SoundWire bus has no device"); > + return -ENODEV; > + } > + > + mutex_init(&bus->bus_lock); > + INIT_LIST_HEAD(&bus->slaves); > + > + /* > + * Enumeration device number and broadcast device number are > + * not used for assignment so mask these and other higher bits > + */ > + > + /* Set higher order bits */ > + *bus->assigned = ~GENMASK(SDW_BROADCAST_DEV_NUM, SDW_ENUM_DEV_NUM); Can't we use ida for this. This would also cut down code added for allocating dev_num. > + > + /* Set device number and broadcast device number */ > + set_bit(SDW_ENUM_DEV_NUM, bus->assigned); > + set_bit(SDW_BROADCAST_DEV_NUM, bus->assigned); > + return 0; > +} > +EXPORT_SYMBOL(sdw_add_bus_master); > + > +static int sdw_delete_slave(struct device *dev, void *data) > +{ > + struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_bus *bus = slave->bus; > + > + mutex_lock(&bus->bus_lock); > + > + if (slave->dev_num) /* clear dev_num if assigned */ > + clear_bit(slave->dev_num, bus->assigned); > + > + list_del_init(&slave->node); > + mutex_unlock(&bus->bus_lock); > + > + device_unregister(dev); > + return 0; > +} > + > +void sdw_delete_bus_master(struct sdw_bus *bus) > +{ > + device_for_each_child(bus->dev, NULL, sdw_delete_slave); > +} > +EXPORT_SYMBOL(sdw_delete_bus_master); No kerneldoc..?? > + diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c > new file mode 100644 > index 000000000000..4bf2a6cf732c > --- /dev/null > +++ b/drivers/soundwire/slave.c > + > +#include <linux/acpi.h> > +#include <linux/init.h> > +#include <linux/soundwire/sdw.h> > +#include "bus.h" > + > +} > + > +static int sdw_slave_add(struct sdw_bus *bus, > + struct sdw_slave_id *id, struct fwnode_handle *fwnode) > +{ > + struct sdw_slave *slave; > + int ret; > + > + slave = kzalloc(sizeof(*slave), GFP_KERNEL); > + if (!slave) > + return -ENOMEM; > + > + /* Initialize data structure */ > + memcpy(&slave->id, id, sizeof(*id)); > + slave->dev.parent = bus->dev; > + slave->dev.fwnode = fwnode; > + > + /* name shall be sdw:link:mfg:part:class:unique */ > + dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x:%x", > + bus->link_id, id->mfg_id, id->part_id, > + id->class_id, id->unique_id); > + > + slave->dev.release = sdw_slave_release; > + slave->dev.bus = &sdw_bus_type; > + slave->bus = bus; > + slave->status = SDW_SLAVE_UNATTACHED; > + slave->dev_num = 0; > + > + mutex_lock(&bus->bus_lock); > + list_add_tail(&slave->node, &bus->slaves); > + mutex_unlock(&bus->bus_lock); > + > + ret = device_register(&slave->dev); > + if (ret) { > + dev_err(bus->dev, "Failed to add slave: ret %d\n", ret); > + > + /* > + * On err, don't free but drop ref as this will be freed > + * when release method is invoked. > + */ > + mutex_lock(&bus->bus_lock); > + list_del(&slave->node); > + mutex_unlock(&bus->bus_lock); > + put_device(&slave->dev); > + return ret; remove this line and .. > + } > + > + return 0; return ret; > + > > +#endif > + > +#if IS_ENABLED(CONFIG_OF) > +int sdw_of_find_slaves(struct sdw_bus *bus) > +{ > + /* placeholder now, fill on OF support */ > + return -ENOTSUPP; > +} > +#endif We should probably remove this dummy function, and add this functionality later.
On Thu, Nov 16, 2017 at 04:05:22PM +0000, Srinivas Kandagatla wrote: > > > On 10/11/17 11:49, Vinod Koul wrote: > >A Master registers with SoundWire bus and scans the firmware provided > >for device description. In this patch we scan the ACPI namespaces and > >create the SoundWire Slave devices based on the ACPI description > > > >Signed-off-by: Sanyog Kale <sanyog.r.kale@intel.com> > >Signed-off-by: Vinod Koul <vinod.koul@intel.com> > >--- > > drivers/soundwire/Makefile | 2 +- > > drivers/soundwire/bus.c | 163 +++++++++++++++++++++++++++++++++++++++ > > drivers/soundwire/bus.h | 20 +++++ > > drivers/soundwire/slave.c | 172 ++++++++++++++++++++++++++++++++++++++++++ > > include/linux/soundwire/sdw.h | 11 +++ > > 5 files changed, 367 insertions(+), 1 deletion(-) > > create mode 100644 drivers/soundwire/bus.c > > create mode 100644 drivers/soundwire/slave.c > > > >diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile > >index d1281def7662..c875e434f8b3 100644 > >--- a/drivers/soundwire/Makefile > >+++ b/drivers/soundwire/Makefile > >@@ -3,5 +3,5 @@ > > # > > #Bus Objs > >-soundwire-bus-objs := bus_type.o > >+soundwire-bus-objs := bus_type.o bus.o slave.o > > >+ > >+#include <linux/delay.h> > >+#include <linux/device.h> > >+#include <linux/pm_runtime.h> > Does this belong to this patch. Not really, tahnks for spotting > > >+#include <linux/soundwire/sdw.h> > >+#include "bus.h" > >+ > >+/** > >+ * sdw_add_bus_master: add a bus Master instance > >+ * > >+ * @bus: bus instance > >+ * > >+ * Initializes the bus instance, read properties and create child > >+ * devices. > >+ */ > >+int sdw_add_bus_master(struct sdw_bus *bus) > >+{ > >+ int ret; > >+ > >+ if (!bus->dev) { > >+ pr_err("SoundWire bus has no device"); > >+ return -ENODEV; > >+ } > >+ > >+ mutex_init(&bus->bus_lock); > >+ INIT_LIST_HEAD(&bus->slaves); > >+ > >+ /* > >+ * Enumeration device number and broadcast device number are > >+ * not used for assignment so mask these and other higher bits > >+ */ > >+ > >+ /* Set higher order bits */ > >+ *bus->assigned = ~GENMASK(SDW_BROADCAST_DEV_NUM, SDW_ENUM_DEV_NUM); > Can't we use ida for this. > This would also cut down code added for allocating dev_num. Device numbers in SoundWire are 0 thru 15 with 0 and 15 having special meaning so can'r be allocated. Bitmaps give me a nice way to ensure we dont use those by masking these and above 15... IDR uses bitmap with stuff on top which maynot be helpful here as I need a number 1 to 14. For a generic, give me a number IDRs are very useful. > > >+ > >+ /* Set device number and broadcast device number */ > >+ set_bit(SDW_ENUM_DEV_NUM, bus->assigned); > >+ set_bit(SDW_BROADCAST_DEV_NUM, bus->assigned); > > >+ return 0; > >+} > >+EXPORT_SYMBOL(sdw_add_bus_master); > >+ > >+static int sdw_delete_slave(struct device *dev, void *data) > >+{ > >+ struct sdw_slave *slave = dev_to_sdw_dev(dev); > >+ struct sdw_bus *bus = slave->bus; > >+ > >+ mutex_lock(&bus->bus_lock); > >+ > >+ if (slave->dev_num) /* clear dev_num if assigned */ > >+ clear_bit(slave->dev_num, bus->assigned); > >+ > >+ list_del_init(&slave->node); > >+ mutex_unlock(&bus->bus_lock); > >+ > >+ device_unregister(dev); > >+ return 0; > >+} > >+ > >+void sdw_delete_bus_master(struct sdw_bus *bus) > >+{ > >+ device_for_each_child(bus->dev, NULL, sdw_delete_slave); > >+} > >+EXPORT_SYMBOL(sdw_delete_bus_master); > No kerneldoc..?? will add. > > >+ > diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c > >new file mode 100644 > >index 000000000000..4bf2a6cf732c > >--- /dev/null > >+++ b/drivers/soundwire/slave.c > > >+ > >+#include <linux/acpi.h> > >+#include <linux/init.h> > >+#include <linux/soundwire/sdw.h> > >+#include "bus.h" > >+ > >+} > >+ > >+static int sdw_slave_add(struct sdw_bus *bus, > >+ struct sdw_slave_id *id, struct fwnode_handle *fwnode) > >+{ > >+ struct sdw_slave *slave; > >+ int ret; > >+ > >+ slave = kzalloc(sizeof(*slave), GFP_KERNEL); > >+ if (!slave) > >+ return -ENOMEM; > >+ > >+ /* Initialize data structure */ > >+ memcpy(&slave->id, id, sizeof(*id)); > >+ slave->dev.parent = bus->dev; > >+ slave->dev.fwnode = fwnode; > >+ > >+ /* name shall be sdw:link:mfg:part:class:unique */ > >+ dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x:%x", > >+ bus->link_id, id->mfg_id, id->part_id, > >+ id->class_id, id->unique_id); > >+ > >+ slave->dev.release = sdw_slave_release; > >+ slave->dev.bus = &sdw_bus_type; > >+ slave->bus = bus; > >+ slave->status = SDW_SLAVE_UNATTACHED; > >+ slave->dev_num = 0; > >+ > >+ mutex_lock(&bus->bus_lock); > >+ list_add_tail(&slave->node, &bus->slaves); > >+ mutex_unlock(&bus->bus_lock); > >+ > >+ ret = device_register(&slave->dev); > >+ if (ret) { > >+ dev_err(bus->dev, "Failed to add slave: ret %d\n", ret); > >+ > >+ /* > >+ * On err, don't free but drop ref as this will be freed > >+ * when release method is invoked. > >+ */ > >+ mutex_lock(&bus->bus_lock); > >+ list_del(&slave->node); > >+ mutex_unlock(&bus->bus_lock); > >+ put_device(&slave->dev); > >+ return ret; > > remove this line and .. > >+ } > >+ > >+ return 0; > > return ret; better :) > >+#if IS_ENABLED(CONFIG_OF) > >+int sdw_of_find_slaves(struct sdw_bus *bus) > >+{ > >+ /* placeholder now, fill on OF support */ > >+ return -ENOTSUPP; > >+} > >+#endif > > We should probably remove this dummy function, and add this functionality > later. this was kept for people to know how they may add DT support, but yes its better to remove.
On Thu, Nov 16, 2017 at 10:19:44PM +0530, Vinod Koul wrote: > On Thu, Nov 16, 2017 at 04:05:22PM +0000, Srinivas Kandagatla wrote: > > >+ *bus->assigned = ~GENMASK(SDW_BROADCAST_DEV_NUM, SDW_ENUM_DEV_NUM); > > Can't we use ida for this. > > This would also cut down code added for allocating dev_num. > Device numbers in SoundWire are 0 thru 15 with 0 and 15 having special > meaning so can'r be allocated. Bitmaps give me a nice way to ensure we dont > use those by masking these and above 15... IDR uses bitmap with stuff on top > which maynot be helpful here as I need a number 1 to 14. For a generic, give > me a number IDRs are very useful. Perhaps we need some comments or something explaining the constraints here to stop people doing misguided cleanups?
On Thu, Nov 16, 2017 at 05:30:24PM +0000, Mark Brown wrote: > On Thu, Nov 16, 2017 at 10:19:44PM +0530, Vinod Koul wrote: > > On Thu, Nov 16, 2017 at 04:05:22PM +0000, Srinivas Kandagatla wrote: > > > > >+ *bus->assigned = ~GENMASK(SDW_BROADCAST_DEV_NUM, SDW_ENUM_DEV_NUM); > > > > Can't we use ida for this. > > > This would also cut down code added for allocating dev_num. > > > Device numbers in SoundWire are 0 thru 15 with 0 and 15 having special > > meaning so can'r be allocated. Bitmaps give me a nice way to ensure we dont > > use those by masking these and above 15... IDR uses bitmap with stuff on top > > which maynot be helpful here as I need a number 1 to 14. For a generic, give > > me a number IDRs are very useful. > > Perhaps we need some comments or something explaining the constraints > here to stop people doing misguided cleanups? Sure, it is already explained at scattered places, will add this comment here as well.
diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile index d1281def7662..c875e434f8b3 100644 --- a/drivers/soundwire/Makefile +++ b/drivers/soundwire/Makefile @@ -3,5 +3,5 @@ # #Bus Objs -soundwire-bus-objs := bus_type.o +soundwire-bus-objs := bus_type.o bus.o slave.o obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c new file mode 100644 index 000000000000..5bb9d930f86a --- /dev/null +++ b/drivers/soundwire/bus.c @@ -0,0 +1,163 @@ +/* + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) + * + * GPL LICENSE SUMMARY + * + * Copyright(c) 2015-17 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * BSD LICENSE + * + * Copyright(c) 2015-17 Intel Corporation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/soundwire/sdw.h> +#include "bus.h" + +/** + * sdw_add_bus_master: add a bus Master instance + * + * @bus: bus instance + * + * Initializes the bus instance, read properties and create child + * devices. + */ +int sdw_add_bus_master(struct sdw_bus *bus) +{ + int ret; + + if (!bus->dev) { + pr_err("SoundWire bus has no device"); + return -ENODEV; + } + + mutex_init(&bus->bus_lock); + INIT_LIST_HEAD(&bus->slaves); + + /* + * Enumeration device number and broadcast device number are + * not used for assignment so mask these and other higher bits + */ + + /* Set higher order bits */ + *bus->assigned = ~GENMASK(SDW_BROADCAST_DEV_NUM, SDW_ENUM_DEV_NUM); + + /* Set device number and broadcast device number */ + set_bit(SDW_ENUM_DEV_NUM, bus->assigned); + set_bit(SDW_BROADCAST_DEV_NUM, bus->assigned); + + /* + * SDW is an enumerable bus, but devices can be powered off. So, + * they won't be able to report as present. + * + * Create Slave devices based on Slaves described in + * the respective firmware (ACPI/DT) + */ + if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev)) + ret = sdw_acpi_find_slaves(bus); + else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node) + ret = sdw_of_find_slaves(bus); + else + ret = -ENOTSUPP; /* No ACPI/DT so error out */ + + if (ret) { + dev_err(bus->dev, "Finding slaves failed:%d\n", ret); + return ret; + } + + return 0; +} +EXPORT_SYMBOL(sdw_add_bus_master); + +static int sdw_delete_slave(struct device *dev, void *data) +{ + struct sdw_slave *slave = dev_to_sdw_dev(dev); + struct sdw_bus *bus = slave->bus; + + mutex_lock(&bus->bus_lock); + + if (slave->dev_num) /* clear dev_num if assigned */ + clear_bit(slave->dev_num, bus->assigned); + + list_del_init(&slave->node); + mutex_unlock(&bus->bus_lock); + + device_unregister(dev); + return 0; +} + +void sdw_delete_bus_master(struct sdw_bus *bus) +{ + device_for_each_child(bus->dev, NULL, sdw_delete_slave); +} +EXPORT_SYMBOL(sdw_delete_bus_master); + +void sdw_extract_slave_id(struct sdw_bus *bus, + u64 addr, struct sdw_slave_id *id) +{ + dev_dbg(bus->dev, "SDW Slave Addr: %llx", addr); + + /* + * Spec definition + * Register Bit Contents + * DevId_0 [7:4] 47:44 sdw_version + * DevId_0 [3:0] 43:40 unique_id + * DevId_1 39:32 mfg_id [15:8] + * DevId_2 31:24 mfg_id [7:0] + * DevId_3 23:16 part_id [15:8] + * DevId_4 15:08 part_id [7:0] + * DevId_5 07:00 class_id + */ + id->sdw_version = (addr >> 44) & GENMASK(3, 0); + id->unique_id = (addr >> 40) & GENMASK(3, 0); + id->mfg_id = (addr >> 24) & GENMASK(15, 0); + id->part_id = (addr >> 8) & GENMASK(15, 0); + id->class_id = addr & GENMASK(7, 0); + + dev_dbg(bus->dev, + "SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x", + id->class_id, id->part_id, id->mfg_id, + id->unique_id, id->sdw_version); + +} diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h index 9b3dca95a098..7b764661c89d 100644 --- a/drivers/soundwire/bus.h +++ b/drivers/soundwire/bus.h @@ -59,6 +59,26 @@ #include <linux/acpi.h> #include <linux/soundwire/sdw.h> +#if IS_ENABLED(CONFIG_ACPI) +int sdw_acpi_find_slaves(struct sdw_bus *bus); +#else +static inline int sdw_acpi_find_slaves(struct sdw_bus *bus) +{ + return -ENOTSUPP; +} +#endif + +#if IS_ENABLED(CONFIG_OF) +int sdw_of_find_slaves(struct sdw_bus *bus); +#else +static inline int sdw_of_find_slaves(struct sdw_bus *bus) +{ + return -ENOTSUPP; +} +#endif + int sdw_slave_modalias(const struct sdw_slave *slave, char *buf, size_t size); +void sdw_extract_slave_id(struct sdw_bus *bus, + unsigned long long addr, struct sdw_slave_id *id); #endif /* __SDW_BUS_H */ diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c new file mode 100644 index 000000000000..4bf2a6cf732c --- /dev/null +++ b/drivers/soundwire/slave.c @@ -0,0 +1,172 @@ +/* + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) + * + * GPL LICENSE SUMMARY + * + * Copyright(c) 2015-17 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * BSD LICENSE + * + * Copyright(c) 2015-17 Intel Corporation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include <linux/acpi.h> +#include <linux/init.h> +#include <linux/soundwire/sdw.h> +#include "bus.h" + +static void sdw_slave_release(struct device *dev) +{ + struct sdw_slave *slave = dev_to_sdw_dev(dev); + + kfree(slave); +} + +static int sdw_slave_add(struct sdw_bus *bus, + struct sdw_slave_id *id, struct fwnode_handle *fwnode) +{ + struct sdw_slave *slave; + int ret; + + slave = kzalloc(sizeof(*slave), GFP_KERNEL); + if (!slave) + return -ENOMEM; + + /* Initialize data structure */ + memcpy(&slave->id, id, sizeof(*id)); + slave->dev.parent = bus->dev; + slave->dev.fwnode = fwnode; + + /* name shall be sdw:link:mfg:part:class:unique */ + dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x:%x", + bus->link_id, id->mfg_id, id->part_id, + id->class_id, id->unique_id); + + slave->dev.release = sdw_slave_release; + slave->dev.bus = &sdw_bus_type; + slave->bus = bus; + slave->status = SDW_SLAVE_UNATTACHED; + slave->dev_num = 0; + + mutex_lock(&bus->bus_lock); + list_add_tail(&slave->node, &bus->slaves); + mutex_unlock(&bus->bus_lock); + + ret = device_register(&slave->dev); + if (ret) { + dev_err(bus->dev, "Failed to add slave: ret %d\n", ret); + + /* + * On err, don't free but drop ref as this will be freed + * when release method is invoked. + */ + mutex_lock(&bus->bus_lock); + list_del(&slave->node); + mutex_unlock(&bus->bus_lock); + put_device(&slave->dev); + return ret; + } + + return 0; +} + +#if IS_ENABLED(CONFIG_ACPI) +/* + * sdw_acpi_find_slaves: Find Slave devices in Master ACPI node + * + * @bus: SDW bus instance + * + * Scans Master ACPI node for SDW child Slave devices and registers it. + */ +int sdw_acpi_find_slaves(struct sdw_bus *bus) +{ + struct acpi_device *adev, *parent; + + parent = ACPI_COMPANION(bus->dev); + if (!parent) { + dev_err(bus->dev, "Can't find parent for acpi bind\n"); + return -ENODEV; + } + + list_for_each_entry(adev, &parent->children, node) { + unsigned long long addr; + struct sdw_slave_id id; + unsigned int link_id; + acpi_status status; + + status = acpi_evaluate_integer(adev->handle, + METHOD_NAME__ADR, NULL, &addr); + + if (ACPI_FAILURE(status)) { + dev_err(bus->dev, "_ADR resolution failed: %x\n", + status); + return status; + } + + /* Extract link id from ADR, it is from 48 to 51 bits */ + link_id = (addr >> 48) & GENMASK(3, 0); + + /* Check for link_id match */ + if (link_id != bus->link_id) + continue; + + sdw_extract_slave_id(bus, addr, &id); + + /* + * don't error check for sdw_slave_add as we want to continue + * adding Slaves + */ + sdw_slave_add(bus, &id, acpi_fwnode_handle(adev)); + } + + return 0; +} + +#endif + +#if IS_ENABLED(CONFIG_OF) +int sdw_of_find_slaves(struct sdw_bus *bus) +{ + /* placeholder now, fill on OF support */ + return -ENOTSUPP; +} +#endif diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 1be63d5538fe..9070aec77576 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -58,6 +58,14 @@ struct sdw_bus; struct sdw_slave; +/* SDW spec defines and enums, as defined by MIPI 1.1. Spec */ + +/* SDW Broadcast Device Number */ +#define SDW_BROADCAST_DEV_NUM 15 + +/* SDW Enumeration Device Number */ +#define SDW_ENUM_DEV_NUM 0 + #define SDW_MAX_DEVICES 11 /** @@ -170,4 +178,7 @@ struct sdw_bus { struct mutex bus_lock; }; +int sdw_add_bus_master(struct sdw_bus *bus); +void sdw_delete_bus_master(struct sdw_bus *bus); + #endif /* __SOUNDWIRE_H */