forked from Minki/linux
163cd1059a
To provide backward compatibility to older systems, the SOF HDA driver
allows user to specify which HDMI codec driver to use at runtime via
kernel parameter. This mechanism has a subtle flaw in that it assumes
the codec drivers not to be loaded when the SOF PCI driver is loaded.
The problem is rooted in use of the hdev->type field.
snd_hdac_ext_bus_device_init() initializes this field to HDA_DEV_ASOC.
This signals the HDA core that ASoC drivers should be considered in
driver matching (hda_bus_match()). The SOF and SST drivers continue by
overriding this field to HDA_DEV_LEGACY and proceeding to load driver
modules with request_module(). Correct drivers will get loaded and
attached.
If however the codec drivers are already loaded when
snd_hdac_ext_bus_device_init() is called, the matching will not work as
expected as device type is still set to HDA_DEV_ASOC. Specifically if
hdac-hdmi is attached when machine driver is configured to use hdac-hda,
this leads to out-of-bounds memory access in
hda_dsp_hdmi_build_controls().
Fix the issue by adding codec type as a parameter to
snd_hdac_ext_bus_device_init() and ensuring type is set correctly from
the start.
Fixes: 139c7febad ("ASoC: SOF: Intel: add support for snd-hda-codec-hdmi")
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200921100841.2882662-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
168 lines
5.4 KiB
C
168 lines
5.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __SOUND_HDAUDIO_EXT_H
|
|
#define __SOUND_HDAUDIO_EXT_H
|
|
|
|
#include <sound/hdaudio.h>
|
|
|
|
int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,
|
|
const struct hdac_bus_ops *ops,
|
|
const struct hdac_ext_bus_ops *ext_ops);
|
|
|
|
void snd_hdac_ext_bus_exit(struct hdac_bus *bus);
|
|
int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,
|
|
struct hdac_device *hdev, int type);
|
|
void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev);
|
|
void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus);
|
|
|
|
#define HDA_CODEC_REV_EXT_ENTRY(_vid, _rev, _name, drv_data) \
|
|
{ .vendor_id = (_vid), .rev_id = (_rev), .name = (_name), \
|
|
.api_version = HDA_DEV_ASOC, \
|
|
.driver_data = (unsigned long)(drv_data) }
|
|
#define HDA_CODEC_EXT_ENTRY(_vid, _revid, _name, _drv_data) \
|
|
HDA_CODEC_REV_EXT_ENTRY(_vid, _revid, _name, _drv_data)
|
|
|
|
void snd_hdac_ext_bus_ppcap_enable(struct hdac_bus *chip, bool enable);
|
|
void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_bus *chip, bool enable);
|
|
|
|
void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *chip,
|
|
bool enable, int index);
|
|
|
|
int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus);
|
|
struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_bus *bus,
|
|
const char *codec_name);
|
|
|
|
enum hdac_ext_stream_type {
|
|
HDAC_EXT_STREAM_TYPE_COUPLED = 0,
|
|
HDAC_EXT_STREAM_TYPE_HOST,
|
|
HDAC_EXT_STREAM_TYPE_LINK
|
|
};
|
|
|
|
/**
|
|
* hdac_ext_stream: HDAC extended stream for extended HDA caps
|
|
*
|
|
* @hstream: hdac_stream
|
|
* @pphc_addr: processing pipe host stream pointer
|
|
* @pplc_addr: processing pipe link stream pointer
|
|
* @spib_addr: software position in buffers stream pointer
|
|
* @fifo_addr: software position Max fifos stream pointer
|
|
* @dpibr_addr: DMA position in buffer resume pointer
|
|
* @dpib: DMA position in buffer
|
|
* @lpib: Linear position in buffer
|
|
* @decoupled: stream host and link is decoupled
|
|
* @link_locked: link is locked
|
|
* @link_prepared: link is prepared
|
|
* link_substream: link substream
|
|
*/
|
|
struct hdac_ext_stream {
|
|
struct hdac_stream hstream;
|
|
|
|
void __iomem *pphc_addr;
|
|
void __iomem *pplc_addr;
|
|
|
|
void __iomem *spib_addr;
|
|
void __iomem *fifo_addr;
|
|
|
|
void __iomem *dpibr_addr;
|
|
|
|
u32 dpib;
|
|
u32 lpib;
|
|
bool decoupled:1;
|
|
bool link_locked:1;
|
|
bool link_prepared;
|
|
|
|
struct snd_pcm_substream *link_substream;
|
|
};
|
|
|
|
#define hdac_stream(s) (&(s)->hstream)
|
|
#define stream_to_hdac_ext_stream(s) \
|
|
container_of(s, struct hdac_ext_stream, hstream)
|
|
|
|
void snd_hdac_ext_stream_init(struct hdac_bus *bus,
|
|
struct hdac_ext_stream *stream, int idx,
|
|
int direction, int tag);
|
|
int snd_hdac_ext_stream_init_all(struct hdac_bus *bus, int start_idx,
|
|
int num_stream, int dir);
|
|
void snd_hdac_stream_free_all(struct hdac_bus *bus);
|
|
void snd_hdac_link_free_all(struct hdac_bus *bus);
|
|
struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_bus *bus,
|
|
struct snd_pcm_substream *substream,
|
|
int type);
|
|
void snd_hdac_ext_stream_release(struct hdac_ext_stream *azx_dev, int type);
|
|
void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
|
|
struct hdac_ext_stream *azx_dev, bool decouple);
|
|
void snd_hdac_ext_stop_streams(struct hdac_bus *bus);
|
|
|
|
int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus,
|
|
struct hdac_ext_stream *stream, u32 value);
|
|
int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus,
|
|
struct hdac_ext_stream *stream);
|
|
void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus,
|
|
bool enable, int index);
|
|
int snd_hdac_ext_stream_set_dpibr(struct hdac_bus *bus,
|
|
struct hdac_ext_stream *stream, u32 value);
|
|
int snd_hdac_ext_stream_set_lpib(struct hdac_ext_stream *stream, u32 value);
|
|
|
|
void snd_hdac_ext_link_stream_start(struct hdac_ext_stream *hstream);
|
|
void snd_hdac_ext_link_stream_clear(struct hdac_ext_stream *hstream);
|
|
void snd_hdac_ext_link_stream_reset(struct hdac_ext_stream *hstream);
|
|
int snd_hdac_ext_link_stream_setup(struct hdac_ext_stream *stream, int fmt);
|
|
|
|
struct hdac_ext_link {
|
|
struct hdac_bus *bus;
|
|
int index;
|
|
void __iomem *ml_addr; /* link output stream reg pointer */
|
|
u32 lcaps; /* link capablities */
|
|
u16 lsdiid; /* link sdi identifier */
|
|
|
|
int ref_count;
|
|
|
|
struct list_head list;
|
|
};
|
|
|
|
int snd_hdac_ext_bus_link_power_up(struct hdac_ext_link *link);
|
|
int snd_hdac_ext_bus_link_power_down(struct hdac_ext_link *link);
|
|
int snd_hdac_ext_bus_link_power_up_all(struct hdac_bus *bus);
|
|
int snd_hdac_ext_bus_link_power_down_all(struct hdac_bus *bus);
|
|
void snd_hdac_ext_link_set_stream_id(struct hdac_ext_link *link,
|
|
int stream);
|
|
void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link,
|
|
int stream);
|
|
|
|
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 */
|
|
struct hdac_ext_codec_ops {
|
|
int (*build_controls)(struct hdac_ext_device *dev);
|
|
int (*init)(struct hdac_ext_device *dev);
|
|
void (*free)(struct hdac_ext_device *dev);
|
|
};
|
|
|
|
struct hda_dai_map {
|
|
char *dai_name;
|
|
hda_nid_t nid;
|
|
u32 maxbps;
|
|
};
|
|
|
|
struct hdac_ext_dma_params {
|
|
u32 format;
|
|
u8 stream_tag;
|
|
};
|
|
|
|
int snd_hda_ext_driver_register(struct hdac_driver *drv);
|
|
void snd_hda_ext_driver_unregister(struct hdac_driver *drv);
|
|
|
|
#endif /* __SOUND_HDAUDIO_EXT_H */
|