* [PATCH 3.10 01/23] ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
@ 2015-04-10 13:18 ` Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 02/23] ASoC: cs4271: Fix wrong value references for boolean kctl Greg Kroah-Hartman
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:18 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Eric Nelson, Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Nelson <eric.nelson@boundarydevices.com>
commit c7d910b87d3c8e9fcf4077089ca4327c12eee099 upstream.
The SGTL5000_CHIP_ANA_POWER register is cached. Update the cached
value instead of writing it directly.
Patch inspired by Russell King's more colorful remarks in this
patch:
https://github.com/SolidRun/linux-imx6-3.14/commit/dd4bf6a
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/sgtl5000.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1111,13 +1111,7 @@ static int sgtl5000_set_power_regs(struc
/* Enable VDDC charge pump */
ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;
} else if (vddio >= 3100 && vdda >= 3100) {
- /*
- * if vddio and vddd > 3.1v,
- * charge pump should be clean before set ana_pwr
- */
- snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
- SGTL5000_VDDC_CHRGPMP_POWERUP, 0);
-
+ ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;
/* VDDC use VDDIO rail */
lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 02/23] ASoC: cs4271: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 01/23] ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP Greg Kroah-Hartman
@ 2015-04-10 13:18 ` Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 03/23] ASoC: wm8960: " Greg Kroah-Hartman
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:18 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Paul Handrigan,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit e8371aa0fecb73fb8a4b2e0296b025b11e7d6229 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/cs4271.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -267,7 +267,7 @@ static int cs4271_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = cs4271->deemph;
+ ucontrol->value.integer.value[0] = cs4271->deemph;
return 0;
}
@@ -277,7 +277,7 @@ static int cs4271_put_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
- cs4271->deemph = ucontrol->value.enumerated.item[0];
+ cs4271->deemph = ucontrol->value.integer.value[0];
return cs4271_set_deemph(codec);
}
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 03/23] ASoC: wm8960: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 01/23] ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 02/23] ASoC: cs4271: Fix wrong value references for boolean kctl Greg Kroah-Hartman
@ 2015-04-10 13:18 ` Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 04/23] ASoC: tas5086: " Greg Kroah-Hartman
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:18 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit b4a18c8b1af15ebfa9054a3d2aef7b0a7e6f2a05 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm8960.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -181,7 +181,7 @@ static int wm8960_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = wm8960->deemph;
+ ucontrol->value.integer.value[0] = wm8960->deemph;
return 0;
}
@@ -190,7 +190,7 @@ static int wm8960_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
if (deemph > 1)
return -EINVAL;
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 04/23] ASoC: tas5086: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (2 preceding siblings ...)
2015-04-10 13:18 ` [PATCH 3.10 03/23] ASoC: wm8960: " Greg Kroah-Hartman
@ 2015-04-10 13:18 ` Greg Kroah-Hartman
2015-04-10 13:18 ` [PATCH 3.10 05/23] ASoC: wm8731: " Greg Kroah-Hartman
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:18 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 4c523ef61160b7d478371ddc9f48c8ce0a00d675 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/tas5086.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -173,7 +173,7 @@ static int tas5086_get_deemph(struct snd
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = priv->deemph;
+ ucontrol->value.integer.value[0] = priv->deemph;
return 0;
}
@@ -184,7 +184,7 @@ static int tas5086_put_deemph(struct snd
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
- priv->deemph = ucontrol->value.enumerated.item[0];
+ priv->deemph = ucontrol->value.integer.value[0];
return tas5086_set_deemph(codec);
}
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 05/23] ASoC: wm8731: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (3 preceding siblings ...)
2015-04-10 13:18 ` [PATCH 3.10 04/23] ASoC: tas5086: " Greg Kroah-Hartman
@ 2015-04-10 13:18 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 06/23] ASoC: wm2000: " Greg Kroah-Hartman
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:18 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit bd14016fbf31aa199026f1e2358eab695f374eb1 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm8731.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -121,7 +121,7 @@ static int wm8731_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = wm8731->deemph;
+ ucontrol->value.integer.value[0] = wm8731->deemph;
return 0;
}
@@ -131,7 +131,7 @@ static int wm8731_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
int ret = 0;
if (deemph > 1)
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 06/23] ASoC: wm2000: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (4 preceding siblings ...)
2015-04-10 13:18 ` [PATCH 3.10 05/23] ASoC: wm8731: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 07/23] ASoC: wm8903: " Greg Kroah-Hartman
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 00a14c2968e3d55817e0fa35c78106ca840537bf upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm2000.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -605,7 +605,7 @@ static int wm2000_anc_mode_get(struct sn
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- ucontrol->value.enumerated.item[0] = wm2000->anc_active;
+ ucontrol->value.integer.value[0] = wm2000->anc_active;
return 0;
}
@@ -615,7 +615,7 @@ static int wm2000_anc_mode_put(struct sn
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- int anc_active = ucontrol->value.enumerated.item[0];
+ int anc_active = ucontrol->value.integer.value[0];
int ret;
if (anc_active > 1)
@@ -638,7 +638,7 @@ static int wm2000_speaker_get(struct snd
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
+ ucontrol->value.integer.value[0] = wm2000->spk_ena;
return 0;
}
@@ -648,7 +648,7 @@ static int wm2000_speaker_put(struct snd
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- int val = ucontrol->value.enumerated.item[0];
+ int val = ucontrol->value.integer.value[0];
int ret;
if (val > 1)
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 07/23] ASoC: wm8903: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (5 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 06/23] ASoC: wm2000: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 08/23] ASoC: wm8904: " Greg Kroah-Hartman
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 24cc883c1fd16df34211ae41624aa6d3cd906693 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm8903.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -446,7 +446,7 @@ static int wm8903_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = wm8903->deemph;
+ ucontrol->value.integer.value[0] = wm8903->deemph;
return 0;
}
@@ -456,7 +456,7 @@ static int wm8903_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
int ret = 0;
if (deemph > 1)
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 08/23] ASoC: wm8904: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (6 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 07/23] ASoC: wm8903: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 09/23] ASoC: ak4641: " Greg Kroah-Hartman
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit eaddf6fd959074f6a6e71deffe079c71eef35da6 upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm8904.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -523,7 +523,7 @@ static int wm8904_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = wm8904->deemph;
+ ucontrol->value.integer.value[0] = wm8904->deemph;
return 0;
}
@@ -532,7 +532,7 @@ static int wm8904_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
if (deemph > 1)
return -EINVAL;
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 09/23] ASoC: ak4641: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (7 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 08/23] ASoC: wm8904: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 10/23] ASoC: adav80x: " Greg Kroah-Hartman
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 08641d9b7bf915144a57a736b42642e13eb1167f upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/ak4641.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -74,7 +74,7 @@ static int ak4641_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
if (deemph > 1)
return -EINVAL;
@@ -90,7 +90,7 @@ static int ak4641_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = ak4641->deemph;
+ ucontrol->value.integer.value[0] = ak4641->deemph;
return 0;
};
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 10/23] ASoC: adav80x: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (8 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 09/23] ASoC: ak4641: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 11/23] ASoC: wm8955: " Greg Kroah-Hartman
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Lars-Peter Clausen,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 2bf4c1d483d911cda5dd385527194d23e5cea73d upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/adav80x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -307,7 +307,7 @@ static int adav80x_put_deemph(struct snd
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
- unsigned int deemph = ucontrol->value.enumerated.item[0];
+ unsigned int deemph = ucontrol->value.integer.value[0];
if (deemph > 1)
return -EINVAL;
@@ -323,7 +323,7 @@ static int adav80x_get_deemph(struct snd
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = adav80x->deemph;
+ ucontrol->value.integer.value[0] = adav80x->deemph;
return 0;
};
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 11/23] ASoC: wm8955: Fix wrong value references for boolean kctl
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (9 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 10/23] ASoC: adav80x: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 12/23] tcm_fc: missing curly braces in ft_invl_hw_context() Greg Kroah-Hartman
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Takashi Iwai, Charles Keepax,
Mark Brown
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 07892b10356f17717abdc578acbef72db86c880e upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/codecs/wm8955.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = wm8955->deemph;
+ ucontrol->value.integer.value[0] = wm8955->deemph;
return 0;
}
@@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
- int deemph = ucontrol->value.enumerated.item[0];
+ int deemph = ucontrol->value.integer.value[0];
if (deemph > 1)
return -EINVAL;
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 12/23] tcm_fc: missing curly braces in ft_invl_hw_context()
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (10 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 11/23] ASoC: wm8955: " Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 13/23] tcm_qla2xxx: Fix incorrect use of __transport_register_session Greg Kroah-Hartman
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Dan Carpenter, Kiran Patil,
Nicholas Bellinger
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <dan.carpenter@oracle.com>
commit d556546e7ecd9fca199df4698943024d40044f8e upstream.
This patch adds a missing set of conditional check braces in
ft_invl_hw_context() originally introduced by commit dcd998ccd
when handling DDP failures in ft_recv_write_data() code.
commit dcd998ccdbf74a7d8fe0f0a44e85da1ed5975946
Author: Kiran Patil <kiran.patil@intel.com>
Date: Wed Aug 3 09:20:01 2011 +0000
tcm_fc: Handle DDP/SW fc_frame_payload_get failures in ft_recv_write_data
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Kiran Patil <kiran.patil@intel.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/target/tcm_fc/tfc_io.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -346,7 +346,7 @@ void ft_invl_hw_context(struct ft_cmd *c
ep = fc_seq_exch(seq);
if (ep) {
lport = ep->lp;
- if (lport && (ep->xid <= lport->lro_xid))
+ if (lport && (ep->xid <= lport->lro_xid)) {
/*
* "ddp_done" trigger invalidation of HW
* specific DDP context
@@ -361,6 +361,7 @@ void ft_invl_hw_context(struct ft_cmd *c
* identified using ep->xid)
*/
cmd->was_ddp_setup = 0;
+ }
}
}
}
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 13/23] tcm_qla2xxx: Fix incorrect use of __transport_register_session
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (11 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 12/23] tcm_fc: missing curly braces in ft_invl_hw_context() Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 14/23] nl80211: ignore HT/VHT capabilities without QoS/WMM Greg Kroah-Hartman
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Bart Van Assche, Giridhar Malavali,
Quinn Tran, Nicholas Bellinger
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <bart.vanassche@sandisk.com>
commit 75c3d0bf9caebb502e96683b2bc37f9692437e68 upstream.
This patch fixes the incorrect use of __transport_register_session()
in tcm_qla2xxx_check_initiator_node_acl() code, that does not perform
explicit se_tpg->session_lock when accessing se_tpg->tpg_sess_list
to add new se_sess nodes.
Given that tcm_qla2xxx_check_initiator_node_acl() is not called with
qla_hw->hardware_lock held for all accesses of ->tpg_sess_list, the
code should be using transport_register_session() instead.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
Cc: Quinn Tran <quinn.tran@qlogic.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1465,7 +1465,7 @@ static int tcm_qla2xxx_check_initiator_n
/*
* Finally register the new FC Nexus with TCM
*/
- __transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
+ transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
return 0;
}
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 14/23] nl80211: ignore HT/VHT capabilities without QoS/WMM
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (12 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 13/23] tcm_qla2xxx: Fix incorrect use of __transport_register_session Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 15/23] mac80211: disable u-APSD queues by default Greg Kroah-Hartman
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Johannes Berg
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <johannes.berg@intel.com>
commit 496fcc294daab18799e190c0264863d653588d1f upstream.
As HT/VHT depend heavily on QoS/WMM, it's not a good idea to
let userspace add clients that have HT/VHT but not QoS/WMM.
Since it does so in certain cases we've observed (client is
using HT IEs but not QoS/WMM) just ignore the HT/VHT info at
this point and don't pass it down to the drivers which might
unconditionally use it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/wireless/nl80211.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4032,6 +4032,16 @@ static int nl80211_new_station(struct sk
if (parse_station_flags(info, dev->ieee80211_ptr->iftype, ¶ms))
return -EINVAL;
+ /* HT/VHT requires QoS, but if we don't have that just ignore HT/VHT
+ * as userspace might just pass through the capabilities from the IEs
+ * directly, rather than enforcing this restriction and returning an
+ * error in this case.
+ */
+ if (!(params.sta_flags_set & BIT(NL80211_STA_FLAG_WME))) {
+ params.ht_capa = NULL;
+ params.vht_capa = NULL;
+ }
+
/* When you run into this, adjust the code below for the new flag */
BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7);
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 15/23] mac80211: disable u-APSD queues by default
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (13 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 14/23] nl80211: ignore HT/VHT capabilities without QoS/WMM Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 16/23] mac80211: drop unencrypted frames in mesh fwding Greg Kroah-Hartman
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Michal Kazior, Johannes Berg
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Kazior <michal.kazior@tieto.com>
commit aa75ebc275b2a91b193654a177daf900ad6703f0 upstream.
Some APs experience problems when working with
U-APSD. Decreasing the probability of that
happening by using legacy mode for all ACs but VO
isn't enough.
Cisco 4410N originally forced us to enable VO by
default only because it treated non-VO ACs as
legacy.
However some APs (notably Netgear R7000) silently
reclassify packets to different ACs. Since u-APSD
ACs require trigger frames for frame retrieval
clients would never see some frames (e.g. ARP
responses) or would fetch them accidentally after
a long time.
It makes little sense to enable u-APSD queues by
default because it needs userspace applications to
be aware of it to actually take advantage of the
possible additional powersavings. Implicitly
depending on driver autotrigger frame support
doesn't make much sense.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/mac80211/ieee80211_i.h | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -60,13 +60,24 @@ struct ieee80211_local;
#define IEEE80211_UNSET_POWER_LEVEL INT_MIN
/*
- * Some APs experience problems when working with U-APSD. Decrease the
- * probability of that happening by using legacy mode for all ACs but VO.
- * The AP that caused us trouble was a Cisco 4410N. It ignores our
- * setting, and always treats non-VO ACs as legacy.
+ * Some APs experience problems when working with U-APSD. Decreasing the
+ * probability of that happening by using legacy mode for all ACs but VO isn't
+ * enough.
+ *
+ * Cisco 4410N originally forced us to enable VO by default only because it
+ * treated non-VO ACs as legacy.
+ *
+ * However some APs (notably Netgear R7000) silently reclassify packets to
+ * different ACs. Since u-APSD ACs require trigger frames for frame retrieval
+ * clients would never see some frames (e.g. ARP responses) or would fetch them
+ * accidentally after a long time.
+ *
+ * It makes little sense to enable u-APSD queues by default because it needs
+ * userspace applications to be aware of it to actually take advantage of the
+ * possible additional powersavings. Implicitly depending on driver autotrigger
+ * frame support doesn't make much sense.
*/
-#define IEEE80211_DEFAULT_UAPSD_QUEUES \
- IEEE80211_WMM_IE_STA_QOSINFO_AC_VO
+#define IEEE80211_DEFAULT_UAPSD_QUEUES 0
#define IEEE80211_DEFAULT_MAX_SP_LEN \
IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 16/23] mac80211: drop unencrypted frames in mesh fwding
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (14 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 15/23] mac80211: disable u-APSD queues by default Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 17/23] Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" Greg Kroah-Hartman
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Johannes Berg, Bob Copeland,
Johannes Berg
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Copeland <me@bobcopeland.com>
commit d0c22119f574b851e63360c6b8660fe9593bbc3c upstream.
The mesh forwarding path was not checking that data
frames were protected when running an encrypted network;
add the necessary check.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/mac80211/rx.c | 3 +++
1 file changed, 3 insertions(+)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2023,6 +2023,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
hdr = (struct ieee80211_hdr *) skb->data;
mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
+ if (ieee80211_drop_unencrypted(rx, hdr->frame_control))
+ return RX_DROP_MONITOR;
+
/* frame is in RMC, don't forward */
if (ieee80211_is_data(hdr->frame_control) &&
is_multicast_ether_addr(hdr->addr1) &&
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 17/23] Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface"
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (15 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 16/23] mac80211: drop unencrypted frames in mesh fwding Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 18/23] perf: Fix irq_work tail recursion Greg Kroah-Hartman
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Jiri Slaby
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit fce2d025479af5e1fa6717480c7853cdfb8b71aa
It was incorrectly applied, as it merged with fuzz.
Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -541,7 +541,7 @@ static int iwl_mvm_mac_add_interface(str
ret = iwl_mvm_mac_ctxt_add(mvm, vif);
if (ret)
- goto out_remove_mac;
+ goto out_release;
/*
* Update power state on the new interface. Admittedly, based on
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 18/23] perf: Fix irq_work tail recursion
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (16 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 17/23] Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 19/23] vt6655: RFbSetPower fix missing rate RATE_12M Greg Kroah-Hartman
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Vince Weaver, Peter Zijlstra (Intel),
Arnaldo Carvalho de Melo, Jiri Olsa, Paul Mackerras,
Steven Rostedt, Ingo Molnar
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <peterz@infradead.org>
commit d525211f9d1be8b523ec7633f080f2116f5ea536 upstream.
Vince reported a watchdog lockup like:
[<ffffffff8115e114>] perf_tp_event+0xc4/0x210
[<ffffffff810b4f8a>] perf_trace_lock+0x12a/0x160
[<ffffffff810b7f10>] lock_release+0x130/0x260
[<ffffffff816c7474>] _raw_spin_unlock_irqrestore+0x24/0x40
[<ffffffff8107bb4d>] do_send_sig_info+0x5d/0x80
[<ffffffff811f69df>] send_sigio_to_task+0x12f/0x1a0
[<ffffffff811f71ce>] send_sigio+0xae/0x100
[<ffffffff811f72b7>] kill_fasync+0x97/0xf0
[<ffffffff8115d0b4>] perf_event_wakeup+0xd4/0xf0
[<ffffffff8115d103>] perf_pending_event+0x33/0x60
[<ffffffff8114e3fc>] irq_work_run_list+0x4c/0x80
[<ffffffff8114e448>] irq_work_run+0x18/0x40
[<ffffffff810196af>] smp_trace_irq_work_interrupt+0x3f/0xc0
[<ffffffff816c99bd>] trace_irq_work_interrupt+0x6d/0x80
Which is caused by an irq_work generating new irq_work and therefore
not allowing forward progress.
This happens because processing the perf irq_work triggers another
perf event (tracepoint stuff) which in turn generates an irq_work ad
infinitum.
Avoid this by raising the recursion counter in the irq_work -- which
effectively disables all software events (including tracepoints) from
actually triggering again.
Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Tested-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20150219170311.GH21418@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
kernel/events/core.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4007,6 +4007,13 @@ static void perf_pending_event(struct ir
{
struct perf_event *event = container_of(entry,
struct perf_event, pending);
+ int rctx;
+
+ rctx = perf_swevent_get_recursion_context();
+ /*
+ * If we 'fail' here, that's OK, it means recursion is already disabled
+ * and we won't recurse 'further'.
+ */
if (event->pending_disable) {
event->pending_disable = 0;
@@ -4017,6 +4024,9 @@ static void perf_pending_event(struct ir
event->pending_wakeup = 0;
perf_event_wakeup(event);
}
+
+ if (rctx >= 0)
+ perf_swevent_put_recursion_context(rctx);
}
/*
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 19/23] vt6655: RFbSetPower fix missing rate RATE_12M
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (17 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 18/23] perf: Fix irq_work tail recursion Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 20/23] dm: hold suspend_lock while suspending device during device deletion Greg Kroah-Hartman
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Malcolm Priestley
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <tvboxspy@gmail.com>
commit 40c8790bcb7ac74f3038153cd09310e220c6a1df upstream.
When the driver sets this rate a power of zero value is set causing
data flow stoppage until another rate is tried.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/vt6655/rf.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -966,6 +966,7 @@ bool RFbSetPower(
break;
case RATE_6M:
case RATE_9M:
+ case RATE_12M:
case RATE_18M:
byPwr = pDevice->abyOFDMPwrTbl[uCH];
if (pDevice->byRFType == RF_UW2452) {
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 20/23] dm: hold suspend_lock while suspending device during device deletion
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (18 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 19/23] vt6655: RFbSetPower fix missing rate RATE_12M Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 21/23] hfsplus: fix B-tree corruption after insertion at position 0 Greg Kroah-Hartman
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Mikulas Patocka, Mike Snitzer
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <mpatocka@redhat.com>
commit ab7c7bb6f4ab95dbca96fcfc4463cd69843e3e24 upstream.
__dm_destroy() must take the suspend_lock so that its presuspend and
postsuspend calls do not race with an internal suspend.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/md/dm.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2333,10 +2333,16 @@ static void __dm_destroy(struct mapped_d
set_bit(DMF_FREEING, &md->flags);
spin_unlock(&_minor_lock);
+ /*
+ * Take suspend_lock so that presuspend and postsuspend methods
+ * do not race with internal suspend.
+ */
+ mutex_lock(&md->suspend_lock);
if (!dm_suspended_md(md)) {
dm_table_presuspend_targets(map);
dm_table_postsuspend_targets(map);
}
+ mutex_unlock(&md->suspend_lock);
/*
* Rare, but there may be I/O requests still going to complete,
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 21/23] hfsplus: fix B-tree corruption after insertion at position 0
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (19 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 20/23] dm: hold suspend_lock while suspending device during device deletion Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 22/23] powerpc/mpc85xx: Add ranges to etsec2 nodes Greg Kroah-Hartman
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Sergei Antonov, Joe Perches,
Vyacheslav Dubeyko, Hin-Tak Leung, Anton Altaparmakov, Al Viro,
Christoph Hellwig, Andrew Morton, Linus Torvalds
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergei Antonov <saproj@gmail.com>
commit 98cf21c61a7f5419d82f847c4d77bf6e96a76f5f upstream.
Fix B-tree corruption when a new record is inserted at position 0 in the
node in hfs_brec_insert(). In this case a hfs_brec_update_parent() is
called to update the parent index node (if exists) and it is passed
hfs_find_data with a search_key containing a newly inserted key instead
of the key to be updated. This results in an inconsistent index node.
The bug reproduces on my machine after an extents overflow record for
the catalog file (CNID=4) is inserted into the extents overflow B-tree.
Because of a low (reserved) value of CNID=4, it has to become the first
record in the first leaf node.
The resulting first leaf node is correct:
----------------------------------------------------
| key0.CNID=4 | key1.CNID=123 | key2.CNID=456, ... |
----------------------------------------------------
But the parent index key0 still contains the previous key CNID=123:
-----------------------
| key0.CNID=123 | ... |
-----------------------
A change in hfs_brec_insert() makes hfs_brec_update_parent() work
correctly by preventing it from getting fd->record=-1 value from
__hfs_brec_find().
Along the way, I removed duplicate code with unification of the if
condition. The resulting code is equivalent to the original code
because node is never 0.
Also hfs_brec_update_parent() will now return an error after getting a
negative fd->record value. However, the return value of
hfs_brec_update_parent() is not checked anywhere in the file and I'm
leaving it unchanged by this patch. brec.c lacks error checking after
some other calls too, but this issue is of less importance than the one
being fixed by this patch.
Signed-off-by: Sergei Antonov <saproj@gmail.com>
Cc: Joe Perches <joe@perches.com>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: Anton Altaparmakov <aia21@cam.ac.uk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/hfsplus/brec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -131,13 +131,16 @@ skip:
hfs_bnode_write(node, entry, data_off + key_len, entry_len);
hfs_bnode_dump(node);
- if (new_node) {
- /* update parent key if we inserted a key
- * at the start of the first node
- */
- if (!rec && new_node != node)
- hfs_brec_update_parent(fd);
+ /*
+ * update parent key if we inserted a key
+ * at the start of the node and it is not the new node
+ */
+ if (!rec && new_node != node) {
+ hfs_bnode_read_key(node, fd->search_key, data_off + size);
+ hfs_brec_update_parent(fd);
+ }
+ if (new_node) {
hfs_bnode_put(fd->bnode);
if (!new_node->parent) {
hfs_btree_inc_height(tree);
@@ -168,9 +171,6 @@ skip:
goto again;
}
- if (!rec)
- hfs_brec_update_parent(fd);
-
return 0;
}
@@ -370,6 +370,8 @@ again:
if (IS_ERR(parent))
return PTR_ERR(parent);
__hfs_brec_find(parent, fd, hfs_find_rec_by_key);
+ if (fd->record < 0)
+ return -ENOENT;
hfs_bnode_dump(parent);
rec = fd->record;
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 22/23] powerpc/mpc85xx: Add ranges to etsec2 nodes
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (20 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 21/23] hfsplus: fix B-tree corruption after insertion at position 0 Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 13:19 ` [PATCH 3.10 23/23] net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5} Greg Kroah-Hartman
2015-04-10 18:05 ` [PATCH 3.10 00/23] 3.10.74-stable review Guenter Roeck
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, stable, Scott Wood, Alexander Graf
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Scott Wood <scottwood@freescale.com>
commit bb344ca5b90df62b1a3b7a35c6a9d00b306a170d upstream.
Commit 746c9e9f92dd "of/base: Fix PowerPC address parsing hack" limited
the applicability of the workaround whereby a missing ranges is treated
as an empty ranges. This workaround was hiding a bug in the etsec2
device tree nodes, which have children with reg, but did not have
ranges.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Reported-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 1 +
arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 1 +
arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 1 +
3 files changed, 3 insertions(+)
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
@@ -50,6 +50,7 @@ ethernet@b0000 {
fsl,num_tx_queues = <0x8>;
fsl,magic-packet;
local-mac-address = [ 00 00 00 00 00 00 ];
+ ranges;
queue-group@b0000 {
#address-cells = <1>;
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
@@ -50,6 +50,7 @@ ethernet@b1000 {
fsl,num_tx_queues = <0x8>;
fsl,magic-packet;
local-mac-address = [ 00 00 00 00 00 00 ];
+ ranges;
queue-group@b1000 {
#address-cells = <1>;
--- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
@@ -49,6 +49,7 @@ ethernet@b2000 {
fsl,num_tx_queues = <0x8>;
fsl,magic-packet;
local-mac-address = [ 00 00 00 00 00 00 ];
+ ranges;
queue-group@b2000 {
#address-cells = <1>;
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 3.10 23/23] net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5}
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (21 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 22/23] powerpc/mpc85xx: Add ranges to etsec2 nodes Greg Kroah-Hartman
@ 2015-04-10 13:19 ` Greg Kroah-Hartman
2015-04-10 18:05 ` [PATCH 3.10 00/23] 3.10.74-stable review Guenter Roeck
23 siblings, 0 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2015-04-10 13:19 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, netdev, Don Fry, Markos Chandras,
David S. Miller
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markos Chandras <markos.chandras@imgtec.com>
commit 87f966d97b89774162df04d2106c6350c8fe4cb3 upstream.
On a MIPS Malta board, tons of fifo underflow errors have been observed
when using u-boot as bootloader instead of YAMON. The reason for that
is that YAMON used to set the pcnet device to SRAM mode but u-boot does
not. As a result, the default Tx threshold (64 bytes) is now too small to
keep the fifo relatively used and it can result to Tx fifo underflow errors.
As a result of which, it's best to setup the SRAM on supported controllers
so we can always use the NOUFLO bit.
Cc: <netdev@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Cc: Don Fry <pcnet32@frontier.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/amd/pcnet32.c | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1516,7 +1516,7 @@ pcnet32_probe1(unsigned long ioaddr, int
{
struct pcnet32_private *lp;
int i, media;
- int fdx, mii, fset, dxsuflo;
+ int fdx, mii, fset, dxsuflo, sram;
int chip_version;
char *chipname;
struct net_device *dev;
@@ -1553,7 +1553,7 @@ pcnet32_probe1(unsigned long ioaddr, int
}
/* initialize variables */
- fdx = mii = fset = dxsuflo = 0;
+ fdx = mii = fset = dxsuflo = sram = 0;
chip_version = (chip_version >> 12) & 0xffff;
switch (chip_version) {
@@ -1586,6 +1586,7 @@ pcnet32_probe1(unsigned long ioaddr, int
chipname = "PCnet/FAST III 79C973"; /* PCI */
fdx = 1;
mii = 1;
+ sram = 1;
break;
case 0x2626:
chipname = "PCnet/Home 79C978"; /* PCI */
@@ -1609,6 +1610,7 @@ pcnet32_probe1(unsigned long ioaddr, int
chipname = "PCnet/FAST III 79C975"; /* PCI */
fdx = 1;
mii = 1;
+ sram = 1;
break;
case 0x2628:
chipname = "PCnet/PRO 79C976";
@@ -1637,6 +1639,31 @@ pcnet32_probe1(unsigned long ioaddr, int
dxsuflo = 1;
}
+ /*
+ * The Am79C973/Am79C975 controllers come with 12K of SRAM
+ * which we can use for the Tx/Rx buffers but most importantly,
+ * the use of SRAM allow us to use the BCR18:NOUFLO bit to avoid
+ * Tx fifo underflows.
+ */
+ if (sram) {
+ /*
+ * The SRAM is being configured in two steps. First we
+ * set the SRAM size in the BCR25:SRAM_SIZE bits. According
+ * to the datasheet, each bit corresponds to a 512-byte
+ * page so we can have at most 24 pages. The SRAM_SIZE
+ * holds the value of the upper 8 bits of the 16-bit SRAM size.
+ * The low 8-bits start at 0x00 and end at 0xff. So the
+ * address range is from 0x0000 up to 0x17ff. Therefore,
+ * the SRAM_SIZE is set to 0x17. The next step is to set
+ * the BCR26:SRAM_BND midway through so the Tx and Rx
+ * buffers can share the SRAM equally.
+ */
+ a->write_bcr(ioaddr, 25, 0x17);
+ a->write_bcr(ioaddr, 26, 0xc);
+ /* And finally enable the NOUFLO bit */
+ a->write_bcr(ioaddr, 18, a->read_bcr(ioaddr, 18) | (1 << 11));
+ }
+
dev = alloc_etherdev(sizeof(*lp));
if (!dev) {
ret = -ENOMEM;
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 3.10 00/23] 3.10.74-stable review
2015-04-10 13:18 [PATCH 3.10 00/23] 3.10.74-stable review Greg Kroah-Hartman
` (22 preceding siblings ...)
2015-04-10 13:19 ` [PATCH 3.10 23/23] net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5} Greg Kroah-Hartman
@ 2015-04-10 18:05 ` Guenter Roeck
23 siblings, 0 replies; 25+ messages in thread
From: Guenter Roeck @ 2015-04-10 18:05 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, torvalds, akpm, satoru.takeuchi, shuah.kh, stable
On Fri, Apr 10, 2015 at 03:18:54PM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 3.10.74 release.
> There are 23 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sun Apr 12 13:15:46 UTC 2015.
> Anything received after that time might be too late.
>
Build results:
total: 123 pass: 123 fail: 0
Qemu test results:
total: 27 pass: 27 fail: 0
Details are available at http://server.roeck-us.net:8010/builders.
Guenter
^ permalink raw reply [flat|nested] 25+ messages in thread