Commit 8f88f025 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda-bus' into for-next

parents 34e72afe 820cc6cf

sound/pci/hda/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ snd-hda-tegra-objs := hda_tegra.o 
# for haswell power well

snd-hda-intel-$(CONFIG_SND_HDA_I915) +=	hda_i915.o



snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o

snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o

sound/pci/hda/hda_beep.c

+1 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static int snd_hda_do_attach(struct hda_beep *beep) 
	input_dev->name = "HDA Digital PCBeep";

	input_dev->phys = beep->phys;

	input_dev->id.bustype = BUS_PCI;

	input_dev->dev.parent = &codec->bus->card->card_dev;



	input_dev->id.vendor = codec->vendor_id >> 16;

	input_dev->id.product = codec->vendor_id & 0xffff;
@@ -168,7 +169,6 @@ static int snd_hda_do_attach(struct hda_beep *beep) 
	input_dev->evbit[0] = BIT_MASK(EV_SND);

	input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);

	input_dev->event = snd_hda_beep_event;

	input_dev->dev.parent = &codec->dev;

	input_set_drvdata(input_dev, beep);



	beep->dev = input_dev;

sound/pci/hda/hda_bind.c

0 → 100644
+321 −0
Original line number Diff line number Diff line 
/*

 * HD-audio codec driver binding

 * Copyright (c) Takashi Iwai <tiwai@suse.de>

 */



#include <linux/init.h>

#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/module.h>

#include <linux/export.h>

#include <linux/pm.h>

#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"



/* codec vendor labels */

struct hda_vendor_id {

	unsigned int id;

	const char *name;

};



static struct hda_vendor_id hda_vendor_ids[] = {

	{ 0x1002, "ATI" },

	{ 0x1013, "Cirrus Logic" },

	{ 0x1057, "Motorola" },

	{ 0x1095, "Silicon Image" },

	{ 0x10de, "Nvidia" },

	{ 0x10ec, "Realtek" },

	{ 0x1102, "Creative" },

	{ 0x1106, "VIA" },

	{ 0x111d, "IDT" },

	{ 0x11c1, "LSI" },

	{ 0x11d4, "Analog Devices" },

	{ 0x13f6, "C-Media" },

	{ 0x14f1, "Conexant" },

	{ 0x17e8, "Chrontel" },

	{ 0x1854, "LG" },

	{ 0x1aec, "Wolfson Microelectronics" },

	{ 0x1af4, "QEMU" },

	{ 0x434d, "C-Media" },

	{ 0x8086, "Intel" },

	{ 0x8384, "SigmaTel" },

	{} /* terminator */

};



/*

 * find a matching codec preset

 */

static int hda_bus_match(struct device *dev, struct device_driver *drv)

{

	struct hda_codec *codec = container_of(dev, struct hda_codec, dev);

	struct hda_codec_driver *driver =

		container_of(drv, struct hda_codec_driver, driver);

	const struct hda_codec_preset *preset;

	/* check probe_id instead of vendor_id if set */

	u32 id = codec->probe_id ? codec->probe_id : codec->vendor_id;



	for (preset = driver->preset; preset->id; preset++) {

		u32 mask = preset->mask;



		if (preset->afg && preset->afg != codec->afg)

			continue;

		if (preset->mfg && preset->mfg != codec->mfg)

			continue;

		if (!mask)

			mask = ~0;

		if (preset->id == (id & mask) &&

		    (!preset->rev || preset->rev == codec->revision_id)) {

			codec->preset = preset;

			return 1;

		}

	}

	return 0;

}



/* reset the codec name from the preset */

static int codec_refresh_name(struct hda_codec *codec, const char *name)

{

	char tmp[16];



	kfree(codec->chip_name);

	if (!name) {

		sprintf(tmp, "ID %x", codec->vendor_id & 0xffff);

		name = tmp;

	}

	codec->chip_name = kstrdup(name, GFP_KERNEL);

	return codec->chip_name ? 0 : -ENOMEM;

}



static int hda_codec_driver_probe(struct device *dev)

{

	struct hda_codec *codec = dev_to_hda_codec(dev);

	struct module *owner = dev->driver->owner;

	int err;



	if (WARN_ON(!codec->preset))

		return -EINVAL;



	err = codec_refresh_name(codec, codec->preset->name);

	if (err < 0)

		goto error;



	if (!try_module_get(owner)) {

		err = -EINVAL;

		goto error;

	}



	err = codec->preset->patch(codec);

	if (err < 0) {

		module_put(owner);

		goto error;

	}



	return 0;



 error:

	codec->preset = NULL;

	memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));

	return err;

}



