From: Vinod Koul <vinod.koul@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
ALSA <alsa-devel@alsa-project.org>, Mark <broonie@kernel.org>,
Takashi <tiwai@suse.de>,
Pierre <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>,
Shreyas NC <shreyas.nc@intel.com>,
patches.audio@intel.com, alan@linux.intel.com,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Sagar Dharia <sdharia@codeaurora.org>,
srinivas.kandagatla@linaro.org, plai@codeaurora.org,
Sudheer Papothi <spapothi@codeaurora.org>
Subject: [PATCH 08/14] soundwire: Add Slave status handling helpers
Date: Thu, 19 Oct 2017 08:33:24 +0530 [thread overview]
Message-ID: <1508382211-3154-9-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1508382211-3154-1-git-send-email-vinod.koul@intel.com>
From: Sanyog Kale <sanyog.r.kale@intel.com>
SoundWire Slaves report status to bus. Add helpers to handle
the status changes.
Signed-off-by: Hardik T Shah <hardik.t.shah@intel.com>
Signed-off-by: Sanyog Kale <sanyog.r.kale@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
drivers/soundwire/bus.c | 211 ++++++++++++++++++++++++++++++++++++++++++
include/linux/soundwire/sdw.h | 1 +
2 files changed, 212 insertions(+)
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 9ac22eab11bb..f206e78d4b68 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -393,6 +393,95 @@ int sdw_write(struct sdw_slave *slave, u32 addr, u8 value)
}
EXPORT_SYMBOL(sdw_write);
+/*
+ * SDW alert handling
+ */
+static struct sdw_slave *sdw_get_slave(struct sdw_bus *bus, int i)
+{
+ struct sdw_slave *slave;
+
+ list_for_each_entry(slave, &bus->slaves, node) {
+ if (slave->dev_num == i)
+ return slave;
+ }
+
+ return NULL;
+}
+
+static int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id)
+{
+
+ if ((slave->id.unique_id != id.unique_id) ||
+ (slave->id.mfg_id != id.mfg_id) ||
+ (slave->id.part_id != id.part_id) ||
+ (slave->id.class_id != id.class_id))
+ return -ENODEV;
+
+ return 0;
+}
+
+static int sdw_get_device_num(struct sdw_slave *slave)
+{
+ bool assigned = false;
+ int i;
+
+ mutex_lock(&slave->bus->bus_lock);
+ for (i = 1; i <= SDW_MAX_DEVICES; i++) {
+ if (slave->bus->assigned[i] == true)
+ continue;
+
+ slave->bus->assigned[i] = true;
+ assigned = true;
+
+ /*
+ * Do not update dev_num in Slave data structure here,
+ * Update once program dev_num is successful
+ */
+ break;
+ }
+
+ mutex_unlock(&slave->bus->bus_lock);
+ if (assigned)
+ return i;
+ else
+ return -ENODEV;
+}
+
+static int sdw_assign_device_num(struct sdw_slave *slave)
+{
+ int ret, dev_num;
+
+ /* check first if device number is assigned, if so reuse that */
+ if (!slave->dev_num) {
+ dev_num = sdw_get_device_num(slave);
+ if (dev_num < 0) {
+ dev_err(slave->bus->dev, "Get dev_num failed: %d",
+ dev_num);
+ return dev_num;
+ }
+ } else {
+ dev_info(slave->bus->dev,
+ "Slave already registered dev_num:%d",
+ slave->dev_num);
+
+ /* Clear the slave->dev_num to transfer message on device 0 */
+ dev_num = slave->dev_num;
+ slave->dev_num = 0;
+
+ }
+
+ ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num);
+ if (ret < 0) {
+ dev_err(&slave->dev, "Program device_num failed: %d", ret);
+ return ret;
+ }
+
+ /* After xfer of msg, restore dev_num */
+ slave->dev_num = dev_num;
+
+ return 0;
+}
+
void sdw_extract_slave_id(struct sdw_bus *bus,
unsigned long long addr, struct sdw_slave_id *id)
{
@@ -421,3 +510,125 @@ void sdw_extract_slave_id(struct sdw_bus *bus,
id->unique_id, id->sdw_version);
}
+
+static int sdw_program_device_num(struct sdw_bus *bus)
+{
+ u8 buf[SDW_NUM_DEV_ID_REGISTERS] = {0};
+ unsigned long long addr;
+ struct sdw_slave *slave;
+ struct sdw_slave_id id;
+ struct sdw_msg msg;
+ bool found = false;
+ int ret;
+
+ /* No Slave, so use raw xfer api */
+ sdw_fill_msg(&msg, SDW_SCP_DEVID_0, SDW_NUM_DEV_ID_REGISTERS,
+ 0, SDW_MSG_FLAG_READ, buf);
+
+ do {
+ ret = sdw_transfer(bus, NULL, &msg);
+ if (ret == -ENODATA)
+ break;
+ if (ret < 0) {
+ dev_err(bus->dev, "DEVID read fail:%d\n", ret);
+ break;
+ }
+
+ /*
+ * Construct the addr and extract. Cast the higher shift
+ * bits to avoid truncation due to size limit.
+ */
+ addr = buf[5] | (buf[4] << 8) | (buf[3] << 16) |
+ (buf[2] << 24) | ((unsigned long long)buf[1] << 32) |
+ ((unsigned long long)buf[0] << 40);
+
+ sdw_extract_slave_id(bus, addr, &id);
+
+ /* Now compare with entries */
+ list_for_each_entry(slave, &bus->slaves, node) {
+ if (sdw_compare_devid(slave, id) == 0) {
+ found = true;
+
+ /*
+ * Assign a new dev_num to this Slave and
+ * not mark it present. It will be marked
+ * present after it reports ATTACHED on new
+ * dev_num
+ */
+ ret = sdw_assign_device_num(slave);
+ if (ret) {
+ dev_err(slave->bus->dev,
+ "Assign dev_num failed:%d",
+ ret);
+ return ret;
+ }
+
+ break;
+ }
+ }
+
+ if (found == false) {
+ /* TODO: Park this device in Group 13 */
+ dev_err(bus->dev, "Slave Entry not found");
+ }
+
+ } while (ret == 0);
+
+ return 0;
+}
+
+static void sdw_modify_slave_status(struct sdw_slave *slave,
+ enum sdw_slave_status status)
+{
+ mutex_lock(&slave->bus->bus_lock);
+ slave->status = status;
+ mutex_unlock(&slave->bus->bus_lock);
+}
+
+static int sdw_initialize_slave(struct sdw_slave *slave)
+{
+ struct sdw_slave_prop *prop = &slave->prop;
+ int val, ret;
+
+ val = sdw_read(slave, SDW_SCP_INTMASK1);
+ if (val < 0) {
+ dev_err(slave->bus->dev,
+ "SDW_SCP_INTMASK1 read failed:%d", val);
+ return val;
+ }
+
+ /* Set bus clash and parity interrupt mask */
+ val |= SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
+
+ /* Enable SCP interrupts */
+ ret = sdw_write(slave, SDW_SCP_INTMASK1, val);
+ if (ret < 0) {
+ dev_err(slave->bus->dev,
+ "SDW_SCP_INTMASK1 write failed:%d", val);
+ return ret;
+ }
+
+ /* No need to continue if DP0 is not present */
+ if (!slave->prop.dp0_prop)
+ return 0;
+
+ /* Enable DP0 interrupts */
+ val = sdw_read(slave, SDW_DP0_INTMASK);
+ if (val < 0) {
+ dev_err(slave->bus->dev,
+ "SDW_DP0_INTMASK read failed:%d", val);
+ return val;
+ }
+
+ val |= prop->dp0_prop->device_interrupts;
+ val |= SDW_DP0_INT_PORT_READY | SDW_DP0_INT_BRA_FAILURE;
+
+ ret = sdw_write(slave, SDW_DP0_INTMASK, val);
+ if (ret < 0) {
+ dev_err(slave->bus->dev,
+ "SDW_DP0_INTMASK write failed:%d", val);
+ return ret;
+ }
+
+ return 0;
+}
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index af94c0a29024..c25315bc5331 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -65,6 +65,7 @@ struct sdw_slave;
/* SDW Enumeration Device Number */
#define SDW_ENUM_DEV_NUM 0
+#define SDW_NUM_DEV_ID_REGISTERS 6
#define SDW_MAX_DEVICES 11
/**
--
2.7.4
next prev parent reply other threads:[~2017-10-19 2:59 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 3:03 [PATCH 00/14] soundwire: Add a new SoundWire subsystem Vinod Koul
2017-10-19 3:03 ` [PATCH 01/14] Documentation: Add SoundWire summary Vinod Koul
2017-10-19 3:33 ` Randy Dunlap
2017-10-19 4:44 ` Vinod Koul
2017-10-20 10:39 ` Greg Kroah-Hartman
2017-10-20 15:49 ` Vinod Koul
2017-10-20 16:22 ` Greg Kroah-Hartman
2017-10-20 17:09 ` Vinod Koul
2017-10-21 8:57 ` Mark Brown
2017-10-21 11:28 ` Vinod Koul
2017-10-22 10:06 ` [alsa-devel] " Pierre-Louis Bossart
2017-10-23 8:21 ` Mark Brown
2017-10-23 7:50 ` Mark Brown
2017-10-23 11:18 ` [alsa-devel] " Vinod Koul
2017-10-19 3:03 ` [PATCH 02/14] soundwire: Add SoundWire bus type Vinod Koul
2017-10-19 7:40 ` Takashi Iwai
2017-10-19 8:32 ` [alsa-devel] " Takashi Iwai
2017-10-20 5:11 ` Vinod Koul
2017-10-20 6:59 ` Takashi Iwai
2017-10-20 15:46 ` Vinod Koul
2017-10-20 15:50 ` Takashi Iwai
2017-10-20 16:11 ` Vinod Koul
2017-10-20 10:41 ` Greg Kroah-Hartman
2017-10-20 15:52 ` Vinod Koul
2017-10-20 10:45 ` Greg Kroah-Hartman
2017-10-20 16:01 ` Vinod Koul
2017-10-20 16:21 ` Greg Kroah-Hartman
2017-10-20 17:10 ` Vinod Koul
2017-10-23 11:46 ` Alan Cox
2017-10-26 8:33 ` Vinod Koul
2017-10-27 8:57 ` Greg Kroah-Hartman
2017-10-30 13:11 ` Vinod Koul
2017-10-20 16:03 ` Philippe Ombredanne
2017-10-20 16:20 ` Vinod Koul
2017-10-20 16:27 ` Greg Kroah-Hartman
2017-10-20 17:13 ` Vinod Koul
2017-10-23 11:52 ` Alan Cox
2017-10-21 9:03 ` Mark Brown
2017-10-21 11:29 ` Vinod Koul
2017-11-09 21:14 ` Srinivas Kandagatla
2017-11-10 4:59 ` Vinod Koul
2017-11-10 8:55 ` Vinod Koul
2017-11-10 10:50 ` Srinivas Kandagatla
2017-11-10 10:42 ` Srinivas Kandagatla
2017-11-10 10:58 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 03/14] soundwire: Add Master registration Vinod Koul
2017-10-19 8:54 ` [alsa-devel] " Takashi Iwai
2017-10-20 5:19 ` Vinod Koul
2017-10-20 10:47 ` Greg Kroah-Hartman
2017-10-20 16:05 ` Vinod Koul
2017-10-21 9:12 ` Mark Brown
2017-10-21 11:35 ` Vinod Koul
2017-10-23 8:24 ` Mark Brown
2017-10-23 11:19 ` Vinod Koul
2017-11-09 21:14 ` Srinivas Kandagatla
2017-11-10 5:02 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 04/14] soundwire: Add MIPI DisCo property helpers Vinod Koul
2017-10-19 9:02 ` [alsa-devel] " Takashi Iwai
2017-10-20 5:25 ` Vinod Koul
2017-10-21 9:20 ` Mark Brown
2017-10-21 11:37 ` Vinod Koul
2017-10-22 10:14 ` [alsa-devel] " Pierre-Louis Bossart
2017-10-19 3:03 ` [PATCH 05/14] soundwire: Add SoundWire MIPI defined registers Vinod Koul
2017-10-19 3:03 ` [PATCH 06/14] soundwire: Add IO transfer Vinod Koul
2017-10-19 9:13 ` [alsa-devel] " Takashi Iwai
2017-10-20 5:30 ` Vinod Koul
2017-10-20 7:06 ` Takashi Iwai
2017-10-20 15:48 ` Vinod Koul
2017-10-21 9:29 ` Mark Brown
2017-10-21 11:40 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 07/14] regmap: Add SoundWire bus support Vinod Koul
2017-10-21 9:34 ` Mark Brown
2017-10-21 11:44 ` Vinod Koul
2017-10-23 11:56 ` Alan Cox
2017-10-23 13:16 ` Mark Brown
2017-10-19 3:03 ` Vinod Koul [this message]
2017-10-19 13:44 ` [alsa-devel] [PATCH 08/14] soundwire: Add Slave status handling helpers Takashi Iwai
2017-10-31 13:04 ` Vinod Koul
2017-10-31 21:19 ` Pierre-Louis Bossart
2017-11-01 9:08 ` Vinod Koul
2017-11-01 21:10 ` Pierre-Louis Bossart
2017-11-02 3:28 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 09/14] soundwire: Add slave status handling Vinod Koul
2017-10-19 3:03 ` [PATCH 10/14] soundwire: Add sysfs for SoundWire DisCo properties Vinod Koul
2017-10-21 9:42 ` Mark Brown
2017-10-21 11:53 ` Vinod Koul
2017-11-09 21:14 ` Srinivas Kandagatla
2017-11-10 4:52 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 11/14] soundwire: cdns: Add cadence module Vinod Koul
2017-10-21 9:52 ` Mark Brown
2017-10-21 11:54 ` Vinod Koul
2017-10-19 3:03 ` [PATCH 12/14] soundwire: cdns: Add sdw_master_ops and IO transfer support Vinod Koul
2017-10-19 3:03 ` [PATCH 13/14] soundwire: intel: Add Intel Master driver Vinod Koul
2017-10-19 3:03 ` [PATCH 14/14] soundwire: intel: Add Intel init module Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1508382211-3154-9-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alan@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches.audio@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=plai@codeaurora.org \
--cc=sanyog.r.kale@intel.com \
--cc=sdharia@codeaurora.org \
--cc=shreyas.nc@intel.com \
--cc=spapothi@codeaurora.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome