From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org,
vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com,
srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [RFC PATCH 25/40] soundwire: intel: use BIOS information to set clock dividers
Date: Thu, 25 Jul 2019 18:40:17 -0500 [thread overview]
Message-ID: <20190725234032.21152-26-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190725234032.21152-1-pierre-louis.bossart@linux.intel.com>
The BIOS provides an Intel-specific property, let's use it to avoid
hard-coded clock dividers.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/cadence_master.c | 26 ++++++++++++++++++++++----
drivers/soundwire/intel.c | 26 ++++++++++++++++++++++++++
include/linux/soundwire/sdw.h | 2 ++
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index d84344e29f71..10ebcef2e84e 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -173,8 +173,6 @@
#define CDNS_PDI_CONFIG_PORT GENMASK(4, 0)
/* Driver defaults */
-
-#define CDNS_DEFAULT_CLK_DIVIDER 0
#define CDNS_DEFAULT_SSP_INTERVAL 0x18
#define CDNS_TX_TIMEOUT 2000
@@ -973,7 +971,10 @@ static u32 cdns_set_default_frame_shape(int n_rows, int n_cols)
*/
int sdw_cdns_init(struct sdw_cdns *cdns)
{
+ struct sdw_bus *bus = &cdns->bus;
+ struct sdw_master_prop *prop = &bus->prop;
u32 val;
+ int divider;
int ret;
/* Exit clock stop */
@@ -985,9 +986,17 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
}
/* Set clock divider */
+ divider = (prop->mclk_freq / prop->max_clk_freq) - 1;
val = cdns_readl(cdns, CDNS_MCP_CLK_CTRL0);
- val |= CDNS_DEFAULT_CLK_DIVIDER;
+ val |= divider;
cdns_writel(cdns, CDNS_MCP_CLK_CTRL0, val);
+ cdns_writel(cdns, CDNS_MCP_CLK_CTRL1, val);
+
+ pr_err("plb: mclk %d max_freq %d divider %d register %x\n",
+ prop->mclk_freq,
+ prop->max_clk_freq,
+ divider,
+ val);
/* Set the default frame shape */
val = cdns_set_default_frame_shape(prop->default_row,
@@ -1035,6 +1044,7 @@ EXPORT_SYMBOL(sdw_cdns_init);
int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)
{
+ struct sdw_master_prop *prop = &bus->prop;
struct sdw_cdns *cdns = bus_to_cdns(bus);
int mcp_clkctrl_off, mcp_clkctrl;
int divider;
@@ -1044,7 +1054,9 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)
return -EINVAL;
}
- divider = (params->max_dr_freq / params->curr_dr_freq) - 1;
+ divider = prop->mclk_freq * SDW_DOUBLE_RATE_FACTOR /
+ params->curr_dr_freq;
+ divider--; /* divider is 1/(N+1) */
if (params->next_bank)
mcp_clkctrl_off = CDNS_MCP_CLK_CTRL1;
@@ -1055,6 +1067,12 @@ int cdns_bus_conf(struct sdw_bus *bus, struct sdw_bus_params *params)
mcp_clkctrl |= divider;
cdns_writel(cdns, mcp_clkctrl_off, mcp_clkctrl);
+ pr_err("plb: mclk * 2 %d curr_dr_freq %d divider %d register %x\n",
+ prop->mclk_freq * SDW_DOUBLE_RATE_FACTOR,
+ params->curr_dr_freq,
+ divider,
+ mcp_clkctrl);
+
return 0;
}
EXPORT_SYMBOL(cdns_bus_conf);
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index c718c9c67a37..796ac2bc8cea 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -917,11 +917,37 @@ static int intel_register_dai(struct sdw_intel *sdw)
dais, num_dai);
}
+static int sdw_master_read_intel_prop(struct sdw_bus *bus)
+{
+ struct sdw_master_prop *prop = &bus->prop;
+ struct fwnode_handle *link;
+ char name[32];
+ int nval, i;
+
+ /* Find master handle */
+ snprintf(name, sizeof(name),
+ "mipi-sdw-link-%d-subproperties", bus->link_id);
+
+ link = device_get_named_child_node(bus->dev, name);
+ if (!link) {
+ dev_err(bus->dev, "Master node %s not found\n", name);
+ return -EIO;
+ }
+
+ fwnode_property_read_u32(link,
+ "intel-sdw-ip-clock",
+ &prop->mclk_freq);
+ return 0;
+}
+
static int intel_prop_read(struct sdw_bus *bus)
{
/* Initialize with default handler to read all DisCo properties */
sdw_master_read_prop(bus);
+ /* read Intel-specific properties */
+ sdw_master_read_intel_prop(bus);
+
return 0;
}
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 31d1e8acf25b..b6acc436ac80 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -379,6 +379,7 @@ struct sdw_slave_prop {
* @dynamic_frame: Dynamic frame shape supported
* @err_threshold: Number of times that software may retry sending a single
* command
+ * @mclk_freq: clock reference passed to SoundWire Master, in Hz.
*/
struct sdw_master_prop {
u32 revision;
@@ -393,6 +394,7 @@ struct sdw_master_prop {
u32 default_col;
bool dynamic_frame;
u32 err_threshold;
+ u32 mclk_freq;
};
int sdw_master_read_prop(struct sdw_bus *bus);
--
2.20.1
next prev parent reply other threads:[~2019-07-25 23:42 UTC|newest]
Thread overview: 183+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 23:39 [RFC PATCH 00/40] soundwire: updates for 5.4 Pierre-Louis Bossart
2019-07-25 23:39 ` [RFC PATCH 01/40] soundwire: add debugfs support Pierre-Louis Bossart
2019-07-25 22:15 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 13:43 ` Pierre-Louis Bossart
2019-07-26 9:22 ` Cezary Rojewski
2019-07-26 13:57 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-26 14:04 ` Greg KH
2019-07-26 15:29 ` Pierre-Louis Bossart
2019-07-25 23:39 ` [RFC PATCH 02/40] soundwire: cadence_master: add debugfs register dump Pierre-Louis Bossart
2019-07-26 14:09 ` Greg KH
2019-07-26 15:32 ` Pierre-Louis Bossart
2019-08-05 7:55 ` Sanyog Kale
2019-08-05 15:20 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:39 ` [RFC PATCH 03/40] soundwire: cadence_master: align debugfs to 8 digits Pierre-Louis Bossart
2019-07-26 9:38 ` Cezary Rojewski
2019-07-26 13:58 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 11:50 ` Vinod Koul
2019-07-25 23:39 ` [RFC PATCH 04/40] soundwire: intel: add debugfs register dump Pierre-Louis Bossart
2019-07-26 9:35 ` Cezary Rojewski
2019-07-26 14:00 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-26 14:11 ` Greg KH
2019-07-26 14:06 ` Greg KH
2019-07-26 14:09 ` Greg KH
2019-07-26 15:34 ` Pierre-Louis Bossart
2019-07-25 23:39 ` [RFC PATCH 05/40] soundwire: intel: move interrupt enable after interrupt handler registration Pierre-Louis Bossart
2019-08-02 11:53 ` Vinod Koul
2019-08-02 15:08 ` Pierre-Louis Bossart
2019-07-25 23:39 ` [RFC PATCH 06/40] soundwire: intel: prevent possible dereference in hw_params Pierre-Louis Bossart
2019-07-26 9:45 ` Cezary Rojewski
2019-07-26 14:02 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 11:55 ` Vinod Koul
2019-08-02 15:16 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 15:57 ` Vinod Koul
2019-08-02 16:52 ` Pierre-Louis Bossart
2019-08-02 17:37 ` Vinod Koul
2019-07-25 23:39 ` [RFC PATCH 07/40] soundwire: intel: fix channel number reported by hardware Pierre-Louis Bossart
2019-08-02 11:57 ` Vinod Koul
2019-08-02 15:18 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 08/40] soundwire: intel: remove BIOS work-arounds Pierre-Louis Bossart
2019-08-02 11:58 ` Vinod Koul
2019-07-25 23:40 ` [RFC PATCH 09/40] soundwire: cadence_master: fix usage of CONFIG_UPDATE Pierre-Louis Bossart
2019-07-25 22:23 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 14:05 ` Pierre-Louis Bossart
2019-07-26 2:11 ` Bard liao
2019-07-26 13:33 ` Pierre-Louis Bossart
2019-07-26 9:53 ` Cezary Rojewski
2019-07-26 9:54 ` Cezary Rojewski
2019-08-02 12:03 ` Vinod Koul
2019-08-02 15:18 ` Pierre-Louis Bossart
2019-08-05 8:51 ` Sanyog Kale
2019-07-25 23:40 ` [RFC PATCH 10/40] soundwire: cadence_master: remove useless wrapper Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 11/40] soundwire: cadence_master: simplify bus clash interrupt clear Pierre-Louis Bossart
2019-08-02 12:07 ` Vinod Koul
2019-07-25 23:40 ` [RFC PATCH 12/40] soundwire: cadence_master: revisit interrupt settings Pierre-Louis Bossart
2019-08-02 12:10 ` Vinod Koul
2019-08-02 15:23 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 13/40] soundwire: cadence_master: fix register definition for SLAVE_STATE Pierre-Louis Bossart
2019-08-02 12:12 ` Vinod Koul
2019-07-25 23:40 ` [RFC PATCH 14/40] soundwire: cadence_master: fix definitions for INTSTAT0/1 Pierre-Louis Bossart
2019-08-02 12:13 ` Vinod Koul
2019-07-25 23:40 ` [RFC PATCH 15/40] soundwire: cadence_master: handle multiple status reports per Slave Pierre-Louis Bossart
2019-07-25 22:31 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 14:09 ` Pierre-Louis Bossart
2019-08-02 12:20 ` Vinod Koul
2019-08-02 15:29 ` Pierre-Louis Bossart
2019-08-02 16:01 ` Vinod Koul
2019-08-02 16:41 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 16/40] soundwire: cadence_master: improve startup sequence with link hw_reset Pierre-Louis Bossart
2019-07-26 7:22 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 14:11 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 17/40] soundwire: bus: use runtime_pm_get_sync/pm when enabled Pierre-Louis Bossart
2019-07-26 7:39 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 7:47 ` Jan Kotas
2019-07-26 8:22 ` Guennadi Liakhovetski
2019-07-26 8:33 ` Jan Kotas
2019-07-26 8:42 ` Guennadi Liakhovetski
2019-07-26 18:08 ` Pierre-Louis Bossart
2019-07-26 18:25 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 19:11 ` Andy Shevchenko
2019-07-26 19:08 ` Andy Shevchenko
2019-07-29 22:07 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-30 11:21 ` Andy Shevchenko
2019-07-30 12:57 ` Pierre-Louis Bossart
2019-07-30 15:58 ` Andy Shevchenko
2019-07-30 15:59 ` Andy Shevchenko
2019-08-02 16:58 ` Vinod Koul
2019-08-02 17:20 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 18/40] soundwire: bus: split handling of Device0 events Pierre-Louis Bossart
2019-08-02 16:59 ` Vinod Koul
2019-07-25 23:40 ` [RFC PATCH 19/40] soundwire: bus: improve dynamic debug comments for enumeration Pierre-Louis Bossart
2019-08-02 17:00 ` Vinod Koul
2019-08-02 17:20 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 20/40] soundwire: prototypes for suspend/resume Pierre-Louis Bossart
2019-07-26 10:04 ` Cezary Rojewski
2019-07-26 14:15 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 17:03 ` Vinod Koul
2019-08-02 17:21 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 21/40] soundwire: export helpers to find row and column values Pierre-Louis Bossart
2019-07-26 14:43 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 15:26 ` Pierre-Louis Bossart
2019-08-02 17:04 ` Vinod Koul
2019-08-05 9:39 ` Sanyog Kale
2019-08-05 15:27 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 22/40] soundwire: include mod_devicetable.h to avoid compiling warnings Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 23/40] soundwire: stream: fix disable sequence Pierre-Louis Bossart
2019-07-26 10:14 ` Cezary Rojewski
2019-07-26 14:17 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-26 14:51 ` Guennadi Liakhovetski
2019-07-26 15:05 ` Pierre-Louis Bossart
2019-08-05 9:56 ` Sanyog Kale
2019-08-05 15:33 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-05 16:32 ` Sanyog Kale
2019-08-05 19:12 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 24/40] soundwire: cadence_master: use BIOS defaults for frame shape Pierre-Louis Bossart
2019-07-26 10:20 ` Cezary Rojewski
2019-07-26 14:22 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 17:10 ` Vinod Koul
2019-08-02 17:24 ` Pierre-Louis Bossart
2019-08-05 10:01 ` Sanyog Kale
2019-07-25 23:40 ` Pierre-Louis Bossart [this message]
2019-08-02 17:17 ` [RFC PATCH 25/40] soundwire: intel: use BIOS information to set clock dividers Vinod Koul
2019-08-02 17:29 ` Pierre-Louis Bossart
2019-08-05 10:28 ` Sanyog Kale
2019-08-05 15:40 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 26/40] soundwire: cadence_master: fix divider setting in clock register Pierre-Louis Bossart
2019-07-26 5:19 ` [alsa-devel] " Bard liao
2019-07-26 5:56 ` rander.wang
2019-07-26 14:24 ` Pierre-Louis Bossart
2019-08-02 17:19 ` Vinod Koul
2019-08-02 17:30 ` Pierre-Louis Bossart
2019-08-05 10:40 ` Sanyog Kale
2019-08-05 15:41 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 27/40] soundwire: Add Intel resource management algorithm Pierre-Louis Bossart
2019-07-26 11:07 ` Cezary Rojewski
2019-07-26 14:41 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-26 15:43 ` Guennadi Liakhovetski
2019-07-26 17:55 ` Pierre-Louis Bossart
2019-08-05 16:54 ` Sanyog Kale
2019-08-05 19:08 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 28/40] soundwire: intel: handle disabled links Pierre-Louis Bossart
2019-08-05 16:57 ` Sanyog Kale
2019-08-05 19:18 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 29/40] soundwire: intel_init: add kernel module parameter to filter out links Pierre-Louis Bossart
2019-07-26 10:30 ` Cezary Rojewski
2019-07-26 14:43 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 30/40] soundwire: cadence_master: add kernel parameter to override interrupt mask Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 31/40] soundwire: intel: move shutdown() callback and don't export symbol Pierre-Louis Bossart
2019-07-26 10:38 ` Cezary Rojewski
2019-07-26 14:46 ` [alsa-devel] " Pierre-Louis Bossart
2019-08-02 17:28 ` Vinod Koul
2019-08-02 17:42 ` Pierre-Louis Bossart
2019-08-14 19:31 ` Pierre-Louis Bossart
2019-08-23 7:34 ` Vinod Koul
2019-08-23 15:57 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 32/40] soundwire: intel: add helper for initialization Pierre-Louis Bossart
2019-07-26 10:42 ` Cezary Rojewski
2019-07-26 14:55 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 33/40] soundwire: intel: Add basic power management support Pierre-Louis Bossart
2019-07-26 10:50 ` Cezary Rojewski
2019-07-26 14:57 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 34/40] soundwire: intel: ignore disabled links for suspend/resume Pierre-Louis Bossart
2019-08-02 17:30 ` Vinod Koul
2019-08-02 17:44 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 35/40] soundwire: intel: export helper to exit reset Pierre-Louis Bossart
2019-07-26 15:52 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 17:22 ` Pierre-Louis Bossart
2019-08-02 17:31 ` Vinod Koul
2019-08-02 17:44 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 36/40] soundwire: intel: disable interrupts on suspend Pierre-Louis Bossart
2019-07-26 15:55 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 17:26 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 37/40] soundwire: cadence_master: add hw_reset capability in debugfs Pierre-Louis Bossart
2019-07-26 14:07 ` Greg KH
2019-07-26 15:01 ` [alsa-devel] " Pierre-Louis Bossart
2019-07-26 15:57 ` Guennadi Liakhovetski
2019-07-26 17:31 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 38/40] soundwire: cadence_master: make clock stop exit configurable on init Pierre-Louis Bossart
2019-07-26 16:02 ` [alsa-devel] " Guennadi Liakhovetski
2019-07-26 17:35 ` Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 39/40] soundwire: intel: add pm_runtime support Pierre-Louis Bossart
2019-07-25 23:40 ` [RFC PATCH 40/40] soundwire: intel: add delay on restart for enumeration Pierre-Louis Bossart
2019-07-26 11:14 ` [RFC PATCH 00/40] soundwire: updates for 5.4 Cezary Rojewski
2019-07-26 15:23 ` [alsa-devel] " Pierre-Louis Bossart
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=20190725234032.21152-26-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).