6.1.2-rc1 review
Subsystems (14)
Greg Kroah-Hartman
maintainerPATCH 390/1146 ASoC: qcom: Add checks for devm_kcalloc
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 1bf5ee979076ceb121ee51c95197d890b1cee7f4 ]
As the devm_kcalloc may return NULL, the return value needs to be checked to avoid NULL poineter dereference.
--- sound/soc/qcom/lpass-sc7180.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/qcom/lpass-sc7180.c +3 -0
@@ -131,6 +131,9 @@ static int sc7180_lpass_init(struct platform_device *pdev) drvdata->clks =devm_kcalloc (dev, variant->num_clks,sizeof (*drvdata->clks),GFP_KERNEL ); +if (!drvdata->clks) +return -ENOMEM ; + drvdata->num_clks = variant->num_clks;for (i =0 ; i < drvdata->num_clks; i++)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 391/1146 ASoC: qcom: cleanup and fix dependency of QCOM_COMMON
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 8d89cf6ff229ff31cd4f73f5b3928564b81fc41e ]
SND_SOC_QCOM_COMMON depends on SOUNDWIRE for some symbols but this is not explicitly specified using Kconfig depends. On the other hand SND_SOC_QCOM_COMMON is also directly selected by the sound card Kconfigs, this could result in various combinations and some symbols ending up in modules and soundcard that uses those symbols as in-build driver.
Fix these issues by explicitly specifying the dependencies of SND_SOC_QCOM_COMMON and also use imply a to select SND_SOC_QCOM_COMMON so that the symbol is selected based on its dependencies.
Also remove dummy stubs in common.c around CONFIG_SOUNDWIRE
--- sound/soc/qcom/Kconfig | 16 +++++++++------- sound/soc/qcom/common.c | 2 -- sound/soc/qcom/common.h | 23 ----------------------- 3 files changed, 9 insertions(+), 32 deletions(-)
sound/soc/qcom/Kconfig +9 -7
@@ -2,6 +2,7 @@ menuconfig SND_SOC_QCOM tristate "ASoC support for QCOM platforms" depends on ARCH_QCOM || COMPILE_TEST + imply SND_SOC_QCOM_COMMON help Say Y or M if you want to add support to use audio devices in Qualcomm Technologies SOC-based platforms.
@@ -59,13 +60,14 @@ config SND_SOC_STORM config SND_SOC_APQ8016_SBC tristate "SoC Audio support for APQ8016 SBC platforms" select SND_SOC_LPASS_APQ8016 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8016 SOC-based systems. Say Y if you want to use audio devices on MI2S. config SND_SOC_QCOM_COMMON + depends on SOUNDWIRE tristate config SND_SOC_QDSP6_COMMON
@@ -142,7 +144,7 @@ config SND_SOC_MSM8996 depends on QCOM_APR depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8096 SoC-based systems.
@@ -153,7 +155,7 @@ config SND_SOC_SDM845 depends on QCOM_APR && I2C && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_RT5663 select SND_SOC_MAX98927 imply SND_SOC_CROS_EC_CODEC
@@ -167,7 +169,7 @@ config SND_SOC_SM8250 depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SM8250 SoC-based systems.
@@ -178,7 +180,7 @@ config SND_SOC_SC8280XP depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SC8280XP SoC-based systems.
@@ -188,7 +190,7 @@ config SND_SOC_SC7180 tristate "SoC Machine driver for SC7180 boards" depends on I2C && GPIOLIB depends on SOUNDWIRE || SOUNDWIRE=n - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7180 select SND_SOC_MAX98357A select SND_SOC_RT5682_I2C
@@ -202,7 +204,7 @@ config SND_SOC_SC7180 config SND_SOC_SC7280 tristate "SoC Machine driver for SC7280 boards" depends on I2C && SOUNDWIRE - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7280 select SND_SOC_MAX98357A select SND_SOC_WCD938X_SDW
sound/soc/qcom/common.c +0 -2
@@ -180,7 +180,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) }EXPORT_SYMBOL_GPL (qcom_snd_parse_of); -#if IS_ENABLED (CONFIG_SOUNDWIRE )int qcom_snd_sdw_prepare (struct snd_pcm_substream *substream,struct sdw_stream_runtime *sruntime,bool *stream_prepared)
@@ -294,7 +293,6 @@ int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream,return 0 ; }EXPORT_SYMBOL_GPL (qcom_snd_sdw_hw_free); -#endif int qcom_snd_wcd_jack_setup (struct snd_soc_pcm_runtime *rtd,struct snd_soc_jack *jack,bool *jack_setup)
sound/soc/qcom/common.h +0 -23
@@ -11,7 +11,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card);int qcom_snd_wcd_jack_setup (struct snd_soc_pcm_runtime *rtd,struct snd_soc_jack *jack,bool *jack_setup); -#if IS_ENABLED (CONFIG_SOUNDWIRE )int qcom_snd_sdw_prepare (struct snd_pcm_substream *substream,struct sdw_stream_runtime *runtime,bool *stream_prepared);
@@ -21,26 +20,4 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream,int qcom_snd_sdw_hw_free (struct snd_pcm_substream *substream,struct sdw_stream_runtime *sruntime,bool *stream_prepared); -#else -static inline int qcom_snd_sdw_prepare (struct snd_pcm_substream *substream, -struct sdw_stream_runtime *runtime, -bool *stream_prepared) -{ -return -ENOTSUPP ; -} - -static inline int qcom_snd_sdw_hw_params (struct snd_pcm_substream *substream, -struct snd_pcm_hw_params *params, -struct sdw_stream_runtime **psruntime) -{ -return -ENOTSUPP ; -} - -static inline int qcom_snd_sdw_hw_free (struct snd_pcm_substream *substream, -struct sdw_stream_runtime *sruntime, -bool *stream_prepared) -{ -return -ENOTSUPP ; -} -#endif #endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 392/1146 ASoC: mediatek: mt8186: Correct I2S shared clocks
In reply to Greg Kroah-HartmanFrom: Jiaxin Yu <[email protected]>
[ Upstream commit 248579fc9a4f3bf36e7cfe9f6a354cee0f9848dc ]
In mt8186 platform, I2S2 should be the main I2S port that provide the clock, on the contrary I2S3 should be the second I2S port that use this clock.
--- sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +1 -1
@@ -192,7 +192,7 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *rstruct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv;int ret; - ret =mt8186_dai_i2s_set_share (afe,"I2S3" ,"I2S2" ); + ret =mt8186_dai_i2s_set_share (afe,"I2S2" ,"I2S3" );if (ret) {dev_err (rtd->dev,"Failed to set up shared clocks\n" );return ret;
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +1 -1
@@ -168,7 +168,7 @@ static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rtstruct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv;int ret; - ret =mt8186_dai_i2s_set_share (afe,"I2S3" ,"I2S2" ); + ret =mt8186_dai_i2s_set_share (afe,"I2S2" ,"I2S3" );if (ret) {dev_err (rtd->dev,"Failed to set up shared clocks\n" );return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 393/1146 media: vimc: Fix wrong function called when vimc_init() fails
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit f74d3f326d1d5b8951ce263c59a121ecfa65e7c0 ]
In vimc_init(), when platform_driver_register(&vimc_pdrv) fails, platform_driver_unregister(&vimc_pdrv) is wrongly called rather than platform_device_unregister(&vimc_pdev), which causes kernel warning:
Unexpected driver unregister!
WARNING: CPU: 1 PID: 14517 at drivers/base/driver.c:270 driver_unregister+0x8f/0xb0 RIP: 0010:driver_unregister+0x8f/0xb0 Call Trace: <TASK> vimc_init+0x7d/0x1000 [vimc] do_one_initcall+0xd0/0x4e0 do_init_module+0x1cf/0x6b0 load_module+0x65c2/0x7820
--- drivers/media/test-drivers/vimc/vimc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/test-drivers/vimc/vimc-core.c +1 -1
@@ -433,7 +433,7 @@ static int __init vimc_init(void)if (ret) {dev_err (&vimc_pdev.dev,"platform driver registration failed (err=%d)\n" , ret); -platform_driver_unregister (&vimc_pdrv); +platform_device_unregister (&vimc_pdev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 394/1146 media: imon: fix a race condition in send_packet()
In reply to Greg Kroah-HartmanFrom: Gautam Menghani <[email protected]>
[ Upstream commit 813ceef062b53d68f296aa3cb944b21a091fabdb ]
The function send_packet() has a race condition as follows:
func send_packet()
{
// do work
call usb_submit_urb()
mutex_unlock()
wait_for_event_interruptible() <-- lock gone
mutex_lock()
}
func vfd_write()
{
mutex_lock()
call send_packet() <- prev call is not completed mutex_unlock()
}
When the mutex is unlocked and the function send_packet() waits for the call to complete, vfd_write() can start another call, which leads to the "URB submitted while active" warning in usb_submit_urb(). Fix this by removing the mutex_unlock() call in send_packet() and using mutex_lock_interruptible().
--- drivers/media/rc/imon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/rc/imon.c +3 -3
@@ -646,15 +646,14 @@ static int send_packet(struct imon_context *ictx)pr_err_ratelimited ("error submitting urb(%d)\n" , retval); }else {/* Wait for transmission to complete (or abort) */ -mutex_unlock (&ictx->lock); retval =wait_for_completion_interruptible ( &ictx->tx.finished);if (retval) {usb_kill_urb (ictx->tx_urb);pr_err_ratelimited ("task interrupted\n" ); } -mutex_lock (&ictx->lock); + ictx->tx.busy = false; retval = ictx->tx.status;if (retval)pr_err_ratelimited ("packet tx failed (%d)\n" , retval);
@@ -953,7 +952,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,if (ictx->disconnected)return -ENODEV ; -mutex_lock (&ictx->lock); +if (mutex_lock_interruptible (&ictx->lock)) +return -ERESTARTSYS ;if (!ictx->dev_present_intf0) {pr_err_ratelimited ("no iMON device present\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 395/1146 media: imx: imx7-media-csi: Clear BIT_MIPI_DOUBLE_CMPNT for <16b formats
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit cccc08a95ca57624563daafd47df5691e8c38995 ]
Commit 9babbbaaeb87 ("media: imx: imx7-media-csi: Use dual sampling for YUV 1X16") set BIT_MIPI_DOUBLE_CMPNT in the CR18 register for 16-bit YUV formats in imx7_csi_configure(). The CR18 register is always updated with read-modify-write cycles, so if a 16-bit YUV format is selected, the bit will stay set forever, even if the format is changed. Fix it by clearing the bit at the beginning of the imx7_csi_configure() function.
While at it, swap two of the bits being cleared to match the MSB to LSB order. This doesn't cause any functional change.
--- drivers/staging/media/imx/imx7-media-csi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/media/imx/imx7-media-csi.c +3 -3
@@ -521,9 +521,9 @@ static void imx7_csi_configure(struct imx7_csi *csi) cr18 =imx7_csi_reg_read (csi,CSI_CSICR18 ); cr18 &= ~(BIT_CSI_HW_ENABLE |BIT_MIPI_DATA_FORMAT_MASK | -BIT_DATA_FROM_MIPI |BIT_BASEADDR_CHG_ERR_EN | -BIT_BASEADDR_SWITCH_EN |BIT_BASEADDR_SWITCH_SEL | -BIT_DEINTERLACE_EN ); +BIT_DATA_FROM_MIPI |BIT_MIPI_DOUBLE_CMPNT | +BIT_BASEADDR_CHG_ERR_EN |BIT_BASEADDR_SWITCH_SEL | +BIT_BASEADDR_SWITCH_EN |BIT_DEINTERLACE_EN );if (out_pix->field ==V4L2_FIELD_INTERLACED ) { cr18 |=BIT_DEINTERLACE_EN ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 396/1146 media: mt9p031: Drop bogus v4l2_subdev_get_try_crop() call from mt9p031_init_cfg()
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e208ad015f9310a87b4bb1ba1e4d3e347f391aa4 ]
The mt9p031_init_cfg() already calls __mt9p031_get_pad_crop(), which correctly calls v4l2_subdev_get_try_crop() on V4L2_SUBDEV_FORMAT_TRY or returns &mt9p031->crop on V4L2_SUBDEV_FORMAT_ACTIVE. No need to call v4l2_subdev_get_try_crop() in mt9p031_init_cfg() again in case of both V4L2_SUBDEV_FORMAT_TRY and V4L2_SUBDEV_FORMAT_ACTIVE.
This also fixes a splat generated by this call since commit2ba3e38517f5a ("media: v4l: subdev: Fail graciously when getting try data for NULL state") because v4l2_subdev_get_try_crop() is called with sd_state = NULL
in mt9p031_init_cfg().
--- drivers/media/i2c/mt9p031.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/i2c/mt9p031.c +0 -1
@@ -702,7 +702,6 @@ static int mt9p031_init_cfg(struct v4l2_subdev *subdev,V4L2_SUBDEV_FORMAT_TRY ; crop =__mt9p031_get_pad_crop (mt9p031, sd_state,0 , which); -v4l2_subdev_get_try_crop (subdev, sd_state,0 ); crop->left =MT9P031_COLUMN_START_DEF ; crop->top =MT9P031_ROW_START_DEF ; crop->width =MT9P031_WINDOW_WIDTH_DEF ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 397/1146 clk: imx8mn: rename vpu_pll to m7_alt_pll
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit a429c60baefd95ab43a2ce7f25d5b2d7a2e431df ]
The IMX8MN platform does not have any video processing unit (VPU), and indeed in the reference manual (document IMX8MNRM Rev 2, 07/2022) there is no occurrence of its pll. From an analysis of the code and the RM itself, I think vpu pll is used instead of m7 alternate pll, probably for copy and paste of code taken from modules of similar architectures.
As an example for all, if we consider the second row of the "Clock Root" table of chapter 5 (Clocks and Power Management) of the RM:
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ARM_M7_CLK_ROOT 0x8080 000 - 24M_REF_CLK
001 - SYSTEM_PLL2_DIV5
010 - SYSTEM_PLL2_DIV4
011 - M7_ALT_PLL_CLK
100 - SYSTEM_PLL1_CLK
101 - AUDIO_PLL1_CLK
110 - VIDEO_PLL_CLK
111 - SYSTEM_PLL3_CLK
... ... ...but in the source code, the imx8mn_m7_sels clocks list contains vpu_pll for the source select bits 011b.
So, let's rename "vpu_pll" to "m7_alt_pll" to be consistent with the RM.
The IMX8MN_VPU_* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
--- drivers/clk/imx/clk-imx8mn.c | 16 ++++++++-------- include/dt-bindings/clock/imx8mn-clock.h | 12 ++++++++---- 2 files changed, 16 insertions(+), 12 deletions(-)
drivers/clk/imx/clk-imx8mn.c +8 -8
@@ -30,7 +30,7 @@ static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , }; -static const char *const vpu_pll_bypass_sels[] = {"vpu_pll" ,"vpu_pll_ref_sel" , }; +static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };static const char *const arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };static const char *const sys_pll3_bypass_sels[] = {"sys_pll3" ,"sys_pll3_ref_sel" , };
@@ -40,7 +40,7 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , }; -static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"vpu_pll_out" , +static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" ,"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,
@@ -252,10 +252,10 @@ static const char * const imx8mn_gpt6_sels[] = {"osc_24m", "sys_pll2_100m", "sys "audio_pll1_out", "clk_ext1", };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" , -"vpu_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" , +"m7_alt_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" ,"sys_pll1_80m" ,"sys_pll2_166m" , }; -static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"vpu_pll_out" , +static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"m7_alt_pll_out" ,"sys_pll3_out" ,"sys_pll2_200m" ,"sys_pll1_266m" ,"sys_pll2_500m" ,"sys_pll1_100m" , };
@@ -352,7 +352,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VPU_PLL_REF_SEL ] =imx_clk_hw_mux ("vpu_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_ARM_PLL_REF_SEL ] =imx_clk_hw_mux ("arm_pll_ref_sel" , base +0x84 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_SYS_PLL3_REF_SEL ] =imx_clk_hw_mux ("sys_pll3_ref_sel" , base +0x114 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));
@@ -361,7 +361,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); - hws[IMX8MN_VPU_PLL ] =imx_clk_hw_pll14xx ("vpu_pll" ,"vpu_pll_ref_sel" , base +0x74 , &imx_1416x_pll); + hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll); hws[IMX8MN_ARM_PLL ] =imx_clk_hw_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , base +0x84 , &imx_1416x_pll); hws[IMX8MN_SYS_PLL1 ] =imx_clk_hw_fixed ("sys_pll1" ,800000000 ); hws[IMX8MN_SYS_PLL2 ] =imx_clk_hw_fixed ("sys_pll2" ,1000000000 );
@@ -373,7 +373,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("vpu_pll_bypass" , base +0x74 ,28 ,1 , vpu_pll_bypass_sels,ARRAY_SIZE (vpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_ARM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("arm_pll_bypass" , base +0x84 ,28 ,1 , arm_pll_bypass_sels,ARRAY_SIZE (arm_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_SYS_PLL3_BYPASS ] =imx_clk_hw_mux_flags ("sys_pll3_bypass" , base +0x114 ,28 ,1 , sys_pll3_bypass_sels,ARRAY_SIZE (sys_pll3_bypass_sels),CLK_SET_RATE_PARENT );
@@ -383,7 +383,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); - hws[IMX8MN_VPU_PLL_OUT ] =imx_clk_hw_gate ("vpu_pll_out" ,"vpu_pll_bypass" , base +0x74 ,11 ); + hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 ); hws[IMX8MN_ARM_PLL_OUT ] =imx_clk_hw_gate ("arm_pll_out" ,"arm_pll_bypass" , base +0x84 ,11 ); hws[IMX8MN_SYS_PLL3_OUT ] =imx_clk_hw_gate ("sys_pll3_out" ,"sys_pll3_bypass" , base +0x114 ,11 );
include/dt-bindings/clock/imx8mn-clock.h +8 -4
@@ -19,7 +19,8 @@#define IMX8MN_VIDEO_PLL1_REF_SEL 10#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12 -#define IMX8MN_VPU_PLL_REF_SEL 13 +#define IMX8MN_M7_ALT_PLL_REF_SEL 13 +#define IMX8MN_VPU_PLL_REF_SEL IMX8MN_M7_ALT_PLL_REF_SEL#define IMX8MN_ARM_PLL_REF_SEL 14#define IMX8MN_SYS_PLL1_REF_SEL 15#define IMX8MN_SYS_PLL2_REF_SEL 16
@@ -29,7 +30,8 @@#define IMX8MN_VIDEO_PLL1 20#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22 -#define IMX8MN_VPU_PLL 23 +#define IMX8MN_M7_ALT_PLL 23 +#define IMX8MN_VPU_PLL IMX8MN_M7_ALT_PLL#define IMX8MN_ARM_PLL 24#define IMX8MN_SYS_PLL1 25#define IMX8MN_SYS_PLL2 26
@@ -39,7 +41,8 @@#define IMX8MN_VIDEO_PLL1_BYPASS 30#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32 -#define IMX8MN_VPU_PLL_BYPASS 33 +#define IMX8MN_M7_ALT_PLL_BYPASS 33 +#define IMX8MN_VPU_PLL_BYPASS IMX8MN_M7_ALT_PLL_BYPASS#define IMX8MN_ARM_PLL_BYPASS 34#define IMX8MN_SYS_PLL1_BYPASS 35#define IMX8MN_SYS_PLL2_BYPASS 36
@@ -49,7 +52,8 @@#define IMX8MN_VIDEO_PLL1_OUT 40#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42 -#define IMX8MN_VPU_PLL_OUT 43 +#define IMX8MN_M7_ALT_PLL_OUT 43 +#define IMX8MN_VPU_PLL_OUT IMX8MN_M7_ALT_PLL_OUT#define IMX8MN_ARM_PLL_OUT 44#define IMX8MN_SYS_PLL1_OUT 45#define IMX8MN_SYS_PLL2_OUT 46
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 398/1146 clk: imx: replace osc_hdmi with dummy
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit e7fa365ff66f16772dc06b480cd78f858d10856b ]
There is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes 76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "osc_hdmi".
Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits.
Tested on the BSH SystemMaster (SMM) S2 board.
--- drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/imx/clk-imx8mn.c +6 -6
@@ -108,27 +108,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 399/1146 clk: imx: rename video_pll1 to video_pll
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit bedcf9d1dcf88ed38731f0ac9620e5a421e1e9d6 ]
Unlike audio_pll1 and audio_pll2, there is no video_pll2. Further, the name used in the RM is video_pll. So, let's rename "video_pll1" to "video_pll" to be consistent with the RM and avoid misunderstandings.
The IMX8MN_VIDEO_PLL1* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
--- drivers/clk/imx/clk-imx8mn.c | 96 ++++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 12 ++- 2 files changed, 56 insertions(+), 52 deletions(-)
drivers/clk/imx/clk-imx8mn.c +48 -48
@@ -27,7 +27,7 @@ static u32 share_count_nand;static const char *const pll_ref_sels[] = {"osc_24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *const audio_pll1_bypass_sels[] = {"audio_pll1" ,"audio_pll1_ref_sel" , };static const char *const audio_pll2_bypass_sels[] = {"audio_pll2" ,"audio_pll2_ref_sel" , }; -static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , }; +static const char *const video_pll_bypass_sels[] = {"video_pll" ,"video_pll_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , };static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };
@@ -41,23 +41,23 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , };static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" , -"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , }; +"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_shader_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_main_axi_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll1_100m" ,}; +"video_pll_out" ,"sys_pll1_100m" ,};static const char *const imx8mn_enet_axi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_200m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll3_out" , }; +"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_nand_usdhc_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_200m" ,"sys_pll1_133m" ,"sys_pll3_out" ,
@@ -77,23 +77,23 @@ static const char * const imx8mn_usb_bus_sels[] = {"osc_24m", "sys_pll2_500m", "static const char *const imx8mn_gpu_axi_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_ahb_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_noc_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"sys_pll2_500m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_ahb_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_800m" ,"sys_pll1_400m" ,"sys_pll2_125m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_audio_ahb_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll2_166m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_dram_alt_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll1_100m" ,"sys_pll2_500m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,
@@ -103,49 +103,49 @@ static const char * const imx8mn_dram_apb_sels[] = {"osc_24m", "sys_pll2_200m","sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" , "sys_pll2_250m", "audio_pll2_out", }; -static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_enet_ref_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_50m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"audio_pll1_out" , -"video_pll1_out" ,"clk_ext4" , }; +"video_pll_out" ,"clk_ext4" , };static const char *const imx8mn_enet_timer_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"audio_pll1_out" ,"clk_ext1" ,"clk_ext2" ,"clk_ext3" , -"clk_ext4" ,"video_pll1_out" , }; +"clk_ext4" ,"video_pll_out" , };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll1_out" , +"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" ,"sys_pll1_400m" ,"audio_pll2_out" ,"sys_pll3_out" , -"sys_pll2_250m" ,"video_pll1_out" , }; +"sys_pll2_250m" ,"video_pll_out" , };static const char *const imx8mn_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll2_333m" , "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m",
@@ -160,19 +160,19 @@ static const char * const imx8mn_usdhc2_sels[] = {"osc_24m", "sys_pll1_400m", "s "audio_pll2_out", "sys_pll1_100m", };static const char *const imx8mn_i2c1_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c2_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c3_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c4_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , }; static const char * const imx8mn_uart1_sels[] = {"osc_24m", "sys_pll1_80m", "sys_pll2_200m",
@@ -213,42 +213,42 @@ static const char * const imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "sstatic const char *const imx8mn_pwm1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_gpt1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt5_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt6_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" ,
@@ -261,15 +261,15 @@ static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "m7_static const char *const imx8mn_dsi_core_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_phy_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_dbi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_usdhc3_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll3_out" ,"sys_pll1_266m" ,
@@ -277,15 +277,15 @@ static const char * const imx8mn_usdhc3_sels[] = {"osc_24m", "sys_pll1_400m", "sstatic const char *const imx8mn_camera_pixel_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi1_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_esc_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_80m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,
@@ -306,9 +306,9 @@ static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "du "dummy", "sys_pll1_80m", };static const char *const imx8mn_clko2_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_400m" ,"sys_pll2_166m" ,"sys_pll3_out" ,"audio_pll1_out" , -"video_pll1_out" ,"osc_32k" , }; +"video_pll_out" ,"osc_32k" , }; -static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" , +static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"dummy" ,"dummy" ,"gpu_pll_out" ,"dummy" ,"arm_pll_out" ,"sys_pll1" ,"sys_pll2" ,"sys_pll3" ,"dummy" ,"dummy" ,"osc_24m" ,"dummy" ,"osc_32k" };
@@ -349,7 +349,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1_REF_SEL ] =imx_clk_hw_mux ("audio_pll1_ref_sel" , base +0x0 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_AUDIO_PLL2_REF_SEL ] =imx_clk_hw_mux ("audio_pll2_ref_sel" , base +0x14 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_VIDEO_PLL_REF_SEL ] =imx_clk_hw_mux ("video_pll_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));
@@ -358,7 +358,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1 ] =imx_clk_hw_pll14xx ("audio_pll1" ,"audio_pll1_ref_sel" , base, &imx_1443x_pll); hws[IMX8MN_AUDIO_PLL2 ] =imx_clk_hw_pll14xx ("audio_pll2" ,"audio_pll2_ref_sel" , base +0x14 , &imx_1443x_pll); - hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); + hws[IMX8MN_VIDEO_PLL ] =imx_clk_hw_pll14xx ("video_pll" ,"video_pll_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll);
@@ -370,7 +370,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL bypass out */ hws[IMX8MN_AUDIO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll1_bypass" , base,16 ,1 , audio_pll1_bypass_sels,ARRAY_SIZE (audio_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_AUDIO_PLL2_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll2_bypass" , base +0x14 ,16 ,1 , audio_pll2_bypass_sels,ARRAY_SIZE (audio_pll2_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_VIDEO_PLL_BYPASS ] =imx_clk_hw_mux_flags ("video_pll_bypass" , base +0x28 ,16 ,1 , video_pll_bypass_sels,ARRAY_SIZE (video_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT );
@@ -380,7 +380,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL out gate */ hws[IMX8MN_AUDIO_PLL1_OUT ] =imx_clk_hw_gate ("audio_pll1_out" ,"audio_pll1_bypass" , base,13 ); hws[IMX8MN_AUDIO_PLL2_OUT ] =imx_clk_hw_gate ("audio_pll2_out" ,"audio_pll2_bypass" , base +0x14 ,13 ); - hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); + hws[IMX8MN_VIDEO_PLL_OUT ] =imx_clk_hw_gate ("video_pll_out" ,"video_pll_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 );
include/dt-bindings/clock/imx8mn-clock.h +8 -4
@@ -16,7 +16,8 @@#define IMX8MN_CLK_EXT4 7#define IMX8MN_AUDIO_PLL1_REF_SEL 8#define IMX8MN_AUDIO_PLL2_REF_SEL 9 -#define IMX8MN_VIDEO_PLL1_REF_SEL 10 +#define IMX8MN_VIDEO_PLL_REF_SEL 10 +#define IMX8MN_VIDEO_PLL1_REF_SEL IMX8MN_VIDEO_PLL_REF_SEL#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12#define IMX8MN_M7_ALT_PLL_REF_SEL 13
@@ -27,7 +28,8 @@#define IMX8MN_SYS_PLL3_REF_SEL 17#define IMX8MN_AUDIO_PLL1 18#define IMX8MN_AUDIO_PLL2 19 -#define IMX8MN_VIDEO_PLL1 20 +#define IMX8MN_VIDEO_PLL 20 +#define IMX8MN_VIDEO_PLL1 IMX8MN_VIDEO_PLL#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22#define IMX8MN_M7_ALT_PLL 23
@@ -38,7 +40,8 @@#define IMX8MN_SYS_PLL3 27#define IMX8MN_AUDIO_PLL1_BYPASS 28#define IMX8MN_AUDIO_PLL2_BYPASS 29 -#define IMX8MN_VIDEO_PLL1_BYPASS 30 +#define IMX8MN_VIDEO_PLL_BYPASS 30 +#define IMX8MN_VIDEO_PLL1_BYPASS IMX8MN_VIDEO_PLL_BYPASS#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32#define IMX8MN_M7_ALT_PLL_BYPASS 33
@@ -49,7 +52,8 @@#define IMX8MN_SYS_PLL3_BYPASS 37#define IMX8MN_AUDIO_PLL1_OUT 38#define IMX8MN_AUDIO_PLL2_OUT 39 -#define IMX8MN_VIDEO_PLL1_OUT 40 +#define IMX8MN_VIDEO_PLL_OUT 40 +#define IMX8MN_VIDEO_PLL1_OUT IMX8MN_VIDEO_PLL_OUT#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42#define IMX8MN_M7_ALT_PLL_OUT 43
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 400/1146 clk: imx8mn: fix imx8mn_sai2_sels clocks list
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 34d996747a74e3a86990f9f9c48de09159d78edb ]
According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
SAI2_CLK_ROOT 0xA600 000 - 24M_REF_CLK
001 - AUDIO_PLL1_CLK
010 - AUDIO_PLL2_CLK
011 - VIDEO_PLL_CLK
100 - SYSTEM_PLL1_DIV6
110 - EXT_CLK_2
111 - EXT_CLK_3
... ... ...while the imx8mn_sai2_sels list contained clk_ext3 and clk_ext4 for source select bits 110b and 111b.
--- drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mn.c +1 -1
@@ -109,7 +109,7 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll_out"static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" , -"clk_ext3" ,"clk_ext4" , }; +"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 401/1146 clk: imx8mn: fix imx8mn_enet_phy_sels clocks list
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 2626cf67f20b28446dfc3a5b9493dd535cdb747b ]
According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ENET_PHY_REF_CLK_ROOT 0xAA80 000 - 24M_REF_CLK
001 - SYSTEM_PLL2_DIV20
010 - SYSTEM_PLL2_DIV8
011 - SYSTEM_PLL2_DIV5
100 - SYSTEM_PLL2_DIV2
101 - AUDIO_PLL1_CLK
110 - VIDEO_PLL_CLK
111 - AUDIO_PLL2_CLK
... ... ...while the imx8mn_enet_phy_sels list didn't contained audio_pll1_out for source select bits 101b.
--- drivers/clk/imx/clk-imx8mn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-imx8mn.c +2 -2
@@ -140,8 +140,8 @@ static const char * const imx8mn_enet_timer_sels[] = {"osc_24m", "sys_pll2_100m" "clk_ext4", "video_pll_out", };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" , -"audio_pll2_out" , }; +"sys_pll2_200m" ,"sys_pll2_500m" ,"audio_pll1_out" , +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" , "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 402/1146 pinctrl: pinconf-generic: add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
[ Upstream commit 5ead93289815a075d43c415e35c8beafafb801c9 ]
of_node_put() needs to be called when jumping out of the loop, since for_each_available_child_of_node() will increase the refcount of node.
--- drivers/pinctrl/pinconf-generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/pinconf-generic.c +3 -1
@@ -395,8 +395,10 @@ int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,for_each_available_child_of_node (np_config, np) { ret =pinconf_generic_dt_subnode_to_map (pctldev, np, map, &reserved_maps, num_maps, type); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np); goto exit; + } }return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 403/1146 media: dvb-core: Fix ignored return value in dvb_register_frontend()
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit a574359e2e71ce16be212df3a082ed60a4bd2c5f ]
In dvb_register_frontend(), dvb_register_device() is possible to fail but its return value is ignored.
It will cause use-after-free when module is removed, because in dvb_unregister_frontend() it tries to unregister a not registered device.
BUG: KASAN: use-after-free in dvb_remove_device+0x18b/0x1f0 [dvb_core] Read of size 4 at addr ffff88800dff4824 by task rmmod/428 CPU: 3 PID: 428 Comm: rmmod Call Trace: <TASK> ... dvb_remove_device+0x18b/0x1f0 [dvb_core] dvb_unregister_frontend+0x7b/0x130 [dvb_core] vidtv_bridge_remove+0x6e/0x160 [dvb_vidtv_bridge] ...
Fix this by catching return value of dvb_register_device(). However the fe->refcount can't be put to zero immediately, because there are still modules calling dvb_frontend_detach() when dvb_register_frontend() fails.
--- drivers/media/dvb-core/dvb_frontend.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvb_frontend.c +7 -1
@@ -2986,6 +2986,7 @@ int dvb_register_frontend(struct dvb_adapter *dvb, .name = fe->ops.info.name,#endif }; +int ret;dev_dbg (dvb->device,"%s:\n" , __func__);
@@ -3019,8 +3020,13 @@ int dvb_register_frontend(struct dvb_adapter *dvb,"DVB: registering adapter %i frontend %i (%s)...\n" , fe->dvb->num, fe->id, fe->ops.info.name); -dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template, + ret =dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template, fe,DVB_DEVICE_FRONTEND ,0 ); +if (ret) { +dvb_frontend_put (fe); +mutex_unlock (&frontend_mutex); +return ret; + }/* * Initialize the cache to the proper values according with the
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 404/1146 media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()
In reply to Greg Kroah-HartmanFrom: Baisong Zhong <[email protected]>
[ Upstream commit 0ed554fd769a19ea8464bb83e9ac201002ef74ad ]
Wei Chen reports a kernel bug as blew:
general protection fault, probably for non-canonical address KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] ... Call Trace: <TASK> __i2c_transfer+0x77e/0x1930 drivers/i2c/i2c-core-base.c:2109 i2c_transfer+0x1d5/0x3d0 drivers/i2c/i2c-core-base.c:2170 i2cdev_ioctl_rdwr+0x393/0x660 drivers/i2c/i2c-dev.c:297 i2cdev_ioctl+0x75d/0x9f0 drivers/i2c/i2c-dev.c:458 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl+0xfb/0x170 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7fd834a8bded
In az6027_i2c_xfer(), if msg[i].addr is 0x99, a null-ptr-deref will caused when accessing msg[i].buf. For msg[i].len is 0 and msg[i].buf is null.
Fix this by checking msg[i].len in az6027_i2c_xfer().
--- drivers/media/usb/dvb-usb/az6027.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/usb/dvb-usb/az6027.c +4 -0
@@ -975,6 +975,10 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nif (msg[i].addr ==0x99 ) { req =0xBE ; index =0 ; +if (msg[i].len <1 ) { + i = -EOPNOTSUPP ; +break ; + } value = msg[i].buf[0 ] &0x00ff ; length =1 ;az6027_usb_out_op (d, req, value, index, data, length);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 405/1146 x86/boot: Skip realmode init code when running as Xen PV guest
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit f1e525009493cbd569e7c8dd7d58157855f8658d ]
When running as a Xen PV guest there is no need for setting up the realmode trampoline, as realmode isn't supported in this environment.
Trying to setup the trampoline has been proven to be problematic in some cases, especially when trying to debug early boot problems with Xen requiring to keep the EFI boot-services memory mapped (some firmware variants seem to claim basically all memory below 1Mb for boot services).
Introduce new x86_platform_ops operations for that purpose, which can be set to a NOP by the Xen PV specific kernel boot code.
[ bp: s/call_init_real_mode/do_init_real_mode/ ]
--- arch/x86/include/asm/realmode.h | 1 + arch/x86/include/asm/x86_init.h | 4 ++++ arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/x86_init.c | 3 +++ arch/x86/realmode/init.c | 8 ++++++-- arch/x86/xen/enlighten_pv.c | 2 ++ 6 files changed, 17 insertions(+), 3 deletions(-)
arch/x86/include/asm/realmode.h +1 -0
@@ -91,6 +91,7 @@ static inline void set_real_mode_mem(phys_addr_t mem)void reserve_real_mode (void );void load_trampoline_pgtable (void ); +void init_real_mode (void );#endif /* __ASSEMBLY__ */
arch/x86/include/asm/x86_init.h +4 -0
@@ -285,6 +285,8 @@ struct x86_hyper_runtime {* possible in x86_early_init_platform_quirks() by * only using the current x86_hardware_subarch * semantics. +* @realmode_reserve: reserve memory for realmode trampoline +* @realmode_init: initialize realmode trampoline * @hyper: x86 hypervisor specific runtime callbacks */ struct x86_platform_ops {
@@ -301,6 +303,8 @@ struct x86_platform_ops {void (*apic_post_init)(void );struct x86_legacy_features legacy;void (*set_legacy_features)(void ); +void (*realmode_reserve)(void ); +void (*realmode_init)(void );struct x86_hyper_runtime hyper;struct x86_guest guest; };
arch/x86/kernel/setup.c +1 -1
@@ -1175,7 +1175,7 @@ void __init setup_arch(char **cmdline_p)* Moreover, on machines with SandyBridge graphics or in setups that use * crashkernel the entire 1M is reserved anyway. */ -reserve_real_mode (); + x86_platform.realmode_reserve ();init_mem_mapping ();
arch/x86/kernel/x86_init.c +3 -0
@@ -25,6 +25,7 @@#include <asm/iommu.h> #include <asm/mach_traps.h> #include <asm/irqdomain.h> +#include <asm/realmode.h> void x86_init_noop (void ) { }void __init x86_init_uint_noop (unsigned int unused) { }
@@ -145,6 +146,8 @@ struct x86_platform_ops x86_platform __ro_after_init = { .get_nmi_reason = default_get_nmi_reason, .save_sched_clock_state = tsc_save_sched_clock_state, .restore_sched_clock_state = tsc_restore_sched_clock_state, + .realmode_reserve = reserve_real_mode, + .realmode_init = init_real_mode, .hyper.pin_vcpu = x86_op_int_noop, .guest = {
arch/x86/realmode/init.c +6 -2
@@ -200,14 +200,18 @@ static void __init set_real_mode_permissions(void)set_memory_x ((unsigned long ) text_start, text_size >>PAGE_SHIFT ); } -static int __init init_real_mode (void ) +void __init init_real_mode (void ) {if (!real_mode_header)panic ("Real mode trampoline was not allocated" );setup_real_mode ();set_real_mode_permissions (); +} +static int __init do_init_real_mode (void ) +{ + x86_platform.realmode_init ();return 0 ; } -early_initcall (init_real_mode); +early_initcall (do_init_real_mode);
arch/x86/xen/enlighten_pv.c +2 -0
@@ -1266,6 +1266,8 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si)xen_vcpu_info_reset (0 ); x86_platform.get_nmi_reason = xen_get_nmi_reason; + x86_platform.realmode_reserve = x86_init_noop; + x86_platform.realmode_init = x86_init_noop; x86_init.resources.memory_setup = xen_memory_setup; x86_init.irqs.intr_mode_select = x86_init_noop;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 406/1146 media: sun6i-mipi-csi2: Require both pads to be connected for streaming
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit f042b08b833de3be810f8769d88ca44aeefd7eba ]
The bridge needs both its pads connected to be able to stream data. Enforcing this is useful to produce an error when no sensor is connected.
--- .../media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +4 -2
@@ -519,8 +519,10 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev)/* Media Pads */ - pads[SUN6I_MIPI_CSI2_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; - pads[SUN6I_MIPI_CSI2_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + pads[SUN6I_MIPI_CSI2_PAD_SINK ].flags =MEDIA_PAD_FL_SINK | +MEDIA_PAD_FL_MUST_CONNECT ; + pads[SUN6I_MIPI_CSI2_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE | +MEDIA_PAD_FL_MUST_CONNECT ; ret =media_entity_pads_init (&subdev->entity,SUN6I_MIPI_CSI2_PAD_COUNT , pads);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 407/1146 media: sun8i-a83t-mipi-csi2: Require both pads to be connected for streaming
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 8985fc724ba89d9b00694304b3f9faf69f4073d0 ]
The bridge needs both its pads connected to be able to stream data. Enforcing this is useful to produce an error when no sensor is connected.
--- .../sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +4 -2
@@ -557,8 +557,10 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev)/* Media Pads */ - pads[SUN8I_A83T_MIPI_CSI2_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; - pads[SUN8I_A83T_MIPI_CSI2_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + pads[SUN8I_A83T_MIPI_CSI2_PAD_SINK ].flags =MEDIA_PAD_FL_SINK | +MEDIA_PAD_FL_MUST_CONNECT ; + pads[SUN8I_A83T_MIPI_CSI2_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE | +MEDIA_PAD_FL_MUST_CONNECT ; ret =media_entity_pads_init (&subdev->entity,SUN8I_A83T_MIPI_CSI2_PAD_COUNT , pads);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 408/1146 media: sun6i-mipi-csi2: Register async subdev with no sensor attached
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 67182951f1dde5a88479cf8befee5f32ea014a49 ]
This allows the device to probe and register its async subdev without a sensor attached.
The rationale is that the parent driver might otherwise wait for the subdev to be registered when it should be available (from the fwnode graph endpoint perspective). This is generally not problematic when the MIPI CSI-2 bridge is the only device attached to the parent, but in the case of a CSI controller that can feed from both MIPI CSI-2 and parallel, it would prevent using the parallel sensor due to the parent waiting for the MIPI CSI-2 subdev to register.
--- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +12 -5
@@ -498,6 +498,7 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev)struct v4l2_async_notifier *notifier = &bridge->notifier;struct media_pad *pads = bridge->pads;struct device *dev = csi2_dev->dev; +bool notifier_registered = false;int ret;mutex_init (&bridge->lock);
@@ -535,12 +536,17 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev) notifier->ops = &sun6i_mipi_csi2_notifier_ops; ret =sun6i_mipi_csi2_bridge_source_setup (csi2_dev); -if (ret) +if (ret && ret != -ENODEV ) goto error_v4l2_notifier_cleanup; - ret =v4l2_async_subdev_nf_register (subdev, notifier); -if (ret <0 ) - goto error_v4l2_notifier_cleanup; +/* Only register the notifier when a sensor is connected. */ +if (ret != -ENODEV ) { + ret =v4l2_async_subdev_nf_register (subdev, notifier); +if (ret <0 ) + goto error_v4l2_notifier_cleanup; + + notifier_registered = true; + }/* V4L2 Subdev */
@@ -551,7 +557,8 @@ static int sun6i_mipi_csi2_bridge_setup(struct sun6i_mipi_csi2_device *csi2_dev)return 0 ; error_v4l2_notifier_unregister: -v4l2_async_nf_unregister (notifier); +if (notifier_registered) +v4l2_async_nf_unregister (notifier); error_v4l2_notifier_cleanup:v4l2_async_nf_cleanup (notifier);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 409/1146 media: sun8i-a83t-mipi-csi2: Register async subdev with no sensor attached
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 614f6e35a9e214c80270ab942bf58d85066a3e34 ]
This allows the device to probe and register its async subdev without a sensor attached.
The rationale is that the parent driver might otherwise wait for the subdev to be registered when it should be available (from the fwnode graph endpoint perspective). This is generally not problematic when the MIPI CSI-2 bridge is the only device attached to the parent, but in the case of a CSI controller that can feed from both MIPI CSI-2 and parallel, it would prevent using the parallel sensor due to the parent waiting for the MIPI CSI-2 subdev to register.
--- .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +12 -5
@@ -536,6 +536,7 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev)struct v4l2_async_notifier *notifier = &bridge->notifier;struct media_pad *pads = bridge->pads;struct device *dev = csi2_dev->dev; +bool notifier_registered = false;int ret;mutex_init (&bridge->lock);
@@ -573,12 +574,17 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev) notifier->ops = &sun8i_a83t_mipi_csi2_notifier_ops; ret =sun8i_a83t_mipi_csi2_bridge_source_setup (csi2_dev); -if (ret) +if (ret && ret != -ENODEV ) goto error_v4l2_notifier_cleanup; - ret =v4l2_async_subdev_nf_register (subdev, notifier); -if (ret <0 ) - goto error_v4l2_notifier_cleanup; +/* Only register the notifier when a sensor is connected. */ +if (ret != -ENODEV ) { + ret =v4l2_async_subdev_nf_register (subdev, notifier); +if (ret <0 ) + goto error_v4l2_notifier_cleanup; + + notifier_registered = true; + }/* V4L2 Subdev */
@@ -589,7 +595,8 @@ sun8i_a83t_mipi_csi2_bridge_setup(struct sun8i_a83t_mipi_csi2_device *csi2_dev)return 0 ; error_v4l2_notifier_unregister: -v4l2_async_nf_unregister (notifier); +if (notifier_registered) +v4l2_async_nf_unregister (notifier); error_v4l2_notifier_cleanup:v4l2_async_nf_cleanup (notifier);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 410/1146 media: amphion: try to wakeup vpu core to avoid failure
In reply to Greg Kroah-HartmanFrom: Ming Qian <[email protected]>
[ Upstream commit 082744433f7b96db7214a98202ed96f367684693 ]
firmware should be waked up by start or configure command, but there is a very small chance that firmware failed to wakeup. in such case, try to wakeup firmware again by sending a noop command
--- drivers/media/platform/amphion/vpu.h | 1 + drivers/media/platform/amphion/vpu_cmds.c | 39 ++++++++++++++++++-- drivers/media/platform/amphion/vpu_malone.c | 1 + drivers/media/platform/amphion/vpu_windsor.c | 1 + 4 files changed, 38 insertions(+), 4 deletions(-)
drivers/media/platform/amphion/vpu.h +1 -0
@@ -13,6 +13,7 @@#include <linux/mailbox_controller.h> #include <linux/kfifo.h> +#define VPU_TIMEOUT_WAKEUP msecs_to_jiffies(200)#define VPU_TIMEOUT msecs_to_jiffies(1000)#define VPU_INST_NULL_ID (-1L)#define VPU_MSG_BUFFER_SIZE (8192)
drivers/media/platform/amphion/vpu_cmds.c +35 -4
@@ -269,7 +269,7 @@ static bool check_is_responsed(struct vpu_inst *inst, unsigned long key)return flag; } -static int sync_session_response (struct vpu_inst *inst,unsigned long key) +static int sync_session_response (struct vpu_inst *inst,unsigned long key,long timeout,int try) {struct vpu_core *core;
@@ -279,10 +279,12 @@ static int sync_session_response(struct vpu_inst *inst, unsigned long key) core = inst->core;call_void_vop (inst, wait_prepare); -wait_event_timeout (core->ack_wq,check_is_responsed (inst, key),VPU_TIMEOUT ); +wait_event_timeout (core->ack_wq,check_is_responsed (inst, key), timeout);call_void_vop (inst, wait_finish);if (!check_is_responsed (inst, key)) { +if (try) +return -EINVAL ;dev_err (inst->dev,"[%d] sync session timeout\n" , inst->id);set_bit (inst->id, &core->hang_mask);mutex_lock (&inst->core->cmd_lock);
@@ -294,6 +296,19 @@ static int sync_session_response(struct vpu_inst *inst, unsigned long key)return 0 ; } +static void vpu_core_keep_active (struct vpu_core *core) +{ +struct vpu_rpc_event pkt; + +memset (&pkt,0 ,sizeof (pkt)); +vpu_iface_pack_cmd (core, &pkt,0 ,VPU_CMD_ID_NOOP ,NULL ); + +dev_dbg (core->dev,"try to wake up\n" ); +mutex_lock (&core->cmd_lock); +vpu_cmd_send (core, &pkt); +mutex_unlock (&core->cmd_lock); +} +static int vpu_session_send_cmd (struct vpu_inst *inst,u32 id,void *data) {unsigned long key;
@@ -304,9 +319,25 @@ static int vpu_session_send_cmd(struct vpu_inst *inst, u32 id, void *data)return -EINVAL ; ret =vpu_request_cmd (inst, id, data, &key, &sync); -if (!ret && sync) - ret =sync_session_response (inst, key); +if (ret) + goto exit; + +/* workaround for a firmware issue, +* firmware should be waked up by start or configure command, +* but there is a very small change that firmware failed to wakeup. +* in such case, try to wakeup firmware again by sending a noop command +*/ +if (sync && (id ==VPU_CMD_ID_CONFIGURE_CODEC || id ==VPU_CMD_ID_START )) { +if (sync_session_response (inst, key,VPU_TIMEOUT_WAKEUP ,1 )) +vpu_core_keep_active (inst->core); +else + goto exit; + } + +if (sync) + ret =sync_session_response (inst, key,VPU_TIMEOUT ,0 ); +exit:if (ret)dev_err (inst->dev,"[%d] send cmd(0x%x) fail\n" , inst->id, id);
drivers/media/platform/amphion/vpu_malone.c +1 -0
@@ -692,6 +692,7 @@ int vpu_malone_set_decode_params(struct vpu_shared_addr *shared, }static struct vpu_pair malone_cmds[] = { + {VPU_CMD_ID_NOOP ,VID_API_CMD_NULL }, {VPU_CMD_ID_START ,VID_API_CMD_START }, {VPU_CMD_ID_STOP ,VID_API_CMD_STOP }, {VPU_CMD_ID_ABORT ,VID_API_CMD_ABORT },
drivers/media/platform/amphion/vpu_windsor.c +1 -0
@@ -658,6 +658,7 @@ int vpu_windsor_get_stream_buffer_size(struct vpu_shared_addr *shared) }static struct vpu_pair windsor_cmds[] = { + {VPU_CMD_ID_NOOP ,GTB_ENC_CMD_NOOP }, {VPU_CMD_ID_CONFIGURE_CODEC ,GTB_ENC_CMD_CONFIGURE_CODEC }, {VPU_CMD_ID_START ,GTB_ENC_CMD_STREAM_START }, {VPU_CMD_ID_STOP ,GTB_ENC_CMD_STREAM_STOP },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 411/1146 media: amphion: cancel vpu before release instance
In reply to Greg Kroah-HartmanFrom: Ming Qian <[email protected]>
[ Upstream commit b3dd974af9de342c733492565ad02d7e23372876 ]
Revert "media: amphion: release m2m ctx when releasing vpu instance" This reverts commit d91d7bc85062309aae6d8064563ddf17947cb6bc.
Call v4l2_m2m_ctx_release() to cancel vpu,
afterwards release the vpu instance.
--- drivers/media/platform/amphion/vpu_v4l2.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/media/platform/amphion/vpu_v4l2.c +7 -4
@@ -596,10 +596,6 @@ static int vpu_v4l2_release(struct vpu_inst *inst) inst->workqueue =NULL ; } -if (inst->fh.m2m_ctx) { -v4l2_m2m_ctx_release (inst->fh.m2m_ctx); - inst->fh.m2m_ctx =NULL ; - }v4l2_ctrl_handler_free (&inst->ctrl_handler);mutex_destroy (&inst->lock);v4l2_fh_del (&inst->fh);
@@ -682,6 +678,13 @@ int vpu_v4l2_close(struct file *file)vpu_trace (vpu->dev,"tgid = %d, pid = %d, inst = %p\n" , inst->tgid, inst->pid, inst); +vpu_inst_lock (inst); +if (inst->fh.m2m_ctx) { +v4l2_m2m_ctx_release (inst->fh.m2m_ctx); + inst->fh.m2m_ctx =NULL ; + } +vpu_inst_unlock (inst); +call_void_vop (inst, release);vpu_inst_unregister (inst);vpu_inst_put (inst);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 412/1146 media: amphion: lock and check m2m_ctx in event handler
In reply to Greg Kroah-HartmanFrom: Ming Qian <[email protected]>
[ Upstream commit 1ade3f3f16986cd7c6fce02feede957f03eb8a42 ]
driver needs to cancel vpu before releasing the vpu instance, so call v4l2_m2m_ctx_release() first,
to handle the redundant event triggered after m2m_ctx is released.
lock and check m2m_ctx in the event handler.
--- drivers/media/platform/amphion/vpu_msgs.c | 2 ++ drivers/media/platform/amphion/vpu_v4l2.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/amphion/vpu_msgs.c +2 -0
@@ -43,6 +43,7 @@ static void vpu_session_handle_mem_request(struct vpu_inst *inst, struct vpu_rpc req_data.ref_frame_num, req_data.act_buf_size, req_data.act_buf_num); +vpu_inst_lock (inst); call_void_vop(inst, mem_request, req_data.enc_frame_size, req_data.enc_frame_num,
@@ -50,6 +51,7 @@ static void vpu_session_handle_mem_request(struct vpu_inst *inst, struct vpu_rpc req_data.ref_frame_num, req_data.act_buf_size, req_data.act_buf_num); +vpu_inst_unlock (inst); }static void vpu_session_handle_stop_done (struct vpu_inst *inst,struct vpu_rpc_event *pkt)
drivers/media/platform/amphion/vpu_v4l2.c +6 -2
@@ -242,8 +242,12 @@ int vpu_process_capture_buffer(struct vpu_inst *inst)struct vb2_v4l2_buffer *vpu_next_src_buf (struct vpu_inst *inst) { -struct vb2_v4l2_buffer *src_buf =v4l2_m2m_next_src_buf (inst->fh.m2m_ctx); +struct vb2_v4l2_buffer *src_buf =NULL ; +if (!inst->fh.m2m_ctx) +return NULL ; + + src_buf =v4l2_m2m_next_src_buf (inst->fh.m2m_ctx);if (!src_buf ||vpu_get_buffer_state (src_buf) ==VPU_BUF_STATE_IDLE )return NULL ;
@@ -266,7 +270,7 @@ void vpu_skip_frame(struct vpu_inst *inst, int count)enum vb2_buffer_state state;int i =0 ; -if (count <=0 ) +if (count <=0 || !inst->fh.m2m_ctx)return ;while (i < count) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 413/1146 media: mediatek: vcodec: Fix getting NULL pointer for dst buffer
In reply to Greg Kroah-HartmanFrom: Yunfei Dong <[email protected]>
[ Upstream commit d879f770e4d1d5f0d9b692d3a2702f23ee441dbb ]
The driver may can't get v4l2 buffer when lat or core decode timeout, will lead to crash when call v4l2_m2m_buf_done to set dst buffer (NULL pointer) done.
--- .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +7 -4
@@ -138,10 +138,13 @@ static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_ctx *ctx, int error state =VB2_BUF_STATE_DONE ; vb2_dst =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx); -v4l2_m2m_buf_done (vb2_dst, state); - -mtk_v4l2_debug (2 ,"free frame buffer id:%d to done list" , - vb2_dst->vb2_buf.index); +if (vb2_dst) { +v4l2_m2m_buf_done (vb2_dst, state); +mtk_v4l2_debug (2 ,"free frame buffer id:%d to done list" , + vb2_dst->vb2_buf.index); + }else { +mtk_v4l2_err ("dst buffer is NULL" ); + }if (src_buf_req)v4l2_ctrl_request_complete (src_buf_req, &ctx->ctrl_hdl);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 414/1146 media: mediatek: vcodec: Fix h264 set lat buffer error
In reply to Greg Kroah-HartmanFrom: Yunfei Dong <[email protected]>
[ Upstream commit 23d677bd9cdd10323e6d290578bbb0a408f43499 ]
Will set lat buffer to lat_list two times when lat decode timeout for inner racing mode.
If core thread can't get frame buffer, need to return error value.
--- .../vcodec/vdec/vdec_h264_req_multi_if.c | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c +17 -11
@@ -471,14 +471,19 @@ static int vdec_h264_slice_core_decode(struct vdec_lat_buf *lat_buf) sizeof(share_info->h264_slice_params)); fb = ctx->dev->vdec_pdata->get_cap_buffer (ctx); - y_fb_dma = fb ? (u64 )fb->base_y.dma_addr :0 ; - vdec_fb_va = (unsigned long )fb; +if (!fb) { + err = -EBUSY ; +mtk_vcodec_err (inst,"fb buffer is NULL" ); + goto vdec_dec_end; + } + vdec_fb_va = (unsigned long )fb; + y_fb_dma = (u64 )fb->base_y.dma_addr;if (ctx->q_data[MTK_Q_DATA_DST ].fmt->num_planes ==1 ) c_fb_dma = y_fb_dma + inst->ctx->picinfo.buf_w * inst->ctx->picinfo.buf_h;else - c_fb_dma = fb ? (u64 )fb->base_c.dma_addr :0 ; + c_fb_dma = (u64 )fb->base_c.dma_addr;mtk_vcodec_debug (inst,"[h264-core] y/c addr = 0x%llx 0x%llx" , y_fb_dma, c_fb_dma);
@@ -656,7 +661,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs, err =vpu_dec_start (vpu, data,2 );if (err) {mtk_vcodec_debug (inst,"lat decode err: %d" , err); - goto err_scp_decode; + goto err_free_fb_out; } share_info->trans_end = inst->ctx->msg_queue.wdma_addr.dma_addr +
@@ -673,12 +678,17 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,/* wait decoder done interrupt */ timeout =mtk_vcodec_wait_for_done_ctx (inst->ctx,MTK_INST_IRQ_RECEIVED ,WAIT_INTR_TIMEOUT_MS ,MTK_VDEC_LAT0 ); +if (timeout) +mtk_vcodec_err (inst,"lat decode timeout: pic_%d" , inst->slice_dec_num); inst->vsi->dec.timeout = !!timeout; err =vpu_dec_end (vpu); -if (err ==SLICE_HEADER_FULL || timeout || err ==TRANS_BUFFER_FULL ) { - err = -EINVAL ; - goto err_scp_decode; +if (err ==SLICE_HEADER_FULL || err ==TRANS_BUFFER_FULL ) { +if (!IS_VDEC_INNER_RACING (inst->ctx->dev->dec_capability)) +vdec_msg_queue_qbuf (&inst->ctx->msg_queue.lat_ctx, lat_buf); + inst->slice_dec_num++; +mtk_vcodec_err (inst,"lat dec fail: pic_%d err:%d" , inst->slice_dec_num, err); +return -EINVAL ; } share_info->trans_end = inst->ctx->msg_queue.wdma_addr.dma_addr +
@@ -695,10 +705,6 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs, inst->slice_dec_num++;return 0 ; - -err_scp_decode: -if (!IS_VDEC_INNER_RACING (inst->ctx->dev->dec_capability)) -vdec_msg_queue_qbuf (&inst->ctx->msg_queue.lat_ctx, lat_buf); err_free_fb_out:vdec_msg_queue_qbuf (&inst->ctx->msg_queue.lat_ctx, lat_buf);mtk_vcodec_err (inst,"slice dec number: %d err: %d" , inst->slice_dec_num, err);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 415/1146 media: mediatek: vcodec: Setting lat buf to lat_list when lat decode error
In reply to Greg Kroah-HartmanFrom: Yunfei Dong <[email protected]>
[ Upstream commit 12ac20d60213a439d1552382d04aabb905e0b784 ]
Need to set lat buf to lat_list when lat decode error, or lat buffer will be lost.
--- .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c +10 -5
@@ -2073,21 +2073,23 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,return -EBUSY ; } pfc = (struct vdec_vp9_slice_pfc *)lat_buf->private_data; -if (!pfc) -return -EINVAL ; +if (!pfc) { + ret = -EINVAL ; + goto err_free_fb_out; + } vsi = &pfc->vsi; ret =vdec_vp9_slice_setup_lat (instance, bs, lat_buf, pfc);if (ret) {mtk_vcodec_err (instance,"Failed to setup VP9 lat ret %d\n" , ret); -return ret; + goto err_free_fb_out; }vdec_vp9_slice_vsi_to_remote (vsi, instance->vsi); ret =vpu_dec_start (&instance->vpu,NULL ,0 );if (ret) {mtk_vcodec_err (instance,"Failed to dec VP9 ret %d\n" , ret); -return ret; + goto err_free_fb_out; }if (instance->irq) {
@@ -2107,7 +2109,7 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,/* LAT trans full, no more UBE or decode timeout */ if (ret) {mtk_vcodec_err (instance,"VP9 decode error: %d\n" , ret); -return ret; + goto err_free_fb_out; } mtk_vcodec_debug(instance, "lat dma addr: 0x%lx 0x%lx\n",
@@ -2120,6 +2122,9 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,vdec_msg_queue_qbuf (&ctx->dev->msg_queue_core_ctx, lat_buf);return 0 ; +err_free_fb_out: +vdec_msg_queue_qbuf (&ctx->msg_queue.lat_ctx, lat_buf); +return ret; } static int vdec_vp9_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 416/1146 media: mediatek: vcodec: Core thread depends on core_list
In reply to Greg Kroah-HartmanFrom: Yunfei Dong <[email protected]>
[ Upstream commit 95bc23513c9188065a22194f9af870376fc38fdd ]
Core thread will continue to work when core_list is not empty, not depends on lat_list.
--- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c +1 -1
@@ -221,7 +221,7 @@ static void vdec_msg_queue_core_work(struct work_struct *work)mtk_vcodec_dec_disable_hardware (ctx,MTK_VDEC_CORE );vdec_msg_queue_qbuf (&ctx->msg_queue.lat_ctx, lat_buf); -if (!list_empty (&ctx->msg_queue.lat_ctx.ready_queue)) { +if (!list_empty (&dev->msg_queue_core_ctx.ready_queue)) {mtk_v4l2_debug (3 ,"re-schedule to decode for core: %d" , dev->msg_queue_core_ctx.ready_num);queue_work (dev->core_workqueue, &msg_queue->core_work);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 417/1146 media: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC
In reply to Greg Kroah-HartmanFrom: Aakarsh Jain <[email protected]>
[ Upstream commit f50ebe10f5d8092c37e2bd430c78e03bf38b1e20 ]
Commit 5441e9dafdfc6dc40 ("[media] s5p-mfc: Core support for MFC v7") which adds mfc v7 support for Exynos3250 and use the same compatible string as used by Exynos5240 but both the IPs are a bit different in terms of IP clock.
Add variant driver data based on the new compatible string "samsung,exynos3250-mfc" for Exynos3250 SoC.
--- .../media/platform/samsung/s5p-mfc/s5p_mfc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c +15 -2
@@ -1576,8 +1576,18 @@ static struct s5p_mfc_variant mfc_drvdata_v7 = { .port_num = MFC_NUM_PORTS_V7, .buf_size = &buf_size_v7, .fw_name[0] = "s5p-mfc-v7.fw", - .clk_names = {"mfc", "sclk_mfc"}, - .num_clocks = 2, + .clk_names = {"mfc"}, + .num_clocks = 1, +}; + +static struct s5p_mfc_variant mfc_drvdata_v7_3250 = { + .version =MFC_VERSION_V7 , + .version_bit =MFC_V7_BIT , + .port_num =MFC_NUM_PORTS_V7 , + .buf_size = &buf_size_v7, + .fw_name[0 ] ="s5p-mfc-v7.fw" , + .clk_names = {"mfc" ,"sclk_mfc" }, + .num_clocks =2 , }; static struct s5p_mfc_buf_size_v6 mfc_buf_size_v8 = {
@@ -1647,6 +1657,9 @@ static const struct of_device_id exynos_mfc_match[] = { }, { .compatible = "samsung,mfc-v7", .data = &mfc_drvdata_v7, + }, { + .compatible = "samsung,exynos3250-mfc", + .data = &mfc_drvdata_v7_3250, }, { .compatible = "samsung,mfc-v8", .data = &mfc_drvdata_v8,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 418/1146 drm/tegra: Add missing clk_disable_unprepare() in tegra_dc_probe()
In reply to Greg Kroah-HartmanFrom: Zhang Zekun <[email protected]>
[ Upstream commit 7ad4384d53c67672a8720cdc2ef638d7d1710ab8 ]
Add the missing clk_disable_unprepare() before return from tegra_dc_probe() in the error handling path.
--- drivers/gpu/drm/tegra/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +3 -1
@@ -3205,8 +3205,10 @@ static int tegra_dc_probe(struct platform_device *pdev)usleep_range (2000 ,4000 ); err =reset_control_assert (dc->rst); -if (err <0 ) +if (err <0 ) { +clk_disable_unprepare (dc->clk);return err; + }usleep_range (2000 ,4000 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 419/1146 ASoC: dt-bindings: wcd9335: fix reset line polarity in example
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 34cb111f8a7b98b5fec809dd194003bca20ef1b2 ]
When resetting the block, the reset line is being driven low and then high, which means that the line in DTS should be annotated as "active low".
--- Documentation/devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/qcom,wcd9335.txt +1 -1
@@ -109,7 +109,7 @@ audio-codec@1{ reg = <1 0>; interrupts = <&msmgpio 54 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "intr2" - reset-gpios = <&msmgpio 64 0>; + reset-gpios = <&msmgpio 64 GPIO_ACTIVE_LOW>; slim-ifc-dev = <&wc9335_ifd>; clock-names = "mclk", "native"; clocks = <&rpmcc RPM_SMD_DIV_CLK1>,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 420/1146 ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d067b3378a78c9c3048ac535e31c171b6f5b5846 ]
As the mtk_btcvsd_snd_write and mtk_btcvsd_snd_read may return error, it should be better to catch the exception.
--- sound/soc/mediatek/common/mtk-btcvsd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/mediatek/common/mtk-btcvsd.c +2 -4
@@ -1038,11 +1038,9 @@ static int mtk_pcm_btcvsd_copy(struct snd_soc_component *component,struct mtk_btcvsd_snd *bt =snd_soc_component_get_drvdata (component);if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -mtk_btcvsd_snd_write (bt, buf, count); +return mtk_btcvsd_snd_write (bt, buf, count);else -mtk_btcvsd_snd_read (bt, buf, count); - -return 0 ; +return mtk_btcvsd_snd_read (bt, buf, count); }/* kcontrol */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 421/1146 drm/msm/mdp5: fix reading hw revision on db410c platform
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5d8c0417ea62fed3cec7f5daed06a20477efeb39 ]
Since the commit commit c6122688f265 ("drm/msm/mdp5: stop overriding drvdata") reading the MDP5 hw revision on db410c will crash the board as the MDSS_GDSC is not enabled. Revert a part of the offending commit (moving rpm enablement) and set priv->kms earlier. This make it possible to use pm_runtime_get_sync() during read_mdp_hw_revision(), which will power up both the MDP5 and MDSS devices.
Patchwork: https://patchwork.freedesktop.org/patch/512985/
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +8 -9
@@ -519,10 +519,9 @@ static void read_mdp_hw_revision(struct mdp5_kms *mdp5_kms,struct device *dev = &mdp5_kms->pdev->dev;u32 version; -/* Manually enable the MDP5, as pm runtime isn't usable yet. */ -mdp5_enable (mdp5_kms); +pm_runtime_get_sync (dev); version =mdp5_read (mdp5_kms,REG_MDP5_HW_VERSION ); -mdp5_disable (mdp5_kms); +pm_runtime_put_sync (dev); *major =FIELD (version,MDP5_HW_VERSION_MAJOR ); *minor =FIELD (version,MDP5_HW_VERSION_MINOR );
@@ -839,6 +838,12 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)*/ clk_set_rate (mdp5_kms->core_clk,200000000 ); +/* set uninit-ed kms */ + priv->kms = &mdp5_kms->base.base; + +pm_runtime_enable (&pdev->dev); + mdp5_kms->rpm_enabled = true; +read_mdp_hw_revision (mdp5_kms, &major, &minor); mdp5_kms->cfg =mdp5_cfg_init (mdp5_kms, major, minor);
@@ -887,12 +892,6 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)if (ret) goto fail; -/* set uninit-ed kms */ - priv->kms = &mdp5_kms->base.base; - -pm_runtime_enable (&pdev->dev); - mdp5_kms->rpm_enabled = true; -return 0 ; fail:if (mdp5_kms)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 422/1146 NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit eef7314caf2d73a94b68ba293cd105154d3a664e ]
We need to clear the FATTR4_WORD2_SECURITY_LABEL bitmap flag irrespective of whether or not the label is too long.
--- fs/nfs/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4xdr.c +1 -1
@@ -4234,6 +4234,7 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, p =xdr_inline_decode (xdr, len);if (unlikely (!p))return -EIO ; + bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) {if (label) {if (label->len) {
@@ -4246,7 +4247,6 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, label->lfs = lfs; status =NFS_ATTR_FATTR_V4_SECURITY_LABEL ; } - bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; }else printk (KERN_WARNING "%s: label too long (%u)!\n" , __func__, len);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 423/1146 NFSv4.2: Always decode the security label
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit c8a62f440229ae7a10874776344dfcc17d860336 ]
If the server returns a reply that includes a security label, then we must decode it whether or not we can store the results.
--- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/nfs/nfs4xdr.c +4 -6
@@ -4755,12 +4755,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,if (status <0 ) goto xdr_error; -if (fattr->label) { - status =decode_attr_security_label (xdr, bitmap, fattr->label); -if (status <0 ) - goto xdr_error; - fattr->valid |= status; - } + status =decode_attr_security_label (xdr, bitmap, fattr->label); +if (status <0 ) + goto xdr_error; + fattr->valid |= status; xdr_error:dprintk ("%s: xdr returned %d\n" , __func__, -status);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 424/1146 NFSv4.2: Fix a memory stomp in decode_attr_security_label
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 43c1031f7110967c240cb6e922adcfc4b8899183 ]
We must not change the value of label->len if it is zero, since that indicates we stored a label.
--- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/nfs/nfs4xdr.c +4 -6
@@ -4236,12 +4236,10 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,return -EIO ; bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) { -if (label) { -if (label->len) { -if (label->len < len) -return -ERANGE ; -memcpy (label->label, p, len); - } +if (label && label->len) { +if (label->len < len) +return -ERANGE ; +memcpy (label->label, p, len); label->len = len; label->pi = pi; label->lfs = lfs;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 425/1146 NFSv4.2: Fix initialisation of struct nfs4_label
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit c528f70f504434eaff993a5ddd52203a2010d51f ]
The call to nfs4_label_init_security() should return a fully initialised label.
--- fs/nfs/nfs4proc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
fs/nfs/nfs4proc.c +10 -5
@@ -122,6 +122,11 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,if (nfs_server_capable (dir,NFS_CAP_SECURITY_LABEL ) ==0 )return NULL ; + label->lfs =0 ; + label->pi =0 ; + label->len =0 ; + label->label =NULL ; + err =security_dentry_init_security (dentry, sattr->ia_mode, &dentry->d_name,NULL , (void **)&label->label, &label->len);
@@ -3796,7 +3801,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags, struct iattr *attr, int *opened) { struct nfs4_state *state; -struct nfs4_label l = {0 ,0 ,0 ,NULL }, *label =NULL ; +struct nfs4_label l, *label; label =nfs4_label_init_security (dir, ctx->dentry, attr, &l);
@@ -4682,7 +4687,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, int flags) {struct nfs_server *server =NFS_SERVER (dir); -struct nfs4_label l, *ilabel =NULL ; +struct nfs4_label l, *ilabel;struct nfs_open_context *ctx;struct nfs4_state *state;int status =0 ;
@@ -5033,7 +5038,7 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
@@ -5074,7 +5079,7 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
@@ -5193,7 +5198,7 @@ static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 426/1146 NFSv4: Fix a credential leak in _nfs4_discover_trunking()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit e83458fce080dc23c25353a1af90bfecf79c7369 ]
--- fs/nfs/nfs4proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfs/nfs4proc.c +3 -1
@@ -4018,7 +4018,7 @@ static int _nfs4_discover_trunking(struct nfs_server *server, page =alloc_page (GFP_KERNEL );if (!page) -return -ENOMEM ; + goto out_put_cred; locations =kmalloc (sizeof (struct nfs4_fs_locations ),GFP_KERNEL );if (!locations) goto out_free;
@@ -4040,6 +4040,8 @@ static int _nfs4_discover_trunking(struct nfs_server *server,kfree (locations); out_free:__free_page (page); +out_put_cred: +put_cred (cred);return status; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 427/1146 NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 51069e4aef6257b0454057359faed0ab0c9af083 ]
If we're asked to recover open state while a delegation return is outstanding, then the state manager thread cannot use a cached open, so if the server returns a delegation, we can end up deadlocked behind the pending delegreturn.
To avoid this problem, let's just ask the server not to give us a delegation unless we're explicitly reclaiming one.
--- fs/nfs/nfs4proc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +12 -7
@@ -2131,18 +2131,18 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context }static int nfs4_open_recover_helper (struct nfs4_opendata *opendata, -fmode_t fmode) +fmode_t fmode) {struct nfs4_state *newstate; +struct nfs_server *server =NFS_SB (opendata->dentry->d_sb); +int openflags = opendata->o_arg.open_flags;int ret;if (!nfs4_mode_match_open_stateid (opendata->state, fmode))return 0 ; - opendata->o_arg.open_flags =0 ; opendata->o_arg.fmode = fmode; - opendata->o_arg.share_access =nfs4_map_atomic_open_share ( -NFS_SB (opendata->dentry->d_sb), - fmode,0 ); + opendata->o_arg.share_access = +nfs4_map_atomic_open_share (server, fmode, openflags);memset (&opendata->o_res,0 ,sizeof (opendata->o_res));memset (&opendata->c_res,0 ,sizeof (opendata->c_res));nfs4_init_opendata_res (opendata);
@@ -2724,10 +2724,15 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *sstruct nfs4_opendata *opendata;int ret; - opendata =nfs4_open_recoverdata_alloc (ctx, state, -NFS4_OPEN_CLAIM_FH ); + opendata =nfs4_open_recoverdata_alloc (ctx, state,NFS4_OPEN_CLAIM_FH );if (IS_ERR (opendata))return PTR_ERR (opendata); +/* +* We're not recovering a delegation, so ask for no delegation. +* Otherwise the recovery thread could deadlock with an outstanding +* delegation return. +*/ + opendata->o_arg.open_flags =O_DIRECT ; ret =nfs4_open_recover (opendata, state);if (ret == -ESTALE )d_drop (ctx->dentry);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 428/1146 NFS: Fix an Oops in nfs_d_automount()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 35e3b6ae84935d0d7ff76cbdaa83411b0ad5e471 ]
When mounting from a NFSv4 referral, path->dentry can end up being a negative dentry, so derive the struct nfs_server from the dentry itself instead.
--- fs/nfs/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/namespace.c +1 -1
@@ -147,7 +147,7 @@ struct vfsmount *nfs_d_automount(struct path *path)struct nfs_fs_context *ctx;struct fs_context *fc;struct vfsmount *mnt =ERR_PTR (-ENOMEM ); -struct nfs_server *server =NFS_SERVER (d_inode (path->dentry)); +struct nfs_server *server =NFS_SB (path->dentry->d_sb);struct nfs_client *client = server->nfs_client;int timeout =READ_ONCE (nfs_mountpoint_expiry_timeout);int ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 429/1146 ALSA: asihpi: fix missing pci_disable_device()
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 9d86515c3d4c0564a0c31a2df87d735353a1971e ]
pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release().
--- sound/pci/asihpi/hpioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/asihpi/hpioctl.c +1 -1
@@ -361,7 +361,7 @@ int asihpi_adapter_probe(struct pci_dev *pci_dev, pci_dev->device, pci_dev->subsystem_vendor, pci_dev->subsystem_device, pci_dev->devfn); -if (pci_enable_device (pci_dev) <0 ) { +if (pcim_enable_device (pci_dev) <0 ) {dev_err (&pci_dev->dev,"pci_enable_device failed, disabling device\n" );return -EIO ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 430/1146 wifi: plfxlc: fix potential memory leak in __lf_x_usb_enable_rx()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 895b3b06efc285c1245242e9638b9ae251dc13ec ]
urbs does not be freed in exception paths in __lf_x_usb_enable_rx(). That will trigger memory leak. To fix it, add kfree() for urbs within "error" label. Compile tested only.
--- drivers/net/wireless/purelifi/plfxlc/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/purelifi/plfxlc/usb.c +1 -0
@@ -247,6 +247,7 @@ static int __lf_x_usb_enable_rx(struct plfxlc_usb *usb)for (i =0 ; i <RX_URBS_COUNT ; i++)free_rx_urb (urbs[i]); } +kfree (urbs);return r; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 431/1146 wifi: rtl8xxxu: Fix use after rcu_read_unlock in rtl8xxxu_bss_info_changed
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
[ Upstream commit 7927afb5e27baac694f585b59c436ba323528dc2 ]
Commit a8b5aef2cca1 ("wifi: rtl8xxxu: gen2: Enable 40 MHz channel width") introduced a line where the pointer returned by ieee80211_find_sta() is used after rcu_read_unlock().
Move rcu_read_unlock() a bit lower to fix this.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -1
@@ -4654,7 +4654,6 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,if (sta->deflink.ht_cap.cap & (IEEE80211_HT_CAP_SGI_40 |IEEE80211_HT_CAP_SGI_20 )) sgi =1 ; -rcu_read_unlock (); highest_rate =fls (ramask) -1 ;if (highest_rate <DESC_RATE_MCS0 ) {
@@ -4679,6 +4678,7 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,else rarpt->txrate.bw =RATE_INFO_BW_20 ; } +rcu_read_unlock (); bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); rarpt->bit_rate = bit_rate; rarpt->desc_rate = highest_rate;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 432/1146 wifi: iwlwifi: mvm: fix double free on tx path.
In reply to Greg Kroah-HartmanFrom: Ben Greear <[email protected]>
[ Upstream commit 0473cbae2137b963bd0eaa74336131cb1d3bc6c3 ]
We see kernel crashes and lockups and KASAN errors related to ax210 firmware crashes. One of the KASAN dumps pointed at the tx path, and it appears there is indeed a way to double-free an skb.
If iwl_mvm_tx_skb_sta returns non-zero, then the 'skb' sent into the method will be freed. But, in case where we build TSO skb buffer, the skb may also be freed in error case. So, return 0 in that particular error case and do cleanup manually.
BUG: KASAN: use-after-free in __list_del_entry_valid+0x12/0x90 iwlwifi 0000:06:00.0: 0x00000000 | tsf hi Read of size 8 at addr ffff88813cfa4ba0 by task btserver/9650 CPU: 4 PID: 9650 Comm: btserver Tainted: G W 5.19.8+ #5 iwlwifi 0000:06:00.0: 0x00000000 | time gp1 Hardware name: Default string Default string/SKYBAY, BIOS 5.12 02/19/2019 Call Trace: <TASK> dump_stack_lvl+0x55/0x6d print_report.cold.12+0xf2/0x684 iwlwifi 0000:06:00.0: 0x1D0915A8 | time gp2 ? __list_del_entry_valid+0x12/0x90 kasan_report+0x8b/0x180 iwlwifi 0000:06:00.0: 0x00000001 | uCode revision type ? __list_del_entry_valid+0x12/0x90 __list_del_entry_valid+0x12/0x90 iwlwifi 0000:06:00.0: 0x00000048 | uCode version major tcp_update_skb_after_send+0x5d/0x170 __tcp_transmit_skb+0xb61/0x15c0 iwlwifi 0000:06:00.0: 0xDAA05125 | uCode version minor ? __tcp_select_window+0x490/0x490 iwlwifi 0000:06:00.0: 0x00000420 | hw version ? trace_kmalloc_node+0x29/0xd0 ? __kmalloc_node_track_caller+0x12a/0x260 ? memset+0x1f/0x40 ? __build_skb_around+0x125/0x150 ? __alloc_skb+0x1d4/0x220 ? skb_zerocopy_clone+0x55/0x230 iwlwifi 0000:06:00.0: 0x00489002 | board version ? kmalloc_reserve+0x80/0x80 ? rcu_read_lock_bh_held+0x60/0xb0 tcp_write_xmit+0x3f1/0x24d0
iwlwifi 0000:06:00.0: 0x034E001C | hcmd
? __check_object_size+0x180/0x350
iwlwifi 0000:06:00.0: 0x24020000 | isr0
tcp_sendmsg_locked+0x8a9/0x1520
iwlwifi 0000:06:00.0: 0x01400000 | isr1
? tcp_sendpage+0x50/0x50
iwlwifi 0000:06:00.0: 0x48F0000A | isr2
? lock_release+0xb9/0x400 ? tcp_sendmsg+0x14/0x40 iwlwifi 0000:06:00.0: 0x00C3080C | isr3 ? lock_downgrade+0x390/0x390 ? do_raw_spin_lock+0x114/0x1d0 iwlwifi 0000:06:00.0: 0x00200000 | isr4 ? rwlock_bug.part.2+0x50/0x50 iwlwifi 0000:06:00.0: 0x034A001C | last cmd Id ? rwlock_bug.part.2+0x50/0x50 ? lockdep_hardirqs_on_prepare+0xe/0x200 iwlwifi 0000:06:00.0: 0x0000C2F0 | wait_event ? __local_bh_enable_ip+0x87/0xe0 ? inet_send_prepare+0x220/0x220 iwlwifi 0000:06:00.0: 0x000000C4 | l2p_control tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70
iwlwifi 0000:06:00.0: 0x00010034 | l2p_duration
__sys_sendto+0x19d/0x250
iwlwifi 0000:06:00.0: 0x00000007 | l2p_mhvalid
? __ia32_sys_getpeername+0x40/0x40
iwlwifi 0000:06:00.0: 0x00000000 | l2p_addr_match
? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_bh_held+0xb0/0xb0 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_sched_held+0x5a/0xd0 ? lock_release+0xb9/0x400 ? lock_downgrade+0x390/0x390 ? ktime_get+0x64/0x130 ? ktime_get+0x8d/0x130 ? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_bh_held+0xb0/0xb0 ? rcu_read_lock_bh_held+0xb0/0xb0 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f1d126e4531 Code: 00 00 00 00 0f 1f 44 00 00 f3 0f 1e fa 48 8d 05 35 80 0c 00 41 89 ca 8b 00 85 c0 75 1c 45 31 c9 45 31 c0 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 67 c3 66 0f 1f 44 00 00 55 48 83 ec 20 48 89 RSP: 002b:00007ffe21a679d8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 000000000000ffdc RCX: 00007f1d126e4531 RDX: 0000000000010000 RSI: 000000000374acf0 RDI: 0000000000000014 RBP: 00007ffe21a67ac0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000010 R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000 </TASK> Allocated by task 9650: kasan_save_stack+0x1c/0x40 __kasan_slab_alloc+0x6d/0x90 kmem_cache_alloc_node+0xf3/0x2b0 __alloc_skb+0x191/0x220 tcp_stream_alloc_skb+0x3f/0x330 tcp_sendmsg_locked+0x67c/0x1520 tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70 __sys_sendto+0x19d/0x250 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 9650: kasan_save_stack+0x1c/0x40 kasan_set_track+0x21/0x30 kasan_set_free_info+0x20/0x30 __kasan_slab_free+0x102/0x170 kmem_cache_free+0xc8/0x3e0 iwl_mvm_mac_itxq_xmit+0x124/0x270 [iwlmvm] ieee80211_queue_skb+0x874/0xd10 [mac80211] ieee80211_xmit_fast+0xf80/0x1180 [mac80211] __ieee80211_subif_start_xmit+0x287/0x680 [mac80211] ieee80211_subif_start_xmit+0xcd/0x730 [mac80211] dev_hard_start_xmit+0xf6/0x420 __dev_queue_xmit+0x165b/0x1b50 ip_finish_output2+0x66e/0xfb0 __ip_finish_output+0x487/0x6d0 ip_output+0x11c/0x350 __ip_queue_xmit+0x36b/0x9d0 __tcp_transmit_skb+0xb35/0x15c0 tcp_write_xmit+0x3f1/0x24d0 tcp_sendmsg_locked+0x8a9/0x1520 tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70 __sys_sendto+0x19d/0x250 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 The buggy address belongs to the object at ffff88813cfa4b40 which belongs to the cache skbuff_fclone_cache of size 472
The buggy address is located 96 bytes inside of
472-byte region [ffff88813cfa4b40, ffff88813cfa4d18)
The buggy address belongs to the physical page:
page:ffffea0004f3e900 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88813cfa6c40 pfn:0x13cfa4
head:ffffea0004f3e900 order:2 compound_mapcount:0 compound_pincount:0
flags: 0x5fff8000010200(slab|head|node=0|zone=2|lastcpupid=0x3fff)
raw: 005fff8000010200 ffffea0004656b08 ffffea0008e8cf08 ffff8881081a5240
raw: ffff88813cfa6c40 0000000000170015 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88813cfa4a80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88813cfa4b00: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
>ffff88813cfa4b80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88813cfa4c00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88813cfa4c80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +11 -1
@@ -1212,6 +1212,7 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,struct sk_buff_head mpdus_skbs;unsigned int payload_len;int ret; +struct sk_buff *orig_skb = skb;if (WARN_ON_ONCE (!mvmsta))return -1 ;
@@ -1244,8 +1245,17 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, ret =iwl_mvm_tx_mpdu (mvm, skb, &info, sta);if (ret) { +/* Free skbs created as part of TSO logic that have not yet been dequeued */ __skb_queue_purge (&mpdus_skbs); -return ret; +/* skb here is not necessarily same as skb that entered this method, +* so free it explicitly. +*/ +if (skb == orig_skb) +ieee80211_free_txskb (mvm->hw, skb); +else +kfree_skb (skb); +/* there was error, but we consumed skb one way or another, so return 0 */ +return 0 ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 433/1146 ASoC: mediatek: mt8173: Enable IRQ when pdata is ready
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
[ Upstream commit 4cbb264d4e9136acab2c8fd39e39ab1b1402b84b ]
If the device does not come straight from reset, we might receive an IRQ before we are ready to handle it.
Fixes:
[ 2.334737] Unable to handle kernel read from unreadable memory at virtual address 00000000000001e4 [ 2.522601] Call trace: [ 2.525040] regmap_read+0x1c/0x80 [ 2.528434] mt8173_afe_irq_handler+0x40/0xf0 ... [ 2.598921] start_kernel+0x338/0x42c
--- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +10 -10
@@ -1070,16 +1070,6 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) afe->dev = &pdev->dev; - irq_id =platform_get_irq (pdev,0 ); -if (irq_id <=0 ) -return irq_id <0 ? irq_id : -ENXIO ; - ret =devm_request_irq (afe->dev, irq_id, mt8173_afe_irq_handler, -0 ,"Afe_ISR_Handle" , (void *)afe); -if (ret) { -dev_err (afe->dev,"could not request_irq\n" ); -return ret; - } - afe->base_addr =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (afe->base_addr))return PTR_ERR (afe->base_addr);
@@ -1185,6 +1175,16 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)if (ret) goto err_cleanup_components; + irq_id =platform_get_irq (pdev,0 ); +if (irq_id <=0 ) +return irq_id <0 ? irq_id : -ENXIO ; + ret =devm_request_irq (afe->dev, irq_id, mt8173_afe_irq_handler, +0 ,"Afe_ISR_Handle" , (void *)afe); +if (ret) { +dev_err (afe->dev,"could not request_irq\n" ); + goto err_pm_disable; + } +dev_info (&pdev->dev,"MT8173 AFE driver initialized.\n" );return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 434/1146 clk: mediatek: fix dependency of MT7986 ADC clocks
In reply to Greg Kroah-HartmanFrom: Daniel Golle <[email protected]>
[ Upstream commit a46315295489933209e902638cd287aeb5f982ab ]
It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the mtk-thermal and mt6577_auxadc drivers, add dependency to the clock driver clk-mt7986-infracfg.c.
--- drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt7986-infracfg.c +1 -1
@@ -153,7 +153,7 @@ static const struct mtk_gate infra_clks[] = { 18),GATE_INFRA1 (CLK_INFRA_MSDC_66M_CK ,"infra_msdc_66m" ,"infra_sysaxi_d2" ,19 ), -GATE_INFRA1 (CLK_INFRA_ADC_26M_CK ,"infra_adc_26m" ,"csw_f26m_sel" ,20 ), +GATE_INFRA1 (CLK_INFRA_ADC_26M_CK ,"infra_adc_26m" ,"infra_adc_frc" ,20 ),GATE_INFRA1 (CLK_INFRA_ADC_FRC_CK ,"infra_adc_frc" ,"csw_f26m_sel" ,21 ), GATE_INFRA1(CLK_INFRA_FBIST2FPC_CK, "infra_fbist2fpc", "nfi1x_sel", 23),/* INFRA2 */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 435/1146 drm/amd/pm/smu11: BACO is supported when its in BACO state
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 6dca7efe6e522bf213c7dab691fa580d82f48f74 ]
Return true early if ASIC is in BACO state already, no need to talk to SMU. It can fix the issue that driver was not calling BACO exit at all in runtime pm resume, and a timing issue leading to a PCI AER error happened eventually.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -0
@@ -1588,6 +1588,10 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu)if (amdgpu_sriov_vf (smu->adev) || !smu_baco->platform_support)return false; +/* return true if ASIC is in BACO state already */ +if (smu_v11_0_baco_get_state (smu) ==SMU_BACO_STATE_ENTER ) +return true; +/* Arcturus does not support this bit mask */ if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && !smu_cmn_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 436/1146 amdgpu/nv.c: Corrected typo in the video capabilities resolution
In reply to Greg Kroah-HartmanFrom: Veerabadhran Gopalakrishnan <[email protected]>
[ Upstream commit 65009bf2b4d287ef7ad7e6eb082b7c3d35eb611f ]
Corrected the typo in the 4K resolution parameters.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 28 ++++++++++++++-------------- drivers/gpu/drm/amd/amdgpu/soc15.c | 24 ++++++++++++------------ drivers/gpu/drm/amd/amdgpu/soc21.c | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +14 -14
@@ -82,10 +82,10 @@ static const struct amdgpu_video_codecs nv_video_codecs_encode =/* Navi1x */ static const struct amdgpu_video_codec_info nv_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )},
@@ -100,10 +100,10 @@ static const struct amdgpu_video_codecs nv_video_codecs_decode =/* Sienna Cichlid */ static const struct amdgpu_video_codec_info sc_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )},
@@ -125,10 +125,10 @@ static struct amdgpu_video_codec_info sriov_sc_video_codecs_encode_array[] =static struct amdgpu_video_codec_info sriov_sc_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )},
@@ -149,7 +149,7 @@ static struct amdgpu_video_codecs sriov_sc_video_codecs_decode =/* Beige Goby*/ static const struct amdgpu_video_codec_info bg_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )}, };
@@ -166,7 +166,7 @@ static const struct amdgpu_video_codecs bg_video_codecs_encode = {/* Yellow Carp*/ static const struct amdgpu_video_codec_info yc_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )},
drivers/gpu/drm/amd/amdgpu/soc15.c +12 -12
@@ -103,10 +103,10 @@ static const struct amdgpu_video_codecs vega_video_codecs_encode =/* Vega */ static const struct amdgpu_video_codec_info vega_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,4096 ,4096 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, };
@@ -120,10 +120,10 @@ static const struct amdgpu_video_codecs vega_video_codecs_decode =/* Raven */ static const struct amdgpu_video_codec_info rv_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,4096 ,4096 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,4096 ,4096 ,0 )},
@@ -138,10 +138,10 @@ static const struct amdgpu_video_codecs rv_video_codecs_decode =/* Renoir, Arcturus */ static const struct amdgpu_video_codec_info rn_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4906 ,3 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4906 ,5 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4906 ,4 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 ,4096 ,4096 ,3 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 ,4096 ,4096 ,5 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 ,4096 ,4096 ,4 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )},
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -1
@@ -61,7 +61,7 @@ static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode =static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array[] = { - {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4096 ,52 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )},
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 437/1146 drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 725a521a18734f65de05b8d353b5bd0d3ca4c37a ]
As comment of pci_get_class() says, it returns a pci_device with its refcount increased and decreased the refcount for the input parameter @from if it is not NULL.
If we break the loop in radeon_atrm_get_bios() with 'pdev' not NULL, we need to call pci_dev_put() to decrease the refcount. Add the missing pci_dev_put() to avoid refcount leak.
--- drivers/gpu/drm/radeon/radeon_bios.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/radeon_bios.c +1 -0
@@ -227,6 +227,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev)if (!found)return false; +pci_dev_put (pdev); rdev->bios =kmalloc (size,GFP_KERNEL );if (!rdev->bios) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 438/1146 drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit ca54639c7752edf1304d92ff4d0c049d4efc9ba0 ]
As comment of pci_get_class() says, it returns a pci_device with its refcount increased and decreased the refcount for the input parameter @from if it is not NULL.
If we break the loop in amdgpu_atrm_get_bios() with 'pdev' not NULL, we need to call pci_dev_put() to decrease the refcount. Add the missing pci_dev_put() to avoid refcount leak.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +1 -0
@@ -317,6 +317,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)if (!found)return false; +pci_dev_put (pdev); adev->bios =kmalloc (size,GFP_KERNEL );if (!adev->bios) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 439/1146 drm/amdkfd: Fix memory leakage
In reply to Greg Kroah-HartmanFrom: Konstantin Meskhidze <[email protected]>
[ Upstream commit 75818afff631e1ea785a82c3e8bb82eb0dee539c ]
This patch fixes potential memory leakage and seg fault in _gpuvm_import_dmabuf() function
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
@@ -2256,7 +2256,7 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, ret =drm_vma_node_allow (&obj->vma_node, drm_priv);if (ret) { -kfree (mem); +kfree (*mem);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 440/1146 drm/i915/bios: fix a memory leak in generate_lfp_data_ptrs
In reply to Greg Kroah-HartmanFrom: Xia Fukun <[email protected]>
[ Upstream commit 1382901f75a5a7dc8eac05059fd0c7816def4eae ]
When (size != 0 || ptrs->lvds_ entries != 3), the program tries to free() the ptrs. However, the ptrs is not created by calling kzmalloc(), but is obtained by pointer offset operation.
This may lead to memory leaks or undefined behavior.
Fix this by replacing the arguments of kfree() with ptrs_block.
--- drivers/gpu/drm/i915/display/intel_bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_bios.c +1 -1
@@ -414,7 +414,7 @@ static void *generate_lfp_data_ptrs(struct drm_i915_private *i915, ptrs->lvds_entries++;if (size !=0 || ptrs->lvds_entries !=3 ) { -kfree (ptrs); +kfree (ptrs_block);return NULL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 441/1146 ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe
In reply to Greg Kroah-HartmanFrom: Zhang Qilong <[email protected]>
[ Upstream commit 97b801be6f8e53676b9f2b105f54e35c745c1b22 ]
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by going to err_pm instead of err_clk.
--- sound/soc/codecs/pcm512x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/pcm512x.c +4 -4
@@ -1634,7 +1634,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)if (val >6 ) {dev_err (dev,"Invalid pll-in\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } pcm512x->pll_in = val; }
@@ -1643,7 +1643,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)if (val >6 ) {dev_err (dev,"Invalid pll-out\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } pcm512x->pll_out = val; }
@@ -1652,12 +1652,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)dev_err (dev,"Error: both pll-in and pll-out, or none\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; }if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) {dev_err (dev,"Error: pll-in == pll-out\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } }#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 442/1146 clk: visconti: Fix memory leak in visconti_register_pll()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit b55226f8553d255f5002c751c7c6ba9291f34bf2 ]
@pll->rate_table has allocated memory by kmemdup(), if clk_hw_register() fails, it should be freed, otherwise it will cause memory leak issue, this patch fixes it.
--- drivers/clk/visconti/pll.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/visconti/pll.c +1 -0
@@ -277,6 +277,7 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx, ret =clk_hw_register (NULL , &pll->hw);if (ret) {pr_err ("failed to register pll clock %s : %d\n" , name, ret); +kfree (pll->rate_table);kfree (pll); pll_hw_clk =ERR_PTR (ret); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 443/1146 netfilter: conntrack: set icmpv6 redirects as RELATED
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 7d7cfb48d81353e826493d24c7cec7360950968f ]
icmp conntrack will set icmp redirects as RELATED, but icmpv6 will not do this.
For icmpv6, only icmp errors (code <= 128) are examined for RELATED state. ICMPV6 Redirects are part of neighbour discovery mechanism, those are handled by marking a selected subset (e.g. neighbour solicitations) as UNTRACKED, but not REDIRECT -- they will thus be flagged as INVALID.
Add minimal support for REDIRECTs. No parsing of neighbour options is added for simplicity, so this will only check that we have the embeeded original header (ND_OPT_REDIRECT_HDR), and then attempt to do a flow lookup for this tuple.
Also extend the existing test case to cover redirects.
--- net/netfilter/nf_conntrack_proto_icmpv6.c | 53 +++++++++++++++++++ .../netfilter/conntrack_icmp_related.sh | 36 ++++++++++++- 2 files changed, 87 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_proto_icmpv6.c +53 -0
@@ -129,6 +129,56 @@ static void icmpv6_error_log(const struct sk_buff *skb,nf_l4proto_log_invalid (skb, state,IPPROTO_ICMPV6 ,"%s" , msg); } +static noinline_for_stack int +nf_conntrack_icmpv6_redirect (struct nf_conn *tmpl,struct sk_buff *skb, +unsigned int dataoff, +const struct nf_hook_state *state) +{ +u8 hl =ipv6_hdr (skb)->hop_limit; +union nf_inet_addr outer_daddr; +union { +struct nd_opt_hdr nd_opt; +struct rd_msg rd_msg; + } tmp; +const struct nd_opt_hdr *nd_opt; +const struct rd_msg *rd_msg; + + rd_msg =skb_header_pointer (skb, dataoff,sizeof (*rd_msg), &tmp.rd_msg); +if (!rd_msg) { +icmpv6_error_log (skb, state,"short redirect" ); +return -NF_ACCEPT ; + } + +if (rd_msg->icmph.icmp6_code !=0 ) +return NF_ACCEPT ; + +if (hl !=255 || !(ipv6_addr_type (&ipv6_hdr (skb)->saddr) &IPV6_ADDR_LINKLOCAL )) { +icmpv6_error_log (skb, state,"invalid saddr or hoplimit for redirect" ); +return -NF_ACCEPT ; + } + + dataoff +=sizeof (*rd_msg); + +/* warning: rd_msg no longer usable after this call */ + nd_opt =skb_header_pointer (skb, dataoff,sizeof (*nd_opt), &tmp.nd_opt); +if (!nd_opt || nd_opt->nd_opt_len ==0 ) { +icmpv6_error_log (skb, state,"redirect without options" ); +return -NF_ACCEPT ; + } + +/* We could call ndisc_parse_options(), but it would need +* skb_linearize() and a bit more work. +*/ +if (nd_opt->nd_opt_type !=ND_OPT_REDIRECT_HDR ) +return NF_ACCEPT ; + +memcpy (&outer_daddr.ip6, &ipv6_hdr (skb)->daddr, +sizeof (outer_daddr.ip6)); + dataoff +=8 ; +return nf_conntrack_inet_error (tmpl, skb, dataoff, state, +IPPROTO_ICMPV6 , &outer_daddr); +} + int nf_conntrack_icmpv6_error(struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff,
@@ -159,6 +209,9 @@ int nf_conntrack_icmpv6_error(struct nf_conn *tmpl,return NF_ACCEPT ; } +if (icmp6h->icmp6_type ==NDISC_REDIRECT ) +return nf_conntrack_icmpv6_redirect (tmpl, skb, dataoff, state); +/* is not error message ? */ if (icmp6h->icmp6_type >=128 )return NF_ACCEPT ;
tools/testing/selftests/netfilter/conntrack_icmp_related.sh +34 -2
@@ -35,6 +35,8 @@ cleanup() { for i in 1 2;do ip netns del nsrouter$i;done } +trap cleanup EXIT + ipv4() { echo -n 192.168.$1.2 }
@@ -146,11 +148,17 @@ ip netns exec nsclient1 nft -f - <<EOF table inet filter { counter unknown { } counter related { } + counter redir4 { } + counter redir6 { } chain input { type filter hook input priority 0; policy accept; - meta l4proto { icmp, icmpv6 } ct state established,untracked accept + icmp type "redirect" ct state "related" counter name "redir4" accept + icmpv6 type "nd-redirect" ct state "related" counter name "redir6" accept + + meta l4proto { icmp, icmpv6 } ct state established,untracked accept meta l4proto { icmp, icmpv6 } ct state "related" counter name "related" accept + counter name "unknown" drop } }
@@ -279,5 +287,29 @@ else echo "ERROR: icmp error RELATED state test has failed" fi -cleanup +# add 'bad' route, expect icmp REDIRECT to be generated +ip netns exec nsclient1 ip route add 192.168.1.42 via 192.168.1.1 +ip netns exec nsclient1 ip route add dead:1::42 via dead:1::1 + +ip netns exec "nsclient1" ping -q -c 2 192.168.1.42 > /dev/null + +expect="packets 1 bytes 112" +check_counter nsclient1 "redir4" "$expect" +if [ $? -ne 0 ];then + ret=1 +fi + +ip netns exec "nsclient1" ping -c 1 dead:1::42 > /dev/null +expect="packets 1 bytes 192" +check_counter nsclient1 "redir6" "$expect" +if [ $? -ne 0 ];then + ret=1 +fi + +if [ $ret -eq 0 ];then + echo "PASS: icmp redirects had RELATED state" +else + echo "ERROR: icmp redirect RELATED state test has failed" +fi + exit $ret
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 444/1146 Input: wistron_btns - disable on UML
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b2b80d9dd14cb5b70dc254bddbc4eea932694791 ]
The wistron_btns driver calls rtc_cmos_read(), which isn't available with UML builds, so disable this driver on UML.
Prevents this build error:
ld: drivers/input/misc/wistron_btns.o: in function `poll_bios':
wistron_btns.c:(.text+0x4be): undefined reference to `rtc_cmos_read'
--- drivers/input/misc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/misc/Kconfig +1 -1
@@ -330,7 +330,7 @@ config INPUT_CPCAP_PWRBUTTON config INPUT_WISTRON_BTNS tristate "x86 Wistron laptop button interface" - depends on X86_32 + depends on X86_32 && !UML select INPUT_SPARSEKMAP select NEW_LEDS select LEDS_CLASS
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 445/1146 bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit 7a9841ca025275b5b0edfb0b618934abb6ceec15 ]
In tcp_bpf_send_verdict() redirection, the eval variable is assigned to __SK_REDIRECT after the apply_bytes data is sent, if msg has more_data, sock_put() will be called multiple times.
We should reset the eval variable to __SK_NONE every time more_data starts.
This causes:
IPv4: Attempt to release TCP socket in state 1 00000000b4c925d7
------------[ cut here ]------------ refcount_t: addition on 0; use-after-free. WARNING: CPU: 5 PID: 4482 at lib/refcount.c:25 refcount_warn_saturate+0x7d/0x110 Modules linked in: CPU: 5 PID: 4482 Comm: sockhash_bypass Kdump: loaded Not tainted 6.0.0 #1 Hardware name: Red Hat KVM, BIOS 1.11.0-2.el7 04/01/2014 Call Trace: <TASK> __tcp_transmit_skb+0xa1b/0xb90 ? __alloc_skb+0x8c/0x1a0 ? __kmalloc_node_track_caller+0x184/0x320 tcp_write_xmit+0x22a/0x1110 __tcp_push_pending_frames+0x32/0xf0 do_tcp_sendpages+0x62d/0x640 tcp_bpf_push+0xae/0x2c0 tcp_bpf_sendmsg_redir+0x260/0x410 ? preempt_count_add+0x70/0xa0 tcp_bpf_send_verdict+0x386/0x4b0 tcp_bpf_sendmsg+0x21b/0x3b0 sock_sendmsg+0x58/0x70 __sys_sendto+0xfa/0x170 ? xfd_validate_state+0x1d/0x80 ? switch_fpu_return+0x59/0xe0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x37/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- net/ipv4/tcp_bpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +2 -1
@@ -279,7 +279,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,bool cork = false, enospc =sk_msg_full (msg);struct sock *sk_redir;u32 tosend, origsize, sent, delta =0 ; -u32 eval = __SK_NONE; +u32 eval;int ret; more_data:
@@ -310,6 +310,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, tosend = msg->sg.size;if (psock->apply_bytes && psock->apply_bytes < tosend) tosend = psock->apply_bytes; + eval = __SK_NONE;switch (psock->eval) {case __SK_PASS:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 446/1146 bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit a351d6087bf7d3d8440d58d3bf244ec64b89394a ]
When redirecting, we use sk_msg_to_ingress() to get the BPF_F_INGRESS flag from the msg->flags. If apply_bytes is used and it is larger than the current data being processed, sk_psock_msg_verdict() will not be called when sendmsg() is called again. At this time, the msg->flags is 0, and we lost the BPF_F_INGRESS flag.
So we need to save the BPF_F_INGRESS flag in sk_psock and use it when redirection.
--- include/linux/skmsg.h | 1 + include/net/tcp.h | 4 ++-- net/core/skmsg.c | 9 ++++++--- net/ipv4/tcp_bpf.c | 11 ++++++----- net/tls/tls_sw.c | 6 ++++-- 5 files changed, 19 insertions(+), 12 deletions(-)
include/linux/skmsg.h +1 -0
@@ -82,6 +82,7 @@ struct sk_psock {u32 apply_bytes;u32 cork_bytes;u32 eval; +bool redir_ingress;/* undefined if sk_redir is null */ struct sk_msg *cork;struct sk_psock_progs progs;#if IS_ENABLED (CONFIG_BPF_STREAM_PARSER )
include/net/tcp.h +2 -2
@@ -2291,8 +2291,8 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);void tcp_bpf_clone (const struct sock *sk,struct sock *newsk);#endif /* CONFIG_BPF_SYSCALL */ -int tcp_bpf_sendmsg_redir (struct sock *sk,struct sk_msg *msg,u32 bytes, -int flags); +int tcp_bpf_sendmsg_redir (struct sock *sk,bool ingress, +struct sk_msg *msg,u32 bytes,int flags);#endif /* CONFIG_NET_SOCK_MSG */ #if !defined(CONFIG_BPF_SYSCALL ) || !defined(CONFIG_NET_SOCK_MSG )
net/core/skmsg.c +6 -3
@@ -886,13 +886,16 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock, ret =sk_psock_map_verd (ret, msg->sk_redir); psock->apply_bytes = msg->apply_bytes;if (ret == __SK_REDIRECT) { -if (psock->sk_redir) +if (psock->sk_redir) {sock_put (psock->sk_redir); - psock->sk_redir = msg->sk_redir; -if (!psock->sk_redir) { + psock->sk_redir =NULL ; + } +if (!msg->sk_redir) { ret = __SK_DROP; goto out; } + psock->redir_ingress =sk_msg_to_ingress (msg); + psock->sk_redir = msg->sk_redir;sock_hold (psock->sk_redir); } out:
net/ipv4/tcp_bpf.c +6 -5
@@ -131,10 +131,9 @@ static int tcp_bpf_push_locked(struct sock *sk, struct sk_msg *msg,return ret; } -int tcp_bpf_sendmsg_redir (struct sock *sk,struct sk_msg *msg, -u32 bytes,int flags) +int tcp_bpf_sendmsg_redir (struct sock *sk,bool ingress, +struct sk_msg *msg,u32 bytes,int flags) { -bool ingress =sk_msg_to_ingress (msg);struct sk_psock *psock =sk_psock_get (sk);int ret;
@@ -276,7 +275,7 @@ static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,static int tcp_bpf_send_verdict (struct sock *sk,struct sk_psock *psock,struct sk_msg *msg,int *copied,int flags) { -bool cork = false, enospc =sk_msg_full (msg); +bool cork = false, enospc =sk_msg_full (msg), redir_ingress;struct sock *sk_redir;u32 tosend, origsize, sent, delta =0 ;u32 eval;
@@ -322,6 +321,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,sk_msg_apply_bytes (psock, tosend);break ;case __SK_REDIRECT: + redir_ingress = psock->redir_ingress; sk_redir = psock->sk_redir;sk_msg_apply_bytes (psock, tosend);if (!psock->apply_bytes) {
@@ -338,7 +338,8 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,release_sock (sk); origsize = msg->sg.size; - ret =tcp_bpf_sendmsg_redir (sk_redir, msg, tosend, flags); + ret =tcp_bpf_sendmsg_redir (sk_redir, redir_ingress, + msg, tosend, flags); sent = origsize - msg->sg.size;if (eval == __SK_REDIRECT)
net/tls/tls_sw.c +4 -2
@@ -792,7 +792,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk,struct sk_psock *psock;struct sock *sk_redir;struct tls_rec *rec; -bool enospc, policy; +bool enospc, policy, redir_ingress;int err =0 , send;u32 delta =0 ;
@@ -837,6 +837,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, }break ;case __SK_REDIRECT: + redir_ingress = psock->redir_ingress; sk_redir = psock->sk_redir;memcpy (&msg_redir, msg,sizeof (*msg));if (msg->apply_bytes < send)
@@ -846,7 +847,8 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk,sk_msg_return_zero (sk, msg, send); msg->sg.size -= send;release_sock (sk); - err =tcp_bpf_sendmsg_redir (sk_redir, &msg_redir, send, flags); + err =tcp_bpf_sendmsg_redir (sk_redir, redir_ingress, + &msg_redir, send, flags);lock_sock (sk);if (err <0 ) { *copied -=sk_msg_free_nocharge (sk, &msg_redir);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 447/1146 bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit 9072931f020bfd907d6d89ee21ff1481cd78b407 ]
Use apply_bytes on ingress redirect, when apply_bytes is less than the length of msg data, some data may be skipped and lost in bpf_tcp_ingress().
If there is still data in the scatterlist that has not been consumed, we cannot move the msg iter.
--- net/ipv4/tcp_bpf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +4 -1
@@ -45,8 +45,11 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, tmp->sg.end = i;if (apply) { apply_bytes -= size; -if (!apply_bytes) +if (!apply_bytes) { +if (sge->length) +sk_msg_iter_var_prev (i);break ; + } } }while (i != msg->sg.end);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 448/1146 bonding: uninitialized variable in bond_miimon_inspect()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e5214f363dabca240446272dac54d404501ad5e5 ]
The "ignore_updelay" variable needs to be initialized to false.
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -2531,10 +2531,10 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in/* called with rcu_read_lock() */ static int bond_miimon_inspect (struct bonding *bond) { +bool ignore_updelay = false;int link_state, commit =0 ;struct list_head *iter;struct slave *slave; -bool ignore_updelay;if (BOND_MODE (bond) ==BOND_MODE_ACTIVEBACKUP ) { ignore_updelay = !rcu_dereference (bond->curr_active_slave);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 449/1146 spi: spidev: mask SPI_CS_HIGH in SPI_IOC_RD_MODE
In reply to Greg Kroah-HartmanFrom: Alexander Sverdlin <[email protected]>
[ Upstream commit 7dbfa445ff7393d1c4c066c1727c9e0af1251958 ]
Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs") has changed the user-space interface so that bogus SPI_CS_HIGH started to appear in the mask returned by SPI_IOC_RD_MODE even for active-low CS pins. Commit 138c9c32f090
("spi: spidev: Fix CS polarity if GPIO descriptors are used") fixed only SPI_IOC_WR_MODE part of the problem. Let's fix SPI_IOC_RD_MODE symmetrically.
Test case:
#include <sys/ioctl.h>
#include <fcntl.h>
#include <linux/spi/spidev.h>
int main(int argc, char **argv)
{
char modew = SPI_CPHA;
char moder;
int f = open("/dev/spidev0.0", O_RDWR);
if (f < 0)
return 1;
ioctl(f, SPI_IOC_WR_MODE, &modew);
ioctl(f, SPI_IOC_RD_MODE, &moder);
return moder == modew ? 0 : 2;
}--- drivers/spi/spidev.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/spi/spidev.c +16 -5
@@ -377,12 +377,23 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)switch (cmd) {/* read requests */ case SPI_IOC_RD_MODE : - retval =put_user (spi->mode &SPI_MODE_MASK , - (__u8 __user *)arg); -break ;case SPI_IOC_RD_MODE32 : - retval =put_user (spi->mode &SPI_MODE_MASK , - (__u32 __user *)arg); + tmp = spi->mode; + + { +struct spi_controller *ctlr = spi->controller; + +if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && + ctlr->cs_gpiods[spi->chip_select]) + tmp &= ~SPI_CS_HIGH ; + } + +if (cmd ==SPI_IOC_RD_MODE ) + retval =put_user (tmp &SPI_MODE_MASK , + (__u8 __user *)arg); +else + retval =put_user (tmp &SPI_MODE_MASK , + (__u32 __user *)arg);break ;case SPI_IOC_RD_LSB_FIRST : retval = put_user((spi->mode & SPI_LSB_FIRST) ? 1 : 0,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 450/1146 wifi: nl80211: Add checks for nla_nest_start() in nl80211_send_iface()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 5cc58b376675981386c6192405fe887cd29c527a ]
As the nla_nest_start() may fail with NULL returned, the return value needs to be checked.
--- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/nl80211.c +3 -0
@@ -3868,6 +3868,9 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flagstruct cfg80211_chan_def chandef = {};int ret; +if (!link) + goto nla_put_failure; +if (nla_put_u8 (msg,NL80211_ATTR_MLO_LINK_ID , link_id)) goto nla_put_failure; if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 451/1146 wifi: mac80211: fix memory leak in ieee80211_if_add()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 13e5afd3d773c6fc6ca2b89027befaaaa1ea7293 ]
When register_netdevice() failed in ieee80211_if_add(), ndev->tstats isn't released. Fix it.
--- net/mac80211/iface.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/iface.c +1 -0
@@ -2258,6 +2258,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, ret =cfg80211_register_netdevice (ndev);if (ret) { +ieee80211_if_free (ndev);free_netdev (ndev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 452/1146 wifi: mac80211: fix maybe-unused warning
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 09d838a457a89883a926b8b0104d575158fd4b92 ]
In ieee80211_lookup_key, the variable named local is unused if compiled without lockdep, getting this warning:
net/mac80211/cfg.c: In function ‘ieee80211_lookup_key’:net/mac80211/cfg.c:542:26: error: unused variable ‘local’ [-Werror=unused-variable]
struct ieee80211_local *local = sdata->local;
^~~~~Fix it with __maybe_unused.
--- net/mac80211/cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/cfg.c +1 -1
@@ -576,7 +576,7 @@ static struct ieee80211_key * ieee80211_lookup_key(struct ieee80211_sub_if_data *sdata, int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr) { - struct ieee80211_local *local = sdata->local; + struct ieee80211_local *local __maybe_unused = sdata->local;struct ieee80211_link_data *link = &sdata->deflink;struct ieee80211_key *key;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 453/1146 wifi: cfg80211: Fix not unregister reg_pdev when load_builtin_regdb_keys() fails
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 833a9fd28c9b7ccb39a334721379e992dc1c0c89 ]
In regulatory_init_db(), when it's going to return a error, reg_pdev should be unregistered. When load_builtin_regdb_keys() fails it doesn't do it and makes cfg80211 can't be reload with report:
sysfs: cannot create duplicate filename '/devices/platform/regulatory.0'
...
<TASK> dump_stack_lvl+0x79/0x9b sysfs_warn_dup.cold+0x1c/0x29 sysfs_create_dir_ns+0x22d/0x290 kobject_add_internal+0x247/0x800 kobject_add+0x135/0x1b0 device_add+0x389/0x1be0 platform_device_add+0x28f/0x790 platform_device_register_full+0x376/0x4b0 regulatory_init+0x9a/0x4b2 [cfg80211] cfg80211_init+0x84/0x113 [cfg80211] ...
--- net/wireless/reg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/reg.c +3 -1
@@ -4311,8 +4311,10 @@ static int __init regulatory_init_db(void)return -EINVAL ; err =load_builtin_regdb_keys (); -if (err) +if (err) { +platform_device_unregister (reg_pdev);return err; + }/* We always try to get an update for the static regdomain */ err =regulatory_hint_core (cfg80211_world_regdom->alpha2);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 454/1146 wifi: mt76: mt7921: fix antenna signal are way off in monitor mode
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit c256ba6b1909f28b517274282b6845567e974143 ]
Group 3 in RxD is disabled in monitor mode. We should use the group 5 in RxD instead to fix antenna signal way off issue, e.g we would see the incorrect antenna signal value in wireshark. On the other hand, Group 5 wouldn't be used in STA or AP mode, so the patch shouldn't cause any harm to those modes.
--- .../net/wireless/mediatek/mt76/mt7921/mac.c | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +21 -11
@@ -396,6 +396,27 @@ mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)if (v0 &MT_PRXV_HT_AD_CODE ) status->enc_flags |=RX_ENC_FLAG_LDPC ; + ret =mt76_connac2_mac_fill_rx_rate (&dev->mt76, status, sband, + rxv, &mode); +if (ret <0 ) +return ret; + +if (rxd1 &MT_RXD1_NORMAL_GROUP_5 ) { + rxd +=6 ; +if ((u8 *)rxd - skb->data >= skb->len) +return -EINVAL ; + + rxv = rxd; +/* Monitor mode would use RCPI described in GROUP 5 +* instead. +*/ + v1 =le32_to_cpu (rxv[0 ]); + + rxd +=12 ; +if ((u8 *)rxd - skb->data >= skb->len) +return -EINVAL ; + } + status->chains = mphy->antenna_mask; status->chain_signal[0 ] =to_rssi (MT_PRXV_RCPI0 , v1); status->chain_signal[1 ] =to_rssi (MT_PRXV_RCPI1 , v1);
@@ -410,17 +431,6 @@ mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) status->signal =max (status->signal, status->chain_signal[i]); } - - ret =mt76_connac2_mac_fill_rx_rate (&dev->mt76, status, sband, - rxv, &mode); -if (ret <0 ) -return ret; - -if (rxd1 &MT_RXD1_NORMAL_GROUP_5 ) { - rxd +=18 ; -if ((u8 *)rxd - skb->data >= skb->len) -return -EINVAL ; - } } amsdu_info =FIELD_GET (MT_RXD4_NORMAL_PAYLOAD_FORMAT , rxd4);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 455/1146 wifi: mt76: mt7915: fix mt7915_mac_set_timing()
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 0c881dc08fd71ca2673f31a64989fbb28eac26f4 ]
Correct mac timiing settings for different hardware generations. This improves 40-60Mbps performance.
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +15 -6
@@ -1151,7 +1151,7 @@ void mt7915_mac_set_timing(struct mt7915_phy *phy)FIELD_PREP (MT_TIMEOUT_VAL_CCA ,48 );u32 ofdm =FIELD_PREP (MT_TIMEOUT_VAL_PLCP ,60 ) |FIELD_PREP (MT_TIMEOUT_VAL_CCA ,28 ); -int offset; +int eifs_ofdm =360 , sifs =10 , offset;bool a_band = !(phy->mt76->chandef.chan->band ==NL80211_BAND_2GHZ );if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))
@@ -1169,17 +1169,26 @@ void mt7915_mac_set_timing(struct mt7915_phy *phy) reg_offset =FIELD_PREP (MT_TIMEOUT_VAL_PLCP , offset) |FIELD_PREP (MT_TIMEOUT_VAL_CCA , offset); +if (!is_mt7915 (&dev->mt76)) { +if (!a_band) { +mt76_wr (dev,MT_TMAC_ICR1 (phy->band_idx), +FIELD_PREP (MT_IFS_EIFS_CCK ,314 )); + eifs_ofdm =78 ; + }else { + eifs_ofdm =84 ; + } + }else if (a_band) { + sifs =16 ; + } +mt76_wr (dev,MT_TMAC_CDTR (phy->band_idx), cck + reg_offset);mt76_wr (dev,MT_TMAC_ODTR (phy->band_idx), ofdm + reg_offset);mt76_wr (dev,MT_TMAC_ICR0 (phy->band_idx), -FIELD_PREP (MT_IFS_EIFS_OFDM , a_band ?84 :78 ) | +FIELD_PREP (MT_IFS_EIFS_OFDM , eifs_ofdm) |FIELD_PREP (MT_IFS_RIFS ,2 ) | -FIELD_PREP (MT_IFS_SIFS ,10 ) | +FIELD_PREP (MT_IFS_SIFS , sifs) |FIELD_PREP (MT_IFS_SLOT , phy->slottime)); -mt76_wr (dev,MT_TMAC_ICR1 (phy->band_idx), -FIELD_PREP (MT_IFS_EIFS_CCK ,314 )); -if (phy->slottime <20 || a_band) val =MT7915_CFEND_RATE_DEFAULT ;else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 456/1146 wifi: mt76: mt7915: fix reporting of TX AGGR histogram
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 528d13e7f033b54d50e0077922dd52f005d648cf ]
Fix stats clash between bins [4-7] in 802.11 tx aggregation histogram.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -1
@@ -1609,7 +1609,7 @@ void mt7915_mac_update_stats(struct mt7915_phy *phy) aggr0 = phy->band_idx ?ARRAY_SIZE (dev->mt76.aggr_stats) /2 :0 ;if (is_mt7915 (&dev->mt76)) { -for (i =0 , aggr1 = aggr0 +4 ; i <4 ; i++) { +for (i =0 , aggr1 = aggr0 +8 ; i <4 ; i++) { val =mt76_rr (dev,MT_MIB_MB_SDR1 (phy->band_idx, (i <<4 ))); mib->ba_miss_cnt +=FIELD_GET (MT_MIB_BA_MISS_COUNT_MASK , val);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 457/1146 wifi: mt76: mt7921: fix reporting of TX AGGR histogram
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 028b4f22b37b88821fd87b56ce47b180583c774e ]
Similar to mt7915, fix stats clash between bins [4-7] in 802.11 tx aggregation histogram.
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +1 -1
@@ -984,7 +984,7 @@ void mt7921_mac_update_mib_stats(struct mt7921_phy *phy) mib->tx_amsdu_cnt += val; } -for (i =0 , aggr1 = aggr0 +4 ; i <4 ; i++) { +for (i =0 , aggr1 = aggr0 +8 ; i <4 ; i++) {u32 val2; val =mt76_rr (dev,MT_TX_AGG_CNT (0 , i));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 458/1146 wifi: mt76: mt7915: rework eeprom tx paths and streams init
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit a7ec8bcf00034ce84d4c9a15dffd7577fbed4db2 ]
Rework tx paths and streams init part to improve readability, and make sure that the available tx streams should be smaller than or equal to the available tx paths.
Stable-dep-of: de147cc28985 ("wifi: mt76: mt7915: Fix chainmask calculation on mt7915 DBDC")
--- .../wireless/mediatek/mt76/mt7915/eeprom.c | 57 ++++++++----------- .../wireless/mediatek/mt76/mt7915/eeprom.h | 5 -- 2 files changed, 23 insertions(+), 39 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +23 -34
@@ -173,60 +173,49 @@ static void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)void mt7915_eeprom_parse_hw_cap (struct mt7915_dev *dev,struct mt7915_phy *phy) { -u8 nss, nss_band, nss_band_max, *eeprom = dev->mt76.eeprom.data; +u8 path, nss, nss_max =4 , *eeprom = dev->mt76.eeprom.data;struct mt76_phy *mphy = phy->mt76; -bool ext_phy = phy != &dev->phy;mt7915_eeprom_parse_band_config (phy); -/* read tx/rx mask from eeprom */ +/* read tx/rx path from eeprom */ if (is_mt7915 (&dev->mt76)) { - nss =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , - eeprom[MT_EE_WIFI_CONF ]); + path =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , + eeprom[MT_EE_WIFI_CONF ]); }else { - nss =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , - eeprom[MT_EE_WIFI_CONF + phy->band_idx]); + path =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , + eeprom[MT_EE_WIFI_CONF + phy->band_idx]); } -if (!nss || nss >4 ) - nss =4 ; +if (!path || path >4 ) + path =4 ;/* read tx/rx stream */ - nss_band = nss; - + nss = path;if (dev->dbdc_support) {if (is_mt7915 (&dev->mt76)) { - nss_band =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B0 , - eeprom[MT_EE_WIFI_CONF +3 ]); + nss =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B0 , + eeprom[MT_EE_WIFI_CONF +3 ]);if (phy->band_idx) - nss_band =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B1 , - eeprom[MT_EE_WIFI_CONF +3 ]); + nss =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B1 , + eeprom[MT_EE_WIFI_CONF +3 ]); }else { - nss_band =FIELD_GET (MT_EE_WIFI_CONF_STREAM_NUM , - eeprom[MT_EE_WIFI_CONF +2 + phy->band_idx]); + nss =FIELD_GET (MT_EE_WIFI_CONF_STREAM_NUM , + eeprom[MT_EE_WIFI_CONF +2 + phy->band_idx]); } - nss_band_max =is_mt7986 (&dev->mt76) ? -MT_EE_NSS_MAX_DBDC_MA7986 :MT_EE_NSS_MAX_DBDC_MA7915 ; - }else { - nss_band_max =is_mt7986 (&dev->mt76) ? -MT_EE_NSS_MAX_MA7986 :MT_EE_NSS_MAX_MA7915 ; +if (!is_mt7986 (&dev->mt76)) + nss_max =2 ; } -if (!nss_band || nss_band > nss_band_max) - nss_band = nss_band_max; - -if (nss_band > nss) { -dev_warn (dev->mt76.dev, -"nss mismatch, nss(%d) nss_band(%d) band(%d) ext_phy(%d)\n" , - nss, nss_band, phy->band_idx, ext_phy); - nss = nss_band; - } +if (!nss) + nss = nss_max; + nss =min_t (u8,min_t (u8, nss_max, nss), path); - mphy->chainmask =BIT (nss) -1 ; -if (ext_phy) + mphy->chainmask =BIT (path) -1 ; +if (phy->band_idx) mphy->chainmask <<= dev->chainshift; - mphy->antenna_mask =BIT (nss_band) -1 ; + mphy->antenna_mask =BIT (nss) -1 ; dev->chainmask |= mphy->chainmask; dev->chainshift =hweight8 (dev->mphy.chainmask); }
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +0 -5
@@ -58,11 +58,6 @@ enum mt7915_eeprom_field {#define MT_EE_RATE_DELTA_SIGN BIT(6)#define MT_EE_RATE_DELTA_EN BIT(7) -#define MT_EE_NSS_MAX_MA7915 4 -#define MT_EE_NSS_MAX_DBDC_MA7915 2 -#define MT_EE_NSS_MAX_MA7986 4 -#define MT_EE_NSS_MAX_DBDC_MA7986 4 -enum mt7915_adie_sku {MT7976_ONE_ADIE_DBDC =0x7 ,MT7975_ONE_ADIE =0x8 ,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 459/1146 wifi: mt76: mt7915: Fix chainmask calculation on mt7915 DBDC
In reply to Greg Kroah-HartmanFrom: Nicolas Cavallari <[email protected]>
[ Upstream commit de147cc28985a2a09e5d6d179fc5ef59b22fc058 ]
mt7915 does not have a per-band number of chains unlike the other chips, it only has a total number of chains. Yet the current code would consider the total number as a per-band number.
For example, it would report that a 2x2 + 2x2 DBDC card have 4 chains on each band and set chainmask to 0b1111 for the first interface and 0b11110000 for the second.
--- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +1 -0
@@ -194,6 +194,7 @@ void mt7915_eeprom_parse_hw_cap(struct mt7915_dev *dev, nss = path;if (dev->dbdc_support) {if (is_mt7915 (&dev->mt76)) { + path =min_t (u8, path,2 ); nss =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B0 , eeprom[MT_EE_WIFI_CONF +3 ]);if (phy->band_idx)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 460/1146 wifi: mt76: mt7921: fix wrong power after multiple SAR set
In reply to Greg Kroah-HartmanFrom: YN Chen <[email protected]>
[ Upstream commit 7eefb93d4a6fbccd859e538d208c50fd10b44cb7 ]
We should update CLC config before SAR set to synchronize all related settings.
--- drivers/net/wireless/mediatek/mt76/mt7921/init.c | 1 + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 6 ++++++ drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 ++ 3 files changed, 9 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/init.c +1 -0
@@ -37,6 +37,7 @@ mt7921_regd_notifier(struct wiphy *wiphy,memcpy (dev->mt76.alpha2, request->alpha2,sizeof (dev->mt76.alpha2)); dev->mt76.region = request->dfs_region; + dev->country_ie_env = request->country_ie_env;mt7921_mutex_acquire (dev);mt7921_mcu_set_clc (dev, request->alpha2, request->country_ie_env);
drivers/net/wireless/mediatek/mt76/mt7921/main.c +6 -0
@@ -1504,7 +1504,13 @@ static int mt7921_set_sar_specs(struct ieee80211_hw *hw,int err;mt7921_mutex_acquire (dev); + err =mt7921_mcu_set_clc (dev, dev->mt76.alpha2, + dev->country_ie_env); +if (err <0 ) + goto out; + err =mt7921_set_tx_sar_pwr (hw, sar); +out:mt7921_mutex_release (dev);return err;
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +2 -0
@@ -244,6 +244,8 @@ struct mt7921_dev {struct work_struct ipv6_ns_work;/* IPv6 addresses for WoWLAN */ struct sk_buff_head ipv6_ns_list; + +enum environment_cap country_ie_env; };enum {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 461/1146 wifi: mt76: fix coverity overrun-call in mt76_get_txpower()
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit 03dd0d49de7db680a856fa566963bb8421f46368 ]
Make sure the nss is valid for nss_delta array. Return zero if the index is invalid.
Coverity message:
Event overrun-call: Overrunning callee's array of size 4 by passing argument "n_chains" (which evaluates to 15) in call to "mt76_tx_power_nss_delta".
int delta = mt76_tx_power_nss_delta(n_chains);
--- drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76.h +2 -1
@@ -1107,8 +1107,9 @@ static inline bool mt76_is_skb_pktid(u8 pktid)static inline u8 mt76_tx_power_nss_delta (u8 nss) {static const u8 nss_delta[4 ] = {0 ,6 ,9 ,12 }; +u8 idx = nss -1 ; -return nss_delta[nss -1 ]; +return (idx <ARRAY_SIZE (nss_delta)) ? nss_delta[idx] :0 ; }static inline bool mt76_testmode_enabled (struct mt76_phy *phy)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 462/1146 wifi: mt76: mt7921: Add missing __packed annotation of struct mt7921_clc
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit e5c6bc6f19d8c293f86b347cddab54d5a3830b38 ]
Add __packed annotation to avoid potential CLC parsing error
--- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +1 -1
@@ -171,7 +171,7 @@ struct mt7921_clc {u8 type;u8 rsv[8 ];u8 data[]; -}; +} __packed;struct mt7921_phy {struct mt76_phy *mt76;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 463/1146 wifi: mt76: do not send firmware FW_FEATURE_NON_DL region
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit f37f76d43865c58cb96aa13c87164abb41f22d0b ]
skip invalid section to avoid potential risks
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +4 -0
@@ -2834,6 +2834,9 @@ mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev, len =le32_to_cpu (region->len); addr =le32_to_cpu (region->addr); +if (region->feature_set &FW_FEATURE_NON_DL ) + goto next; +if (region->feature_set &FW_FEATURE_OVERRIDE_ADDR ) override = addr;
@@ -2850,6 +2853,7 @@ mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev,return err; } +next: offset += len; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 464/1146 mt76: mt7915: Fix PCI device refcount leak in mt7915_pci_init_hif2()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 5938196cc188ba4323bc6357f5ac55127d715888 ]
As comment of pci_get_device() says, it returns a pci_device with its refcount increased. We need to call pci_dev_put() to decrease the refcount. Save the return value of pci_get_device() and call pci_dev_put() to decrease the refcount.
--- drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +10 -3
@@ -65,10 +65,17 @@ static void mt7915_put_hif2(struct mt7915_hif *hif)static struct mt7915_hif *mt7915_pci_init_hif2 (struct pci_dev *pdev) { +struct pci_dev *tmp_pdev; + hif_idx++; -if (!pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x7916 ,NULL ) && - !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x790a ,NULL )) -return NULL ; + + tmp_pdev =pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x7916 ,NULL ); +if (!tmp_pdev) { + tmp_pdev =pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x790a ,NULL ); +if (!tmp_pdev) +return NULL ; + } +pci_dev_put (tmp_pdev);writel (hif_idx |MT_PCIE_RECOG_ID_SEM ,pcim_iomap_table (pdev)[0 ] +MT_PCIE_RECOG_ID );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 465/1146 regulator: core: fix module refcount leak in set_supply()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit da46ee19cbd8344d6860816b4827a7ce95764867 ]
If create_regulator() fails in set_supply(), the module refcount needs be put to keep refcount balanced.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -1640,6 +1640,7 @@ static int set_supply(struct regulator_dev *rdev, rdev->supply =create_regulator (supply_rdev, &rdev->dev,"SUPPLY" );if (rdev->supply ==NULL ) { +module_put (supply_rdev->owner); err = -ENOMEM ;return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 466/1146 clk: qcom: lpass-sc7280: Fix pm_runtime usage
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit d470be3c4f30b4666e43eef6bab80f543563cdb0 ]
The pm_runtime usage in lpass-sc7280 was broken in quite a few ways. Specifically:
1. At the end of probe it called "put" twice. This is a no-no and will end us up with a negative usage count. Even worse than calling "put" twice, it never called "get" once. Thus after bootup it could be seen that the runtime usage of the devices managed by this driver was -2.
2. In some error cases it manually called pm_runtime_disable() even though it had previously used devm_add_action_or_reset() to set this up to be called automatically. This meant that in these error cases we'd double-call pm_runtime_disable().
3. It forgot to call undo pm_runtime_use_autosuspend(), which can sometimes have subtle problems (and the docs specifically mention that you need to undo this function).
Overall the above seriously calls into question how this driver is working. It seems like a combination of "it doesn't", "by luck", and "because of the weirdness of runtime_pm". Specifically I put a printout to the serial console every time the runtime suspend/resume was called for the two devices created by this driver (I wrapped the pm_clk calls). When I had serial console enabled, I found that the calls got resumed at bootup (when the clk core probed and before our double-put) and then never touched again. That's no good.
[ 0.829997] DOUG: my_pm_clk_resume, usage=1 [ 0.835487] DOUG: my_pm_clk_resume, usage=1
When I disabled serial console (speeding up boot), I got a different pattern, which I guess (?) is better:
[ 0.089767] DOUG: my_pm_clk_resume, usage=1 [ 0.090507] DOUG: my_pm_clk_resume, usage=1 [ 0.151885] DOUG: my_pm_clk_suspend, usage=-2 [ 0.151914] DOUG: my_pm_clk_suspend, usage=-2 [ 1.825747] DOUG: my_pm_clk_resume, usage=-1 [ 1.825774] DOUG: my_pm_clk_resume, usage=-1 [ 1.888269] DOUG: my_pm_clk_suspend, usage=-2 [ 1.888282] DOUG: my_pm_clk_suspend, usage=-2
These different patterns have to do with the fact that the core PM Runtime code really isn't designed to be robust to negative usage counts and sometimes may happen to stumble upon a behavior that happens to "work". For instance, you can see that __pm_runtime_suspend() will treat any non-zero value (including negative numbers) as if the device is in use.
In any case, let's fix the driver to be correct. We'll hold a pm_runtime reference for the whole probe and then drop it (once!) at the end. We'll get rid of manual pm_runtime_disable() calls in the error handling. We'll also switch to devm_pm_runtime_enable(), which magically handles undoing pm_runtime_use_autosuspend() as of commit b4060db9251f ("PM: runtime: Have devm_pm_runtime_enable() handle pm_runtime_dont_use_autosuspend()").
While we're at this, let's also use devm_pm_clk_create() instead of rolling it ourselves.
Note that the above changes make it obvious that lpassaudio_create_pm_clks() was doing more than just creating clocks. It was also setting up pm_runtime parameters. Let's rename it.
All of these problems were found by code inspection. I started looking at this driver because it was involved in a deadlock that I reported a while ago [1]. Though I bisected the deadlock to commit 1b771839de05 ("clk: qcom: gdsc: enable optional power domain support"), it was never really clear why that patch affected it other than a luck of timing changes. I'll also note that by fixing the timing (as done in this change) we also seem to aboid the deadlock, which is a nice benefit.
Also note that some of the fixes here are much the same type of stuff that Dmitry did in commit 72cfc73f4663 ("clk: qcom: use devm_pm_runtime_enable and devm_pm_clk_create"), but I guess lpassaudiocc-sc7280.c didn't exist then.
[1] https://lore.kernel.org/r/[email protected]
--- drivers/clk/qcom/lpassaudiocc-sc7280.c | 55 ++++++++++---------------- 1 file changed, 21 insertions(+), 34 deletions(-)
drivers/clk/qcom/lpassaudiocc-sc7280.c +21 -34
@@ -722,33 +722,17 @@ static const struct of_device_id lpass_audio_cc_sc7280_match_table[] = { };MODULE_DEVICE_TABLE (of, lpass_audio_cc_sc7280_match_table); -static void lpassaudio_pm_runtime_disable (void *data) -{ -pm_runtime_disable (data); -} - -static void lpassaudio_pm_clk_destroy (void *data) -{ -pm_clk_destroy (data); -} - -static int lpassaudio_create_pm_clks (struct platform_device *pdev) +static int lpass_audio_setup_runtime_pm (struct platform_device *pdev) {int ret;pm_runtime_use_autosuspend (&pdev->dev);pm_runtime_set_autosuspend_delay (&pdev->dev,50 ); -pm_runtime_enable (&pdev->dev); - - ret =devm_add_action_or_reset (&pdev->dev, lpassaudio_pm_runtime_disable, &pdev->dev); -if (ret) -return ret; - - ret =pm_clk_create (&pdev->dev); + ret =devm_pm_runtime_enable (&pdev->dev);if (ret)return ret; - ret =devm_add_action_or_reset (&pdev->dev, lpassaudio_pm_clk_destroy, &pdev->dev); + ret =devm_pm_clk_create (&pdev->dev);if (ret)return ret;
@@ -756,7 +740,7 @@ static int lpassaudio_create_pm_clks(struct platform_device *pdev)if (ret <0 )dev_err (&pdev->dev,"failed to acquire iface clock\n" ); -return ret; +return pm_runtime_resume_and_get (&pdev->dev); }static int lpass_audio_cc_sc7280_probe (struct platform_device *pdev)
@@ -765,7 +749,7 @@ static int lpass_audio_cc_sc7280_probe(struct platform_device *pdev)struct regmap *regmap;int ret; - ret =lpassaudio_create_pm_clks (pdev); + ret =lpass_audio_setup_runtime_pm (pdev);if (ret)return ret;
@@ -775,8 +759,8 @@ static int lpass_audio_cc_sc7280_probe(struct platform_device *pdev) regmap =qcom_cc_map (pdev, desc);if (IS_ERR (regmap)) { -pm_runtime_disable (&pdev->dev); -return PTR_ERR (regmap); + ret =PTR_ERR (regmap); + goto exit; }clk_zonda_pll_configure (&lpass_audio_cc_pll, regmap, &lpass_audio_cc_pll_config);
@@ -788,20 +772,18 @@ static int lpass_audio_cc_sc7280_probe(struct platform_device *pdev) ret =qcom_cc_really_probe (pdev, &lpass_audio_cc_sc7280_desc, regmap);if (ret) {dev_err (&pdev->dev,"Failed to register LPASS AUDIO CC clocks\n" ); -pm_runtime_disable (&pdev->dev); -return ret; + goto exit; } ret =qcom_cc_probe_by_index (pdev,1 , &lpass_audio_cc_reset_sc7280_desc);if (ret) {dev_err (&pdev->dev,"Failed to register LPASS AUDIO CC Resets\n" ); -pm_runtime_disable (&pdev->dev); -return ret; + goto exit; }pm_runtime_mark_last_busy (&pdev->dev); +exit:pm_runtime_put_autosuspend (&pdev->dev); -pm_runtime_put_sync (&pdev->dev);return ret; }
@@ -839,14 +821,15 @@ static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev)struct regmap *regmap;int ret; - ret =lpassaudio_create_pm_clks (pdev); + ret =lpass_audio_setup_runtime_pm (pdev);if (ret)return ret;if (of_property_read_bool (pdev->dev.of_node,"qcom,adsp-pil-mode" )) { lpass_audio_cc_sc7280_regmap_config.name ="cc" ; desc = &lpass_cc_sc7280_desc; -return qcom_cc_probe (pdev, desc); + ret =qcom_cc_probe (pdev, desc); + goto exit; } lpass_audio_cc_sc7280_regmap_config.name ="lpasscc_aon" ;
@@ -854,18 +837,22 @@ static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev) desc = &lpass_aon_cc_sc7280_desc; regmap =qcom_cc_map (pdev, desc); -if (IS_ERR (regmap)) -return PTR_ERR (regmap); +if (IS_ERR (regmap)) { + ret =PTR_ERR (regmap); + goto exit; + }clk_lucid_pll_configure (&lpass_aon_cc_pll, regmap, &lpass_aon_cc_pll_config); ret =qcom_cc_really_probe (pdev, &lpass_aon_cc_sc7280_desc, regmap); -if (ret) +if (ret) {dev_err (&pdev->dev,"Failed to register LPASS AON CC clocks\n" ); + goto exit; + }pm_runtime_mark_last_busy (&pdev->dev); +exit:pm_runtime_put_autosuspend (&pdev->dev); -pm_runtime_put_sync (&pdev->dev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 467/1146 clk: qcom: lpass-sc7180: Fix pm_runtime usage
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit ff1ccf59eaffd192efe21f7de9fb0c130faf1b1b ]
The sc7180 lpass clock controller's pm_runtime usage wasn't broken quite as spectacularly as the sc7280's pm_runtime usage, but it was still broken. Putting some printouts in at boot showed me this (with serial console enabled, which makes the prints slow and thus changes timing):
[ 3.109951] DOUG: my_pm_clk_resume, usage=1 [ 3.114767] DOUG: my_pm_clk_resume, usage=1 [ 3.664443] DOUG: my_pm_clk_suspend, usage=0 [ 3.897566] DOUG: my_pm_clk_suspend, usage=0 [ 3.910137] DOUG: my_pm_clk_resume, usage=1 [ 3.923217] DOUG: my_pm_clk_resume, usage=0 [ 4.440116] DOUG: my_pm_clk_suspend, usage=-1 [ 4.444982] DOUG: my_pm_clk_suspend, usage=0 [ 14.170501] DOUG: my_pm_clk_resume, usage=1 [ 14.176245] DOUG: my_pm_clk_resume, usage=0
...or this w/out serial console:
[ 0.556139] DOUG: my_pm_clk_resume, usage=1 [ 0.556279] DOUG: my_pm_clk_resume, usage=1 [ 1.058422] DOUG: my_pm_clk_suspend, usage=-1 [ 1.058464] DOUG: my_pm_clk_suspend, usage=0 [ 1.186250] DOUG: my_pm_clk_resume, usage=1 [ 1.186292] DOUG: my_pm_clk_resume, usage=0 [ 1.731536] DOUG: my_pm_clk_suspend, usage=-1 [ 1.731557] DOUG: my_pm_clk_suspend, usage=0 [ 10.288910] DOUG: my_pm_clk_resume, usage=1 [ 10.289496] DOUG: my_pm_clk_resume, usage=0
It seems to be doing roughly the right sequence of calls, but just like with sc7280 this is more by luck than anything. Having a usage of -1 is just not OK.
Let's fix this like we did with sc7280.
--- drivers/clk/qcom/lpasscorecc-sc7180.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/clk/qcom/lpasscorecc-sc7180.c +16 -8
@@ -356,7 +356,7 @@ static const struct qcom_cc_desc lpass_audio_hm_sc7180_desc = { .num_gdscs = ARRAY_SIZE(lpass_audio_hm_sc7180_gdscs), }; -static int lpass_create_pm_clks (struct platform_device *pdev) +static int lpass_setup_runtime_pm (struct platform_device *pdev) {int ret;
@@ -375,7 +375,7 @@ static int lpass_create_pm_clks(struct platform_device *pdev)if (ret <0 )dev_err (&pdev->dev,"failed to acquire iface clock\n" ); -return ret; +return pm_runtime_resume_and_get (&pdev->dev); }static int lpass_core_cc_sc7180_probe (struct platform_device *pdev)
@@ -384,7 +384,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev)struct regmap *regmap;int ret; - ret =lpass_create_pm_clks (pdev); + ret =lpass_setup_runtime_pm (pdev);if (ret)return ret;
@@ -392,12 +392,14 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) desc = &lpass_audio_hm_sc7180_desc; ret =qcom_cc_probe_by_index (pdev,1 , desc);if (ret) -return ret; + goto exit; lpass_core_cc_sc7180_regmap_config.name ="lpass_core_cc" ; regmap =qcom_cc_map (pdev, &lpass_core_cc_sc7180_desc); -if (IS_ERR (regmap)) -return PTR_ERR (regmap); +if (IS_ERR (regmap)) { + ret =PTR_ERR (regmap); + goto exit; + }/* * Keep the CLK always-ON
@@ -415,6 +417,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) ret =qcom_cc_really_probe (pdev, &lpass_core_cc_sc7180_desc, regmap);pm_runtime_mark_last_busy (&pdev->dev); +exit:pm_runtime_put_autosuspend (&pdev->dev);return ret;
@@ -425,14 +428,19 @@ static int lpass_hm_core_probe(struct platform_device *pdev)const struct qcom_cc_desc *desc;int ret; - ret =lpass_create_pm_clks (pdev); + ret =lpass_setup_runtime_pm (pdev);if (ret)return ret; lpass_core_cc_sc7180_regmap_config.name ="lpass_hm_core" ; desc = &lpass_core_hm_sc7180_desc; -return qcom_cc_probe_by_index (pdev,0 , desc); + ret =qcom_cc_probe_by_index (pdev,0 , desc); + +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_put_autosuspend (&pdev->dev); + +return ret; }static const struct of_device_id lpass_hm_sc7180_match_table[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 468/1146 clk: qcom: clk-krait: fix wrong div2 functions
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit d676d3a3717cf726d3affedbe5ba98fc4ccad7b3 ]
Currently div2 value is applied to the wrong bits. This is caused by a bug in the code where the shift is done only for lpl, for anything else the mask is not shifted to the correct bits.
Fix this by correctly shift if lpl is not supported.
--- drivers/clk/qcom/clk-krait.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/clk-krait.c +2 -0
@@ -114,6 +114,8 @@ static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate,if (d->lpl) mask = mask << (d->shift +LPL_SHIFT ) | mask << d->shift; +else + mask <<= d->shift;spin_lock_irqsave (&krait_clock_reg_lock, flags); val =krait_get_l2_indirect_reg (d->offset);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 469/1146 Revert "net: hsr: use hlist_head instead of list_head for mac addresses"
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit e012764cebf6e33097f6833ff15a936fbe7b846c ]
The hlist optimisation (which not only uses hlist_head instead of list_head but also splits hsr_priv::node_db into an array of 256 slots) does not consider the "node merge":
Upon starting the hsr network (with three nodes) a packet that is sent from node1 to node3 will also be sent from node1 to node2 and then forwarded to node3.
As a result node3 will receive 2 packets because it is not able to filter out the duplicate. Each packet received will create a new struct hsr_node with macaddress_A only set the MAC address it received from (the two MAC addesses from node1).
At some point (early in the process) two supervision frames will be received from node1. They will be processed by hsr_handle_sup_frame() and one frame will leave early ("Node has already been merged") and does nothing. The other frame will be merged as portB and have its MAC address written to macaddress_B and the hsr_node (that was created for it as macaddress_A) will be removed.
Quoted 1 line
From now on HSR is able to identify a duplicate because both packets
sent from one node will result in the same struct hsr_node because hsr_get_node() will find the MAC address either on macaddress_A or macaddress_B.
Things get tricky with the optimisation: If sender's MAC address is saved as macaddress_A then the lookup will work as usual. If the MAC address has been merged into macaddress_B of another hsr_node then the lookup won't work because it is likely that the data structure is in another bucket. This results in creating a new struct hsr_node and not recognising a possible duplicate.
A way around it would be to add another hsr_node::mac_list_B and attach it to the other bucket to ensure that this hsr_node will be looked up either via macaddress_A _or_ macaddress_B.
I however prefer to revert it because it sounds like an academic problem rather than real life workload plus it adds complexity. I'm not an HSR expert with what is usual size of a network but I would guess 40 to 60 nodes. With 10.000 nodes and assuming 60us for pass-through (from node to node) then it would take almost 600ms for a packet to almost wrap around which sounds a lot.
Revert the hash MAC addresses optimisation.
--- net/hsr/hsr_debugfs.c | 40 ++++---- net/hsr/hsr_device.c | 10 +- net/hsr/hsr_forward.c | 7 +- net/hsr/hsr_framereg.c | 209 ++++++++++++++++------------------------- net/hsr/hsr_framereg.h | 14 +-- net/hsr/hsr_main.h | 9 +- net/hsr/hsr_netlink.c | 4 +- 7 files changed, 106 insertions(+), 187 deletions(-)
net/hsr/hsr_debugfs.c +16 -24
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/errno.h> #include <linux/debugfs.h> -#include <linux/jhash.h> #include "hsr_main.h" #include "hsr_framereg.h"
@@ -21,7 +20,6 @@ hsr_node_table_show(struct seq_file *sfp, void *data) {struct hsr_priv *priv = (struct hsr_priv *)sfp->private;struct hsr_node *node; -int i;seq_printf (sfp,"Node Table entries for (%s) device\n" , (priv->prot_version ==PRP_V1 ?"PRP" :"HSR" ));
@@ -33,28 +31,22 @@ hsr_node_table_show(struct seq_file *sfp, void *data)seq_puts (sfp,"DAN-H\n" );rcu_read_lock (); - -for (i =0 ; i < priv->hash_buckets; i++) { -hlist_for_each_entry_rcu (node, &priv->node_db[i], mac_list) { -/* skip self node */ -if (hsr_addr_is_self (priv, node->macaddress_A)) -continue ; -seq_printf (sfp,"%pM " , &node->macaddress_A[0 ]); -seq_printf (sfp,"%pM " , &node->macaddress_B[0 ]); -seq_printf (sfp,"%10lx, " , - node->time_in[HSR_PT_SLAVE_A ]); -seq_printf (sfp,"%10lx, " , - node->time_in[HSR_PT_SLAVE_B ]); -seq_printf (sfp,"%14x, " , node->addr_B_port); - -if (priv->prot_version ==PRP_V1 ) -seq_printf (sfp,"%5x, %5x, %5x\n" , - node->san_a, node->san_b, - (node->san_a ==0 && - node->san_b ==0 )); -else -seq_printf (sfp,"%5x\n" ,1 ); - } +list_for_each_entry_rcu (node, &priv->node_db, mac_list) { +/* skip self node */ +if (hsr_addr_is_self (priv, node->macaddress_A)) +continue ; +seq_printf (sfp,"%pM " , &node->macaddress_A[0 ]); +seq_printf (sfp,"%pM " , &node->macaddress_B[0 ]); +seq_printf (sfp,"%10lx, " , node->time_in[HSR_PT_SLAVE_A ]); +seq_printf (sfp,"%10lx, " , node->time_in[HSR_PT_SLAVE_B ]); +seq_printf (sfp,"%14x, " , node->addr_B_port); + +if (priv->prot_version ==PRP_V1 ) +seq_printf (sfp,"%5x, %5x, %5x\n" , + node->san_a, node->san_b, + (node->san_a ==0 && node->san_b ==0 )); +else +seq_printf (sfp,"%5x\n" ,1 ); }rcu_read_unlock ();return 0 ;
net/hsr/hsr_device.c +3 -7
@@ -485,16 +485,12 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], {bool unregister = false;struct hsr_priv *hsr; -int res, i; +int res; hsr =netdev_priv (hsr_dev);INIT_LIST_HEAD (&hsr->ports); -INIT_HLIST_HEAD (&hsr->self_node_db); - hsr->hash_buckets =HSR_HSIZE ; -get_random_bytes (&hsr->hash_seed,sizeof (hsr->hash_seed)); -for (i =0 ; i < hsr->hash_buckets; i++) -INIT_HLIST_HEAD (&hsr->node_db[i]); - +INIT_LIST_HEAD (&hsr->node_db); +INIT_LIST_HEAD (&hsr->self_node_db);spin_lock_init (&hsr->list_lock);eth_hw_addr_set (hsr_dev, slave[0 ]->dev_addr);
net/hsr/hsr_forward.c +2 -5
@@ -571,23 +571,20 @@ static int fill_frame_info(struct hsr_frame_info *frame,struct ethhdr *ethhdr;__be16 proto;int ret; -u32 hash;/* Check if skb contains ethhdr */ if (skb->mac_len <sizeof (struct ethhdr ))return -EINVAL ;memset (frame,0 ,sizeof (*frame)); - - ethhdr = (struct ethhdr *)skb_mac_header (skb); - hash =hsr_mac_hash (port->hsr, ethhdr->h_source); frame->is_supervision =is_supervision_frame (port->hsr, skb); - frame->node_src =hsr_get_node (port, &hsr->node_db[hash], skb, + frame->node_src =hsr_get_node (port, &hsr->node_db, skb, frame->is_supervision, port->type);if (!frame->node_src)return -1 ;/* Unknown node and !is_supervision, or no mem */ + ethhdr = (struct ethhdr *)skb_mac_header (skb); frame->is_vlan = false; proto = ethhdr->h_proto;
net/hsr/hsr_framereg.c +79 -130
374 lines not on this page · raw message
net/hsr/hsr_framereg.h +3 -11
@@ -28,17 +28,9 @@ struct hsr_frame_info {bool is_from_san; }; -#ifdef CONFIG_LOCKDEP -int lockdep_hsr_is_held (spinlock_t *lock); -#else -#define lockdep_hsr_is_held (lock) 1 -#endif - -u32 hsr_mac_hash (struct hsr_priv *hsr,const unsigned char *addr); -struct hsr_node *hsr_node_get_first (struct hlist_head *head,spinlock_t *lock);void hsr_del_self_node (struct hsr_priv *hsr); -void hsr_del_nodes (struct hlist_head *node_db); -struct hsr_node *hsr_get_node (struct hsr_port *port,struct hlist_head *node_db, +void hsr_del_nodes (struct list_head *node_db); +struct hsr_node *hsr_get_node (struct hsr_port *port,struct list_head *node_db,struct sk_buff *skb,bool is_sup,enum hsr_port_type rx_port);void hsr_handle_sup_frame (struct hsr_frame_info *frame);
@@ -76,7 +68,7 @@ void prp_handle_san_frame(bool san, enum hsr_port_type port,void prp_update_san_info (struct hsr_node *node,bool is_sup);struct hsr_node { -struct hlist_node mac_list; +struct list_head mac_list;unsigned char macaddress_A[ETH_ALEN ];unsigned char macaddress_B[ETH_ALEN ];/* Local slave through which AddrB frames are received from this node */
net/hsr/hsr_main.h +2 -7
@@ -47,9 +47,6 @@#define HSR_V1_SUP_LSDUSIZE 52 -#define HSR_HSIZE_SHIFT 8 -#define HSR_HSIZE BIT(HSR_HSIZE_SHIFT) -/* The helper functions below assumes that 'path' occupies the 4 most * significant bits of the 16-bit field shared by 'path' and 'LSDU_size' (or * equivalently, the 4 most significant bits of HSR tag byte 14).
@@ -188,8 +185,8 @@ struct hsr_proto_ops {struct hsr_priv {struct rcu_head rcu_head;struct list_head ports; -struct hlist_head node_db[HSR_HSIZE ];/* Known HSR nodes */ -struct hlist_head self_node_db;/* MACs of slaves */ +struct list_head node_db;/* Known HSR nodes */ +struct list_head self_node_db;/* MACs of slaves */ struct timer_list announce_timer;/* Supervision frame dispatch */ struct timer_list prune_timer;int announce_count;
@@ -199,8 +196,6 @@ struct hsr_priv {spinlock_t seqnr_lock;/* locking for sequence_nr */ spinlock_t list_lock;/* locking for node list */ struct hsr_proto_ops *proto_ops; -u32 hash_buckets; -u32 hash_seed;#define PRP_LAN_ID 0x5/* 0x1010 for A and 0x1011 for B. Bit 0 is set * based on SLAVE_A or SLAVE_B */
net/hsr/hsr_netlink.c +1 -3
@@ -105,7 +105,6 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev,static void hsr_dellink (struct net_device *dev,struct list_head *head) {struct hsr_priv *hsr =netdev_priv (dev); -int i;del_timer_sync (&hsr->prune_timer);del_timer_sync (&hsr->announce_timer);
@@ -114,8 +113,7 @@ static void hsr_dellink(struct net_device *dev, struct list_head *head)hsr_del_ports (hsr);hsr_del_self_node (hsr); -for (i =0 ; i < hsr->hash_buckets; i++) -hsr_del_nodes (&hsr->node_db[i]); +hsr_del_nodes (&hsr->node_db);unregister_netdevice_queue (dev, head); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 470/1146 hsr: Add a rcu-read lock to hsr_forward_skb().
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 5aa2820177af650293b2f9f1873c1f6f8e4ad7a4 ]
hsr_forward_skb() a skb and keeps information in an on-stack hsr_frame_info. hsr_get_node() assigns hsr_frame_info::node_src which is from a RCU list. This pointer is used later in hsr_forward_do(). I don't see a reason why this pointer can't vanish midway since there is no guarantee that hsr_forward_skb() is invoked from an RCU read section.
Use rcu_read_lock() to protect hsr_frame_info::node_src from its assignment until it is no longer used.
--- net/hsr/hsr_forward.c | 3 +++ 1 file changed, 3 insertions(+)
net/hsr/hsr_forward.c +3 -0
@@ -614,11 +614,13 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port) {struct hsr_frame_info frame; +rcu_read_lock ();if (fill_frame_info (&frame, skb, port) <0 ) goto out_drop;hsr_register_frame_in (frame.node_src, port, frame.sequence_nr);hsr_forward_do (&frame); +rcu_read_unlock ();/* Gets called for ingress frames as well as egress from master port. * So check and increment stats for master port only here. */
@@ -633,6 +635,7 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port)return ; out_drop: +rcu_read_unlock (); port->dev->stats.tx_dropped++;kfree_skb (skb); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 471/1146 hsr: Avoid double remove of a node.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 0c74d9f79ec4299365bbe803baa736ae0068179e ]
Due to the hashed-MAC optimisation one problem become visible:hsr_handle_sup_frame() walks over the list of available nodes and merges two node entries into one if based on the information in the supervision both MAC addresses belong to one node. The list-walk happens on a RCU protected list and delete operation happens under a lock.
If the supervision arrives on both slave interfaces at the same time then this delete operation can occur simultaneously on two CPUs. The result is the first-CPU deletes the from the list and the second CPUs BUGs while attempting to dereference a poisoned list-entry. This happens more likely with the optimisation because a new node for the mac_B entry is created once a packet has been received and removed (merged) once the supervision frame has been received.
Avoid removing/ cleaning up a hsr_node twice by adding a `removed' field which is set to true after the removal and checked before the removal.
--- net/hsr/hsr_framereg.c | 16 +++++++++++----- net/hsr/hsr_framereg.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-)
net/hsr/hsr_framereg.c +11 -5
@@ -366,9 +366,12 @@ void hsr_handle_sup_frame(struct hsr_frame_info *frame) node_real->addr_B_port = port_rcv->type;spin_lock_bh (&hsr->list_lock); -list_del_rcu (&node_curr->mac_list); +if (!node_curr->removed) { +list_del_rcu (&node_curr->mac_list); + node_curr->removed = true; +kfree_rcu (node_curr, rcu_head); + }spin_unlock_bh (&hsr->list_lock); -kfree_rcu (node_curr, rcu_head); done:/* Push back here */
@@ -539,9 +542,12 @@ void hsr_prune_nodes(struct timer_list *t)if (time_is_before_jiffies (timestamp +msecs_to_jiffies (HSR_NODE_FORGET_TIME ))) {hsr_nl_nodedown (hsr, node->macaddress_A); -list_del_rcu (&node->mac_list); -/* Note that we need to free this entry later: */ -kfree_rcu (node, rcu_head); +if (!node->removed) { +list_del_rcu (&node->mac_list); + node->removed = true; +/* Note that we need to free this entry later: */ +kfree_rcu (node, rcu_head); + } } }spin_unlock_bh (&hsr->list_lock);
net/hsr/hsr_framereg.h +1 -0
@@ -80,6 +80,7 @@ struct hsr_node {bool san_a;bool san_b;u16 seq_out[HSR_PT_PORTS ]; +bool removed;struct rcu_head rcu_head; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 472/1146 hsr: Disable netpoll.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit d5c7652eb16fa203d82546e0285136d7b321ffa9 ]
The hsr device is a software device. Its net_device_ops::ndo_start_xmit() routine will process the packet and then pass the resulting skb to dev_queue_xmit().
During processing, hsr acquires a lock with spin_lock_bh() (hsr_add_node()) which needs to be promoted to the _irq() suffix in order to avoid a potential deadlock.
Then there are the warnings in dev_queue_xmit() (due to local_bh_disable() with disabled interrupts) left.
Instead trying to address those (there is qdisc and…) for netpoll sake, just disable netpoll on hsr.
Disable netpoll on hsr and replace the _irqsave() locking with _bh().
--- net/hsr/hsr_device.c | 14 ++++++-------- net/hsr/hsr_forward.c | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-)
net/hsr/hsr_device.c +6 -8
@@ -278,7 +278,6 @@ static void send_hsr_supervision_frame(struct hsr_port *master,__u8 type =HSR_TLV_LIFE_CHECK ;struct hsr_sup_payload *hsr_sp;struct hsr_sup_tag *hsr_stag; -unsigned long irqflags;struct sk_buff *skb; *interval =msecs_to_jiffies (HSR_LIFE_CHECK_INTERVAL );
@@ -299,7 +298,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master,set_hsr_stag_HSR_ver (hsr_stag, hsr->prot_version);/* From HSRv1 on we have separate supervision sequence numbers. */ -spin_lock_irqsave (&master->hsr->seqnr_lock, irqflags); +spin_lock_bh (&hsr->seqnr_lock);if (hsr->prot_version >0 ) { hsr_stag->sequence_nr =htons (hsr->sup_sequence_nr); hsr->sup_sequence_nr++;
@@ -307,7 +306,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master, hsr_stag->sequence_nr =htons (hsr->sequence_nr); hsr->sequence_nr++; } -spin_unlock_irqrestore (&master->hsr->seqnr_lock, irqflags); +spin_unlock_bh (&hsr->seqnr_lock); hsr_stag->tlv.HSR_TLV_type = type;/* TODO: Why 12 in HSRv0? */
@@ -332,7 +331,6 @@ static void send_prp_supervision_frame(struct hsr_port *master,struct hsr_priv *hsr = master->hsr;struct hsr_sup_payload *hsr_sp;struct hsr_sup_tag *hsr_stag; -unsigned long irqflags;struct sk_buff *skb; skb =hsr_init_skb (master);
@@ -347,7 +345,7 @@ static void send_prp_supervision_frame(struct hsr_port *master,set_hsr_stag_HSR_ver (hsr_stag, (hsr->prot_version ?1 :0 ));/* From HSRv1 on we have separate supervision sequence numbers. */ -spin_lock_irqsave (&master->hsr->seqnr_lock, irqflags); +spin_lock_bh (&hsr->seqnr_lock); hsr_stag->sequence_nr =htons (hsr->sup_sequence_nr); hsr->sup_sequence_nr++; hsr_stag->tlv.HSR_TLV_type =PRP_TLV_LIFE_CHECK_DD ;
@@ -358,11 +356,11 @@ static void send_prp_supervision_frame(struct hsr_port *master,ether_addr_copy (hsr_sp->macaddress_A, master->dev->dev_addr);if (skb_put_padto (skb,ETH_ZLEN )) { -spin_unlock_irqrestore (&master->hsr->seqnr_lock, irqflags); +spin_unlock_bh (&hsr->seqnr_lock);return ; } -spin_unlock_irqrestore (&master->hsr->seqnr_lock, irqflags); +spin_unlock_bh (&hsr->seqnr_lock);hsr_forward_skb (skb, master); }
@@ -444,7 +442,7 @@ void hsr_dev_setup(struct net_device *dev) dev->header_ops = &hsr_header_ops; dev->netdev_ops = &hsr_device_ops;SET_NETDEV_DEVTYPE (dev, &hsr_type); - dev->priv_flags |=IFF_NO_QUEUE ; + dev->priv_flags |=IFF_NO_QUEUE |IFF_DISABLE_NETPOLL ; dev->needs_free_netdev = true;
net/hsr/hsr_forward.c +2 -3
@@ -500,7 +500,6 @@ static void handle_std_frame(struct sk_buff *skb, {struct hsr_port *port = frame->port_rcv;struct hsr_priv *hsr = port->hsr; -unsigned long irqflags; frame->skb_hsr =NULL ; frame->skb_prp =NULL ;
@@ -510,10 +509,10 @@ static void handle_std_frame(struct sk_buff *skb, frame->is_from_san = true; }else {/* Sequence nr for the master node */ -spin_lock_irqsave (&hsr->seqnr_lock, irqflags); +spin_lock_bh (&hsr->seqnr_lock); frame->sequence_nr = hsr->sequence_nr; hsr->sequence_nr++; -spin_unlock_irqrestore (&hsr->seqnr_lock, irqflags); +spin_unlock_bh (&hsr->seqnr_lock); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 473/1146 hsr: Synchronize sending frames to have always incremented outgoing seq nr.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 06afd2c31d338fa762548580c1bf088703dd1e03 ]
Sending frames via the hsr (master) device requires a sequence number which is tracked in hsr_priv::sequence_nr and protected by hsr_priv::seqnr_lock. Each time a new frame is sent, it will obtain a new id and then send it via the slave devices.
Each time a packet is sent (via hsr_forward_do()) the sequence number is checked via hsr_register_frame_out() to ensure that a frame is not handled twice. This make sense for the receiving side to ensure that the frame is not injected into the stack twice after it has been received from both slave ports.
There is no locking to cover the sending path which means the following scenario is possible:
CPU0 CPU1
hsr_dev_xmit(skb1) hsr_dev_xmit(skb2)
fill_frame_info() fill_frame_info()
hsr_fill_frame_info() hsr_fill_frame_info()
handle_std_frame() handle_std_frame()
skb1's sequence_nr = 1
skb2's sequence_nr = 2
hsr_forward_do() hsr_forward_do()
hsr_register_frame_out(, 2) // okay, send)
hsr_register_frame_out(, 1) // stop, lower seq duplicate
Both skbs (or their struct hsr_frame_info) received an unique id. However since skb2 was sent before skb1, the higher sequence number was recorded in hsr_register_frame_out() and the late arriving skb1 was dropped and never sent.
This scenario has been observed in a three node HSR setup, with node1 + node2 having ping and iperf running in parallel. From time to time ping reported a missing packet. Based on tracing that missing ping packet did not leave the system.
It might be possible (didn't check) to drop the sequence number check on the sending side. But if the higher sequence number leaves on wire before the lower does and the destination receives them in that order and it will drop the packet with the lower sequence number and never inject into the stack.
Therefore it seems the only way is to lock the whole path from obtaining the sequence number and sending via dev_queue_xmit() and assuming the packets leave on wire in the same order (and don't get reordered by the NIC).
Cover the whole path for the master interface from obtaining the ID until after it has been forwarded via hsr_forward_skb() to ensure the skbs are sent to the NIC in the order of the assigned sequence numbers.
--- net/hsr/hsr_device.c | 12 +++++++----- net/hsr/hsr_forward.c | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-)
net/hsr/hsr_device.c +7 -5
@@ -219,7 +219,9 @@ static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) skb->dev = master->dev;skb_reset_mac_header (skb);skb_reset_mac_len (skb); +spin_lock_bh (&hsr->seqnr_lock);hsr_forward_skb (skb, master); +spin_unlock_bh (&hsr->seqnr_lock); }else {dev_core_stats_tx_dropped_inc (dev);dev_kfree_skb_any (skb);
@@ -306,7 +308,6 @@ static void send_hsr_supervision_frame(struct hsr_port *master, hsr_stag->sequence_nr =htons (hsr->sequence_nr); hsr->sequence_nr++; } -spin_unlock_bh (&hsr->seqnr_lock); hsr_stag->tlv.HSR_TLV_type = type;/* TODO: Why 12 in HSRv0? */
@@ -317,11 +318,13 @@ static void send_hsr_supervision_frame(struct hsr_port *master, hsr_sp =skb_put (skb,sizeof (struct hsr_sup_payload ));ether_addr_copy (hsr_sp->macaddress_A, master->dev->dev_addr); -if (skb_put_padto (skb,ETH_ZLEN )) +if (skb_put_padto (skb,ETH_ZLEN )) { +spin_unlock_bh (&hsr->seqnr_lock);return ; + }hsr_forward_skb (skb, master); - +spin_unlock_bh (&hsr->seqnr_lock);return ; }
@@ -360,9 +363,8 @@ static void send_prp_supervision_frame(struct hsr_port *master,return ; } -spin_unlock_bh (&hsr->seqnr_lock); -hsr_forward_skb (skb, master); +spin_unlock_bh (&hsr->seqnr_lock); }/* Announce (supervision frame) timer function
net/hsr/hsr_forward.c +1 -2
@@ -509,10 +509,9 @@ static void handle_std_frame(struct sk_buff *skb, frame->is_from_san = true; }else {/* Sequence nr for the master node */ -spin_lock_bh (&hsr->seqnr_lock); +lockdep_assert_held (&hsr->seqnr_lock); frame->sequence_nr = hsr->sequence_nr; hsr->sequence_nr++; -spin_unlock_bh (&hsr->seqnr_lock); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 474/1146 hsr: Synchronize sequence number updates.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 5c7aa13210c3abdd34fd421f62347665ec6eb551 ]
hsr_register_frame_out() compares new sequence_nr vs the old one recorded in hsr_node::seq_out and if the new sequence_nr is higher then it will be written to hsr_node::seq_out as the new value.
This operation isn't locked so it is possible that two frames with the same sequence number arrive (via the two slave devices) and are fed to hsr_register_frame_out() at the same time. Both will pass the check and update the sequence counter later to the same value. As a result the content of the same packet is fed into the stack twice.
This was noticed by running ping and observing DUP being reported from time to time.
Instead of using the hsr_priv::seqnr_lock for the whole receive path (as it is for sending in the master node) add an additional lock that is only used for sequence number checks and updates.
Add a per-node lock that is used during sequence number reads and updates.
--- net/hsr/hsr_framereg.c | 9 ++++++++- net/hsr/hsr_framereg.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
net/hsr/hsr_framereg.c +8 -1
@@ -157,6 +157,7 @@ static struct hsr_node *hsr_add_node(struct hsr_priv *hsr,return NULL ;ether_addr_copy (new_node->macaddress_A, addr); +spin_lock_init (&new_node->seq_out_lock);/* We are only interested in time diffs here, so use current jiffies * as initialization. (0 could trigger an spurious ring error warning).
@@ -353,6 +354,7 @@ void hsr_handle_sup_frame(struct hsr_frame_info *frame) }ether_addr_copy (node_real->macaddress_B, ethhdr->h_source); +spin_lock_bh (&node_real->seq_out_lock);for (i =0 ; i <HSR_PT_PORTS ; i++) {if (!node_curr->time_in_stale[i] &&time_after (node_curr->time_in[i], node_real->time_in[i])) {
@@ -363,6 +365,7 @@ void hsr_handle_sup_frame(struct hsr_frame_info *frame)if (seq_nr_after (node_curr->seq_out[i], node_real->seq_out[i])) node_real->seq_out[i] = node_curr->seq_out[i]; } +spin_unlock_bh (&node_real->seq_out_lock); node_real->addr_B_port = port_rcv->type;spin_lock_bh (&hsr->list_lock);
@@ -456,13 +459,17 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,int hsr_register_frame_out (struct hsr_port *port,struct hsr_node *node,u16 sequence_nr) { +spin_lock_bh (&node->seq_out_lock);if (seq_nr_before_or_eq (sequence_nr, node->seq_out[port->type]) &&time_is_after_jiffies (node->time_out[port->type] + -msecs_to_jiffies (HSR_ENTRY_FORGET_TIME ))) +msecs_to_jiffies (HSR_ENTRY_FORGET_TIME ))) { +spin_unlock_bh (&node->seq_out_lock);return 1 ; + } node->time_out[port->type] = jiffies; node->seq_out[port->type] = sequence_nr; +spin_unlock_bh (&node->seq_out_lock);return 0 ; }
net/hsr/hsr_framereg.h +2 -0
@@ -69,6 +69,8 @@ void prp_update_san_info(struct hsr_node *node, bool is_sup);struct hsr_node {struct list_head mac_list; +/* Protect R/W access to seq_out */ +spinlock_t seq_out_lock;unsigned char macaddress_A[ETH_ALEN ];unsigned char macaddress_B[ETH_ALEN ];/* Local slave through which AddrB frames are received from this node */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 475/1146 configfs: fix possible memory leak in configfs_create_dir()
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit c65234b283a65cfbfc94619655e820a5e55199eb ]
kmemleak reported memory leaks in configfs_create_dir():
unreferenced object 0xffff888009f6af00 (size 192):
comm "modprobe", pid 3777, jiffies 4295537735 (age 233.784s) backtrace:
kmem_cache_alloc (mm/slub.c:3250 mm/slub.c:3256 mm/slub.c:3263 mm/slub.c:3273)
new_fragment (./include/linux/slab.h:600 fs/configfs/dir.c:163)
configfs_register_subsystem (fs/configfs/dir.c:1857)
basic_write (drivers/hwtracing/stm/p_basic.c:14) stm_p_basic
do_one_initcall (init/main.c:1296)
do_init_module (kernel/module/main.c:2455)
...unreferenced object 0xffff888003ba7180 (size 96):
comm "modprobe", pid 3777, jiffies 4295537735 (age 233.784s) backtrace:
kmem_cache_alloc (mm/slub.c:3250 mm/slub.c:3256 mm/slub.c:3263 mm/slub.c:3273)
configfs_new_dirent (./include/linux/slab.h:723 fs/configfs/dir.c:194)
configfs_make_dirent (fs/configfs/dir.c:248)
configfs_create_dir (fs/configfs/dir.c:296)
configfs_attach_group.isra.28 (fs/configfs/dir.c:816 fs/configfs/dir.c:852)
configfs_register_subsystem (fs/configfs/dir.c:1881)
basic_write (drivers/hwtracing/stm/p_basic.c:14) stm_p_basic
do_one_initcall (init/main.c:1296)
do_init_module (kernel/module/main.c:2455)
...This is because the refcount is not correct in configfs_make_dirent(). For normal stage, the refcount is changing as:
configfs_register_subsystem()
configfs_create_dir()
configfs_make_dirent()
configfs_new_dirent() # set s_count = 1 dentry->d_fsdata = configfs_get(sd); # s_count = 2
...configfs_unregister_subsystem()
configfs_remove_dir()
remove_dir()
configfs_remove_dirent() # s_count = 1
dput() ...
*dentry_unlink_inode()*
configfs_d_iput() # s_count = 0, release
However, if we failed in configfs_create():
configfs_register_subsystem()
configfs_create_dir()
configfs_make_dirent() # s_count = 2
...
configfs_create() # fail
->out_remove:
configfs_remove_dirent(dentry)
configfs_put(sd) # s_count = 1
return PTR_ERR(inode);
There is no inode in the error path, so the configfs_d_iput() is lost and makes sd and fragment memory leaked.
To fix this, when we failed in configfs_create(), manually call configfs_put(sd) to keep the refcount correct.
--- fs/configfs/dir.c | 2 ++ 1 file changed, 2 insertions(+)
fs/configfs/dir.c +2 -0
@@ -316,6 +316,7 @@ static int configfs_create_dir(struct config_item *item, struct dentry *dentry,return 0 ; out_remove: +configfs_put (dentry->d_fsdata);configfs_remove_dirent (dentry);return PTR_ERR (inode); }
@@ -382,6 +383,7 @@ int configfs_create_link(struct configfs_dirent *target, struct dentry *parent,return 0 ; out_remove: +configfs_put (dentry->d_fsdata);configfs_remove_dirent (dentry);return PTR_ERR (inode); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 476/1146 regulator: core: fix resource leak in regulator_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ba62319a42c50e6254e98b3f316464fac8e77968 ]
I got some resource leak reports while doing fault injection test:
OF: ERROR: memory leak, expected refcount 1 instead of 100, of_node_get()/of_node_put() unbalanced - destroy cset entry:
attach overlay node /i2c/pmic@64/regulators/buck1
unreferenced object 0xffff88810deea000 (size 512):
comm "490-i2c-rt5190a", pid 253, jiffies 4294859840 (age 5061.046s) hex dump (first 32 bytes):
00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........
ff ff ff ff ff ff ff ff a0 1e 00 a1 ff ff ff ff ................
backtrace:
[<00000000d78541e2>] kmalloc_trace+0x21/0x110
[<00000000b343d153>] device_private_init+0x32/0xd0
[<00000000be1f0c70>] device_add+0xb2d/0x1030
[<00000000e3e6344d>] regulator_register+0xaf2/0x12a0
[<00000000e2f5e754>] devm_regulator_register+0x57/0xb0
[<000000008b898197>] rt5190a_probe+0x52a/0x861 [rt5190a_regulator]unreferenced object 0xffff88810b617b80 (size 32):
comm "490-i2c-rt5190a", pid 253, jiffies 4294859904 (age 5060.983s) hex dump (first 32 bytes):
72 65 67 75 6c 61 74 6f 72 2e 32 38 36 38 2d 53 regulator.2868-S
55 50 50 4c 59 00 ff ff 29 00 00 00 2b 00 00 00 UPPLY...)...+...
backtrace:
[<000000009da9280d>] __kmalloc_node_track_caller+0x44/0x1b0
[<0000000025c6a4e5>] kstrdup+0x3a/0x70
[<00000000790efb69>] create_regulator+0xc0/0x4e0
[<0000000005ed203a>] regulator_resolve_supply+0x2d4/0x440
[<0000000045796214>] regulator_register+0x10b3/0x12a0
[<00000000e2f5e754>] devm_regulator_register+0x57/0xb0
[<000000008b898197>] rt5190a_probe+0x52a/0x861 [rt5190a_regulator]After calling regulator_resolve_supply(), the 'rdev->supply' is set by set_supply(), after this set, in the error path, the resources need be released, so call regulator_put() to avoid the leaks.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -5643,6 +5643,7 @@ regulator_register(const struct regulator_desc *regulator_desc,regulator_remove_coupling (rdev);mutex_unlock (®ulator_list_mutex); wash: +regulator_put (rdev->supply);kfree (rdev->coupling_desc.coupled_rdevs);mutex_lock (®ulator_list_mutex);regulator_ena_gpio_free (rdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 477/1146 hwmon: (jc42) Convert register access and caching to regmap/regcache
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 8f2fa4726faf01094d7a5be7bd0c120c565f54d9 ]
Switch the jc42 driver to use an I2C regmap to access the registers. Also move over to regmap's built-in caching instead of adding a custom caching implementation. This works for JC42_REG_TEMP_UPPER, JC42_REG_TEMP_LOWER and JC42_REG_TEMP_CRITICAL as these values never change except when explicitly written. The cache For JC42_REG_TEMP is dropped (regmap can't cache it because it's volatile, meaning it can change at any time) as well for simplicity and consistency with other drivers.
Stable-dep-of: 084ed144c448 ("hwmon: (jc42) Restore the min/max/critical temperatures on resume")
--- drivers/hwmon/Kconfig | 1 + drivers/hwmon/jc42.c | 233 ++++++++++++++++++++++++------------------ 2 files changed, 132 insertions(+), 102 deletions(-)
drivers/hwmon/Kconfig +1 -0
@@ -799,6 +799,7 @@ config SENSORS_IT87 config SENSORS_JC42 tristate "JEDEC JC42.4 compliant memory module temperature sensors" depends on I2C + select REGMAP_I2C help If you say yes here, you get support for JEDEC JC42.4 compliant temperature sensors, which are used on many DDR3 memory modules for
drivers/hwmon/jc42.c +131 -102
364 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 478/1146 hwmon: (jc42) Restore the min/max/critical temperatures on resume
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 084ed144c448fd5bc8ed5a58247153fbbfd115c3 ]
The JC42 compatible thermal sensor on Kingston KSM32ES8/16ME DIMMs (using Micron E-Die) is an ST Microelectronics STTS2004 (manufacturer 0x104a, device 0x2201). It does not keep the previously programmed minimum, maximum and critical temperatures after system suspend and resume (which is a shutdown / startup cycle for the JC42 temperature sensor). This results in an alarm on system resume because the hardware default for these values is 0°C (so any environment temperature greater than 0°C will trigger the alarm).
Example before system suspend:
jc42-i2c-0-1a
Adapter: SMBus PIIX4 adapter port 0 at 0b00
temp1: +34.8°C (low = +0.0°C)
(high = +85.0°C, hyst = +85.0°C)
(crit = +95.0°C, hyst = +95.0°C)Example after system resume (without this change):
jc42-i2c-0-1a
Adapter: SMBus PIIX4 adapter port 0 at 0b00
temp1: +34.8°C (low = +0.0°C) ALARM (HIGH, CRIT)
(high = +0.0°C, hyst = +0.0°C)
(crit = +0.0°C, hyst = +0.0°C)Apply the cached values from the JC42_REG_TEMP_UPPER, JC42_REG_TEMP_LOWER, JC42_REG_TEMP_CRITICAL and JC42_REG_SMBUS (where the SMBUS register is not related to this issue but a side-effect of using regcache_sync() during system resume with the previously cached/programmed values. This fixes the alarm due to the hardware defaults of 0°C because the previously applied limits (set by userspace) are re-applied on system resume.
--- drivers/hwmon/jc42.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/hwmon/jc42.c +9 -1
@@ -578,6 +578,10 @@ static int jc42_suspend(struct device *dev) data->config |=JC42_CFG_SHUTDOWN ;regmap_write (data->regmap,JC42_REG_CONFIG , data->config); + +regcache_cache_only (data->regmap, true); +regcache_mark_dirty (data->regmap); +return 0 ; }
@@ -585,9 +589,13 @@ static int jc42_resume(struct device *dev) {struct jc42_data *data =dev_get_drvdata (dev); +regcache_cache_only (data->regmap, false); + data->config &= ~JC42_CFG_SHUTDOWN ;regmap_write (data->regmap,JC42_REG_CONFIG , data->config); -return 0 ; + +/* Restore cached register values to hardware */ +return regcache_sync (data->regmap); }static const struct dev_pm_ops jc42_dev_pm_ops = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 479/1146 bpf: Add dummy type reference to nf_conn___init to fix type deduplication
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 578ce69ffda49d6c1a252490553290d1f27199f0 ]
The bpf_ct_set_nat_info() kfunc is defined in the nf_nat.ko module, and takes as a parameter the nf_conn___init struct, which is allocated through the bpf_xdp_ct_alloc() helper defined in the nf_conntrack.ko module. However, because kernel modules can't deduplicate BTF types between each other, and the nf_conn___init struct is not referenced anywhere in vmlinux BTF, this leads to two distinct BTF IDs for the same type (one in each module). This confuses the verifier, as described here:
https://lore.kernel.org/all/[email protected]/
As a workaround, add an explicit BTF_TYPE_EMIT for the type in net/filter.c, so the type definition gets included in vmlinux BTF. This way, both modules can refer to the same type ID (as they both build on top of vmlinux BTF), and the verifier is no longer confused.
v2:
- Use BTF_TYPE_EMIT (which is a statement so it has to be inside a function definition; use xdp_func_proto() for this, since this is mostly xdp-related).
--- net/core/filter.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
net/core/filter.c +14 -0
@@ -80,6 +80,7 @@#include <net/tls.h> #include <net/xdp.h> #include <net/mptcp.h> +#include <net/netfilter/nf_conntrack_bpf.h> static const struct bpf_func_proto *bpf_sk_base_func_proto (enum bpf_func_id func_id);
@@ -7988,6 +7989,19 @@ xdp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)default :return bpf_sk_base_func_proto (func_id); } + +#if IS_MODULE (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES ) +/* The nf_conn___init type is used in the NF_CONNTRACK kfuncs. The +* kfuncs are defined in two different modules, and we want to be able +* to use them interchangably with the same BTF type ID. Because modules +* can't de-duplicate BTF IDs between each other, we need the type to be +* referenced in the vmlinux BTF or the verifier will get confused about +* the different types. So we add this dummy type reference which will +* be included in vmlinux BTF, allowing both modules to refer to the +* same type ID. +*/ +BTF_TYPE_EMIT (struct nf_conn___init ); +#endif }const struct bpf_func_proto bpf_sock_map_update_proto__weak ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 480/1146 bpf, sockmap: fix race in sock_map_free()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0a182f8d607464911756b4dbef5d6cad8de22469 ]
sock_map_free() calls release_sock(sk) without owning a reference on the socket. This can cause use-after-free as syzbot found [1]
Jakub Sitnicki already took care of a similar issue in sock_hash_free() in commit 75e68e5bf2c7 ("bpf, sockhash:
Synchronize delete from bucket list on map free")
[1]refcount_t: decrement hit 0; leaking memory.
WARNING: CPU: 0 PID: 3785 at lib/refcount.c:31 refcount_warn_saturate+0x17c/0x1a0 lib/refcount.c:31 Modules linked in: CPU: 0 PID: 3785 Comm: kworker/u4:6 Not tainted 6.1.0-rc7-syzkaller-00103-gef4d3ea40565 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 Workqueue: events_unbound bpf_map_free_deferred RIP: 0010:refcount_warn_saturate+0x17c/0x1a0 lib/refcount.c:31 Code: 68 8b 31 c0 e8 75 71 15 fd 0f 0b e9 64 ff ff ff e8 d9 6e 4e fd c6 05 62 9c 3d 0a 01 48 c7 c7 80 bb 68 8b 31 c0 e8 54 71 15 fd <0f> 0b e9 43 ff ff ff 89 d9 80 e1 07 80 c1 03 38 c1 0f 8c a2 fe ff RSP: 0018:ffffc9000456fb60 EFLAGS: 00010246 RAX: eae59bab72dcd700 RBX: 0000000000000004 RCX: ffff8880207057c0 RDX: 0000000000000000 RSI: 0000000000000201 RDI: 0000000000000000 RBP: 0000000000000004 R08: ffffffff816fdabd R09: fffff520008adee5 R10: fffff520008adee5 R11: 1ffff920008adee4 R12: 0000000000000004 R13: dffffc0000000000 R14: ffff88807b1c6c00 R15: 1ffff1100f638dcf FS: 0000000000000000(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b30c30000 CR3: 000000000d08e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __refcount_dec include/linux/refcount.h:344 [inline] refcount_dec include/linux/refcount.h:359 [inline] __sock_put include/net/sock.h:779 [inline] tcp_release_cb+0x2d0/0x360 net/ipv4/tcp_output.c:1092 release_sock+0xaf/0x1c0 net/core/sock.c:3468 sock_map_free+0x219/0x2c0 net/core/sock_map.c:356 process_one_work+0x81c/0xd10 kernel/workqueue.c:2289 worker_thread+0xb14/0x1330 kernel/workqueue.c:2436 kthread+0x266/0x300 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 </TASK>
--- net/core/sock_map.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/sock_map.c +2 -0
@@ -349,11 +349,13 @@ static void sock_map_free(struct bpf_map *map) sk =xchg (psk,NULL );if (sk) { +sock_hold (sk);lock_sock (sk);rcu_read_lock ();sock_map_unref (sk, psk);rcu_read_unlock ();release_sock (sk); +sock_put (sk); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 481/1146 ALSA: pcm: Set missing stop_operating flag at undoing trigger start
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 5c8cc93b06d1ff860327a273abf3ac006290d242 ]
When a PCM trigger-start fails at snd_pcm_do_start(), PCM core tries to undo the action at snd_pcm_undo_start() by issuing the trigger STOP manually. At that point, we forgot to set the stop_operating flag, hence the sync-stop won't be issued at the next prepare or other calls.
This patch adds the missing stop_operating flag at snd_pcm_undo_start().
--- sound/core/pcm_native.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/core/pcm_native.c +3 -1
@@ -1432,8 +1432,10 @@ static int snd_pcm_do_start(struct snd_pcm_substream *substream,static void snd_pcm_undo_start (struct snd_pcm_substream *substream,snd_pcm_state_t state) { -if (substream->runtime->trigger_master == substream) +if (substream->runtime->trigger_master == substream) { substream->ops->trigger (substream,SNDRV_PCM_TRIGGER_STOP ); + substream->runtime->stop_operating = true; + } } static void snd_pcm_post_start(struct snd_pcm_substream *substream,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 482/1146 media: saa7164: fix missing pci_disable_device()
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 57fb35d7542384cac8f198cd1c927540ad38b61a ]
Add missing pci_disable_device() in the error path in saa7164_initdev().
--- drivers/media/pci/saa7164/saa7164-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/pci/saa7164/saa7164-core.c +3 -1
@@ -1259,7 +1259,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,if (saa7164_dev_setup (dev) <0 ) { err = -EINVAL ; - goto fail_free; + goto fail_dev; }/* print pci info */
@@ -1427,6 +1427,8 @@ static int saa7164_initdev(struct pci_dev *pci_dev, fail_irq:saa7164_dev_unregister (dev); +fail_dev: +pci_disable_device (pci_dev); fail_free:v4l2_device_unregister (&dev->v4l2_dev);kfree (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 483/1146 media: ov5640: set correct default link frequency
In reply to Greg Kroah-HartmanFrom: Guoniu.zhou <[email protected]>
[ Upstream commit d7b41196927ba2a2b5badad1a85f9087eb90b076 ]
current_link_freq field in ov5640_dev structure is link frequency, not link frequency array index, so correct it.
--- drivers/media/i2c/ov5640.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/i2c/ov5640.c +2 -1
@@ -3817,7 +3817,8 @@ static int ov5640_probe(struct i2c_client *client) sensor->current_mode = &ov5640_mode_data[OV5640_MODE_VGA_640_480 ]; sensor->last_mode = sensor->current_mode; - sensor->current_link_freq =OV5640_DEFAULT_LINK_FREQ ; + sensor->current_link_freq = + ov5640_csi2_link_freqs[OV5640_DEFAULT_LINK_FREQ ]; sensor->ae_target =52 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 484/1146 ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit cf2ea3c86ad90d63d1c572b43e1ca9276b0357ad ]
I got a null-ptr-defer error report when I do the following tests on the qemu platform:
make defconfig and CONFIG_PARPORT=m, CONFIG_PARPORT_PC=m, CONFIG_SND_MTS64=m
Then making test scripts:
cat>test_mod1.sh<<EOF
modprobe snd-mts64
modprobe snd-mts64
EOF
Executing the script, perhaps several times, we will get a null-ptr-defer report, as follow:
syzkaller:~# ./test_mod.sh snd_mts64: probe of snd_mts64.0 failed with error -5 modprobe: ERROR: could not insert 'snd_mts64': No such device BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 0 P4D 0 Oops: 0002 [#1] PREEMPT SMP PTI CPU: 0 PID: 205 Comm: modprobe Not tainted 6.1.0-rc8-00588-g76dcd734eca2 #6 Call Trace: <IRQ> snd_mts64_interrupt+0x24/0xa0 [snd_mts64] parport_irq_handler+0x37/0x50 [parport] __handle_irq_event_percpu+0x39/0x190 handle_irq_event_percpu+0xa/0x30 handle_irq_event+0x2f/0x50 handle_edge_irq+0x99/0x1b0 __common_interrupt+0x5d/0x100 common_interrupt+0xa0/0xc0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40 RIP: 0010:_raw_write_unlock_irqrestore+0x11/0x30 parport_claim+0xbd/0x230 [parport] snd_mts64_probe+0x14a/0x465 [snd_mts64] platform_probe+0x3f/0xa0 really_probe+0x129/0x2c0 __driver_probe_device+0x6d/0xc0 driver_probe_device+0x1a/0xa0 __device_attach_driver+0x7a/0xb0 bus_for_each_drv+0x62/0xb0 __device_attach+0xe4/0x180 bus_probe_device+0x82/0xa0 device_add+0x550/0x920 platform_device_add+0x106/0x220 snd_mts64_attach+0x2e/0x80 [snd_mts64] port_check+0x14/0x20 [parport] bus_for_each_dev+0x6e/0xc0 __parport_register_driver+0x7c/0xb0 [parport] snd_mts64_module_init+0x31/0x1000 [snd_mts64] do_one_initcall+0x3c/0x1f0 do_init_module+0x46/0x1c6 load_module+0x1d8d/0x1e10 __do_sys_finit_module+0xa2/0xf0 do_syscall_64+0x37/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK> Kernel panic - not syncing: Fatal exception in interrupt Rebooting in 1 seconds..
The mts wa not initialized during interrupt, we add check for mts to fix this bug.
--- sound/drivers/mts64.c | 3 +++ 1 file changed, 3 insertions(+)
sound/drivers/mts64.c +3 -0
@@ -815,6 +815,9 @@ static void snd_mts64_interrupt(void *private)u8 status, data;struct snd_rawmidi_substream *substream; +if (!mts) +return ; +spin_lock (&mts->lock); ret =mts64_read (mts->pardev->port); data = ret &0x00ff ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 485/1146 pinctrl: thunderbay: fix possible memory leak in thunderbay_build_functions()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 83e1bcaf8cef26edaaf2a6098ef760f563683483 ]
The thunderbay_add_functions() will free memory of thunderbay_funcs when everything is ok, but thunderbay_funcs will not be freed when thunderbay_add_functions() fails, then there will be a memory leak, so we need to add kfree() when thunderbay_add_functions() fails to fix it.
In addition, doing some cleaner works, moving kfree(funcs) from thunderbay_add_functions() to thunderbay_build_functions().
--- drivers/pinctrl/pinctrl-thunderbay.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-thunderbay.c +6 -2
@@ -808,7 +808,7 @@ static int thunderbay_add_functions(struct thunderbay_pinctrl *tpc, struct funct funcs[i].num_group_names, funcs[i].data); } -kfree (funcs); +return 0 ; }
@@ -817,6 +817,7 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc)struct function_desc *thunderbay_funcs;void *ptr;int pin; +int ret;/* * Allocate maximum possible number of functions. Assume every pin
@@ -860,7 +861,10 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc)return -ENOMEM ; thunderbay_funcs = ptr; -return thunderbay_add_functions (tpc, thunderbay_funcs); + ret =thunderbay_add_functions (tpc, thunderbay_funcs); + +kfree (thunderbay_funcs); +return ret; } static int thunderbay_pinconf_set_tristate(struct thunderbay_pinctrl *tpc,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 486/1146 xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 9181f40fb2952fd59ecb75e7158620c9c669eee3 ]
If rdma receive buffer allocate failed, should call rpcrdma_regbuf_free() to free the send buffer, otherwise, the buffer data will be leaked.
--- net/sunrpc/xprtrdma/verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/xprtrdma/verbs.c +1 -1
@@ -831,7 +831,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt,return req; out3: -kfree (req->rl_sendbuf); +rpcrdma_regbuf_free (req->rl_sendbuf); out2:kfree (req); out1:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 487/1146 SUNRPC: Fix missing release socket in rpc_sockname()
In reply to Greg Kroah-HartmanFrom: Wang ShaoBo <[email protected]>
[ Upstream commit 50fa355bc0d75911fe9d5072a5ba52cdb803aff7 ]
socket dynamically created is not released when getting an unintended address family type in rpc_sockname(), direct to out_release for calling sock_release().
--- net/sunrpc/clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/clnt.c +1 -1
@@ -1442,7 +1442,7 @@ static int rpc_sockname(struct net *net, struct sockaddr *sap, size_t salen,break ;default : err = -EAFNOSUPPORT ; - goto out; + goto out_release; }if (err <0 ) {dprintk ("RPC: can't bind UDP socket (%d)\n" , err);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 488/1146 NFSv4.2: Set the correct size scratch buffer for decoding READ_PLUS
In reply to Greg Kroah-HartmanFrom: Anna Schumaker <[email protected]>
[ Upstream commit 36357fe74ef736524a29fbd3952948768510a8b9 ]
The scratch_buf array is 16 bytes, but I was passing 32 to the xdr_set_scratch_buffer() function. Fix this by using sizeof(), which is what I probably should have been doing this whole time.
--- fs/nfs/nfs42xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs42xdr.c +1 -1
@@ -1142,7 +1142,7 @@ static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res)if (!segs)return -ENOMEM ; -xdr_set_scratch_buffer (xdr, &scratch_buf,32 ); +xdr_set_scratch_buffer (xdr, &scratch_buf,sizeof (scratch_buf)); status = -EIO ;for (i =0 ; i < segments; i++) { status =decode_read_plus_segment (xdr, &segs[i]);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 489/1146 NFS: Allow very small rsize & wsize again
In reply to Greg Kroah-HartmanFrom: Anna Schumaker <[email protected]>
[ Upstream commit a60214c2465493aac0b014d87ee19327b6204c42 ]
940261a19508 introduced nfs_io_size() to clamp the iosize to a multiple of PAGE_SIZE. This had the unintended side effect of no longer allowing iosizes less than a page, which could be useful in some situations.
UDP already has an exception that causes it to fall back on the power-of-two style sizes instead. This patch adds an additional exception for very small iosizes.
--- fs/nfs/internal.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/nfs/internal.h +2 -4
@@ -739,12 +739,10 @@ unsigned long nfs_io_size(unsigned long iosize, enum xprt_transports proto) iosize =NFS_DEF_FILE_IO_SIZE ; else if (iosize >= NFS_MAX_FILE_IO_SIZE) iosize =NFS_MAX_FILE_IO_SIZE ; - else - iosize = iosize &PAGE_MASK ; -if (proto ==XPRT_TRANSPORT_UDP ) +if (proto ==XPRT_TRANSPORT_UDP || iosize <PAGE_SIZE )return nfs_block_bits (iosize,NULL ); -return iosize; +return iosize &PAGE_MASK ; }/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 490/1146 NFSv4.x: Fail client initialisation if state manager thread cant run
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit b4e4f66901658fae0614dea5bf91062a5387eda7 ]
If the state manager thread fails to start, then we should just mark the client initialisation as failed so that other processes or threads don't get stuck in nfs_wait_client_init_complete().
--- fs/nfs/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs4state.c +2 -0
@@ -1230,6 +1230,8 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)if (IS_ERR (task)) {printk (KERN_ERR "%s: kthread_run: %ld\n" , __func__,PTR_ERR (task)); +if (!nfs_client_init_is_complete (clp)) +nfs_mark_client_ready (clp,PTR_ERR (task));nfs4_clear_state_manager_bit (clp);clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state);nfs_put_client (clp);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 491/1146 riscv, bpf: Emit fixed-length instructions for BPF_PSEUDO_FUNC
In reply to Greg Kroah-HartmanFrom: Pu Lehui <[email protected]>
[ Upstream commit b54b6003612a376e7be32cbc5c1af3754bbbbb3d ]
For BPF_PSEUDO_FUNC instruction, verifier will refill imm with correct addresses of bpf_calls and then run last pass of JIT. Since the emit_imm of RV64 is variable-length, which will emit appropriate length instructions accorroding to the imm, it may broke ctx->offset, and lead to unpredictable problem, such as inaccurate jump. So let's fix it with fixed-length instructions.
--- arch/riscv/net/bpf_jit_comp64.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)
arch/riscv/net/bpf_jit_comp64.c +28 -1
@@ -136,6 +136,25 @@ static bool in_auipc_jalr_range(s64 val) val < ((1L <<31 ) - (1L <<11 )); } +/* Emit fixed-length instructions for address */ +static int emit_addr (u8 rd,u64 addr,bool extra_pass,struct rv_jit_context *ctx) +{ +u64 ip = (u64)(ctx->insns + ctx->ninsns); +s64 off = addr - ip; +s64 upper = (off + (1 <<11 )) >>12 ; +s64 lower = off &0xfff ; + +if (extra_pass && !in_auipc_jalr_range (off)) { +pr_err ("bpf-jit: target offset 0x%llx is out of range\n" , off); +return -ERANGE ; + } + +emit (rv_auipc (rd, upper), ctx); +emit (rv_addi (rd, rd, lower), ctx); +return 0 ; +} + +/* Emit variable-length instructions for 32-bit and 64-bit imm */ static void emit_imm (u8 rd,s64 val,struct rv_jit_context *ctx) {/* Note that the immediate from the add is sign-extended,
@@ -1050,7 +1069,15 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,u64 imm64; imm64 = (u64 )insn1.imm <<32 | (u32 )imm; -emit_imm (rd, imm64, ctx); +if (bpf_pseudo_func (insn)) { +/* fixed-length insns for extra jit pass */ + ret =emit_addr (rd, imm64, extra_pass, ctx); +if (ret) +return ret; + }else { +emit_imm (rd, imm64, ctx); + } +return 1 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 492/1146 bpftool: Fix memory leak in do_build_table_cb
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit fa55ef14ef4fe06198c0ce811b603aec24134bc2 ]
strdup() allocates memory for path. We need to release the memory in the following error path. Add free() to avoid memory leak.
--- tools/bpf/bpftool/common.c | 1 + 1 file changed, 1 insertion(+)
tools/bpf/bpftool/common.c +1 -0
@@ -499,6 +499,7 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb,if (err) {p_err ("failed to append entry to hashmap for ID %u, path '%s': %s" , pinned_info.id, path,strerror (errno)); +free (path); goto out_close; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 493/1146 hwmon: (emc2305) fix unable to probe emc2301/2/3
In reply to Greg Kroah-HartmanFrom: Xingjiang Qiao <[email protected]>
[ Upstream commit 4d50591ebf60ccf79380fff3a4c23659c61c482f ]
The definitions of 'EMC2305_REG_PRODUCT_ID' and 'EMC2305_REG_DEVICE' are both '0xfd', they actually return the same value, but the values returned by emc2301/2/3/5 are different, so probe emc2301/2/3 will fail, This patch fixes that.
--- drivers/hwmon/emc2305.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/hwmon/emc2305.c +1 -6
@@ -16,7 +16,6 @@ static const unsigned short emc2305_normal_i2c[] = { 0x27, 0x2c, 0x2d, 0x2e, 0x2f, 0x4c, 0x4d, I2C_CLIENT_END };#define EMC2305_REG_DRIVE_FAIL_STATUS 0x27 -#define EMC2305_REG_DEVICE 0xfd#define EMC2305_REG_VENDOR 0xfe#define EMC2305_FAN_MAX 0xff#define EMC2305_FAN_MIN 0x00
@@ -524,7 +523,7 @@ static int emc2305_probe(struct i2c_client *client, const struct i2c_device_id *struct device *dev = &client->dev;struct emc2305_data *data;struct emc2305_platform_data *pdata; -int vendor, device; +int vendor;int ret;int i;
@@ -535,10 +534,6 @@ static int emc2305_probe(struct i2c_client *client, const struct i2c_device_id *if (vendor !=EMC2305_VENDOR )return -ENODEV ; - device =i2c_smbus_read_byte_data (client,EMC2305_REG_DEVICE ); -if (device !=EMC2305_DEVICE ) -return -ENODEV ; - data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 494/1146 hwmon: (emc2305) fix pwm never being able to set lower
In reply to Greg Kroah-HartmanFrom: Xingjiang Qiao <[email protected]>
[ Upstream commit 364ffd2537c44cb6914ff5669153f4a86fffad29 ]
There are fields 'last_hwmon_state' and 'last_thermal_state' in the structure 'emc2305_cdev_data', which respectively store the cooling state set by the 'hwmon' and 'thermal' subsystem, and the driver author hopes that if the state set by 'hwmon' is lower than the value set by 'thermal', the driver will just save it without actually setting the pwm. Currently, the 'last_thermal_state' also be updated by 'hwmon', which will cause the cooling state to never be set to a lower value. This patch fixes that.
--- drivers/hwmon/emc2305.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
drivers/hwmon/emc2305.c +24 -13
@@ -171,22 +171,12 @@ static int emc2305_get_max_state(struct thermal_cooling_device *cdev, unsigned lreturn 0 ; } -static int emc2305_set_cur_state (struct thermal_cooling_device *cdev,unsigned long state) +static int __emc2305_set_cur_state (struct emc2305_data *data,int cdev_idx,unsigned long state) { -int cdev_idx, ret; -struct emc2305_data *data = cdev->devdata; +int ret;struct i2c_client *client = data->client;u8 val, i; -if (state > data->max_state) -return -EINVAL ; - - cdev_idx =emc2305_get_cdev_idx (cdev); -if (cdev_idx <0 ) -return cdev_idx; - -/* Save thermal state. */ - data->cdev_data[cdev_idx].last_thermal_state = state; state = max_t(unsigned long, state, data->cdev_data[cdev_idx].last_hwmon_state); val =EMC2305_PWM_STATE2DUTY (state, data->max_state,EMC2305_FAN_MAX );
@@ -211,6 +201,27 @@ static int emc2305_set_cur_state(struct thermal_cooling_device *cdev, unsigned lreturn 0 ; } +static int emc2305_set_cur_state (struct thermal_cooling_device *cdev,unsigned long state) +{ +int cdev_idx, ret; +struct emc2305_data *data = cdev->devdata; + +if (state > data->max_state) +return -EINVAL ; + + cdev_idx =emc2305_get_cdev_idx (cdev); +if (cdev_idx <0 ) +return cdev_idx; + +/* Save thermal state. */ + data->cdev_data[cdev_idx].last_thermal_state = state; + ret =__emc2305_set_cur_state (data, cdev_idx, state); +if (ret <0 ) +return ret; + +return 0 ; +} +static const struct thermal_cooling_device_ops emc2305_cooling_ops = { .get_max_state = emc2305_get_max_state, .get_cur_state = emc2305_get_cur_state,
@@ -401,7 +412,7 @@ emc2305_write(struct device *dev, enum hwmon_sensor_types type, u32 attr, int ch*/ if (data->cdev_data[cdev_idx].last_hwmon_state >= data->cdev_data[cdev_idx].last_thermal_state) -return emc2305_set_cur_state (data->cdev_data[cdev_idx].cdev, +return __emc2305_set_cur_state (data, cdev_idx, data->cdev_data[cdev_idx].last_hwmon_state);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 495/1146 mmc: alcor: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e93d1468f429475a753d6baa79b853b7ee5ef8c0 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and calling mmc_free_host() in the error path.
--- drivers/mmc/host/alcor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/alcor.c +4 -1
@@ -1114,7 +1114,10 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)alcor_hw_init (host);dev_set_drvdata (&pdev->dev, host); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto free_host; +return 0 ; free_host:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 496/1146 mmc: moxart: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0ca18d09c744fb030ae9bc5836c3e357e0237dea ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/moxart-mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/moxart-mmc.c +3 -1
@@ -665,7 +665,9 @@ static int moxart_probe(struct platform_device *pdev) goto out;dev_set_drvdata (dev, mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto out;dev_dbg (dev,"IRQ=%d, FIFO is %d bytes\n" , irq, host->fifo_width);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 497/1146 mmc: mxcmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit cde600af7b413c9fe03e85c58c4279df90e91d13 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/mxcmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/mxcmmc.c +3 -1
@@ -1143,7 +1143,9 @@ static int mxcmci_probe(struct platform_device *pdev)timer_setup (&host->watchdog, mxcmci_watchdog,0 ); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto out_free_dma;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 498/1146 mmc: pxamci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 80e1ef3afb8bfbe768380b70ffe1b6cab87d1a3b ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, ->exit() need be called to uninit the pdata.
--- drivers/mmc/host/pxamci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mmc/host/pxamci.c +6 -1
@@ -763,7 +763,12 @@ static int pxamci_probe(struct platform_device *pdev)dev_warn (dev,"gpio_ro and get_ro() both defined\n" ); } -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +if (host->pdata && host->pdata->exit) + host->pdata->exit (dev, mmc); + goto out; + }return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 499/1146 mmc: rtsx_pci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0c87db77423a282b3b38b8a6daf057b822680516 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and calling mmc_free_host() in the error path, beside, runtime PM also needs be disabled.
--- drivers/mmc/host/rtsx_pci_sdmmc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/mmc/host/rtsx_pci_sdmmc.c +8 -1
@@ -1474,6 +1474,7 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)struct realtek_pci_sdmmc *host;struct rtsx_pcr *pcr;struct pcr_handle *handle = pdev->dev.platform_data; +int ret;if (!handle)return -ENXIO ;
@@ -1511,7 +1512,13 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)pm_runtime_mark_last_busy (&pdev->dev);pm_runtime_use_autosuspend (&pdev->dev); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); +mmc_free_host (mmc); +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 500/1146 mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit fc38a5a10e9e5a75eb9189854abeb8405b214cc9 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and calling mmc_free_host() in the error path, besides, led_classdev_unregister() and pm_runtime_disable() also need be called.
--- drivers/mmc/host/rtsx_usb_sdmmc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/mmc/host/rtsx_usb_sdmmc.c +10 -1
@@ -1329,6 +1329,7 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev)#ifdef RTSX_USB_USE_LEDS_CLASS int err;#endif +int ret; ucr =usb_get_intfdata (to_usb_interface (pdev->dev.parent));if (!ucr)
@@ -1365,7 +1366,15 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev)INIT_WORK (&host->led_work, rtsx_usb_update_led);#endif -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +#ifdef RTSX_USB_USE_LEDS_CLASS +led_classdev_unregister (&host->led); +#endif +mmc_free_host (mmc); +pm_runtime_disable (&pdev->dev); +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 501/1146 mmc: toshsd: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f670744a316ea983113a65313dcd387b5a992444 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, free_irq() also needs be called.
--- drivers/mmc/host/toshsd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/toshsd.c +5 -1
@@ -651,7 +651,9 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto unmap; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto free_irq; base =pci_resource_start (pdev,0 );dev_dbg (&pdev->dev,"MMIO %pa, IRQ %d\n" , &base, pdev->irq);
@@ -660,6 +662,8 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return 0 ; +free_irq: +free_irq (pdev->irq, host); unmap:pci_iounmap (pdev, host->ioaddr); release:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 502/1146 mmc: vub300: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0613ad2401f88bdeae5594c30afe318e93b14676 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, the timer added before mmc_add_host() needs be del.
And this patch fixes another missing call mmc_free_host() if usb_control_msg() fails.
--- drivers/mmc/host/vub300.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/host/vub300.c +8 -3
@@ -2299,14 +2299,14 @@ static int vub300_probe(struct usb_interface *interface,0x0000 ,0x0000 , &vub300->system_port_status, sizeof(vub300->system_port_status), 1000);if (retval <0 ) { - goto error4; + goto error5; }else if (sizeof (vub300->system_port_status) == retval) { vub300->card_present = (0x0001 & vub300->system_port_status.port_flags) ?1 :0 ; vub300->read_only = (0x0010 & vub300->system_port_status.port_flags) ?1 :0 ; }else { - goto error4; + goto error5; }usb_set_intfdata (interface, vub300);INIT_DELAYED_WORK (&vub300->pollwork, vub300_pollwork_thread);
@@ -2329,8 +2329,13 @@ static int vub300_probe(struct usb_interface *interface,"USB vub300 remote SDIO host controller[%d]" "connected with no SD/SDIO card inserted\n" , interface_to_InterfaceNumber(interface)); -mmc_add_host (mmc); + retval =mmc_add_host (mmc); +if (retval) + goto error6; +return 0 ; +error6: +del_timer_sync (&vub300->inactivity_timer); error5:mmc_free_host (mmc);/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 503/1146 mmc: wmt-sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 29276d56f6ed138db0f38cd31aedc0b725c8c76c ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, clk_disable_unprepare() also needs be called.
--- drivers/mmc/host/wmt-sdmmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/wmt-sdmmc.c +5 -1
@@ -856,11 +856,15 @@ static int wmt_mci_probe(struct platform_device *pdev)/* configure the controller to a known 'ready' state */ wmt_reset_hardware (mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto fail7;dev_info (&pdev->dev,"WMT SDHC Controller initialized\n" );return 0 ; +fail7: +clk_disable_unprepare (priv->clk_sdmmc); fail6:clk_put (priv->clk_sdmmc); fail5_and_a_half:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 504/1146 mmc: litex_mmc: ensure `host->irq == 0` if polling
In reply to Greg Kroah-HartmanFrom: Gabriel Somlo <[email protected]>
[ Upstream commit 5c1a2b77cd1b59112cf22b3e338f7e416797ad32 ]
Ensure the flag is explicitly set to 0 if we determine that polling is needed during driver probe, to cover all possible cases.
--- drivers/mmc/host/litex_mmc.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/litex_mmc.c +1 -0
@@ -502,6 +502,7 @@ static int litex_mmc_irq_init(struct platform_device *pdev, use_polling: host->mmc->caps |=MMC_CAP_NEEDS_POLL ; + host->irq =0 ;return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 505/1146 mmc: atmel-mci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 9e6e8c43726673ca2abcaac87640b9215fd72f4c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and calling mmc_free_host() in the error path.
--- drivers/mmc/host/atmel-mci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/host/atmel-mci.c +6 -3
@@ -2222,6 +2222,7 @@ static int atmci_init_slot(struct atmel_mci *host, {struct mmc_host *mmc;struct atmel_mci_slot *slot; +int ret; mmc =mmc_alloc_host (sizeof (struct atmel_mci_slot ), &host->pdev->dev);if (!mmc)
@@ -2305,11 +2306,13 @@ static int atmci_init_slot(struct atmel_mci *host, host->slot[id] = slot;mmc_regulator_get_supply (mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +mmc_free_host (mmc); +return ret; + }if (gpio_is_valid (slot->detect_pin)) { -int ret; -timer_setup (&slot->detect_timer, atmci_detect_change,0 ); ret = request_irq(gpio_to_irq(slot->detect_pin),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 506/1146 mmc: omap_hsmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit a525cad241c339ca00bf7ebf03c5180f2a9b767c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path wihch will call mmc_free_host().
--- drivers/mmc/host/omap_hsmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/omap_hsmmc.c +3 -1
@@ -1946,7 +1946,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)if (!ret) mmc->caps |=MMC_CAP_SDIO_IRQ ; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto err_irq;if (mmc_pdata (host)->name !=NULL ) { ret =device_create_file (&mmc->class_dev, &dev_attr_slot_name);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 507/1146 mmc: meson-gx: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 90935f16f2650ab7416fa2ffbe5c28cb39cf3f1e ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/meson-gx-mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/meson-gx-mmc.c +3 -1
@@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev) } mmc->ops = &meson_mmc_ops; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto err_free_irq;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 508/1146 mmc: via-sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e4e46fb61e3bb4628170810d3f2b996b709b90d9 ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/via-sdmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/via-sdmmc.c +3 -1
@@ -1151,7 +1151,9 @@ static int via_sd_probe(struct pci_dev *pcidev, pcidev->subsystem_device == 0x3891) sdhost->quirks =VIA_CRDR_QUIRK_300MS_PWRDELAY ; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto unmap;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 509/1146 mmc: wbsd: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit dc5b9b50fc9d1334407e316e6e29a5097ef833bd ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, other resources also need be released.
--- drivers/mmc/host/wbsd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/mmc/host/wbsd.c +11 -1
@@ -1698,7 +1698,17 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma,*/ wbsd_init_device (host); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +if (!pnp) +wbsd_chip_poweroff (host); + +wbsd_release_resources (host); +wbsd_free_mmc (dev); + +mmc_free_host (mmc); +return ret; + }pr_info ("%s: W83L51xD" ,mmc_hostname (mmc));if (host->chip_id !=0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 510/1146 mmc: mmci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b38a20f29a49ae04d23750d104b25400b792b98c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/mmci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/mmci.c +3 -1
@@ -2256,7 +2256,9 @@ static int mmci_probe(struct amba_device *dev,pm_runtime_set_autosuspend_delay (&dev->dev,50 );pm_runtime_use_autosuspend (&dev->dev); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto clk_disable;pm_runtime_put (&dev->dev);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 511/1146 mmc: renesas_sdhi: alway populate SCC pointer
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 3d4f9898c1c74323dd61d6a8a0efca9401232ad4 ]
We need the SCC pointer to reset the device, so populate it even when we don't need it for tuning.
--- drivers/mmc/host/renesas_sdhi_core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/mmc/host/renesas_sdhi_core.c +7 -5
@@ -1068,11 +1068,14 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (ver >=SDHI_VER_GEN3_SD ) host->get_timeout_cycles = renesas_sdhi_gen3_get_cycles; +/* Check for SCC so we can reset it if needed */ +if (of_data && of_data->scc_offset && ver >=SDHI_VER_GEN2_SDR104 ) + priv->scc_ctl = host->ctl + of_data->scc_offset; +/* Enable tuning iff we have an SCC and a supported mode */ -if (of_data && of_data->scc_offset && - (host->mmc->caps &MMC_CAP_UHS_SDR104 || - host->mmc->caps2 & (MMC_CAP2_HS200_1_8V_SDR | -MMC_CAP2_HS400_1_8V ))) { +if (priv->scc_ctl && (host->mmc->caps &MMC_CAP_UHS_SDR104 || + host->mmc->caps2 & (MMC_CAP2_HS200_1_8V_SDR | +MMC_CAP2_HS400_1_8V ))) {const struct renesas_sdhi_scc *taps = of_data->taps;bool use_4tap = quirks && quirks->hs400_4taps;bool hit = false;
@@ -1092,7 +1095,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (!hit)dev_warn (&host->pdev->dev,"Unknown clock rate for tuning\n" ); - priv->scc_ctl = host->ctl + of_data->scc_offset; host->check_retune = renesas_sdhi_check_scc_error; host->ops.execute_tuning = renesas_sdhi_execute_tuning; host->ops.prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 512/1146 memstick/ms_block: Add check for alloc_ordered_workqueue
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 4f431a047a5c8698ed4b67e2760cfbeb5fffb69d ]
As the alloc_ordered_workqueue may return NULL pointer, it should be better to add check for the return value. Moreover, the msb->io_queue should be freed if error occurs later.
--- drivers/memstick/core/ms_block.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/memstick/core/ms_block.c +8 -1
@@ -2116,6 +2116,11 @@ static int msb_init_disk(struct memstick_dev *card)dbg ("Set total disk size to %lu sectors" , capacity); msb->io_queue =alloc_ordered_workqueue ("ms_block" ,WQ_MEM_RECLAIM ); +if (!msb->io_queue) { + rc = -ENOMEM ; + goto out_cleanup_disk; + } +INIT_WORK (&msb->io_work, msb_io_work);sg_init_table (msb->prealloc_sg,MS_BLOCK_MAX_SEGS +1 );
@@ -2125,10 +2130,12 @@ static int msb_init_disk(struct memstick_dev *card)msb_start (card); rc =device_add_disk (&card->dev, msb->disk,NULL );if (rc) - goto out_cleanup_disk; + goto out_destroy_workqueue;dbg ("Disk added" );return 0 ; +out_destroy_workqueue: +destroy_workqueue (msb->io_queue); out_cleanup_disk:put_disk (msb->disk); out_free_tag_set:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 513/1146 mmc: core: Normalize the error handling branch in sd_read_ext_regs()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit fc02e2b52389c8fde02852b2f959c0b45f042bbd ]
Let's use pr_err() to output the error messages and let's extend a comment to clarify why returning 0 (success) in one case make sense.
--- drivers/mmc/core/sd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/core/sd.c +8 -3
@@ -1259,7 +1259,7 @@ static int sd_read_ext_regs(struct mmc_card *card)*/ err =sd_read_ext_reg (card,0 ,0 ,0 ,512 , gen_info_buf);if (err) { -pr_warn ("%s: error %d reading general info of SD ext reg\n" , +pr_err ("%s: error %d reading general info of SD ext reg\n" ,mmc_hostname (card->host), err); goto out; }
@@ -1273,7 +1273,12 @@ static int sd_read_ext_regs(struct mmc_card *card)/* Number of extensions to be find. */ num_ext = gen_info_buf[4 ]; -/* We support revision 0, but limit it to 512 bytes for simplicity. */ +/* +* We only support revision 0 and limit it to 512 bytes for simplicity. +* No matter what, let's return zero to allow us to continue using the +* card, even if we can't support the features from the SD function +* extensions registers. +*/ if (rev !=0 || len >512 ) {pr_warn ("%s: non-supported SD ext reg layout\n" ,mmc_hostname (card->host));
@@ -1288,7 +1293,7 @@ static int sd_read_ext_regs(struct mmc_card *card)for (i =0 ; i < num_ext; i++) { err =sd_parse_ext_reg (card, gen_info_buf, &next_ext_addr);if (err) { -pr_warn ("%s: error %d parsing SD ext reg\n" , +pr_err ("%s: error %d parsing SD ext reg\n" ,mmc_hostname (card->host), err); goto out; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 514/1146 nvme: pass nr_maps explicitly to nvme_alloc_io_tag_set
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit dcef77274ae52136925287b6b59d5c6e6a4adfb9 ]
Don't look at ctrl->ops as only RDMA and TCP actually support multiple maps.
--- drivers/nvme/host/core.c | 5 ++--- drivers/nvme/host/fc.c | 2 +- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/host/rdma.c | 4 +++- drivers/nvme/host/tcp.c | 1 + drivers/nvme/target/loop.c | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-)
drivers/nvme/host/core.c +2 -3
@@ -4867,7 +4867,7 @@ EXPORT_SYMBOL_GPL(nvme_remove_admin_tag_set);int nvme_alloc_io_tag_set (struct nvme_ctrl *ctrl,struct blk_mq_tag_set *set,const struct blk_mq_ops *ops,unsigned int flags, -unsigned int cmd_size) +unsigned int nr_maps,unsigned int cmd_size) {int ret;
@@ -4881,8 +4881,7 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, set->driver_data = ctrl; set->nr_hw_queues = ctrl->queue_count -1 ; set->timeout =NVME_IO_TIMEOUT ; -if (ops->map_queues) - set->nr_maps = ctrl->opts->nr_poll_queues ?HCTX_MAX_TYPES :2 ; + set->nr_maps = nr_maps; ret =blk_mq_alloc_tag_set (set);if (ret)return ret;
drivers/nvme/host/fc.c +1 -1
@@ -2903,7 +2903,7 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl)nvme_fc_init_io_queues (ctrl); ret =nvme_alloc_io_tag_set (&ctrl->ctrl, &ctrl->tag_set, - &nvme_fc_mq_ops,BLK_MQ_F_SHOULD_MERGE , + &nvme_fc_mq_ops,BLK_MQ_F_SHOULD_MERGE ,1 ,struct_size ((struct nvme_fcp_op_w_sgl *)NULL , priv, ctrl->lport->ops->fcprqst_priv_sz));if (ret)
drivers/nvme/host/nvme.h +1 -1
@@ -743,7 +743,7 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,void nvme_remove_admin_tag_set (struct nvme_ctrl *ctrl);int nvme_alloc_io_tag_set (struct nvme_ctrl *ctrl,struct blk_mq_tag_set *set,const struct blk_mq_ops *ops,unsigned int flags, -unsigned int cmd_size); +unsigned int nr_maps,unsigned int cmd_size);void nvme_remove_io_tag_set (struct nvme_ctrl *ctrl);void nvme_remove_namespaces (struct nvme_ctrl *ctrl);
drivers/nvme/host/rdma.c +3 -1
@@ -798,7 +798,9 @@ static int nvme_rdma_alloc_tag_set(struct nvme_ctrl *ctrl)NVME_RDMA_METADATA_SGL_SIZE ;return nvme_alloc_io_tag_set (ctrl, &to_rdma_ctrl (ctrl)->tag_set, - &nvme_rdma_mq_ops,BLK_MQ_F_SHOULD_MERGE , cmd_size); + &nvme_rdma_mq_ops,BLK_MQ_F_SHOULD_MERGE , + ctrl->opts->nr_poll_queues ?HCTX_MAX_TYPES :2 , + cmd_size); }static void nvme_rdma_destroy_admin_queue (struct nvme_rdma_ctrl *ctrl)
drivers/nvme/host/tcp.c +1 -0
@@ -1868,6 +1868,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) ret =nvme_alloc_io_tag_set (ctrl, &to_tcp_ctrl (ctrl)->tag_set, &nvme_tcp_mq_ops,BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING , + ctrl->opts->nr_poll_queues ?HCTX_MAX_TYPES :2 ,sizeof (struct nvme_tcp_request ));if (ret) goto out_free_io_queues;
drivers/nvme/target/loop.c +1 -1
@@ -494,7 +494,7 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl)return ret; ret =nvme_alloc_io_tag_set (&ctrl->ctrl, &ctrl->tag_set, - &nvme_loop_mq_ops,BLK_MQ_F_SHOULD_MERGE , + &nvme_loop_mq_ops,BLK_MQ_F_SHOULD_MERGE ,1 ,sizeof (struct nvme_loop_iod ) +NVME_INLINE_SG_CNT *sizeof (struct scatterlist ));if (ret)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 515/1146 regulator: qcom-labibb: Fix missing of_node_put() in qcom_labibb_regulator_probe()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit cf34ac6aa2b12fb0c3aacfdcae8acd7904b949ec ]
The reg_node needs to be released through of_node_put() in the error handling path when of_irq_get_byname() failed.
--- drivers/regulator/qcom-labibb-regulator.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/qcom-labibb-regulator.c +1 -0
@@ -822,6 +822,7 @@ static int qcom_labibb_regulator_probe(struct platform_device *pdev)if (irq ==0 ) irq = -EINVAL ; +of_node_put (reg_node);return dev_err_probe (vreg->dev, irq,"Short-circuit irq not found.\n" ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 516/1146 media: c8sectpfe: Add of_node_put() when breaking out of loop
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 63ff05a1ad242a5a0f897921c87b70d601bda59c ]
In configure_channels(), we should call of_node_put() when breaking out of for_each_child_of_node() which will automatically increase and decrease the refcount.
--- drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +1 -0
@@ -925,6 +925,7 @@ static int configure_channels(struct c8sectpfei *fei)if (ret) {dev_err (fei->dev,"configure_memdma_and_inputblock failed\n" ); +of_node_put (child); goto err_unmap; } index++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 517/1146 media: coda: Add check for dcoda_iram_alloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6b8082238fb8bb20f67e46388123e67a5bbc558d ]
As the coda_iram_alloc may return NULL pointer, it should be better to check the return value
in order to avoid NULL poineter dereference, same as the others.
--- drivers/media/platform/chips-media/coda-bit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/chips-media/coda-bit.c +2 -2
@@ -854,7 +854,7 @@ static void coda_setup_iram(struct coda_ctx *ctx)/* Only H.264BP and H.263P3 are considered */ iram_info->buf_dbk_y_use =coda_iram_alloc (iram_info, w64); iram_info->buf_dbk_c_use =coda_iram_alloc (iram_info, w64); -if (!iram_info->buf_dbk_c_use) +if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits;
@@ -878,7 +878,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) iram_info->buf_dbk_y_use =coda_iram_alloc (iram_info, w128); iram_info->buf_dbk_c_use =coda_iram_alloc (iram_info, w128); -if (!iram_info->buf_dbk_c_use) +if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 518/1146 media: coda: Add check for kmalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6e5e5defdb8b0186312c2f855ace175aee6daf9b ]
As the kmalloc may return NULL pointer,
it should be better to check the return value
in order to avoid NULL poineter dereference,
same as the others.
--- drivers/media/platform/chips-media/coda-bit.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/chips-media/coda-bit.c +8 -2
@@ -1084,10 +1084,16 @@ static int coda_start_encoding(struct coda_ctx *ctx) }if (dst_fourcc ==V4L2_PIX_FMT_JPEG ) { -if (!ctx->params.jpeg_qmat_tab[0 ]) +if (!ctx->params.jpeg_qmat_tab[0 ]) { ctx->params.jpeg_qmat_tab[0 ] =kmalloc (64 ,GFP_KERNEL ); -if (!ctx->params.jpeg_qmat_tab[1 ]) +if (!ctx->params.jpeg_qmat_tab[0 ]) +return -ENOMEM ; + } +if (!ctx->params.jpeg_qmat_tab[1 ]) { ctx->params.jpeg_qmat_tab[1 ] =kmalloc (64 ,GFP_KERNEL ); +if (!ctx->params.jpeg_qmat_tab[1 ]) +return -ENOMEM ; + }coda_set_jpeg_compression_quality (ctx, ctx->params.jpeg_quality); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 519/1146 media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit faaf901727eddcfbe889fe172ec9cdb5e63c8236 ]
By moving support for the USB Syntek DC1125 Camera to staging, the dependencies on MEDIA_USB_SUPPORT and MEDIA_CAMERA_SUPPORT were lost.
--- drivers/staging/media/deprecated/stkwebcam/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/deprecated/stkwebcam/Kconfig +1 -1
@@ -2,7 +2,7 @@ config VIDEO_STKWEBCAM tristate "USB Syntek DC1125 Camera support (DEPRECATED)" depends on VIDEO_DEV - depends on USB + depends on MEDIA_USB_SUPPORT && MEDIA_CAMERA_SUPPORT help Say Y here if you want to use this type of camera. Supported devices are typically found in some Asus laptops,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 520/1146 clk: samsung: Fix memory leak in _samsung_clk_register_pll()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 5174e5b0d1b669a489524192b6adcbb3c54ebc72 ]
If clk_register() fails, @pll->rate_table may have allocated memory by kmemdup(), so it needs to be freed, otherwise will cause memory leak issue, this patch fixes it.
--- drivers/clk/samsung/clk-pll.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/samsung/clk-pll.c +1 -0
@@ -1583,6 +1583,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx,if (ret) {pr_err ("%s: failed to register pll clock %s : %d\n" , __func__, pll_clk->name, ret); +kfree (pll->rate_table);kfree (pll);return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 521/1146 spi: spi-gpio: Dont set MOSI as an input if not 3WIRE mode
In reply to Greg Kroah-HartmanFrom: Kris Bahnsen <[email protected]>
[ Upstream commit 3a6f994f848a69deb2bf3cd9d130dd0c09730e55 ]
The addition of 3WIRE support would affect MOSI direction even when still in standard (4 wire) mode. This can lead to MOSI being at an invalid logic level when a device driver sets an SPI message with a NULL tx_buf.
spi.h states that if tx_buf is NULL then "zeros will be shifted out ... " If MOSI is tristated then the data shifted out is subject to pull resistors, keepers, or in the absence of those, noise.
This issue came to light when using spi-gpio connected to an ADS7843 touchscreen controller. MOSI pulled high when clocking MISO data in caused the SPI device to interpret this as a command which would put the device in an unexpected and non-functional state.
--- drivers/spi/spi-gpio.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/spi/spi-gpio.c +13 -3
@@ -268,9 +268,19 @@ static int spi_gpio_set_direction(struct spi_device *spi, bool output)if (output)return gpiod_direction_output (spi_gpio->mosi,1 ); - ret =gpiod_direction_input (spi_gpio->mosi); -if (ret) -return ret; +/* +* Only change MOSI to an input if using 3WIRE mode. +* Otherwise, MOSI could be left floating if there is +* no pull resistor connected to the I/O pin, or could +* be left logic high if there is a pull-up. Transmitting +* logic high when only clocking MISO data in can put some +* SPI devices in to a bad state. +*/ +if (spi->mode &SPI_3WIRE ) { + ret =gpiod_direction_input (spi_gpio->mosi); +if (ret) +return ret; + }/* * Send a turnaround high impedance cycle when switching * from output to input. Theoretically there should be
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 522/1146 wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
[ Upstream commit dd469a754afdb782ba3033cee102147493dc39f4 ]
This struct is used to access a sequence of bytes received from the wifi chip. It must not have any padding bytes between the members.
This doesn't change anything on my system, possibly because currently none of the members need more than byte alignment.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +1 -1
@@ -1190,7 +1190,7 @@ struct rtl8723bu_c2h {u8 bw; }__packed ra_report; }; -}; +} __packed;struct rtl8xxxu_fileops ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 523/1146 wifi: rtl8xxxu: Fix the channel width reporting
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
[ Upstream commit 76c16af2cb10282274596e21add2c9f0b95c941b ]
The gen 2 chips RTL8192EU and RTL8188FU periodically send the driver reports about the TX rate, and the driver passes these reports to sta_statistics. The reports from RTL8192EU may or may not include the channel width. The reports from RTL8188FU do not include it.
Only access the c2h->ra_report.bw field if the report (skb) is big enough.
The other problem fixed here is that the code was actually never changing the channel width initially reported by rtl8xxxu_bss_info_changed because the value of RATE_INFO_BW_20 is 0.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +7 -3
@@ -5574,7 +5574,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) rarpt->txrate.flags =0 ; rate = c2h->ra_report.rate; sgi = c2h->ra_report.sgi; - bw = c2h->ra_report.bw;if (rate <DESC_RATE_MCS0 ) { rarpt->txrate.legacy =
@@ -5591,8 +5590,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)RATE_INFO_FLAGS_SHORT_GI ; } -if (bw ==RATE_INFO_BW_20 ) - rarpt->txrate.bw |=RATE_INFO_BW_20 ; +if (skb->len >=offsetofend (typeof (*c2h), ra_report.bw)) { +if (c2h->ra_report.bw ==RTL8XXXU_CHANNEL_WIDTH_40 ) + bw =RATE_INFO_BW_40 ; +else + bw =RATE_INFO_BW_20 ; + rarpt->txrate.bw = bw; + } } bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); rarpt->bit_rate = bit_rate;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 524/1146 wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit c2f2924bc7f9ea75ef8d95863e710168f8196256 ]
Fix to return a negative error code instead of 0 when brcmf_chip_set_active() fails. In addition, change the return value for brcmf_pcie_exit_download_state() to keep consistent.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +1 -1
@@ -726,7 +726,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo, }if (!brcmf_chip_set_active (devinfo->ci, resetintr)) -return -EINVAL ; +return -EIO ;return 0 ; }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -0
@@ -3414,6 +3414,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,/* Take arm out of reset */ if (!brcmf_chip_set_active (bus->ci, rstvec)) {brcmf_err ("error getting out of ARM core reset\n" ); + bcmerror = -EIO ; goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 525/1146 blktrace: Fix output non-blktrace event when blk_classic option enabled
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit f596da3efaf4130ff61cd029558845808df9bf99 ]
When the blk_classic option is enabled, non-blktrace events must be filtered out. Otherwise, events of other types are output in the blktrace classic format, which is unexpected.
The problem can be triggered in the following ways:
# echo 1 > /sys/kernel/debug/tracing/options/blk_classic # echo 1 > /sys/kernel/debug/tracing/events/enable # echo blk > /sys/kernel/debug/tracing/current_tracer # cat /sys/kernel/debug/tracing/trace_pipe
--- kernel/trace/blktrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +2 -1
@@ -1548,7 +1548,8 @@ blk_trace_event_print_binary(struct trace_iterator *iter, int flags,static enum print_line_t blk_tracer_print_line (struct trace_iterator *iter) { -if (!(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC )) +if ((iter->ent->type !=TRACE_BLK ) || + !(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC ))return TRACE_TYPE_UNHANDLED ;return print_one_line (iter, true);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 526/1146 bpf: Do not zero-extend kfunc return values
In reply to Greg Kroah-HartmanFrom: Björn Töpel <[email protected]>
[ Upstream commit d35af0a7feb077c43ff0233bba5a8c6e75b73e35 ]
In BPF all global functions, and BPF helpers return a 64-bit value. For kfunc calls, this is not the case, and they can return e.g. 32-bit values.
The return register R0 for kfuncs calls can therefore be marked as subreg_def != DEF_NOT_SUBREG. In general, if a register is marked with subreg_def != DEF_NOT_SUBREG, some archs (where bpf_jit_needs_zext() returns true) require the verifier to insert explicit zero-extension instructions.
For kfuncs calls, however, the caller should do sign/zero extension for return values. In other words, the compiler is responsible to insert proper instructions, not the verifier.
An example, provided by Yonghong Song:
$ cat t.c
extern unsigned foo(void);
unsigned bar1(void) {
return foo();
}
unsigned bar2(void) {
if (foo()) return 10; else return 20;
}$ clang -target bpf -mcpu=v3 -O2 -c t.c && llvm-objdump -d t.o t.o: file format elf64-bpf
Disassembly of section .text:
0000000000000000 <bar1>:
0: 85 10 00 00 ff ff ff ff call -0x1 1: 95 00 00 00 00 00 00 00 exit
0000000000000010 <bar2>:
2: 85 10 00 00 ff ff ff ff call -0x1 3: bc 01 00 00 00 00 00 00 w1 = w0 4: b4 00 00 00 14 00 00 00 w0 = 0x14 5: 16 01 01 00 00 00 00 00 if w1 == 0x0 goto +0x1 <LBB1_2> 6: b4 00 00 00 0a 00 00 00 w0 = 0xa
0000000000000038 <LBB1_2>:
7: 95 00 00 00 00 00 00 00 exit
If the return value of 'foo()' is used in the BPF program, the proper zero-extension will be done.
Currently, the verifier correctly marks, say, a 32-bit return value as subreg_def != DEF_NOT_SUBREG, but will fail performing the actual zero-extension, due to a verifier bug in opt_subreg_zext_lo32_rnd_hi32(). load_reg is not properly set to R0, and the following path will be taken:
if (WARN_ON(load_reg == -1)) {
verbose(env, "verifier bug. zext_dst is set, but no reg is defined\n");
return -EFAULT;
}A longer discussion from v1 can be found in the link below.
Correct the verifier by avoiding doing explicit zero-extension of R0 for kfunc calls. Note that R0 will still be marked as a sub-register for return values smaller than 64-bit.
--- kernel/bpf/verifier.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/bpf/verifier.c +4 -0
@@ -13402,6 +13402,10 @@ static int opt_subreg_zext_lo32_rnd_hi32(struct bpf_verifier_env *env,if (!bpf_jit_needs_zext () && !is_cmpxchg_insn (&insn))continue ; +/* Zero-extension is done by the caller. */ +if (bpf_pseudo_kfunc_call (&insn)) +continue ; +if (WARN_ON (load_reg ==-1 )) {verbose (env,"verifier bug. zext_dst is set, but no reg is defined\n" );return -EFAULT ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 527/1146 clk: socfpga: Fix memory leak in socfpga_gate_init()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 0b8ba891ad4d1ef6bfa4c72efc83f9f9f855f68b ]
Free @socfpga_clk and @ops on the error path to avoid memory leak issue.
--- drivers/clk/socfpga/clk-gate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/socfpga/clk-gate.c +4 -1
@@ -188,8 +188,10 @@ void __init socfpga_gate_init(struct device_node *node)return ; ops =kmemdup (&gateclk_ops,sizeof (gateclk_ops),GFP_KERNEL ); -if (WARN_ON (!ops)) +if (WARN_ON (!ops)) { +kfree (socfpga_clk);return ; + } rc =of_property_read_u32_array (node,"clk-gate" , clk_gate,2 );if (rc)
@@ -243,6 +245,7 @@ void __init socfpga_gate_init(struct device_node *node) err =clk_hw_register (NULL , hw_clk);if (err) { +kfree (ops);kfree (socfpga_clk);return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 528/1146 net: vmw_vsock: vmci: Check memcpy_from_msg()
In reply to Greg Kroah-HartmanFrom: Artem Chernyshev <[email protected]>
[ Upstream commit 44aa5a6dba8283bfda28b1517af4de711c5652a4 ]
vmci_transport_dgram_enqueue() does not check the return value of memcpy_from_msg(). If memcpy_from_msg() fails, it is possible that uninitialized memory contents are sent unintentionally instead of user's message in the datagram to the destination. Return with an error if memcpy_from_msg() fails.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- net/vmw_vsock/vmci_transport.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/vmw_vsock/vmci_transport.c +5 -1
@@ -1711,7 +1711,11 @@ static int vmci_transport_dgram_enqueue(if (!dg)return -ENOMEM ; -memcpy_from_msg (VMCI_DG_PAYLOAD (dg), msg, len); + err =memcpy_from_msg (VMCI_DG_PAYLOAD (dg), msg, len); +if (err) { +kfree (dg); +return err; + } dg->dst =vmci_make_handle (remote_addr->svm_cid, remote_addr->svm_port);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 529/1146 net: defxx: Fix missing err handling in dfx_init()
In reply to Greg Kroah-HartmanFrom: Yongqiang Liu <[email protected]>
[ Upstream commit ae18dcdff0f8d7e84cd3fd9f496518b5e72d185d ]
When eisa_driver_register() or tc_register_driver() failed, the modprobe defxx would fail with some err log as follows:
Error: Driver 'defxx' is already registered, aborting...
Fix this issue by adding err hanling in dfx_init().
--- drivers/net/fddi/defxx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/net/fddi/defxx.c +18 -4
@@ -3831,10 +3831,24 @@ static int dfx_init(void)int status; status =pci_register_driver (&dfx_pci_driver); -if (!status) - status =eisa_driver_register (&dfx_eisa_driver); -if (!status) - status =tc_register_driver (&dfx_tc_driver); +if (status) + goto err_pci_register; + + status =eisa_driver_register (&dfx_eisa_driver); +if (status) + goto err_eisa_register; + + status =tc_register_driver (&dfx_tc_driver); +if (status) + goto err_tc_register; + +return 0 ; + +err_tc_register: +eisa_driver_unregister (&dfx_eisa_driver); +err_eisa_register: +pci_unregister_driver (&dfx_pci_driver); +err_pci_register:return status; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 530/1146 net: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload()
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit f150b63f3fa5fdd81e0dd6151e8850268e29438c ]
The skb allocated by stmmac_test_get_arp_skb() hasn't been released in some error handling case, which will lead to a memory leak. Fix this up by adding kfree_skb() to release skb.
Compile tested only.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +6 -2
@@ -1654,12 +1654,16 @@ static int stmmac_test_arpoffload(struct stmmac_priv *priv) } ret =stmmac_set_arp_offload (priv, priv->hw, true, ip_addr); -if (ret) +if (ret) { +kfree_skb (skb); goto cleanup; + } ret =dev_set_promiscuity (priv->dev,1 ); -if (ret) +if (ret) { +kfree_skb (skb); goto cleanup; + } ret =dev_direct_xmit (skb,0 );if (ret)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 531/1146 net: stmmac: fix possible memory leak in stmmac_dvr_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit a137f3f27f9290933fe7e40e6dc8a445781c31a2 ]
The bitmap_free() should be called to free priv->af_xdp_zc_qps when create_singlethread_workqueue() fails, otherwise there will be a memory leak, so we add the err path error_wq_init to fix it.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -1
@@ -7097,7 +7097,7 @@ int stmmac_dvr_probe(struct device *device, priv->wq =create_singlethread_workqueue ("stmmac_wq" );if (!priv->wq) {dev_err (priv->device,"failed to create workqueue\n" ); -return -ENOMEM ; + goto error_wq_init; }INIT_WORK (&priv->service_task, stmmac_service_task);
@@ -7325,6 +7325,7 @@ int stmmac_dvr_probe(struct device *device,stmmac_napi_del (ndev); error_hw_init:destroy_workqueue (priv->wq); +error_wq_init:bitmap_free (priv->af_xdp_zc_qps);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 532/1146 drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 01de1123322e4fe1bbd0fcdf0982511b55519c03 ]
If vp alloc failed in qlcnic_sriov_init(), all previously allocated vp needs to be freed.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +2 -0
@@ -221,6 +221,8 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)return 0 ; qlcnic_destroy_async_wq: +while (i--) +kfree (sriov->vf_info[i].vp);destroy_workqueue (bc->bc_async_wq); qlcnic_destroy_trans_wq:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 533/1146 ipvs: use u64_stats_t for the per-cpu counters
In reply to Greg Kroah-HartmanFrom: Julian Anastasov <[email protected]>
[ Upstream commit 1dbd8d9a82e3f26b9d063292d47ece673f48fce2 ]
Use the provided u64_stats_t type to avoid
load/store tearing.
--- include/net/ip_vs.h | 10 +++++----- net/netfilter/ipvs/ip_vs_core.c | 30 +++++++++++++++--------------- net/netfilter/ipvs/ip_vs_ctl.c | 10 +++++----- net/netfilter/ipvs/ip_vs_est.c | 20 ++++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-)
include/net/ip_vs.h +5 -5
@@ -351,11 +351,11 @@ struct ip_vs_seq {/* counters per cpu */ struct ip_vs_counters { -__u64 conns;/* connections scheduled */ -__u64 inpkts;/* incoming packets */ -__u64 outpkts;/* outgoing packets */ -__u64 inbytes;/* incoming bytes */ -__u64 outbytes;/* outgoing bytes */ +u64_stats_t conns;/* connections scheduled */ +u64_stats_t inpkts;/* incoming packets */ +u64_stats_t outpkts;/* outgoing packets */ +u64_stats_t inbytes;/* incoming bytes */ +u64_stats_t outbytes;/* outgoing bytes */ };/* Stats per cpu */ struct ip_vs_cpu_stats {
net/netfilter/ipvs/ip_vs_core.c +15 -15
@@ -132,21 +132,21 @@ ip_vs_in_stats(struct ip_vs_conn *cp, struct sk_buff *skb) s =this_cpu_ptr (dest->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.inpkts++; - s->cnt.inbytes += skb->len; +u64_stats_inc (&s->cnt.inpkts); +u64_stats_add (&s->cnt.inbytes, skb->len);u64_stats_update_end (&s->syncp); svc =rcu_dereference (dest->svc); s =this_cpu_ptr (svc->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.inpkts++; - s->cnt.inbytes += skb->len; +u64_stats_inc (&s->cnt.inpkts); +u64_stats_add (&s->cnt.inbytes, skb->len);u64_stats_update_end (&s->syncp); s =this_cpu_ptr (ipvs->tot_stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.inpkts++; - s->cnt.inbytes += skb->len; +u64_stats_inc (&s->cnt.inpkts); +u64_stats_add (&s->cnt.inbytes, skb->len);u64_stats_update_end (&s->syncp);local_bh_enable ();
@@ -168,21 +168,21 @@ ip_vs_out_stats(struct ip_vs_conn *cp, struct sk_buff *skb) s =this_cpu_ptr (dest->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.outpkts++; - s->cnt.outbytes += skb->len; +u64_stats_inc (&s->cnt.outpkts); +u64_stats_add (&s->cnt.outbytes, skb->len);u64_stats_update_end (&s->syncp); svc =rcu_dereference (dest->svc); s =this_cpu_ptr (svc->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.outpkts++; - s->cnt.outbytes += skb->len; +u64_stats_inc (&s->cnt.outpkts); +u64_stats_add (&s->cnt.outbytes, skb->len);u64_stats_update_end (&s->syncp); s =this_cpu_ptr (ipvs->tot_stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.outpkts++; - s->cnt.outbytes += skb->len; +u64_stats_inc (&s->cnt.outpkts); +u64_stats_add (&s->cnt.outbytes, skb->len);u64_stats_update_end (&s->syncp);local_bh_enable ();
@@ -200,17 +200,17 @@ ip_vs_conn_stats(struct ip_vs_conn *cp, struct ip_vs_service *svc) s =this_cpu_ptr (cp->dest->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.conns++; +u64_stats_inc (&s->cnt.conns);u64_stats_update_end (&s->syncp); s =this_cpu_ptr (svc->stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.conns++; +u64_stats_inc (&s->cnt.conns);u64_stats_update_end (&s->syncp); s =this_cpu_ptr (ipvs->tot_stats.cpustats);u64_stats_update_begin (&s->syncp); - s->cnt.conns++; +u64_stats_inc (&s->cnt.conns);u64_stats_update_end (&s->syncp);local_bh_enable ();
net/netfilter/ipvs/ip_vs_ctl.c +5 -5
@@ -2297,11 +2297,11 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)do { start =u64_stats_fetch_begin_irq (&u->syncp); - conns = u->cnt.conns; - inpkts = u->cnt.inpkts; - outpkts = u->cnt.outpkts; - inbytes = u->cnt.inbytes; - outbytes = u->cnt.outbytes; + conns =u64_stats_read (&u->cnt.conns); + inpkts =u64_stats_read (&u->cnt.inpkts); + outpkts =u64_stats_read (&u->cnt.outpkts); + inbytes =u64_stats_read (&u->cnt.inbytes); + outbytes =u64_stats_read (&u->cnt.outbytes); }while (u64_stats_fetch_retry_irq (&u->syncp, start)); seq_printf(seq, "%3X %8LX %8LX %8LX %16LX %16LX\n",
net/netfilter/ipvs/ip_vs_est.c +10 -10
@@ -67,11 +67,11 @@ static void ip_vs_read_cpu_stats(struct ip_vs_kstats *sum,if (add) {do { start =u64_stats_fetch_begin (&s->syncp); - conns = s->cnt.conns; - inpkts = s->cnt.inpkts; - outpkts = s->cnt.outpkts; - inbytes = s->cnt.inbytes; - outbytes = s->cnt.outbytes; + conns =u64_stats_read (&s->cnt.conns); + inpkts =u64_stats_read (&s->cnt.inpkts); + outpkts =u64_stats_read (&s->cnt.outpkts); + inbytes =u64_stats_read (&s->cnt.inbytes); + outbytes =u64_stats_read (&s->cnt.outbytes); }while (u64_stats_fetch_retry (&s->syncp, start)); sum->conns += conns; sum->inpkts += inpkts;
@@ -82,11 +82,11 @@ static void ip_vs_read_cpu_stats(struct ip_vs_kstats *sum, add = true;do { start =u64_stats_fetch_begin (&s->syncp); - sum->conns = s->cnt.conns; - sum->inpkts = s->cnt.inpkts; - sum->outpkts = s->cnt.outpkts; - sum->inbytes = s->cnt.inbytes; - sum->outbytes = s->cnt.outbytes; + sum->conns =u64_stats_read (&s->cnt.conns); + sum->inpkts =u64_stats_read (&s->cnt.inpkts); + sum->outpkts =u64_stats_read (&s->cnt.outpkts); + sum->inbytes =u64_stats_read (&s->cnt.inbytes); + sum->outbytes =u64_stats_read (&s->cnt.outbytes); }while (u64_stats_fetch_retry (&s->syncp, start)); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 534/1146 of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()
In reply to Greg Kroah-HartmanFrom: ruanjinjie <[email protected]>
[ Upstream commit ee9d7a0e754568180a2f8ebc4aad226278a9116f ]
When kmalloc() fail to allocate memory in kasprintf(), fn_1 or fn_2 will be NULL, and strcmp() will cause null pointer dereference.
--- drivers/of/overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/of/overlay.c +2 -2
@@ -545,7 +545,7 @@ static int find_dup_cset_node_entry(struct overlay_changeset *ovcs, fn_1 =kasprintf (GFP_KERNEL ,"%pOF" , ce_1->np); fn_2 =kasprintf (GFP_KERNEL ,"%pOF" , ce_2->np); - node_path_match = !strcmp (fn_1, fn_2); + node_path_match = !fn_1 || !fn_2 || !strcmp (fn_1, fn_2);kfree (fn_1);kfree (fn_2);if (node_path_match) {
@@ -580,7 +580,7 @@ static int find_dup_cset_prop(struct overlay_changeset *ovcs, fn_1 =kasprintf (GFP_KERNEL ,"%pOF" , ce_1->np); fn_2 =kasprintf (GFP_KERNEL ,"%pOF" , ce_2->np); - node_path_match = !strcmp (fn_1, fn_2); + node_path_match = !fn_1 || !fn_2 || !strcmp (fn_1, fn_2);kfree (fn_1);kfree (fn_2); if (node_path_match &&
Signature · 1 line
2.35.1