static int hda_codec_driver_remove(struct device *dev)

{

	struct hda_codec *codec = dev_to_hda_codec(dev);



	if (codec->patch_ops.free)

		codec->patch_ops.free(codec);

	codec->preset = NULL;

	memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));

	module_put(dev->driver->owner);

	return 0;

}



int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name,

			       struct module *owner)

{

	drv->driver.name = name;

	drv->driver.owner = owner;

	drv->driver.bus = &snd_hda_bus_type;

	drv->driver.probe = hda_codec_driver_probe;

	drv->driver.remove = hda_codec_driver_remove;

	drv->driver.pm = &hda_codec_driver_pm;

	return driver_register(&drv->driver);

}

EXPORT_SYMBOL_GPL(__hda_codec_driver_register);



void hda_codec_driver_unregister(struct hda_codec_driver *drv)

{

	driver_unregister(&drv->driver);

}

EXPORT_SYMBOL_GPL(hda_codec_driver_unregister);



static inline bool codec_probed(struct hda_codec *codec)

{

	return device_attach(hda_codec_dev(codec)) > 0 && codec->preset;

}



/* try to auto-load and bind the codec module */

static void codec_bind_module(struct hda_codec *codec)

{

#ifdef MODULE

	request_module("snd-hda-codec-id:%08x", codec->vendor_id);

	if (codec_probed(codec))

		return;

	request_module("snd-hda-codec-id:%04x*",

		       (codec->vendor_id >> 16) & 0xffff);

	if (codec_probed(codec))

		return;

#endif

}



/* store the codec vendor name */

static int get_codec_vendor_name(struct hda_codec *codec)

{

	const struct hda_vendor_id *c;

	const char *vendor = NULL;

	u16 vendor_id = codec->vendor_id >> 16;

	char tmp[16];



	for (c = hda_vendor_ids; c->id; c++) {

		if (c->id == vendor_id) {

			vendor = c->name;

			break;

		}

	}

	if (!vendor) {

		sprintf(tmp, "Generic %04x", vendor_id);

		vendor = tmp;

	}

	codec->vendor_name = kstrdup(vendor, GFP_KERNEL);

	if (!codec->vendor_name)

		return -ENOMEM;

	return 0;

}



#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)

/* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */

static bool is_likely_hdmi_codec(struct hda_codec *codec)

{

	hda_nid_t nid = codec->start_nid;

	int i;



	for (i = 0; i < codec->num_nodes; i++, nid++) {

		unsigned int wcaps = get_wcaps(codec, nid);

		switch (get_wcaps_type(wcaps)) {

		case AC_WID_AUD_IN:

			return false; /* HDMI parser supports only HDMI out */

		case AC_WID_AUD_OUT:

			if (!(wcaps & AC_WCAP_DIGITAL))

				return false;

			break;

		}

	}

	return true;

}

#else

/* no HDMI codec parser support */

#define is_likely_hdmi_codec(codec)	false

#endif /* CONFIG_SND_HDA_CODEC_HDMI */



static int codec_bind_generic(struct hda_codec *codec)

{

	if (codec->probe_id)

		return -ENODEV;



	if (is_likely_hdmi_codec(codec)) {

		codec->probe_id = HDA_CODEC_ID_GENERIC_HDMI;

#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI)

		request_module("snd-hda-codec-hdmi");

#endif

		if (codec_probed(codec))

			return 0;

	}



	codec->probe_id = HDA_CODEC_ID_GENERIC;

#if IS_MODULE(CONFIG_SND_HDA_GENERIC)

	request_module("snd-hda-codec-generic");

#endif

	if (codec_probed(codec))

		return 0;

	return -ENODEV;

}



#if IS_ENABLED(CONFIG_SND_HDA_GENERIC)

#define is_generic_config(codec) \

	(codec->modelname && !strcmp(codec->modelname, "generic"))

#else

#define is_generic_config(codec)	0

#endif



/**

 * snd_hda_codec_configure - (Re-)configure the HD-audio codec

 * @codec: the HDA codec

 *

 * Start parsing of the given codec tree and (re-)initialize the whole

 * patch instance.

 *

 * Returns 0 if successful or a negative error code.

 */

