ASoC: hdmi-codec: fix S/PDIF DAI
Subsystems (14)
Sasha Levin
maintainerPATCH 1/32 ASoC: hdmi-codec: fix S/PDIF DAI
From: Russell King <[email protected]>
[ Upstream commit 2e95f984aae4cf0608d0ba2189c756f2bd50b44a ]
When using the S/PDIF DAI, there is no requirement to call snd_soc_dai_set_fmt() as there is no DAI format definition that defines S/PDIF. In any case, S/PDIF does not have separate clocks, this is embedded into the data stream.
Consequently, when attempting to use TDA998x in S/PDIF mode, the attempt to configure TDA998x via the hw_params callback fails as the hdmi_codec_daifmt is left initialised to zero.
Since the S/PDIF DAI will only be used by S/PDIF, prepare the hdmi_codec_daifmt structure for this format.
--- sound/soc/codecs/hdmi-codec.c | 118 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 59 deletions(-)
sound/soc/codecs/hdmi-codec.c +59 -59
@@ -536,73 +536,71 @@ static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, {struct hdmi_codec_priv *hcp =snd_soc_dai_get_drvdata (dai);struct hdmi_codec_daifmt cf = {0 }; -int ret =0 ;dev_dbg (dai->dev,"%s()\n" , __func__); -if (dai->id ==DAI_ID_SPDIF ) { - cf.fmt =HDMI_SPDIF ; - }else { -switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { -case SND_SOC_DAIFMT_CBM_CFM : - cf.bit_clk_master =1 ; - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFM : - cf.frame_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBM_CFS : - cf.bit_clk_master =1 ; -break ; -case SND_SOC_DAIFMT_CBS_CFS : -break ; -default : -return -EINVAL ; - } +if (dai->id ==DAI_ID_SPDIF ) +return 0 ; + +switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { +case SND_SOC_DAIFMT_CBM_CFM : + cf.bit_clk_master =1 ; + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFM : + cf.frame_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBM_CFS : + cf.bit_clk_master =1 ; +break ; +case SND_SOC_DAIFMT_CBS_CFS : +break ; +default : +return -EINVAL ; + } -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_NF : -break ; -case SND_SOC_DAIFMT_NB_IF : - cf.frame_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_NF : - cf.bit_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_IF : - cf.frame_clk_inv =1 ; - cf.bit_clk_inv =1 ; -break ; - } +switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { +case SND_SOC_DAIFMT_NB_NF : +break ; +case SND_SOC_DAIFMT_NB_IF : + cf.frame_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_NF : + cf.bit_clk_inv =1 ; +break ; +case SND_SOC_DAIFMT_IB_IF : + cf.frame_clk_inv =1 ; + cf.bit_clk_inv =1 ; +break ; + } -switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { -case SND_SOC_DAIFMT_I2S : - cf.fmt =HDMI_I2S ; -break ; -case SND_SOC_DAIFMT_DSP_A : - cf.fmt =HDMI_DSP_A ; -break ; -case SND_SOC_DAIFMT_DSP_B : - cf.fmt =HDMI_DSP_B ; -break ; -case SND_SOC_DAIFMT_RIGHT_J : - cf.fmt =HDMI_RIGHT_J ; -break ; -case SND_SOC_DAIFMT_LEFT_J : - cf.fmt =HDMI_LEFT_J ; -break ; -case SND_SOC_DAIFMT_AC97 : - cf.fmt =HDMI_AC97 ; -break ; -default : -dev_err (dai->dev,"Invalid DAI interface format\n" ); -return -EINVAL ; - } +switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { +case SND_SOC_DAIFMT_I2S : + cf.fmt =HDMI_I2S ; +break ; +case SND_SOC_DAIFMT_DSP_A : + cf.fmt =HDMI_DSP_A ; +break ; +case SND_SOC_DAIFMT_DSP_B : + cf.fmt =HDMI_DSP_B ; +break ; +case SND_SOC_DAIFMT_RIGHT_J : + cf.fmt =HDMI_RIGHT_J ; +break ; +case SND_SOC_DAIFMT_LEFT_J : + cf.fmt =HDMI_LEFT_J ; +break ; +case SND_SOC_DAIFMT_AC97 : + cf.fmt =HDMI_AC97 ; +break ; +default : +dev_err (dai->dev,"Invalid DAI interface format\n" ); +return -EINVAL ; } hcp->daifmt[dai->id] = cf; -return ret; +return 0 ; }static int hdmi_codec_digital_mute (struct snd_soc_dai *dai,int mute)
@@ -784,8 +782,10 @@ static int hdmi_codec_probe(struct platform_device *pdev) i++; } -if (hcd->spdif) +if (hcd->spdif) { hcp->daidrv[i] = hdmi_spdif_dai; + hcp->daifmt[DAI_ID_SPDIF ].fmt =HDMI_SPDIF ; + } ret =snd_soc_register_codec (dev, &hdmi_codec, hcp->daidrv, dai_count);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 2/32 ASoC: ab8500: Mark expected switch fall-through
From: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit 102cefc8e879b707be0024fdc7bce1deeb359a5f ]
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
In file included from sound/soc/codecs/ab8500-codec.c:24:sound/soc/codecs/ab8500-codec.c: In function ‘ab8500_codec_set_dai_fmt’:./include/linux/device.h:1485:2: warning: this statement may fall through [-Wimplicit-fallthrough=]
_dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sound/soc/codecs/ab8500-codec.c:2129:3: note: in expansion of macro ‘dev_err’
dev_err(dai->component->dev,
^~~~~~~sound/soc/codecs/ab8500-codec.c:2132:2: note: here
default:
^~~~~~~
Warning level 3 was used: -Wimplicit-fallthrough=3
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
--- sound/soc/codecs/ab8500-codec.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/ab8500-codec.c +1 -0
@@ -2129,6 +2129,7 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)dev_err (dai->codec->dev,"%s: ERROR: The device is either a master or a slave.\n" , __func__); +/* fall through */ default : dev_err(dai->codec->dev, "%s: ERROR: Unsupporter master mask 0x%x\n",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 3/32 ASoC:soc-pcm:fix a codec fixup issue in TDM case
In reply to Sasha LevinFrom: Rander Wang <[email protected]>
[ Upstream commit 570f18b6a8d1f0e60e8caf30e66161b6438dcc91 ]
On HDaudio platforms, if playback is started when capture is working, there is no audible output.
This can be root-caused to the use of the rx|tx_mask to store an HDaudio stream tag.
If capture is stared before playback, rx_mask would be non-zero on HDaudio platform, then the channel number of playback, which is in the same codec dai with the capture, would be changed by soc_pcm_codec_params_fixup based on the tx_mask at first, then overwritten by this function based on rx_mask at last.
According to the author of tx|rx_mask, tx_mask is for playback and rx_mask is for capture. And stream direction is checked at all other references of tx|rx_mask in ASoC, so here should be an error. This patch checks stream direction for tx|rx_mask for fixup function.
This issue would affect not only HDaudio+ASoC, but also I2S codecs if the channel number based on rx_mask is not equal to the one for tx_mask. It could be rarely reproduecd because most drivers in kernel set the same channel number to tx|rx_mask or rx_mask is zero.
Tested on all platforms using stream_tag & HDaudio and intel I2S platforms.
--- sound/soc/soc-pcm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +5 -2
@@ -894,10 +894,13 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_params = *params;/* fixup params based on TDM slot masks */ -if (codec_dai->tx_mask) +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK && + codec_dai->tx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->tx_mask); -if (codec_dai->rx_mask) + +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE && + codec_dai->rx_mask)soc_pcm_codec_params_fixup (&codec_params, codec_dai->rx_mask);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 4/32 ASoC: nau8824: fix the issue of the widget with prefix name
In reply to Sasha LevinFrom: John Hsu <[email protected]>
[ Upstream commit 844a4a362dbec166b44d6b9b3dd45b08cb273703 ]
The driver has two issues when machine add prefix name for codec. (1)The stream name of DAI can't find the AIF widgets. (2)The drivr can enable/disalbe the MICBIAS and SAR widgets.
The patch will fix these issues caused by prefixed name added.
--- sound/soc/codecs/nau8824.c | 46 +++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-)
sound/soc/codecs/nau8824.c +38 -8
@@ -634,8 +634,8 @@ static const struct snd_soc_dapm_widget nau8824_dapm_widgets[] = {SND_SOC_DAPM_ADC ("ADCR" ,NULL ,NAU8824_REG_ANALOG_ADC_2 ,NAU8824_ADCR_EN_SFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"HiFi Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("AIFRX" ,"HiFi Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIFTX" ,"Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIFRX" ,"Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_DAC ("DACL" ,NULL ,NAU8824_REG_RDAC , NAU8824_DACL_EN_SFT, 0),
@@ -784,6 +784,36 @@ static void nau8824_int_status_clear_all(struct regmap *regmap) } } +static void nau8824_dapm_disable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_disable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_disable_pin (dapm, pin); + } +} + +static void nau8824_dapm_enable_pin (struct nau8824 *nau8824,const char *pin) +{ +struct snd_soc_dapm_context *dapm = nau8824->dapm; +const char *prefix = dapm->component->name_prefix; +char prefixed_pin[80 ]; + +if (prefix) { +snprintf (prefixed_pin,sizeof (prefixed_pin),"%s %s" , + prefix, pin); +snd_soc_dapm_force_enable_pin (dapm, prefixed_pin); + }else { +snd_soc_dapm_force_enable_pin (dapm, pin); + } +} +static void nau8824_eject_jack (struct nau8824 *nau8824) {struct snd_soc_dapm_context *dapm = nau8824->dapm;
@@ -792,8 +822,8 @@ static void nau8824_eject_jack(struct nau8824 *nau8824)/* Clear all interruption status */ nau8824_int_status_clear_all (regmap); -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm);/* Enable the insertion interruption, disable the ejection
@@ -822,8 +852,8 @@ static void nau8824_jdet_work(struct work_struct *work)struct regmap *regmap = nau8824->regmap;int adc_value, event =0 , event_mask =0 ; -snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); -snd_soc_dapm_force_enable_pin (dapm,"SAR" ); +nau8824_dapm_enable_pin (nau8824,"MICBIAS" ); +nau8824_dapm_enable_pin (nau8824,"SAR" );snd_soc_dapm_sync (dapm);msleep (100 );
@@ -834,8 +864,8 @@ static void nau8824_jdet_work(struct work_struct *work)if (adc_value <HEADSET_SARADC_THD ) { event |=SND_JACK_HEADPHONE ; -snd_soc_dapm_disable_pin (dapm,"SAR" ); -snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +nau8824_dapm_disable_pin (nau8824,"SAR" ); +nau8824_dapm_disable_pin (nau8824,"MICBIAS" );snd_soc_dapm_sync (dapm); }else { event |=SND_JACK_HEADSET ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 5/32 ASoC: nau8810: fix the issue of widget with prefixed name
In reply to Sasha LevinFrom: John Hsu <[email protected]>
[ Upstream commit 54d1cf78b0f4ba348a7c7fb8b7d0708d71b6cc8a ]
The driver changes the stream name of DAC and ADC to avoid the issue of widget with prefixed name. When the machine adds prefixed name for codec, the stream name of DAI may not find the widgets.
--- sound/soc/codecs/nau8810.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/nau8810.c +2 -2
@@ -414,9 +414,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = {SND_SOC_DAPM_MIXER ("Mono Mixer" ,NAU8810_REG_POWER3 ,NAU8810_MOUTMX_EN_SFT ,0 , &nau8810_mono_mixer_controls[0 ],ARRAY_SIZE (nau8810_mono_mixer_controls)), -SND_SOC_DAPM_DAC ("DAC" ,"HiFi Playback" ,NAU8810_REG_POWER3 , +SND_SOC_DAPM_DAC ("DAC" ,"Playback" ,NAU8810_REG_POWER3 ,NAU8810_DAC_EN_SFT ,0 ), -SND_SOC_DAPM_ADC ("ADC" ,"HiFi Capture" ,NAU8810_REG_POWER2 , +SND_SOC_DAPM_ADC ("ADC" ,"Capture" ,NAU8810_REG_POWER2 ,NAU8810_ADC_EN_SFT ,0 ),SND_SOC_DAPM_PGA ("SpkN Out" ,NAU8810_REG_POWER3 , NAU8810_NSPK_EN_SFT, 0, NULL, 0),
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 6/32 ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
In reply to Sasha LevinFrom: Sylwester Nawrocki <[email protected]>
[ Upstream commit 2b13bee3884926cba22061efa75bd315e871de24 ]
After commit fbeec965b8d1c ("ASoC: samsung: odroid: Fix 32000 sample rate handling") the audio root clock frequency is configured improperly for 44100 sample rate. Due to clock rate rounding it's 20070401 Hz instead of 22579000 Hz. This results in a too low value of the PSR clock divider in the CPU DAI driver and too fast actual sample rate for fs=44100. E.g. 1 kHz tone has actual 1780 Hz frequency (1 kHz * 20070401/22579000 * 2).
Fix this by increasing the correction passed to clk_set_rate() to take into account inaccuracy of the EPLL frequency properly.
--- sound/soc/samsung/odroid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/samsung/odroid.c +2 -2
@@ -66,11 +66,11 @@ static int odroid_card_hw_params(struct snd_pcm_substream *substream,return ret;/* -* We add 1 to the rclk_freq value in order to avoid too low clock +* We add 2 to the rclk_freq value in order to avoid too low clock * frequency values due to the EPLL output frequency not being exact * multiple of the audio sampling rate. */ - rclk_freq =params_rate (params) * rfs +1 ; + rclk_freq =params_rate (params) * rfs +2 ; ret =clk_set_rate (priv->sclk_i2s, rclk_freq);if (ret <0 )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/32 ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit a2225a6d155fcb247fe4c6d87f7c91807462966d ]
Best to lock across handling the bus error to ensure the DSP doesn't change power state as we are reading the status registers.
--- sound/soc/codecs/wm_adsp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +8 -3
@@ -3711,11 +3711,13 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)struct regmap *regmap = dsp->regmap;int ret =0 ; +mutex_lock (&dsp->pwr_lock); + ret =regmap_read (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL , &val);if (ret) {adsp_err (dsp,"Failed to read Region Lock Ctrl register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; }if (val &ADSP2_WDT_TIMEOUT_STS_MASK ) {
@@ -3734,7 +3736,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Bus Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "bus error address = 0x%x\n",
@@ -3747,7 +3749,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)adsp_err (dsp,"Failed to read Pmem Xmem Err Addr register: %d\n" , ret); -return IRQ_HANDLED ; + goto error; } adsp_err(dsp, "xmem error address = 0x%x\n",
@@ -3760,6 +3762,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)regmap_update_bits (regmap, dsp->base +ADSP2_LOCK_REGION_CTRL ,ADSP2_CTRL_ERR_EINT ,ADSP2_CTRL_ERR_EINT ); +error: +mutex_unlock (&dsp->pwr_lock); +return IRQ_HANDLED ; }EXPORT_SYMBOL_GPL (wm_adsp2_bus_error);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 8/32 ASoC: cs4270: Set auto-increment bit for register writes
In reply to Sasha LevinFrom: Daniel Mack <[email protected]>
[ Upstream commit f0f2338a9cfaf71db895fa989ea7234e8a9b471d ]
The CS4270 does not by default increment the register address on consecutive writes. During normal operation it doesn't matter as all register accesses are done individually. At resume time after suspend, however, the regcache code gathers the biggest possible block of registers to sync and sends them one on one go.
To fix this, set the INCR bit in all cases.
--- sound/soc/codecs/cs4270.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4270.c +1 -0
@@ -643,6 +643,7 @@ static const struct regmap_config cs4270_regmap = { .reg_defaults = cs4270_reg_defaults, .num_reg_defaults = ARRAY_SIZE(cs4270_reg_defaults), .cache_type = REGCACHE_RBTREE, + .write_flag_mask = CS4270_I2C_INCR, .readable_reg = cs4270_reg_is_readable, .volatile_reg = cs4270_reg_is_volatile,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 9/32 IB/hfi1: Eliminate opcode tests on mr deref
In reply to Sasha LevinFrom: Kaike Wan <[email protected]>
[ Upstream commit a8639a79e85c18c16c10089edd589c7948f19bbd ]
When an old ack_queue entry is used to store an incoming request, it may need to clean up the old entry if it is still referencing the MR. Originally only RDMA READ request needed to reference MR on the responder side and therefore the opcode was tested when cleaning up the old entry. The introduction of tid rdma specific operations in the ack_queue makes the specific opcode tests wrong. Multiple opcodes (RDMA READ, TID RDMA READ, and TID RDMA WRITE) may need MR ref cleanup.
Remove the opcode specific tests associated with the ack_queue.
--- drivers/infiniband/hw/hfi1/rc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hfi1/rc.c +2 -2
@@ -2309,7 +2309,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
@@ -2383,7 +2383,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet)update_ack_queue (qp, next); } e = &qp->s_ack_queue[qp->r_head_ack_queue]; -if (e->opcode ==OP (RDMA_READ_REQUEST ) && e->rdma_sge.mr) { +if (e->rdma_sge.mr) {rvt_put_mr (e->rdma_sge.mr); e->rdma_sge.mr =NULL ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 10/32 MIPS: KGDB: fix kgdb support for SMP platforms.
In reply to Sasha LevinFrom: Chong Qiao <[email protected]>
[ Upstream commit ab8a6d821179ab9bea1a9179f535ccba6330c1ed ]
KGDB_call_nmi_hook is called by other cpu through smp call. MIPS smp call is processed in ipi irq handler and regs is saved in
handle_int.
So kgdb_call_nmi_hook get regs by get_irq_regs and regs will be passed
to kgdb_cpu_enter.
--- arch/mips/kernel/kgdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/kgdb.c +2 -1
@@ -33,6 +33,7 @@#include <asm/processor.h> #include <asm/sigcontext.h> #include <linux/uaccess.h> +#include <asm/irq_regs.h> static struct hard_trap_info { unsigned char tt; /* Trap type code for MIPS R3xxx and R4xxx */
@@ -214,7 +215,7 @@ static void kgdb_call_nmi_hook(void *ignored) old_fs =get_fs ();set_fs (get_ds ()); -kgdb_nmicallback (raw_smp_processor_id (),NULL ); +kgdb_nmicallback (raw_smp_processor_id (),get_irq_regs ());set_fs (old_fs); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 11/32 ASoC: tlv320aic32x4: Fix Common Pins
In reply to Sasha LevinFrom: Annaliese McDermond <[email protected]>
[ Upstream commit c63adb28f6d913310430f14c69f0a2ea55eed0cc ]
The common pins were mistakenly not added to the DAPM graph. Adding these pins will allow valid graphs to be created.
--- sound/soc/codecs/tlv320aic32x4.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/tlv320aic32x4.c +2 -0
@@ -462,6 +462,8 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {SND_SOC_DAPM_INPUT ("IN2_R" ),SND_SOC_DAPM_INPUT ("IN3_L" ),SND_SOC_DAPM_INPUT ("IN3_R" ), +SND_SOC_DAPM_INPUT ("CM_L" ), + SND_SOC_DAPM_INPUT("CM_R"), }; static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 12/32 drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 2d85978341e6a32e7443d9f28639da254d53f400 ]
We don't want to overwrite "ret", it already holds the correct error code. The "regmap" variable might be a valid pointer as this point.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_hdmi.c +0 -1
@@ -1473,7 +1473,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (regmap)) ret =PTR_ERR (regmap);if (ret) { - ret =PTR_ERR (regmap);dev_err (dev,"Failed to get system configuration registers: %d\n" , ret);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 13/32 perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
In reply to Sasha LevinFrom: Stephane Eranian <[email protected]>
[ Upstream commit 583feb08e7f7ac9d533b446882eb3a54737a6dbb ]
When an event is programmed with attr.wakeup_events=N (N>0), it means the caller is interested in getting a user level notification after N samples have been recorded in the kernel sampling buffer.
With precise events on Intel processors, the kernel uses PEBS. The kernel tries minimize sampling overhead by verifying
if the event configuration is compatible with multi-entry PEBS mode. If so, the kernel is notified only when the buffer has reached its threshold. Other PEBS operates in single-entry mode, the kenrel is notified for each PEBS sample.
The problem is that the current implementation look at frequency mode and event sample_type but ignores the wakeup_events field. Thus, it may not be possible to receive a notification after each precise event.
This patch fixes this problem by disabling multi-entry PEBS if wakeup_events is non-zero.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -3051,7 +3051,7 @@ static int intel_pmu_hw_config(struct perf_event *event)return ret;if (event->attr.precise_ip) { -if (!event->attr.freq) { +if (!(event->attr.freq || event->attr.wakeup_events)) { event->hw.flags |=PERF_X86_EVENT_AUTO_RELOAD ;if (!(event->attr.sample_type & ~intel_pmu_free_running_flags (event)))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 14/32 perf/x86/intel: Initialize TFA MSR
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit d7262457e35dbe239659e62654e56f8ddb814bed ]
Stephane reported that the TFA MSR is not initialized by the kernel, but the TFA bit could set by firmware or as a leftover from a kexec, which makes the state inconsistent.
--- arch/x86/events/intel/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/events/intel/core.c +6 -0
@@ -3427,6 +3427,12 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; +if (x86_pmu.flags &PMU_FL_TFA ) { +WARN_ON_ONCE (cpuc->tfa_shadow); + cpuc->tfa_shadow = ~0ULL ; +intel_set_tfa (cpuc, false); + } +if (x86_pmu.version >1 )flip_smm_bit (&x86_pmu.attr_freeze_on_smi);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 15/32 linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit a0fe2c6479aab5723239b315ef1b552673f434a3 ]
Use parentheses around uses of the argument in u64_to_user_ptr() to ensure that the cast doesn't apply to part of the argument.
There are existing uses of the macro of the form
u64_to_user_ptr(A + B)
which expands to
(void __user *)(uintptr_t)A + B
(the cast applies to the first operand of the addition, the addition is a pointer addition). This happens to still work as intended, the semantic difference doesn't cause a difference in behavior.
But I want to use u64_to_user_ptr() with a ternary operator in the argument, like so:
u64_to_user_ptr(A ? B : C)
This currently doesn't work as intended.
--- include/linux/kernel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/kernel.h +2 -2
@@ -72,8 +72,8 @@#define u64_to_user_ptr (x) ( \ { \ - typecheck(u64, x); \ - (void __user *)(uintptr_t)x; \ + typecheck(u64, (x)); \ + (void __user *)(uintptr_t)(x); \ } \ )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 16/32 xtensa: fix initialization of pt_regs::syscall in start_thread
In reply to Sasha LevinFrom: Max Filippov <[email protected]>
[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ]
New pt_regs should indicate that there's no syscall, not that there's syscall #0. While at it wrap macro body in do/while and parenthesize macro arguments.
--- arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/xtensa/include/asm/processor.h +12 -9
@@ -195,15 +195,18 @@ struct thread_struct {/* Clearing a0 terminates the backtrace. */ #define start_thread (regs, new_pc, new_sp) \ - memset(regs, 0, sizeof(*regs)); \ - regs->pc = new_pc; \ - regs->ps = USER_PS_VALUE; \ - regs->areg[1] = new_sp; \ - regs->areg[0] = 0; \ - regs->wmask = 1; \ - regs->depc = 0; \ - regs->windowbase = 0; \ - regs->windowstart = 1; + do { \ + memset((regs), 0, sizeof(*(regs))); \ + (regs)->pc = (new_pc); \ + (regs)->ps = USER_PS_VALUE; \ + (regs)->areg[1] = (new_sp); \ + (regs)->areg[0] = 0; \ + (regs)->wmask = 1; \ + (regs)->depc = 0; \ + (regs)->windowbase = 0; \ + (regs)->windowstart = 1; \ + (regs)->syscall = NO_SYSCALL; \ + } while (0)/* Forward declaration */ struct task_struct ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/32 ASoC: rockchip: pdm: fix regmap_ops hang issue
In reply to Sasha LevinFrom: Sugar Zhang <[email protected]>
[ Upstream commit c85064435fe7a216ec0f0238ef2b8f7cd850a450 ]
This is because set_fmt ops maybe called when PD is off, and in such case, regmap_ops will lead system hang. enale PD before doing regmap_ops.
--- sound/soc/rockchip/rockchip_pdm.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/rockchip/rockchip_pdm.c +2 -0
@@ -208,7 +208,9 @@ static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai,return -EINVAL ; } +pm_runtime_get_sync (cpu_dai->dev);regmap_update_bits (pdm->regmap,PDM_CLK_CTRL , mask, val); +pm_runtime_put (cpu_dai->dev);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/32 slab: fix a crash by reading /proc/slab_allocators
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit fcf88917dd435c6a4cb2830cb086ee58605a1d85 ]
The commit 510ded33e075 ("slab: implement slab_root_caches list") changes the name of the list node within "struct kmem_cache" from "list" to "root_caches_node", but leaks_show() still use the "list" which causes a crash when reading /proc/slab_allocators.
You need to have CONFIG_SLAB=y and CONFIG_MEMCG=y to see the problem, because without MEMCG all slab caches are root caches, and the "list" node happens to be the right one.
--- mm/slab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/slab.c +2 -1
@@ -4299,7 +4299,8 @@ static void show_symbol(struct seq_file *m, unsigned long address)static int leaks_show (struct seq_file *m,void *p) { - struct kmem_cache *cachep = list_entry(p, struct kmem_cache, list); + struct kmem_cache *cachep = list_entry(p, struct kmem_cache, + root_caches_node);struct page *page;struct kmem_cache_node *n;const char *name;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 19/32 ASoC: stm32: fix sai driver name initialisation
In reply to Sasha LevinFrom: Arnaud Pouliquen <[email protected]>
[ Upstream commit 17d3069ccf06970e2db3f7cbf4335f207524279e ]
This patch fixes the sai driver structure overwriting which results in a cpu dai name equal NULL.
--- sound/soc/stm/stm32_sai_sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/stm/stm32_sai_sub.c +1 -1
@@ -873,7 +873,6 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev,if (!sai->cpu_dai_drv)return -ENOMEM ; - sai->cpu_dai_drv->name =dev_name (&pdev->dev);if (STM_SAI_IS_PLAYBACK (sai)) {memcpy (sai->cpu_dai_drv, &stm32_sai_playback_dai,sizeof (stm32_sai_playback_dai));
@@ -883,6 +882,7 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev, sizeof(stm32_sai_capture_dai)); sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; } + sai->cpu_dai_drv->name =dev_name (&pdev->dev);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/32 virtio_pci: fix a NULL pointer reference in vp_del_vqs
In reply to Sasha LevinFrom: Longpeng <[email protected]>
[ Upstream commit 6a8aae68c87349dbbcd46eac380bc43cdb98a13b ]
If the msix_affinity_masks is alloced failed, then we'll try to free some resources in vp_free_vectors() that may access it directly.
We met the following stack in our production:
[ 29.296767] BUG: unable to handle kernel NULL pointer dereference at (null) [ 29.311151] IP: [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.324787] PGD 0 [ 29.333224] Oops: 0000 [#1] SMP [...] [ 29.425175] RIP: 0010:[<ffffffffc04fe35a>] [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.441405] RSP: 0018:ffff9a55c2dcfa10 EFLAGS: 00010206 [ 29.453491] RAX: 0000000000000000 RBX: ffff9a55c322c400 RCX: 0000000000000000 [ 29.467488] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9a55c322c400 [ 29.481461] RBP: ffff9a55c2dcfa20 R08: 0000000000000000 R09: ffffc1b6806ff020 [ 29.495427] R10: 0000000000000e95 R11: 0000000000aaaaaa R12: 0000000000000000 [ 29.509414] R13: 0000000000010000 R14: ffff9a55bd2d9e98 R15: ffff9a55c322c400 [ 29.523407] FS: 00007fdcba69f8c0(0000) GS:ffff9a55c2840000(0000) knlGS:0000000000000000 [ 29.538472] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.551621] CR2: 0000000000000000 CR3: 000000003ce52000 CR4: 00000000003607a0 [ 29.565886] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.580055] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.594122] Call Trace: [ 29.603446] [<ffffffffc04fe8a2>] vp_request_msix_vectors+0xe2/0x260 [virtio_pci] [ 29.618017] [<ffffffffc04fedc5>] vp_try_to_find_vqs+0x95/0x3b0 [virtio_pci] [ 29.632152] [<ffffffffc04ff117>] vp_find_vqs+0x37/0xb0 [virtio_pci] [ 29.645582] [<ffffffffc057bf63>] init_vq+0x153/0x260 [virtio_blk] [ 29.658831] [<ffffffffc057c1e8>] virtblk_probe+0xe8/0x87f [virtio_blk]
[...]
--- drivers/virtio/virtio_pci_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci_common.c +5 -3
@@ -254,9 +254,11 @@ void vp_del_vqs(struct virtio_device *vdev)for (i =0 ; i < vp_dev->msix_used_vectors; ++i)free_irq (pci_irq_vector (vp_dev->pci_dev, i), vp_dev); -for (i =0 ; i < vp_dev->msix_vectors; i++) -if (vp_dev->msix_affinity_masks[i]) -free_cpumask_var (vp_dev->msix_affinity_masks[i]); +if (vp_dev->msix_affinity_masks) { +for (i =0 ; i < vp_dev->msix_vectors; i++) +if (vp_dev->msix_affinity_masks[i]) +free_cpumask_var (vp_dev->msix_affinity_masks[i]); + }if (vp_dev->msix_enabled) {/* Disable the vector used for configuration */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/32 virtio_pci: fix a NULL pointer reference in vp_del_vqs
In reply to Sasha LevinFrom: Longpeng <[email protected]>
[ Upstream commit 6a8aae68c87349dbbcd46eac380bc43cdb98a13b ]
If the msix_affinity_masks is alloced failed, then we'll try to free some resources in vp_free_vectors() that may access it directly.
We met the following stack in our production:
[ 29.296767] BUG: unable to handle kernel NULL pointer dereference at (null) [ 29.311151] IP: [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.324787] PGD 0 [ 29.333224] Oops: 0000 [#1] SMP [...] [ 29.425175] RIP: 0010:[<ffffffffc04fe35a>] [<ffffffffc04fe35a>] vp_free_vectors+0x6a/0x150 [virtio_pci] [ 29.441405] RSP: 0018:ffff9a55c2dcfa10 EFLAGS: 00010206 [ 29.453491] RAX: 0000000000000000 RBX: ffff9a55c322c400 RCX: 0000000000000000 [ 29.467488] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9a55c322c400 [ 29.481461] RBP: ffff9a55c2dcfa20 R08: 0000000000000000 R09: ffffc1b6806ff020 [ 29.495427] R10: 0000000000000e95 R11: 0000000000aaaaaa R12: 0000000000000000 [ 29.509414] R13: 0000000000010000 R14: ffff9a55bd2d9e98 R15: ffff9a55c322c400 [ 29.523407] FS: 00007fdcba69f8c0(0000) GS:ffff9a55c2840000(0000) knlGS:0000000000000000 [ 29.538472] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.551621] CR2: 0000000000000000 CR3: 000000003ce52000 CR4: 00000000003607a0 [ 29.565886] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.580055] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.594122] Call Trace: [ 29.603446] [<ffffffffc04fe8a2>] vp_request_msix_vectors+0xe2/0x260 [virtio_pci] [ 29.618017] [<ffffffffc04fedc5>] vp_try_to_find_vqs+0x95/0x3b0 [virtio_pci] [ 29.632152] [<ffffffffc04ff117>] vp_find_vqs+0x37/0xb0 [virtio_pci] [ 29.645582] [<ffffffffc057bf63>] init_vq+0x153/0x260 [virtio_blk] [ 29.658831] [<ffffffffc057c1e8>] virtblk_probe+0xe8/0x87f [virtio_blk]
[...]
--- drivers/virtio/virtio_pci_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci_common.c +5 -3
@@ -254,9 +254,11 @@ void vp_del_vqs(struct virtio_device *vdev)for (i =0 ; i < vp_dev->msix_used_vectors; ++i)free_irq (pci_irq_vector (vp_dev->pci_dev, i), vp_dev); -for (i =0 ; i < vp_dev->msix_vectors; i++) -if (vp_dev->msix_affinity_masks[i]) -free_cpumask_var (vp_dev->msix_affinity_masks[i]); +if (vp_dev->msix_affinity_masks) { +for (i =0 ; i < vp_dev->msix_vectors; i++) +if (vp_dev->msix_affinity_masks[i]) +free_cpumask_var (vp_dev->msix_affinity_masks[i]); + }if (vp_dev->msix_enabled) {/* Disable the vector used for configuration */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/32 RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
In reply to Sasha LevinFrom: Kamal Heib <[email protected]>
[ Upstream commit ea7a5c706fa49273cf6d1d9def053ecb50db2076 ]
Make sure to free the DSR on pvrdma_pci_remove() to avoid the memory leak.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +2 -0
@@ -1055,6 +1055,8 @@ static void pvrdma_pci_remove(struct pci_dev *pdev)pvrdma_page_dir_cleanup (dev, &dev->cq_pdir);pvrdma_page_dir_cleanup (dev, &dev->async_pdir);pvrdma_free_slots (dev); +dma_free_coherent (&pdev->dev,sizeof (*dev->dsr), dev->dsr, + dev->dsrbase);iounmap (dev->regs);kfree (dev->sgid_tbl);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/32 scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
In reply to Sasha LevinFrom: Varun Prakash <[email protected]>
[ Upstream commit 5c2442fd78998af60e13aba506d103f7f43f8701 ]
If scsi cmd sglist is not suitable for DDP then csiostor driver uses preallocated buffers for DDP, because of this data copy is required from DDP buffer to scsi cmd sglist before calling ->scsi_done().
--- drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/csiostor/csio_scsi.c +4 -1
@@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: -if (req->nsge >0 ) +if (req->nsge >0 ) {scsi_dma_unmap (cmnd); +if (req->dcopy && (host_status ==DID_OK )) + host_status =csio_scsi_copy_to_sgl (hw, req); + } cmnd->result = (((host_status) <<16 ) | scsi_status); cmnd->scsi_done (cmnd);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 23/32 drm/mediatek: fix possible object reference leak
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 2ae2c3316fb77dcf64275d011596b60104c45426 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/mediatek/mtk_hdmi.c:1521:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function. drivers/gpu/drm/mediatek/mtk_hdmi.c:1524:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_hdmi.c +1 -0
@@ -1508,6 +1508,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,of_node_put (remote); hdmi->ddc_adpt =of_find_i2c_adapter_by_node (i2c_np); +of_node_put (i2c_np);if (!hdmi->ddc_adpt) {dev_err (dev,"Failed to get ddc i2c adapter by node\n" );return -EINVAL ;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 24/32 Bluetooth: btusb: request wake pin with NOAUTOEN
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 771acc7e4a6e5dba779cb1a7fd851a164bc81033 ]
Badly-designed systems might have (for example) active-high wake pins that default to high (e.g., because of external pull ups) until they have an active firmware which starts driving it low. This can cause an interrupt storm in the time between request_irq() and disable_irq().
We don't support shared interrupts here, so let's just pre-configure the interrupt to avoid auto-enabling it.
--- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
@@ -2893,6 +2893,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)return 0 ; } +irq_set_status_flags (irq,IRQ_NOAUTOEN ); ret =devm_request_irq (&hdev->dev, irq, btusb_oob_wake_handler,0 ,"OOB Wake-on-BT" , data);if (ret) {
@@ -2907,7 +2908,6 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) } data->oob_wake_irq = irq; -disable_irq (irq);bt_dev_info (hdev,"OOB Wake-on-BT configured at IRQ %u" , irq);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/32 ASoC: Intel: kbl: fix wrong number of channels
In reply to Sasha LevinFrom: Tzung-Bi Shih <[email protected]>
[ Upstream commit d6ba3f815bc5f3c4249d15c8bc5fbb012651b4a4 ]
Fix wrong setting on number of channels. The context wants to set constraint to 2 channels instead of 4.
--- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
@@ -405,7 +405,7 @@ static const struct snd_pcm_hw_constraint_list constraints_dmic_channels = { };static const unsigned int dmic_2ch[] = { -4 , +2 , };static const struct snd_pcm_hw_constraint_list constraints_dmic_2ch = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/32 virtio-blk: limit number of hw queues by nr_cpu_ids
In reply to Sasha LevinFrom: Dongli Zhang <[email protected]>
[ Upstream commit bf348f9b78d413e75bb079462751a1d86b6de36c ]
When tag_set->nr_maps is 1, the block layer limits the number of hw queues by nr_cpu_ids. No matter how many hw queues are used by virtio-blk, as it has (tag_set->nr_maps == 1), it can use at most nr_cpu_ids hw queues.
In addition, specifically for pci scenario, when the 'num-queues' specified by qemu is more than maxcpus, virtio-blk would not be able to allocate more than maxcpus vectors in order to have a vector for each queue. As a result, it falls back into MSI-X with one vector for config and one shared for queues.
Considering above reasons, this patch limits the number of hw queues used by virtio-blk by nr_cpu_ids.
--- drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/virtio_blk.c +2 -0
@@ -437,6 +437,8 @@ static int init_vq(struct virtio_blk *vblk)if (err) num_vqs =1 ; + num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs); + vblk->vqs =kmalloc_array (num_vqs,sizeof (*vblk->vqs),GFP_KERNEL );if (!vblk->vqs)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/32 virtio-blk: limit number of hw queues by nr_cpu_ids
In reply to Sasha LevinFrom: Dongli Zhang <[email protected]>
[ Upstream commit bf348f9b78d413e75bb079462751a1d86b6de36c ]
When tag_set->nr_maps is 1, the block layer limits the number of hw queues by nr_cpu_ids. No matter how many hw queues are used by virtio-blk, as it has (tag_set->nr_maps == 1), it can use at most nr_cpu_ids hw queues.
In addition, specifically for pci scenario, when the 'num-queues' specified by qemu is more than maxcpus, virtio-blk would not be able to allocate more than maxcpus vectors in order to have a vector for each queue. As a result, it falls back into MSI-X with one vector for config and one shared for queues.
Considering above reasons, this patch limits the number of hw queues used by virtio-blk by nr_cpu_ids.
--- drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/virtio_blk.c +2 -0
@@ -437,6 +437,8 @@ static int init_vq(struct virtio_blk *vblk)if (err) num_vqs =1 ; + num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs); + vblk->vqs =kmalloc_array (num_vqs,sizeof (*vblk->vqs),GFP_KERNEL );if (!vblk->vqs)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 27/32 clk: x86: Add system specific quirk to mark clocks as critical
In reply to Sasha LevinFrom: David Müller <[email protected]>
[ Upstream commit 7c2e07130090ae001a97a6b65597830d6815e93e ]
Since commit 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL"), the pmc_plt_clocks of the Bay Trail SoC are unconditionally gated off. Unfortunately this will break systems where these clocks are used for external purposes beyond the kernel's knowledge. Fix it by implementing a system specific quirk to mark the necessary pmc_plt_clks as critical.
--- drivers/clk/x86/clk-pmc-atom.c | 14 ++++++++++--- drivers/platform/x86/pmc_atom.c | 21 +++++++++++++++++++ .../linux/platform_data/x86/clk-pmc-atom.h | 3 +++ 3 files changed, 35 insertions(+), 3 deletions(-)
drivers/clk/x86/clk-pmc-atom.c +11 -3
@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops = { };static struct clk_plt *plt_clk_register (struct platform_device *pdev,int id, -void __iomem *base, +const struct pmc_clk_data *pmc_data,const char **parent_names,int num_parents) {
@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, init.num_parents = num_parents; pclk->hw.init = &init; - pclk->reg = base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ; + pclk->reg = pmc_data->base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ;spin_lock_init (&pclk->lock); +/* +* On some systems, the pmc_plt_clocks already enabled by the +* firmware are being marked as critical to avoid them being +* gated by the clock framework. +*/ +if (pmc_data->critical &&plt_clk_is_enabled (&pclk->hw)) + init.flags |=CLK_IS_CRITICAL ; + ret =devm_clk_hw_register (&pdev->dev, &pclk->hw);if (ret) { pclk =ERR_PTR (ret);
@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platform_device *pdev)return PTR_ERR (parent_names);for (i =0 ; i <PMC_CLK_NUM ; i++) { - data->clks[i] =plt_clk_register (pdev, i, pmc_data->base, + data->clks[i] =plt_clk_register (pdev, i, pmc_data, parent_names, data->nparents);if (IS_ERR (data->clks[i])) { err =PTR_ERR (data->clks[i]);
drivers/platform/x86/pmc_atom.c +21 -0
@@ -17,6 +17,7 @@#include <linux/debugfs.h> #include <linux/device.h> +#include <linux/dmi.h> #include <linux/init.h> #include <linux/io.h> #include <linux/platform_data/x86/clk-pmc-atom.h>
@@ -421,11 +422,27 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc) }#endif /* CONFIG_DEBUG_FS */ +/* +* Some systems need one or more of their pmc_plt_clks to be +* marked as critical. +*/ +static const struct dmi_system_id critclk_systems[]__initconst = { + { + .ident ="MPL CEC1x" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MPL AG" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"CEC10 Family" ), + }, + }, + {/*sentinel*/ } +}; +static int pmc_setup_clks (struct pci_dev *pdev,void __iomem *pmc_regmap,const struct pmc_data *pmc_data) {struct platform_device *clkdev;struct pmc_clk_data *clk_data; +const struct dmi_system_id *d =dmi_first_match (critclk_systems); clk_data =kzalloc (sizeof (*clk_data),GFP_KERNEL );if (!clk_data)
@@ -433,6 +450,10 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap, clk_data->base = pmc_regmap;/* offset is added by client */ clk_data->clks = pmc_data->clks; +if (d) { + clk_data->critical = true; +pr_info ("%s critclks quirk enabled\n" , d->ident); + } clkdev = platform_device_register_data(&pdev->dev, "clk-pmc-atom", PLATFORM_DEVID_NONE,
include/linux/platform_data/x86/clk-pmc-atom.h +3 -0
@@ -35,10 +35,13 @@ struct pmc_clk {* * @base: PMC clock register base offset * @clks: pointer to set of registered clocks, typically 0..5 +* @critical: flag to indicate if firmware enabled pmc_plt_clks +* should be marked as critial or not */ struct pmc_clk_data {void __iomem *base;const struct pmc_clk *clks; +bool critical; };#endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 28/32 platform/x86: pmc_atom: Drop __initconst on dmi table
In reply to Sasha LevinFrom: Stephen Boyd <[email protected]>
[ Upstream commit b995dcca7cf12f208cfd95fd9d5768dca7cccec7 ]
It's used by probe and that isn't an init function. Drop this so that we don't get a section mismatch.
--- drivers/platform/x86/pmc_atom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/pmc_atom.c +1 -1
@@ -426,7 +426,7 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)* Some systems need one or more of their pmc_plt_clks to be * marked as critical. */ -static const struct dmi_system_id critclk_systems[]__initconst = { +static const struct dmi_system_id critclk_systems[] = { { .ident ="MPL CEC1x" , .matches = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/32 NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 7c2bd9a39845bfb6d72ddb55ce737650271f6f96 ]
syzbot is reporting uninitialized value at rpc_sockaddr2uaddr() [1]. This is because syzbot is setting AF_INET6 to "struct sockaddr_in"->sin_family (which is embedded into user-visible "struct nfs_mount_data" structure) despite nfs23_validate_mount_data() cannot pass sizeof(struct sockaddr_in6) bytes of AF_INET6 address to rpc_sockaddr2uaddr().
Since "struct nfs_mount_data" structure is user-visible, we can't change "struct nfs_mount_data" to use "struct sockaddr_storage". Therefore, assuming that everybody is using AF_INET family when passing address via "struct nfs_mount_data"->addr, reject if its sin_family is not AF_INET.
[1] https://syzkaller.appspot.com/bug?id=599993614e7cbbf66bc2656a919ab2a95fb5d75c
--- fs/nfs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/super.c +2 -1
@@ -2044,7 +2044,8 @@ static int nfs23_validate_mount_data(void *options,memcpy (sap, &data->addr,sizeof (data->addr)); args->nfs_server.addrlen =sizeof (data->addr); args->nfs_server.port =ntohs (data->addr.sin_port); -if (!nfs_verify_server_address (sap)) +if (sap->sa_family !=AF_INET || + !nfs_verify_server_address (sap)) goto out_no_address;if (!(data->flags &NFS_MOUNT_TCP ))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/32 iommu/amd: Set exclusion range correctly
In reply to Sasha LevinFrom: Joerg Roedel <[email protected]>
[ Upstream commit 3c677d206210f53a4be972211066c0f1cd47fe12 ]
The exlcusion range limit register needs to contain the base-address of the last page that is part of the range, as bits 0-11 of this register are treated as 0xfff by the hardware for comparisons.
So correctly set the exclusion range in the hardware to the last page which is _in_ the range.
--- drivers/iommu/amd_iommu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu_init.c +1 -1
@@ -355,7 +355,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val)static void iommu_set_exclusion_range (struct amd_iommu *iommu) {u64 start = iommu->exclusion_start &PAGE_MASK ; -u64 limit = (start + iommu->exclusion_length) &PAGE_MASK ; +u64 limit = (start + iommu->exclusion_length -1 ) &PAGE_MASK ;u64 entry;if (!iommu->exclusion_start)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 31/32 mm: make page ref count overflow check tighter and more explicit
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit f958d7b528b1b40c44cfda5eabe2d82760d868c3 ]
We have a VM_BUG_ON() to check that the page reference count doesn't underflow (or get close to overflow) by checking the sign of the count.
That's all fine, but we actually want to allow people to use a "get page ref unless it's already very high" helper function, and we want that one to use the sign of the page ref (without triggering this VM_BUG_ON).
Change the VM_BUG_ON to only check for small underflows (or _very_ close to overflowing), and ignore overflows which have strayed into negative territory.
--- include/linux/mm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/mm.h +5 -1
@@ -824,6 +824,10 @@ static inline bool is_device_public_page(const struct page *page)#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */ +/* 127: arbitrary random number, small enough to assemble well */ +#define page_ref_zero_or_close_to_overflow (page) \ + ((unsigned int) page_ref_count(page) + 127u <= 127u) +static inline void get_page (struct page *page) { page =compound_head (page);
@@ -831,7 +835,7 @@ static inline void get_page(struct page *page)* Getting a normal page or the head of a compound page * requires to already have an elevated page->_refcount. */ -VM_BUG_ON_PAGE (page_ref_count (page) <=0 , page); +VM_BUG_ON_PAGE (page_ref_zero_or_close_to_overflow (page), page);page_ref_inc (page); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 32/32 mm: add 'try_get_page()' helper function
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit 88b1a17dfc3ed7728316478fae0f5ad508f50397 ]
This is the same as the traditional 'get_page()' function, but instead of unconditionally incrementing the reference count of the page, it only does so if the count was "safe". It returns whether the reference count was incremented (and is marked __must_check, since the caller obviously has to be aware of it).
Also like 'get_page()', you can't use this function unless you already had a reference to the page. The intent is that you can use this exactly like get_page(), but in situations where you want to limit the maximum reference count.
The code currently does an unconditional WARN_ON_ONCE() if we ever hit the reference count issues (either zero or negative), as a notification that the conditional non-increment actually happened.
NOTE! The count access for the "safety" check is inherently racy, but that doesn't matter since the buffer we use is basically half the range of the reference count (ie we look at the sign of the count).
--- include/linux/mm.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/linux/mm.h +9 -0
@@ -839,6 +839,15 @@ static inline void get_page(struct page *page)page_ref_inc (page); } +static inline __must_check bool try_get_page (struct page *page) +{ + page =compound_head (page); +if (WARN_ON_ONCE (page_ref_count (page) <=0 )) +return false; +page_ref_inc (page); +return true; +} +static inline void put_page (struct page *page) { page =compound_head (page);
Signature · 1 line
2.19.1