Cleanup and removal of set_fs() from HD-audio
cover Cleanup and removal of set_fs() from HD-audio
Hi,
this is the resubmission of a part of the previous RFC patchset. There is no change since then for them, it's just officially submitted for merging to 4.13.
Takashi
===
Takashi Iwai (6):
ALSA: hda - Simplify bound-beep mute control for ALC268
ALSA: hda - Move bind-mixer switch codes to generic parser
ALSA: hda - Remove the generic bind ctl helpers
ALSA: hda - Remove the use of set_fs()
ALSA: hda - Fix a typo in comment
ALSA: hda - Remove superfluous header inclusions
sound/pci/hda/hda_codec.c | 251 ++++++------------------------------------ sound/pci/hda/hda_generic.c | 46 +++++++- sound/pci/hda/hda_local.h | 61 ---------- sound/pci/hda/patch_realtek.c | 37 +++++-- 4 files changed, 103 insertions(+), 292 deletions(-)
Signature · 1 line
2.12.2
PATCH 1/6 ALSA: hda - Simplify bound-beep mute control for ALC268
The beep mute switch for ALC268 needs to touch two NIDs, and we used to apply the bind-mixer stuff. But the use case for ALC268 is fairly easy to convert to an open-code in a shorter form. Since this is the only user of the bind-ctls, we can clean up the common helper codes later.
--- sound/pci/hda/patch_realtek.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-)
sound/pci/hda/patch_realtek.c +28 -9
@@ -2573,18 +2573,37 @@ static int patch_alc262(struct hda_codec *codec)* ALC268 */ /* bind Beep switches of both NID 0x0f and 0x10 */ -static const struct hda_bind_ctls alc268_bind_beep_sw = { - .ops = &snd_hda_bind_sw, - .values = { -HDA_COMPOSE_AMP_VAL (0x0f ,3 ,1 ,HDA_INPUT ), -HDA_COMPOSE_AMP_VAL (0x10 ,3 ,1 ,HDA_INPUT ), -0 - }, -}; +static int alc268_beep_switch_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct hda_codec *codec =snd_kcontrol_chip (kcontrol); +unsigned long pval; +int err; + +mutex_lock (&codec->control_mutex); + pval = kcontrol->private_value; + kcontrol->private_value = (pval & ~0xff ) |0x0f ; + err =snd_hda_mixer_amp_switch_put (kcontrol, ucontrol); +if (err >=0 ) { + kcontrol->private_value = (pval & ~0xff ) |0x10 ; + err =snd_hda_mixer_amp_switch_put (kcontrol, ucontrol); + } + kcontrol->private_value = pval; +mutex_unlock (&codec->control_mutex); +return err; +}static const struct snd_kcontrol_new alc268_beep_mixer[] = {HDA_CODEC_VOLUME ("Beep Playback Volume" ,0x1d ,0x0 ,HDA_INPUT ), -HDA_BIND_SW ("Beep Playback Switch" , &alc268_bind_beep_sw), + { + .iface =SNDRV_CTL_ELEM_IFACE_MIXER , + .name ="Beep Playback Switch" , + .subdevice =HDA_SUBDEV_AMP_FLAG , + .info = snd_hda_mixer_amp_switch_info, + .get = snd_hda_mixer_amp_switch_get, + .put = alc268_beep_switch_put, + .private_value =HDA_COMPOSE_AMP_VAL (0x0f ,3 ,1 ,HDA_INPUT ) + }, { } };
Signature · 1 line
2.12.2
PATCH 2/6 ALSA: hda - Move bind-mixer switch codes to generic parser
In reply to Takashi IwaiThe generic parser is the only user of the bind-mixer controls, so we can move the code there and clean up the core helper.
--- sound/pci/hda/hda_codec.c | 66 --------------------------------------------- sound/pci/hda/hda_generic.c | 46 +++++++++++++++++++++++++++++-- sound/pci/hda/hda_local.h | 17 ------------ 3 files changed, 44 insertions(+), 85 deletions(-)
sound/pci/hda/hda_codec.c +0 -66
@@ -2117,72 +2117,6 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, }EXPORT_SYMBOL_GPL (snd_hda_mixer_amp_switch_put); -/* -* bound volume controls -* -* bind multiple volumes (# indices, from 0) -*/ - -#define AMP_VAL_IDX_SHIFT 19 -#define AMP_VAL_IDX_MASK (0x0f<<19) - -/** -* snd_hda_mixer_bind_switch_get - Get callback for a bound volume control -* @kcontrol: ctl element -* @ucontrol: pointer to get/store the data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_MUTE*() macros. -*/ -int snd_hda_mixer_bind_switch_get (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -unsigned long pval; -int err; - -mutex_lock (&codec->control_mutex); - pval = kcontrol->private_value; - kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK ;/* index 0 */ - err =snd_hda_mixer_amp_switch_get (kcontrol, ucontrol); - kcontrol->private_value = pval; -mutex_unlock (&codec->control_mutex); -return err; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_switch_get); - -/** -* snd_hda_mixer_bind_switch_put - Put callback for a bound volume control -* @kcontrol: ctl element -* @ucontrol: pointer to get/store the data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_MUTE*() macros. -*/ -int snd_hda_mixer_bind_switch_put (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -unsigned long pval; -int i, indices, err =0 , change =0 ; - -mutex_lock (&codec->control_mutex); - pval = kcontrol->private_value; - indices = (pval &_VAL_IDX_MASK ) >>AMP_VAL_IDX_SHIFT ; -for (i =0 ; i < indices; i++) { - kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK ) | - (i <<AMP_VAL_IDX_SHIFT ); - err =snd_hda_mixer_amp_switch_put (kcontrol, ucontrol); -if (err <0 ) -break ; - change |= err; - } - kcontrol->private_value = pval; -mutex_unlock (&codec->control_mutex); -return err <0 ? err : change; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_switch_put); -/** * snd_hda_mixer_bind_ctls_info - Info callback for a generic bound control * @kcontrol: referred ctl element
sound/pci/hda/hda_generic.c +44 -2
68 lines not on this page · raw message
sound/pci/hda/hda_local.h +0 -17
@@ -178,23 +178,6 @@ void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook);#define HDA_AMP_UNMUTE 0x00#define HDA_AMP_VOLMASK 0x7f -/* mono switch binding multiple inputs */ -#define HDA_BIND_MUTE_MONO (xname, nid, channel, indices, direction) \ - { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \ - .info = snd_hda_mixer_amp_switch_info, \ - .get = snd_hda_mixer_bind_switch_get, \ - .put = snd_hda_mixer_bind_switch_put, \ - .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) } - -/* stereo switch binding multiple inputs */ -#define HDA_BIND_MUTE (xname,nid,indices,dir) \ - HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir) - -int snd_hda_mixer_bind_switch_get (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol); -int snd_hda_mixer_bind_switch_put (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol); -/* more generic bound controls */ struct hda_ctl_ops {snd_kcontrol_info_t *info;
Signature · 1 line
2.12.2
PATCH 3/6 ALSA: hda - Remove the generic bind ctl helpers
In reply to Takashi IwaiNow all the users of this workaround code is gone, and we can finally remove the legacy codes from the core HD-audio module.
--- sound/pci/hda/hda_codec.c | 124 ---------------------------------------------- sound/pci/hda/hda_local.h | 44 ---------------- 2 files changed, 168 deletions(-)
sound/pci/hda/hda_codec.c +0 -124
@@ -2117,130 +2117,6 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, }EXPORT_SYMBOL_GPL (snd_hda_mixer_amp_switch_put); -/** -* snd_hda_mixer_bind_ctls_info - Info callback for a generic bound control -* @kcontrol: referred ctl element -* @uinfo: pointer to get/store the data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_VOL() or HDA_BIND_SW() macros. -*/ -int snd_hda_mixer_bind_ctls_info (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_info *uinfo) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -struct hda_bind_ctls *c; -int err; - -mutex_lock (&codec->control_mutex); - c = (struct hda_bind_ctls *)kcontrol->private_value; - kcontrol->private_value = *c->values; - err = c->ops->info (kcontrol, uinfo); - kcontrol->private_value = (long )c; -mutex_unlock (&codec->control_mutex); -return err; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_ctls_info); - -/** -* snd_hda_mixer_bind_ctls_get - Get callback for a generic bound control -* @kcontrol: ctl element -* @ucontrol: pointer to get/store the data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_VOL() or HDA_BIND_SW() macros. -*/ -int snd_hda_mixer_bind_ctls_get (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -struct hda_bind_ctls *c; -int err; - -mutex_lock (&codec->control_mutex); - c = (struct hda_bind_ctls *)kcontrol->private_value; - kcontrol->private_value = *c->values; - err = c->ops->get (kcontrol, ucontrol); - kcontrol->private_value = (long )c; -mutex_unlock (&codec->control_mutex); -return err; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_ctls_get); - -/** -* snd_hda_mixer_bind_ctls_put - Put callback for a generic bound control -* @kcontrol: ctl element -* @ucontrol: pointer to get/store the data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_VOL() or HDA_BIND_SW() macros. -*/ -int snd_hda_mixer_bind_ctls_put (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -struct hda_bind_ctls *c; -unsigned long *vals; -int err =0 , change =0 ; - -mutex_lock (&codec->control_mutex); - c = (struct hda_bind_ctls *)kcontrol->private_value; -for (vals = c->values; *vals; vals++) { - kcontrol->private_value = *vals; - err = c->ops->put (kcontrol, ucontrol); -if (err <0 ) -break ; - change |= err; - } - kcontrol->private_value = (long )c; -mutex_unlock (&codec->control_mutex); -return err <0 ? err : change; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_ctls_put); - -/** -* snd_hda_mixer_bind_tlv - TLV callback for a generic bound control -* @kcontrol: ctl element -* @op_flag: operation flag -* @size: byte size of input TLV -* @tlv: TLV data -* -* The control element is supposed to have the private_value field -* set up via HDA_BIND_VOL() macro. -*/ -int snd_hda_mixer_bind_tlv (struct snd_kcontrol *kcontrol,int op_flag, -unsigned int size,unsigned int __user *tlv) -{ -struct hda_codec *codec =snd_kcontrol_chip (kcontrol); -struct hda_bind_ctls *c; -int err; - -mutex_lock (&codec->control_mutex); - c = (struct hda_bind_ctls *)kcontrol->private_value; - kcontrol->private_value = *c->values; - err = c->ops->tlv (kcontrol, op_flag, size, tlv); - kcontrol->private_value = (long )c; -mutex_unlock (&codec->control_mutex); -return err; -} -EXPORT_SYMBOL_GPL (snd_hda_mixer_bind_tlv); - -struct hda_ctl_ops snd_hda_bind_vol = { - .info = snd_hda_mixer_amp_volume_info, - .get = snd_hda_mixer_amp_volume_get, - .put = snd_hda_mixer_amp_volume_put, - .tlv = snd_hda_mixer_amp_tlv -}; -EXPORT_SYMBOL_GPL (snd_hda_bind_vol); - -struct hda_ctl_ops snd_hda_bind_sw = { - .info = snd_hda_mixer_amp_switch_info, - .get = snd_hda_mixer_amp_switch_get, - .put = snd_hda_mixer_amp_switch_put, - .tlv = snd_hda_mixer_amp_tlv -}; -EXPORT_SYMBOL_GPL (snd_hda_bind_sw); -/* * SPDIF out controls */
sound/pci/hda/hda_local.h +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.12.2
PATCH 4/6 ALSA: hda - Remove the use of set_fs()
In reply to Takashi Iwaiset_fs() is used in HD-audio vmaster code to retrieve the TLV data of each slave kctl. Since the slave is supposed to be a standard amp kctl, we can call directly the supposed tlv callback instead of the indirect call, so that we can remove the set_fs() hack.
--- sound/pci/hda/hda_codec.c | 59 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 28 deletions(-)
sound/pci/hda/hda_codec.c +31 -28
@@ -1477,18 +1477,8 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, }EXPORT_SYMBOL_GPL (snd_hda_mixer_amp_volume_put); -/** -* snd_hda_mixer_amp_volume_put - TLV callback for a standard AMP mixer volume -* @kcontrol: ctl element -* @op_flag: operation flag -* @size: byte size of input TLV -* @_tlv: TLV data -* -* The control element is supposed to have the private_value field -* set up via HDA_COMPOSE_AMP_VAL*() or related macros. -*/ -int snd_hda_mixer_amp_tlv (struct snd_kcontrol *kcontrol,int op_flag, -unsigned int size,unsigned int __user *_tlv) +/* inquiry the amp caps and convert to TLV */ +static void get_ctl_amp_tlv (struct snd_kcontrol *kcontrol,unsigned int *tlv) {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);hda_nid_t nid =get_amp_nid (kcontrol);
@@ -1497,8 +1487,6 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,bool min_mute =get_amp_min_mute (kcontrol);u32 caps, val1, val2; -if (size <4 *sizeof (unsigned int )) -return -ENOMEM ; caps =query_amp_caps (codec, nid, dir); val2 = (caps &AC_AMPCAP_STEP_SIZE ) >>AC_AMPCAP_STEP_SIZE_SHIFT ; val2 = (val2 +1 ) *25 ;
@@ -1507,13 +1495,31 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, val1 = ((int )val1) * ((int )val2);if (min_mute || (caps &AC_AMPCAP_MIN_MUTE )) val2 |=TLV_DB_SCALE_MUTE ; -if (put_user (SNDRV_CTL_TLVT_DB_SCALE , _tlv)) -return -EFAULT ; -if (put_user (2 *sizeof (unsigned int ), _tlv +1 )) -return -EFAULT ; -if (put_user (val1, _tlv +2 )) -return -EFAULT ; -if (put_user (val2, _tlv +3 )) + tlv[0 ] =SNDRV_CTL_TLVT_DB_SCALE ; + tlv[1 ] =2 *sizeof (unsigned int ); + tlv[2 ] = val1; + tlv[3 ] = val2; +} + +/** +* snd_hda_mixer_amp_volume_put - TLV callback for a standard AMP mixer volume +* @kcontrol: ctl element +* @op_flag: operation flag +* @size: byte size of input TLV +* @_tlv: TLV data +* +* The control element is supposed to have the private_value field +* set up via HDA_COMPOSE_AMP_VAL*() or related macros. +*/ +int snd_hda_mixer_amp_tlv (struct snd_kcontrol *kcontrol,int op_flag, +unsigned int size,unsigned int __user *_tlv) +{ +unsigned int tlv[4 ]; + +if (size <4 *sizeof (unsigned int )) +return -ENOMEM ; +get_ctl_amp_tlv (kcontrol, tlv); +if (copy_to_user (_tlv, tlv,sizeof (tlv)))return -EFAULT ;return 0 ; }
@@ -1807,13 +1813,10 @@ static int get_kctl_0dB_offset(struct hda_codec *codec,const int *tlv =NULL ;int val =-1 ; -if (kctl->vd[0 ].access &SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK ) { -/* FIXME: set_fs() hack for obtaining user-space TLV data */ -mm_segment_t fs =get_fs (); -set_fs (get_ds ()); -if (!kctl->tlv.c (kctl,0 ,sizeof (_tlv), _tlv)) - tlv = _tlv; -set_fs (fs); +if ((kctl->vd[0 ].access &SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK ) && + kctl->tlv.c == snd_hda_mixer_amp_tlv) { +get_ctl_amp_tlv (kctl, _tlv); + tlv = _tlv; }else if (kctl->vd[0 ].access &SNDRV_CTL_ELEM_ACCESS_TLV_READ ) tlv = kctl->tlv.p;if (tlv && tlv[0 ] ==SNDRV_CTL_TLVT_DB_SCALE ) {
Signature · 1 line
2.12.2
PATCH 5/6 ALSA: hda - Fix a typo in comment
In reply to Takashi Iwai--- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_codec.c +1 -1
@@ -1502,7 +1502,7 @@ static void get_ctl_amp_tlv(struct snd_kcontrol *kcontrol, unsigned int *tlv) }/** -* snd_hda_mixer_amp_volume_put - TLV callback for a standard AMP mixer volume +* snd_hda_mixer_amp_tlv - TLV callback for a standard AMP mixer volume * @kcontrol: ctl element * @op_flag: operation flag * @size: byte size of input TLV
Signature · 1 line
2.12.2
PATCH 6/6 ALSA: hda - Remove superfluous header inclusions
In reply to Takashi Iwai--- sound/pci/hda/hda_codec.c | 2 -- 1 file changed, 2 deletions(-)
sound/pci/hda/hda_codec.c +0 -2
@@ -19,13 +19,11 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/mm.h> #include <linux/init.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/mutex.h> #include <linux/module.h> -#include <linux/async.h> #include <linux/pm.h> #include <linux/pm_runtime.h> #include <sound/core.h>
Signature · 1 line
2.12.2
Quoted 19 lines · Takashi Iwai
Hi,
this is the resubmission of a part of the previous RFC patchset. There is no change since then for them, it's just officially submitted for merging to 4.13.
Takashi
===
Takashi Iwai (6):
ALSA: hda - Simplify bound-beep mute control for ALC268
ALSA: hda - Move bind-mixer switch codes to generic parser
ALSA: hda - Remove the generic bind ctl helpers
ALSA: hda - Remove the use ofset_fs()
ALSA: hda - Fix a typo in comment
ALSA: hda - Remove superfluous header inclusions
Quoted 5 lines
sound/pci/hda/hda_codec.c | 251 ++++++------------------------------------ sound/pci/hda/hda_generic.c | 46 +++++++- sound/pci/hda/hda_local.h | 61 ---------- sound/pci/hda/patch_realtek.c | 37 +++++-- 4 files changed, 103 insertions(+), 292 deletions(-)
For all changes:
Regards
Takashi Sakamoto