int snd_hda_codec_configure(struct hda_codec *codec)

{

	int err;



	if (!codec->vendor_name) {

		err = get_codec_vendor_name(codec);

		if (err < 0)

			return err;

	}



	if (is_generic_config(codec))

		codec->probe_id = HDA_CODEC_ID_GENERIC;

	else

		codec->probe_id = 0;



	err = device_add(hda_codec_dev(codec));

	if (err < 0)

		return err;



	if (!codec->preset)

		codec_bind_module(codec);

	if (!codec->preset) {

		err = codec_bind_generic(codec);

		if (err < 0) {

			codec_err(codec, "Unable to bind the codec\n");

			goto error;

		}

	}



	/* audio codec should override the mixer name */

	if (codec->afg || !*codec->bus->card->mixername)

		snprintf(codec->bus->card->mixername,

			 sizeof(codec->bus->card->mixername),

			 "%s %s", codec->vendor_name, codec->chip_name);

	return 0;



 error:

	device_del(hda_codec_dev(codec));

	return err;

}

EXPORT_SYMBOL_GPL(snd_hda_codec_configure);



/*

 * bus registration

 */

struct bus_type snd_hda_bus_type = {

	.name = "hdaudio",

	.match = hda_bus_match,

};



static int __init hda_codec_init(void)

{

	return bus_register(&snd_hda_bus_type);

}



static void __exit hda_codec_exit(void)

{

	bus_unregister(&snd_hda_bus_type);

}



module_init(hda_codec_init);

module_exit(hda_codec_exit);

sound/pci/hda/hda_codec.c

+142 −589

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_codec.h

+29 −79
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ struct hda_bus_ops { 
			  struct hda_pcm *pcm);

	/* reset bus for retry verb */

	void (*bus_reset)(struct hda_bus *bus);

#ifdef CONFIG_PM

	/* notify power-up/down from codec to controller */

	void (*pm_notify)(struct hda_bus *bus, bool power_up);

#endif

#ifdef CONFIG_SND_HDA_DSP_LOADER

	/* prepare DSP transfer */

	int (*load_dsp_prepare)(struct hda_bus *bus, unsigned int format,
@@ -122,7 +118,6 @@ struct hda_bus { 
	void *private_data;

	struct pci_dev *pci;

	const char *modelname;

	int *power_save;

	struct hda_bus_ops ops;



	/* codec linked list */
@@ -151,10 +146,10 @@ struct hda_bus { 
	unsigned int rirb_error:1;	/* error in codec communication */

	unsigned int response_reset:1;	/* controller was reset */

	unsigned int in_reset:1;	/* during reset operation */

	unsigned int power_keep_link_on:1; /* don't power off HDA link */

	unsigned int no_response_fallback:1; /* don't fallback at RIRB error */



	int primary_dig_out_type;	/* primary digital out PCM type */

	unsigned long codec_powered;	/* bit flags of powered codecs */

};



/*
@@ -174,15 +169,22 @@ struct hda_codec_preset { 
	int (*patch)(struct hda_codec *codec);

};

	

struct hda_codec_preset_list {

#define HDA_CODEC_ID_GENERIC_HDMI	0x00000101

#define HDA_CODEC_ID_GENERIC		0x00000201



struct hda_codec_driver {

	struct device_driver driver;

	const struct hda_codec_preset *preset;

	struct module *owner;

	struct list_head list;

};



/* initial hook */

int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset);

int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset);

int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name,

			       struct module *owner);

#define hda_codec_driver_register(drv) \

	__hda_codec_driver_register(drv, KBUILD_MODNAME, THIS_MODULE)

void hda_codec_driver_unregister(struct hda_codec_driver *drv);

#define module_hda_codec_driver(drv) \

	module_driver(drv, hda_codec_driver_register, \

		      hda_codec_driver_unregister)



/* ops set by the preset patch */

