OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/0988-Revert-BXT-Workaround-...

154 lines
5.3 KiB
Diff
Raw Permalink Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Laxminarayan Bharadiya, Pankaj"
<pankaj.laxminarayan.bharadiya@intel.com>
Date: Wed, 20 Feb 2019 01:36:18 -0800
Subject: [PATCH] Revert "BXT Workaround for HW bug: data loss in 16/16 ->
32/32 copier"
This commit is causing regression on APL NUC hence revert it.
This reverts commit 174f1c58b33141401de1257261cd034e77585590.
Change-Id: I2395e1e01b8786e71d77b01df039b6c2d9923fae
---
include/sound/hdaudio.h | 12 +-----------
include/sound/hdaudio_ext.h | 10 ++++++++++
sound/hda/ext/hdac_ext_stream.c | 13 ++++++++++++-
sound/hda/hdac_stream.c | 33 ---------------------------------
4 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 0d422ab82701..5eee13a0c045 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -523,8 +523,7 @@ struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,
void snd_hdac_stream_release(struct hdac_stream *azx_dev);
struct hdac_stream *snd_hdac_get_stream(struct hdac_bus *bus,
int dir, int stream_tag);
-void snd_hdac_stream_decouple(struct hdac_bus *bus,
- struct hdac_stream *hstream, bool decouple);
+
int snd_hdac_stream_setup(struct hdac_stream *azx_dev);
void snd_hdac_stream_cleanup(struct hdac_stream *azx_dev);
int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev);
@@ -576,15 +575,6 @@ void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
(snd_hdac_stream_readb(dev, reg) & \
~(mask)) | (val))
-/* update register macro */
-#define snd_hdac_updatel(addr, reg, mask, val) \
- writel(((readl(addr + reg) & ~(mask)) | (val)), \
- addr + reg)
-
-#define snd_hdac_updatew(addr, reg, mask, val) \
- writew(((readw(addr + reg) & ~(mask)) | (val)), \
- addr + reg)
-
#ifdef CONFIG_SND_HDA_DSP_LOADER
/* DSP lock helpers */
#define snd_hdac_dsp_lock_init(dev) mutex_init(&(dev)->dsp_mutex)
diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h
index 0cbf44b819e8..5ebf57fa778d 100644
--- a/include/sound/hdaudio_ext.h
+++ b/include/sound/hdaudio_ext.h
@@ -137,6 +137,16 @@ void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link,
int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, struct hdac_ext_link *link);
int snd_hdac_ext_bus_link_put(struct hdac_bus *bus, struct hdac_ext_link *link);
+/* update register macro */
+#define snd_hdac_updatel(addr, reg, mask, val) \
+ writel(((readl(addr + reg) & ~(mask)) | (val)), \
+ addr + reg)
+
+#define snd_hdac_updatew(addr, reg, mask, val) \
+ writew(((readw(addr + reg) & ~(mask)) | (val)), \
+ addr + reg)
+
+
struct hdac_ext_device;
/* ops common to all codec drivers */
diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c
index 85ff1536ba44..fa7b80fcba9d 100644
--- a/sound/hda/ext/hdac_ext_stream.c
+++ b/sound/hda/ext/hdac_ext_stream.c
@@ -126,8 +126,19 @@ void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
struct hdac_ext_stream *stream, bool decouple)
{
struct hdac_stream *hstream = &stream->hstream;
- snd_hdac_stream_decouple(bus, hstream, decouple);
+ u32 val;
+ int mask = AZX_PPCTL_PROCEN(hstream->index);
+
+ spin_lock_irq(&bus->reg_lock);
+ val = readw(bus->ppcap + AZX_REG_PP_PPCTL) & mask;
+
+ if (decouple && !val)
+ snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, mask);
+ else if (!decouple && val)
+ snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, 0);
+
stream->decoupled = decouple;
+ spin_unlock_irq(&bus->reg_lock);
}
EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple);
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
index 1b83a88ae4e5..67d672192606 100644
--- a/sound/hda/hdac_stream.c
+++ b/sound/hda/hdac_stream.c
@@ -178,33 +178,6 @@ void snd_hdac_stream_reset(struct hdac_stream *azx_dev)
}
EXPORT_SYMBOL_GPL(snd_hdac_stream_reset);
-/**
- * snd_hdac_stream_decouple - decouple the hdac stream
- * @bus: HD-audio core bus
- * @stream: HD-audio core stream object to initialize
- * @decouple: flag to decouple
- */
-void snd_hdac_stream_decouple(struct hdac_bus *bus,
- struct hdac_stream *hstream, bool decouple)
-{
- u32 val;
- int mask = AZX_PPCTL_PROCEN(hstream->index);
-
- if (bus->ppcap) {
- spin_lock_irq(&bus->reg_lock);
- val = readw(bus->ppcap + AZX_REG_PP_PPCTL) & mask;
-
- if (decouple && !val)
- snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL,
- mask, mask);
- else if (!decouple && val)
- snd_hdac_updatel(bus->ppcap, AZX_REG_PP_PPCTL, mask, 0);
-
- spin_unlock_irq(&bus->reg_lock);
- }
-}
-EXPORT_SYMBOL_GPL(snd_hdac_stream_decouple);
-
/**
* snd_hdac_stream_setup - set up the SD for streaming
* @azx_dev: HD-audio core stream to set up
@@ -232,16 +205,10 @@ int snd_hdac_stream_setup(struct hdac_stream *azx_dev)
/* program the length of samples in cyclic buffer */
snd_hdac_stream_writel(azx_dev, SD_CBL, azx_dev->bufsize);
- /* workaround for BXT HW bug */
- snd_hdac_stream_decouple(bus, azx_dev, false);
-
/* program the stream format */
/* this value needs to be the same as the one programmed */
snd_hdac_stream_writew(azx_dev, SD_FORMAT, azx_dev->format_val);
- /* workaround for BXT HW bug */
- snd_hdac_stream_decouple(bus, azx_dev, true);
-
/* program the stream LVI (last valid index) of the BDL */
snd_hdac_stream_writew(azx_dev, SD_LVI, azx_dev->frags - 1);
--
https://clearlinux.org
Reference in New Issue View Git Blame Copy Permalink