From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Vinod Koul <vkoul@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.19 10/33] soundwire: intel: fix channel number reported by hardware
Date: Sun, 29 Sep 2019 13:33:58 -0400 [thread overview]
Message-ID: <20190929173424.9361-10-sashal@kernel.org> (raw)
In-Reply-To: <20190929173424.9361-1-sashal@kernel.org>
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
[ Upstream commit 18046335643de6d21327f5ae034c8fb8463f6715 ]
On all released Intel controllers (CNL/CML/ICL), PDI2 reports an
invalid count, force the correct hardware-supported value
This may have to be revisited with platform-specific values if the
hardware changes, but for now this is good enough.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190806005522.22642-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/soundwire/intel.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index a6e2581ada703..29bc99c4a7b66 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -282,6 +282,16 @@ intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)
if (pcm) {
count = intel_readw(shim, SDW_SHIM_PCMSYCHC(link_id, pdi_num));
+
+ /*
+ * WORKAROUND: on all existing Intel controllers, pdi
+ * number 2 reports channel count as 1 even though it
+ * supports 8 channels. Performing hardcoding for pdi
+ * number 2.
+ */
+ if (pdi_num == 2)
+ count = 7;
+
} else {
count = intel_readw(shim, SDW_SHIM_PDMSCAP(link_id));
count = ((count & SDW_SHIM_PDMSCAP_CPSS) >>
--
2.20.1
next prev parent reply other threads:[~2019-09-29 17:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-29 17:33 [PATCH AUTOSEL 4.19 01/33] MIPS: Ingenic: Disable broken BTB lookup optimization Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 02/33] clk: jz4740: Add TCU clock Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 03/33] MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 04/33] i2c-cht-wc: Fix lockdep warning Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 05/33] mfd: intel-lpss: Remove D3cold delay Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 06/33] PCI: tegra: Fix OF node reference leak Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 07/33] HID: wacom: Fix several minor compiler warnings Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 08/33] livepatch: Nullify obj->mod in klp_module_coming()'s error path Sasha Levin
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 09/33] ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes Sasha Levin
2019-09-29 17:33 ` Sasha Levin [this message]
2019-09-29 17:33 ` [PATCH AUTOSEL 4.19 11/33] ARM: 8875/1: Kconfig: default to AEABI w/ Clang Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 12/33] MIPS: lantiq: update the clock alias' for the mainline PCIe PHY driver Sasha Levin
2019-09-29 17:40 ` Martin Blumenstingl
2019-10-05 23:01 ` Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 13/33] firmware: bcm47xx_nvram: Correct size_t printf format Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 14/33] rtc: snvs: fix possible race condition Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 15/33] rtc: pcf85363/pcf85263: fix regmap error in set_time Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 16/33] HID: apple: Fix stuck function keys when using FN Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 17/33] PCI: rockchip: Propagate errors for optional regulators Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 18/33] PCI: histb: " Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 19/33] PCI: imx6: " Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 20/33] PCI: exynos: Propagate errors for optional PHYs Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 21/33] security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb() Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 22/33] ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 23/33] fat: work around race with userspace's read via blockdev while mounting Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 24/33] pktcdvd: remove warning on attempting to register non-passthrough dev Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 25/33] hypfs: Fix error number left in struct pointer member Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 26/33] crypto: hisilicon - Fix double free in sec_free_hw_sgl() Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 27/33] kbuild: clean compressed initramfs image Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 28/33] ocfs2: wait for recovering done after direct unlock request Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 29/33] kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 30/33] arm64: consider stack randomization for mmap base only when necessary Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 31/33] mips: properly account for stack randomization and stack guard gap Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 32/33] arm: " Sasha Levin
2019-09-29 17:34 ` [PATCH AUTOSEL 4.19 33/33] arm: use STACK_TOP when computing mmap base address Sasha Levin
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=20190929173424.9361-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=stable@vger.kernel.org \
--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).