struct hda_codec_ops {
@@ -286,11 +288,10 @@ struct hda_codec { 
	u32 vendor_id;

	u32 subsystem_id;

	u32 revision_id;

	u32 probe_id; /* overridden id for probing */



	/* detected preset */

	const struct hda_codec_preset *preset;

	struct module *owner;

	int (*parser)(struct hda_codec *codec);

	const char *vendor_name;	/* codec vendor name */

	const char *chip_name;		/* codec chip name */

	const char *modelname;	/* model name for preset */
@@ -366,17 +367,11 @@ struct hda_codec { 
	unsigned int dp_mst:1; /* support DP1.2 Multi-stream transport */

	unsigned int dump_coef:1; /* dump processing coefs in codec proc file */

#ifdef CONFIG_PM

	unsigned int power_on :1;	/* current (global) power-state */

	unsigned int d3_stop_clk:1;	/* support D3 operation without BCLK */

	unsigned int pm_up_notified:1;	/* PM notified to controller */

	unsigned int in_pm:1;		/* suspend/resume being performed */

	int power_transition;	/* power-state in transition */

	int power_count;	/* current (global) power refcount */

	struct delayed_work power_work; /* delayed task for powerdown */

	atomic_t in_pm;		/* suspend/resume being performed */

	unsigned long power_on_acct;

	unsigned long power_off_acct;

	unsigned long power_jiffies;

	spinlock_t power_lock;

#endif



	/* filter the requested power state per nid */
@@ -408,6 +403,11 @@ struct hda_codec { 
	struct snd_array verbs;

};



#define dev_to_hda_codec(_dev)	container_of(_dev, struct hda_codec, dev)

#define hda_codec_dev(_dev)	(&(_dev)->dev)



extern struct bus_type snd_hda_bus_type;



/* direction */

enum {

	HDA_INPUT, HDA_OUTPUT
@@ -556,14 +556,12 @@ void snd_hda_codec_set_power_to_all(struct hda_codec *codec, hda_nid_t fg, 


int snd_hda_lock_devices(struct hda_bus *bus);

void snd_hda_unlock_devices(struct hda_bus *bus);

void snd_hda_bus_reset(struct hda_bus *bus);



/*

 * power management

 */

#ifdef CONFIG_PM

int snd_hda_suspend(struct hda_bus *bus);

int snd_hda_resume(struct hda_bus *bus);

#endif

extern const struct dev_pm_ops hda_codec_driver_pm;



static inline

int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)
@@ -586,64 +584,16 @@ const char *snd_hda_get_jack_location(u32 cfg); 
 * power saving

 */

#ifdef CONFIG_PM

void snd_hda_power_save(struct hda_codec *codec, int delta, bool d3wait);

void snd_hda_power_up(struct hda_codec *codec);

void snd_hda_power_down(struct hda_codec *codec);

void snd_hda_set_power_save(struct hda_bus *bus, int delay);

void snd_hda_update_power_acct(struct hda_codec *codec);

#else

static inline void snd_hda_power_save(struct hda_codec *codec, int delta,

				      bool d3wait) {}

static inline void snd_hda_power_up(struct hda_codec *codec) {}

static inline void snd_hda_power_down(struct hda_codec *codec) {}

static inline void snd_hda_set_power_save(struct hda_bus *bus, int delay) {}

#endif



/**

 * snd_hda_power_up - Power-up the codec

 * @codec: HD-audio codec

 *

 * Increment the power-up counter and power up the hardware really when

 * not turned on yet.

 */

static inline void snd_hda_power_up(struct hda_codec *codec)

{

	snd_hda_power_save(codec, 1, false);

}



/**

 * snd_hda_power_up_d3wait - Power-up the codec after waiting for any pending

 *   D3 transition to complete.  This differs from snd_hda_power_up() when

 *   power_transition == -1.  snd_hda_power_up sees this case as a nop,

 *   snd_hda_power_up_d3wait waits for the D3 transition to complete then powers

 *   back up.

 * @codec: HD-audio codec

 *

 * Cancel any power down operation hapenning on the work queue, then power up.

 */

static inline void snd_hda_power_up_d3wait(struct hda_codec *codec)

{

	snd_hda_power_save(codec, 1, true);

}



/**

 * snd_hda_power_down - Power-down the codec

 * @codec: HD-audio codec

 *

 * Decrement the power-up counter and schedules the power-off work if

 * the counter rearches to zero.

 */

static inline void snd_hda_power_down(struct hda_codec *codec)

{

	snd_hda_power_save(codec, -1, false);

}



/**

 * snd_hda_power_sync - Synchronize the power-save status

 * @codec: HD-audio codec

 *

 * Synchronize the actual power state with the power account;

 * called when power_save parameter is changed

 */

static inline void snd_hda_power_sync(struct hda_codec *codec)

{

	snd_hda_power_save(codec, 0, false);

}



#ifdef CONFIG_SND_HDA_PATCH_LOADER

/*

 * patch firmware