[alsa-devel] [RFC 04/10] ASoC: Intel: Skylake: use hda_bus instead of hdac_bus

[Ughreja, Rakesh A]

>-----Original Message-----
>From: Pierre-Louis Bossart [mailto:pierre-louis.bossart at linux.intel.com]
>Sent: Friday, December 1, 2017 11:57 PM
>To: Ughreja, Rakesh A <rakesh.a.ughreja at intel.com>; alsa-devel at alsa-
>project.org; broonie at kernel.org; tiwai at suse.de; liam.r.girdwood at linux.intel.com
>Cc: Koul, Vinod <vinod.koul at intel.com>; Patches Audio
><patches.audio at intel.com>
>Subject: Re: [alsa-devel] [RFC 04/10] ASoC: Intel: Skylake: use hda_bus instead of
>hdac_bus
>
>On 12/1/17 3:14 AM, Rakesh Ughreja wrote:
>> This patch prepares SKL platform driver to make reuse of legacy HDA
>> codec drivers. It does following things.
>>
>> use hda_bus instead of hdac_bus in the SKL platform driver to align
>> with the legacy controller driver.
>>
>> modify snd_hdac_ext_bus_device_init definition to align with
>> snd_hdac_bus_device_init, used by legacy drivers.
>> Memory for hdac_device is allocated by the caller.
>>
>> Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja at intel.com>
>> ---
>>   include/sound/hdaudio_ext.h   |  3 ++-
>>   sound/hda/ext/hdac_ext_bus.c  |  9 ++-------
>>   sound/soc/intel/skylake/skl.c | 19 ++++++++++++++++++-
>>   sound/soc/intel/skylake/skl.h | 10 +++++++---
>>   4 files changed, 29 insertions(+), 12 deletions(-)
>>
>> diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h
>> index 3c30247..c188b80 100644
>> --- a/include/sound/hdaudio_ext.h
>> +++ b/include/sound/hdaudio_ext.h
>> @@ -9,7 +9,8 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device
>*dev,
>>   		      const struct hdac_io_ops *io_ops);
>>
>>   void snd_hdac_ext_bus_exit(struct hdac_bus *bus);
>> -int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr);
>> +int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,
>> +						struct hdac_device *hdev);
>>   void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev);
>>   void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus);
>>
>> diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c
>> index 52f0776..e4bcb76 100644
>> --- a/sound/hda/ext/hdac_ext_bus.c
>> +++ b/sound/hda/ext/hdac_ext_bus.c
>> @@ -135,16 +135,12 @@ static void default_release(struct device *dev)
>>    *
>>    * Returns zero for success or a negative error code.
>>    */
>> -int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr)
>> +int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,
>> +					struct hdac_device *hdev)
>>   {
>> -	struct hdac_device *hdev = NULL;
>>   	char name[15];
>>   	int ret;
>>
>> -	hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);
>> -	if (!hdev)
>> -		return -ENOMEM;
>> -
>>   	hdev->bus = bus;
>>
>>   	snprintf(name, sizeof(name), "ehdaudio%dD%d", bus->idx, addr);
>> @@ -175,7 +171,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init);
>>   void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev)
>>   {
>>   	snd_hdac_device_exit(hdev);
>> -	kfree(hdev);
>>   }
>>   EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_exit);
>>
>> diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
>> index 568a285..72a788a 100644
>> --- a/sound/soc/intel/skylake/skl.c
>> +++ b/sound/soc/intel/skylake/skl.c
>> @@ -35,6 +35,7 @@
>>   #include "skl.h"
>>   #include "skl-sst-dsp.h"
>>   #include "skl-sst-ipc.h"
>> +#include "../../../pci/hda/hda_codec.h"
>>
>>   static struct skl_machine_pdata skl_dmic_data;
>>
>> @@ -531,6 +532,8 @@ static int probe_codec(struct hdac_bus *bus, int addr)
>>   	unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |
>>   		(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
>>   	unsigned int res = -1;
>> +	struct skl *skl = bus_to_skl(bus);
>> +	struct hdac_device *hdev;
>>
>>   	mutex_lock(&bus->cmd_mutex);
>>   	snd_hdac_bus_send_cmd(bus, cmd);
>> @@ -540,7 +543,11 @@ static int probe_codec(struct hdac_bus *bus, int addr)
>>   		return -EIO;
>>   	dev_dbg(bus->dev, "codec #%d probed OK\n", addr);
>>
>> -	return snd_hdac_ext_bus_device_init(bus, addr);
>> +	hdev = devm_kzalloc(&skl->pci->dev, sizeof(*hdev), GFP_KERNEL);
>> +	if (!hdev)
>> +		return -ENOMEM;
>> +
>> +	return snd_hdac_ext_bus_device_init(bus, addr, hdev);
>>   }
>>
>>   /* Codec initialization */
>> @@ -665,6 +672,7 @@ static int skl_create(struct pci_dev *pci,
>>   {
>>   	struct skl *skl;
>>   	struct hdac_bus *bus;
>> +	struct hda_bus *hbus;
>>
>>   	int err;
>>
>> @@ -680,6 +688,7 @@ static int skl_create(struct pci_dev *pci,
>>   		return -ENOMEM;
>>   	}
>>
>> +	hbus = skl_to_hbus(skl);
>>   	bus = skl_to_bus(skl);
>>   	snd_hdac_ext_bus_init(bus, &pci->dev, &bus_core_ops, io_ops);
>>   	bus->use_posbuf = 1;
>> @@ -687,6 +696,14 @@ static int skl_create(struct pci_dev *pci,
>>   	INIT_WORK(&skl->probe_work, skl_probe_work);
>>   	bus->bdl_pos_adj = 0;
>>
>> +	/*
>> +	 * TODO: other parameters can be taken the way it is taken by
>> +	 * legacy HDA driver
>
>what parameters where you referring to? kernel module?

In the following code, I have not initialized all the fields of hbus.
So in this TODO, I wanted to remind myself that all the parameters
of hbus needs to be initialized as required by legacy codec driver.

>
>> +	 */
>> +	mutex_init(&hbus->prepare_mutex);
>> +	hbus->pci = pci;
>> +	hbus->mixer_assigned = -1;
>> +