6.1.16-rc1 review
Subsystems (18)
Greg Kroah-Hartman
maintainerPATCH 301/885 drm/bridge: lt9611: fix programming of video modes
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit ad188aa47edaa033a270e1a3efae43836ff47569 ]
Program the upper part of the hfront_porch into the proper register.
--- drivers/gpu/drm/bridge/lontium-lt9611.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +2 -1
@@ -187,7 +187,8 @@ static void lt9611_mipi_video_setup(struct lt9611 *lt9611,regmap_write (lt9611->regmap,0x8319 , (u8)(hfront_porch %256 )); -regmap_write (lt9611->regmap,0x831a , (u8)(hsync_porch /256 )); +regmap_write (lt9611->regmap,0x831a , (u8)(hsync_porch /256 ) | + ((hfront_porch /256 ) <<4 ));regmap_write (lt9611->regmap,0x831b , (u8)(hsync_porch %256 )); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 302/885 drm/bridge: lt9611: fix clock calculation
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 2576eb26494eb0509dd9ceb0cd27771a7a5e3674 ]
Instead of having several fixed values for the pcr register, calculate it before programming. This allows the bridge to support most of the display modes.
--- drivers/gpu/drm/bridge/lontium-lt9611.c | 32 +++++++++++-------------- 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +14 -18
@@ -192,8 +192,9 @@ static void lt9611_mipi_video_setup(struct lt9611 *lt9611,regmap_write (lt9611->regmap,0x831b , (u8)(hsync_porch %256 )); } -static void lt9611_pcr_setup (struct lt9611 *lt9611,const struct drm_display_mode *mode) +static void lt9611_pcr_setup (struct lt9611 *lt9611,const struct drm_display_mode *mode,unsigned int postdiv) { +unsigned int pcr_m = mode->clock *5 * postdiv /27000 ;const struct reg_sequence reg_cfg[] = { {0x830b ,0x01 }, {0x830c ,0x10 },
@@ -236,24 +237,14 @@ static void lt9611_pcr_setup(struct lt9611 *lt9611, const struct drm_display_modelse regmap_multi_reg_write (lt9611->regmap, reg_cfg,ARRAY_SIZE (reg_cfg)); -switch (mode->hdisplay) { -case 640 : -regmap_write (lt9611->regmap,0x8326 ,0x14 ); -break ; -case 1920 : -regmap_write (lt9611->regmap,0x8326 ,0x37 ); -break ; -case 3840 : -regmap_write (lt9611->regmap,0x8326 ,0x37 ); -break ; - } +regmap_write (lt9611->regmap,0x8326 , pcr_m);/* pcr rst */ regmap_write (lt9611->regmap,0x8011 ,0x5a );regmap_write (lt9611->regmap,0x8011 ,0xfa ); } -static int lt9611_pll_setup (struct lt9611 *lt9611,const struct drm_display_mode *mode) +static int lt9611_pll_setup (struct lt9611 *lt9611,const struct drm_display_mode *mode,unsigned int *postdiv) {unsigned int pclk = mode->clock; const struct reg_sequence reg_cfg[] = {
@@ -271,12 +262,16 @@ static int lt9611_pll_setup(struct lt9611 *lt9611, const struct drm_display_moderegmap_multi_reg_write (lt9611->regmap, reg_cfg,ARRAY_SIZE (reg_cfg)); -if (pclk >150000 ) +if (pclk >150000 ) {regmap_write (lt9611->regmap,0x812d ,0x88 ); -else if (pclk >70000 ) + *postdiv =1 ; + }else if (pclk >70000 ) {regmap_write (lt9611->regmap,0x812d ,0x99 ); -else + *postdiv =2 ; + }else {regmap_write (lt9611->regmap,0x812d ,0xaa ); + *postdiv =4 ; + }/* * first divide pclk by 2 first
@@ -895,14 +890,15 @@ static void lt9611_bridge_mode_set(struct drm_bridge *bridge, {struct lt9611 *lt9611 =bridge_to_lt9611 (bridge);struct hdmi_avi_infoframe avi_frame; +unsigned int postdiv;int ret;lt9611_bridge_pre_enable (bridge);lt9611_mipi_input_digital (lt9611, mode); -lt9611_pll_setup (lt9611, mode); +lt9611_pll_setup (lt9611, mode, &postdiv);lt9611_mipi_video_setup (lt9611, mode); -lt9611_pcr_setup (lt9611, mode); +lt9611_pcr_setup (lt9611, mode, postdiv); ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame, <9611->connector,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 303/885 drm/bridge: lt9611: pass a pointer to the of node
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit b0a7f8736789935f62d6df32d441cdf05a5c05d2 ]
Pass a pointer to the OF node while registering lt9611 MIPI device.
--- drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt9611.c +1 -1
@@ -769,7 +769,7 @@ static const struct drm_connector_funcs lt9611_bridge_connector_funcs = {static struct mipi_dsi_device *lt9611_attach_dsi (struct lt9611 *lt9611,struct device_node *dsi_node) { -const struct mipi_dsi_device_info info = {"lt9611" ,0 ,NULL }; +const struct mipi_dsi_device_info info = {"lt9611" ,0 , lt9611->dev->of_node};struct mipi_dsi_device *dsi;struct mipi_dsi_host *host;struct device *dev = lt9611->dev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 304/885 regulator: tps65219: use IS_ERR() to detect an error pointer
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 2bbba115c3c9a647bcb3201b014fcc3728fe75c8 ]
Fix pointer comparison to integer warning from gcc & sparse:
GCC:../drivers/regulator/tps65219-regulator.c:370:26: warning: ordered comparison of pointer with integer zero [-Wextra]
370 | if (rdev < 0) {
| ^
sparse warning:drivers/regulator/tps65219-regulator.c:370:26: sparse: error: incompatible types for operation (<):drivers/regulator/tps65219-regulator.c:370:26: sparse: struct regulator_dev *[assigned] rdevdrivers/regulator/tps65219-regulator.c:370:26: sparse: int
--- drivers/regulator/tps65219-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/tps65219-regulator.c +1 -1
@@ -367,7 +367,7 @@ static int tps65219_regulator_probe(struct platform_device *pdev) irq_data[i].type = irq_type;tps65219_get_rdev_by_name (irq_type->regulator_name, rdevtbl, rdev); -if (rdev <0 ) { +if (IS_ERR (rdev)) {dev_err (tps->dev,"Failed to get rdev for %s\n" , irq_type->regulator_name);return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 305/885 drm/mipi-dsi: Fix byte order of 16-bit DCS set/get brightness
In reply to Greg Kroah-HartmanFrom: Daniel Mentz <[email protected]>
[ Upstream commit c9d27c6be518b4ef2966d9564654ef99292ea1b3 ]
The MIPI DCS specification demands that brightness values are sent in big endian byte order. It also states that one parameter (i.e. one byte) shall be sent/received for 8 bit wide values, and two parameters shall be used for values that are between 9 and 16 bits wide.
Add new functions to properly handle 16-bit brightness in big endian, since the two 8- and 16-bit cases are distinct from each other.
[richard: use separate functions instead of switch/case] [richard: split into 16-bit component]
--- drivers/gpu/drm/drm_mipi_dsi.c | 52 ++++++++++++++++++++++++++++++++++ include/drm/drm_mipi_dsi.h | 4 +++ 2 files changed, 56 insertions(+)
drivers/gpu/drm/drm_mipi_dsi.c +52 -0
@@ -1224,6 +1224,58 @@ int mipi_dsi_dcs_get_display_brightness(struct mipi_dsi_device *dsi, }EXPORT_SYMBOL (mipi_dsi_dcs_get_display_brightness); +/** +* mipi_dsi_dcs_set_display_brightness_large() - sets the 16-bit brightness value +* of the display +* @dsi: DSI peripheral device +* @brightness: brightness value +* +* Return: 0 on success or a negative error code on failure. +*/ +int mipi_dsi_dcs_set_display_brightness_large (struct mipi_dsi_device *dsi, +u16 brightness) +{ +u8 payload[2 ] = { brightness >>8 , brightness &0xff }; +ssize_t err; + + err =mipi_dsi_dcs_write (dsi,MIPI_DCS_SET_DISPLAY_BRIGHTNESS , + payload,sizeof (payload)); +if (err <0 ) +return err; + +return 0 ; +} +EXPORT_SYMBOL (mipi_dsi_dcs_set_display_brightness_large); + +/** +* mipi_dsi_dcs_get_display_brightness_large() - gets the current 16-bit +* brightness value of the display +* @dsi: DSI peripheral device +* @brightness: brightness value +* +* Return: 0 on success or a negative error code on failure. +*/ +int mipi_dsi_dcs_get_display_brightness_large (struct mipi_dsi_device *dsi, +u16 *brightness) +{ +u8 brightness_be[2 ]; +ssize_t err; + + err =mipi_dsi_dcs_read (dsi,MIPI_DCS_GET_DISPLAY_BRIGHTNESS , + brightness_be,sizeof (brightness_be)); +if (err <=0 ) { +if (err ==0 ) + err = -ENODATA ; + +return err; + } + + *brightness = (brightness_be[0 ] <<8 ) | brightness_be[1 ]; + +return 0 ; +} +EXPORT_SYMBOL (mipi_dsi_dcs_get_display_brightness_large); +static int mipi_dsi_drv_probe (struct device *dev) {struct mipi_dsi_driver *drv =to_mipi_dsi_driver (dev->driver);
include/drm/drm_mipi_dsi.h +4 -0
@@ -296,6 +296,10 @@ int mipi_dsi_dcs_set_display_brightness(struct mipi_dsi_device *dsi, u16 brightness);int mipi_dsi_dcs_get_display_brightness (struct mipi_dsi_device *dsi,u16 *brightness); +int mipi_dsi_dcs_set_display_brightness_large (struct mipi_dsi_device *dsi, +u16 brightness); +int mipi_dsi_dcs_get_display_brightness_large (struct mipi_dsi_device *dsi, +u16 *brightness);/** * mipi_dsi_dcs_write_seq - transmit a DCS command with payload
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 306/885 drm: exynos: dsi: Fix MIPI_DSI*_NO_* mode flags
In reply to Greg Kroah-HartmanFrom: Jagan Teki <[email protected]>
[ Upstream commit 996e1defca34485dd2bd70b173f069aab5f21a65 ]
HFP/HBP/HSA/EOT_PACKET modes in Exynos DSI host specifies 0 = Enable and 1 = Disable.
The logic for checking these mode flags was correct before the MIPI_DSI*_NO_* mode flag conversion.
This patch is trying to fix this MIPI_DSI*_NO_* mode flags handling Exynos DSI host and update the mode_flags in relevant panel drivers.
--- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 ++++---- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +++- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 3 ++- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 -- 4 files changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_dsi.c +4 -4
@@ -805,15 +805,15 @@ static int exynos_dsi_init_link(struct exynos_dsi *dsi) reg |=DSIM_AUTO_MODE ;if (dsi->mode_flags &MIPI_DSI_MODE_VIDEO_HSE ) reg |=DSIM_HSE_MODE ; -if (!(dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HFP )) +if (dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HFP ) reg |=DSIM_HFP_MODE ; -if (!(dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HBP )) +if (dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HBP ) reg |=DSIM_HBP_MODE ; -if (!(dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HSA )) +if (dsi->mode_flags &MIPI_DSI_MODE_VIDEO_NO_HSA ) reg |=DSIM_HSA_MODE ; } -if (!(dsi->mode_flags &MIPI_DSI_MODE_NO_EOT_PACKET )) +if (dsi->mode_flags &MIPI_DSI_MODE_NO_EOT_PACKET ) reg |=DSIM_EOT_DISABLE ;switch (dsi->format) {
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +3 -1
@@ -692,7 +692,9 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi) dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; - dsi->mode_flags =MIPI_DSI_CLOCK_NON_CONTINUOUS ; + dsi->mode_flags =MIPI_DSI_CLOCK_NON_CONTINUOUS | +MIPI_DSI_MODE_VIDEO_NO_HFP |MIPI_DSI_MODE_VIDEO_NO_HBP | +MIPI_DSI_MODE_VIDEO_NO_HSA |MIPI_DSI_MODE_NO_EOT_PACKET ; ctx->supplies[0 ].supply ="vdd3" ; ctx->supplies[1 ].supply ="vci" ;
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +2 -1
@@ -446,7 +446,8 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi) dsi->lanes =1 ; dsi->format =MIPI_DSI_FMT_RGB888 ; - dsi->mode_flags =MIPI_DSI_MODE_NO_EOT_PACKET ; + dsi->mode_flags =MIPI_DSI_MODE_VIDEO_NO_HFP | +MIPI_DSI_MODE_VIDEO_NO_HBP |MIPI_DSI_MODE_VIDEO_NO_HSA ; ctx->supplies[0 ].supply ="vdd3" ; ctx->supplies[1 ].supply ="vci" ;
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +0 -2
@@ -990,8 +990,6 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi) dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST - |MIPI_DSI_MODE_VIDEO_NO_HFP |MIPI_DSI_MODE_VIDEO_NO_HBP - |MIPI_DSI_MODE_VIDEO_NO_HSA |MIPI_DSI_MODE_NO_EOT_PACKET |MIPI_DSI_MODE_VSYNC_FLUSH |MIPI_DSI_MODE_VIDEO_AUTO_VERT ; ret =s6e8aa0_parse_dt (ctx);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 307/885 drm/msm/dsi: Allow 2 CTRLs on v2.5.0
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 1ae654ded7c5a19dc13f57a4fe4434fef879b6f9 ]
v2.5.0 support was originally added for SC7280, but this hw is also present on SM8350, which has one more DSI host. Bump up the dsi count and fill in the register of the secondary host to allow it to probe.
This should not have any adverse effects on SC7280, as the secondary CTRL will only be touched if it's defined, anyway.
Patchwork: https://patchwork.freedesktop.org/patch/519513/
--- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_cfg.c +2 -2
@@ -209,8 +209,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), - .io_start = { 0xae94000 }, - .num_dsi = 1, + .io_start = { 0xae94000, 0xae96000 }, + .num_dsi = 2, }; static const char * const dsi_qcm2290_bus_clk_names[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 308/885 scsi: ufs: exynos: Fix DMA alignment for PAGE_SIZE != 4096
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 86bd0c4a2a5dc4265884648cb92c681646509692 ]
The Exynos UFS controller only supports scatter/gather list elements that are aligned on a 4 KiB boundary. Fix DMA alignment in case PAGE_SIZE != 4096. Rename UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE into UFSHCD_QUIRK_4KB_DMA_ALIGNMENT.
--- drivers/ufs/core/ufshcd.c | 4 ++-- drivers/ufs/host/ufs-exynos.c | 2 +- include/ufs/ufshcd.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/ufs/core/ufshcd.c +2 -2
@@ -5068,8 +5068,8 @@ static int ufshcd_slave_configure(struct scsi_device *sdev)ufshcd_hpb_configure (hba, sdev);blk_queue_update_dma_pad (q,PRDT_DATA_BYTE_COUNT_PAD -1 ); -if (hba->quirks &UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE ) -blk_queue_update_dma_alignment (q,PAGE_SIZE -1 ); +if (hba->quirks &UFSHCD_QUIRK_4KB_DMA_ALIGNMENT ) +blk_queue_update_dma_alignment (q,4096 -1 );/* * Block runtime-pm until all consumers are added. * Refer ufshcd_setup_links().
drivers/ufs/host/ufs-exynos.c +1 -1
@@ -1673,7 +1673,7 @@ static const struct exynos_ufs_drv_data exynos_ufs_drvs = {UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL |UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING | - UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE, + UFSHCD_QUIRK_4KB_DMA_ALIGNMENT, .opts =EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL |EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL | EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX |
include/ufs/ufshcd.h +2 -2
@@ -566,9 +566,9 @@ enum ufshcd_quirks {UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING =1 <<13 ,/* -* This quirk allows only sg entries aligned with page size. +* Align DMA SG entries on a 4 KiB boundary. */ - UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE = 1 << 14, + UFSHCD_QUIRK_4KB_DMA_ALIGNMENT = 1 << 14,/* * This quirk needs to be enabled if the host controller does not
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 309/885 drm/msm/dpu: sc7180: add missing WB2 clock control
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 255f056181ac69278dcd8778f0be32a21b2d2a6a ]
Add missing DPU_CLK_CTRL_WB2 to sc7180_mdp clocks array.
Patchwork: https://patchwork.freedesktop.org/patch/518504/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +2 -0
@@ -444,6 +444,8 @@ static const struct dpu_mdp_cfg sc7180_mdp[] = { .reg_off = 0x2B4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { .reg_off = 0x2C4, .bit_off = 8}, + .clk_ctrls[DPU_CLK_CTRL_WB2] = { + .reg_off = 0x3B8, .bit_off = 24}, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 310/885 drm/msm: use strscpy instead of strncpy
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit d7fd8634f48d76aa799ed57beb7d87dab91bde80 ]
Using strncpy can result in non-NULL-terminated destination string. Use strscpy instead. This fixes following warning:
drivers/gpu/drm/msm/msm_fence.c: In function ‘msm_fence_context_alloc’:drivers/gpu/drm/msm/msm_fence.c:25:9: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]
25 | strncpy(fctx->name, name, sizeof(fctx->name));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Patchwork: https://patchwork.freedesktop.org/patch/518787/
--- drivers/gpu/drm/msm/msm_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_fence.c +1 -1
@@ -22,7 +22,7 @@ msm_fence_context_alloc(struct drm_device *dev, volatile uint32_t *fenceptr,return ERR_PTR (-ENOMEM ); fctx->dev = dev; -strncpy (fctx->name, name,sizeof (fctx->name)); +strscpy (fctx->name, name,sizeof (fctx->name)); fctx->context =dma_fence_context_alloc (1 ); fctx->index = index++; fctx->fenceptr = fenceptr;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 311/885 drm/msm/dpu: Add check for cstate
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit c96988b7d99327bb08bd9efd29a203b22cd88ace ]
As kzalloc may fail and return NULL pointer,
it should be better to check cstate
in order to avoid the NULL pointer dereference
in __drm_atomic_helper_crtc_reset.
Patchwork: https://patchwork.freedesktop.org/patch/514163/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -1
@@ -968,7 +968,10 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)if (crtc->state)dpu_crtc_destroy_state (crtc, crtc->state); -__drm_atomic_helper_crtc_reset (crtc, &cstate->base); +if (cstate) +__drm_atomic_helper_crtc_reset (crtc, &cstate->base); +else +__drm_atomic_helper_crtc_reset (crtc,NULL ); }/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 312/885 drm/msm/dpu: Add check for pstates
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 93340e10b9c5fc86730d149636e0aa8b47bb5a34 ]
As kzalloc may fail and return NULL pointer,
it should be better to check pstates
in order to avoid the NULL pointer dereference.
Patchwork: https://patchwork.freedesktop.org/patch/514160/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -0
@@ -1153,6 +1153,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,bool needs_dirtyfb =dpu_crtc_needs_dirtyfb (crtc_state); pstates =kzalloc (sizeof (*pstates) *DPU_STAGE_MAX *4 ,GFP_KERNEL ); +if (!pstates) +return -ENOMEM ;if (!crtc_state->enable || !crtc_state->active) { DRM_DEBUG_ATOMIC("crtc%d -> enable %d, active %d, skip atomic_check\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 313/885 drm/msm/mdp5: Add check for kzalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 13fcfcb2a9a4787fe4e49841d728f6f2e9fa6911 ]
As kzalloc may fail and return NULL pointer,
it should be better to check the return value
in order to avoid the NULL pointer dereference.
Patchwork: https://patchwork.freedesktop.org/patch/514154/
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +4 -1
@@ -1139,7 +1139,10 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc)if (crtc->state)mdp5_crtc_destroy_state (crtc, crtc->state); -__drm_atomic_helper_crtc_reset (crtc, &mdp5_cstate->base); +if (mdp5_cstate) +__drm_atomic_helper_crtc_reset (crtc, &mdp5_cstate->base); +else +__drm_atomic_helper_crtc_reset (crtc,NULL ); }static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 314/885 habanalabs: bugs fixes in timestamps buff alloc
In reply to Greg Kroah-HartmanFrom: farah kassabri <[email protected]>
[ Upstream commit 1693fef9e95dbe8ab767d208a02328fff13fbb94 ]
use argument instead of fixed GFP value for allocation in Timestamps buffers alloc function.
change data type of size to size_t.
--- drivers/misc/habanalabs/common/memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/common/memory.c +3 -2
@@ -2089,12 +2089,13 @@ static int hl_ts_mmap(struct hl_mmap_mem_buf *buf, struct vm_area_struct *vma, vstatic int hl_ts_alloc_buf (struct hl_mmap_mem_buf *buf,gfp_t gfp,void *args) {struct hl_ts_buff *ts_buff =NULL ; -u32 size, num_elements; +u32 num_elements; +size_t size;void *p; num_elements = *(u32 *)args; - ts_buff =kzalloc (sizeof (*ts_buff),GFP_KERNEL ); + ts_buff =kzalloc (sizeof (*ts_buff), gfp);if (!ts_buff)return -ENOMEM ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 315/885 pinctrl: bcm2835: Remove of_node_put() in bcm2835_of_gpio_ranges_fallback()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 2d578dd27871372f7159dd3206149ec616700d87 ]
Remove wrong of_node_put() in bcm2835_of_gpio_ranges_fallback(), there is no counterpart of_node_get() for it.
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 -- 1 file changed, 2 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +0 -2
@@ -363,8 +363,6 @@ static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc, {struct pinctrl_dev *pctldev =of_pinctrl_get (np); -of_node_put (np); -if (!pctldev)return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 316/885 pinctrl: mediatek: Initialize variable pullen and pullup to zero
In reply to Greg Kroah-HartmanFrom: Guodong Liu <[email protected]>
[ Upstream commit a298c70a10c604a6b3df5a0aa56597b705ba0f6b ]
Coverity spotted that pullen and pullup is not initialized to zero in mtk_pctrl_show_one_pin. The uninitialized variable pullen is used in assignment statement "rsel = pullen;" in mtk_pctrl_show_one_pin, and Uninitialized variable pullup is used when calling scnprintf. Fix this coverity by initializing pullen and pullup as zero.
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mediatek/pinctrl-paris.c +1 -1
@@ -635,7 +635,7 @@ static int mtk_hw_get_value_wrap(struct mtk_pinctrl *hw, unsigned int gpio, intssize_t mtk_pctrl_show_one_pin (struct mtk_pinctrl *hw,unsigned int gpio,char *buf,unsigned int buf_len) { -int pinmux, pullup, pullen, len =0 , r1 =-1 , r0 =-1 , rsel =-1 ; +int pinmux, pullup =0 , pullen =0 , len =0 , r1 =-1 , r0 =-1 , rsel =-1 ;const struct mtk_pin_desc *desc;u32 try_all_type =0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 317/885 pinctrl: mediatek: Initialize variable *buf to zero
In reply to Greg Kroah-HartmanFrom: Guodong Liu <[email protected]>
[ Upstream commit 2e34f82ba214134ecf590fbe0cdbd87401645a8a ]
Coverity spotted that *buf is not initialized to zero in mtk_pctrl_dbg_show. Using uninitialized variable *buf as argument to %s when calling seq_printf. Fix this coverity by initializing *buf as zero.
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mediatek/pinctrl-paris.c +1 -1
@@ -712,7 +712,7 @@ static void mtk_pctrl_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s, unsigned int gpio) {struct mtk_pinctrl *hw =pinctrl_dev_get_drvdata (pctldev); -char buf[PIN_DBG_BUF_SZ ]; +char buf[PIN_DBG_BUF_SZ ] = {0 }; (void )mtk_pctrl_show_one_pin (hw, gpio, buf,PIN_DBG_BUF_SZ );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 318/885 gpu: host1x: Fix mask for syncpoint increment register
In reply to Greg Kroah-HartmanFrom: Mikko Perttunen <[email protected]>
[ Upstream commit 79aad29c7d2d2cd64790115d3a6ebac28c00a8ec ]
On Tegra186+, the syncpoint ID has 10 bits of space. To allow using more than 256 syncpoints, fix the mask.
--- drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +- drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 2 +- drivers/gpu/host1x/hw/hw_host1x08_uclass.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/host1x/hw/hw_host1x06_uclass.h +1 -1
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v)host1x_uclass_incr_syncpt_cond_f (v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { -return (v &0xff ) <<0 ; +return (v &0x3ff ) <<0 ; }#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F (v) \ host1x_uclass_incr_syncpt_indx_f(v)
drivers/gpu/host1x/hw/hw_host1x07_uclass.h +1 -1
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v)host1x_uclass_incr_syncpt_cond_f (v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { -return (v &0xff ) <<0 ; +return (v &0x3ff ) <<0 ; }#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F (v) \ host1x_uclass_incr_syncpt_indx_f(v)
drivers/gpu/host1x/hw/hw_host1x08_uclass.h +1 -1
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v)host1x_uclass_incr_syncpt_cond_f (v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { -return (v &0xff ) <<0 ; +return (v &0x3ff ) <<0 ; }#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F (v) \ host1x_uclass_incr_syncpt_indx_f(v)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 319/885 gpu: host1x: Dont skip assigning syncpoints to channels
In reply to Greg Kroah-HartmanFrom: Mikko Perttunen <[email protected]>
[ Upstream commit eb258cc1fd458e584082be987dbc6ec42668c05e ]
The code to write the syncpoint channel assignment register incorrectly skips the write if hypervisor registers are not available.
The register, however, is within the guest aperture so remove the check and assign syncpoints properly even on virtualized systems.
--- drivers/gpu/host1x/hw/syncpt_hw.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/host1x/hw/syncpt_hw.c +0 -3
@@ -106,9 +106,6 @@ static void syncpt_assign_to_channel(struct host1x_syncpt *sp,#if HOST1X_HW >=6 struct host1x *host = sp->host; -if (!host->hv_regs) -return ; -host1x_sync_writel (host,HOST1X_SYNC_SYNCPT_CH_APP_CH (ch ? ch->id :0xff ),HOST1X_SYNC_SYNCPT_CH_APP (sp->id));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 320/885 drm/tegra: firewall: Check for is_addr_reg existence in IMM check
In reply to Greg Kroah-HartmanFrom: Mikko Perttunen <[email protected]>
[ Upstream commit 1b5c09de25e8c08655c270a70e5e74e93b6bad1f ]
In the IMM opcode check, don't call is_addr_reg if it's not set.
--- drivers/gpu/drm/tegra/firewall.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/tegra/firewall.c +3 -0
@@ -97,6 +97,9 @@ static int fw_check_regs_imm(struct tegra_drm_firewall *fw, u32 offset) {bool is_addr; +if (!fw->client->ops->is_addr_reg) +return 0 ; + is_addr = fw->client->ops->is_addr_reg (fw->client->base.dev, fw->class, offset);if (is_addr)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 321/885 pinctrl: renesas: rzg2l: Fix configuring the GPIO pins as interrupts
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 00dfe29887761405ccd23cc0aa07cb86623bb2b7 ]
On the RZ/G2UL SoC we have less number of pins compared to RZ/G2L and also the pin configs are completely different. This patch makes sure we use the appropriate pin configs for each SoC (which is passed as part of the OF data) while configuring the GPIO pin as interrupts instead of using rzg2l_gpio_configs[] for all the SoCs.
--- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/pinctrl/renesas/pinctrl-rzg2l.c +10 -7
@@ -127,6 +127,7 @@ struct rzg2l_dedicated_configs {struct rzg2l_pinctrl_data {const char *const *port_pins;const u32 *port_pin_configs; +unsigned int n_ports;struct rzg2l_dedicated_configs *dedicated_pins;unsigned int n_port_pins;unsigned int n_dedicated_pins;
@@ -1122,7 +1123,7 @@ static struct { } }; -static int rzg2l_gpio_get_gpioint (unsigned int virq) +static int rzg2l_gpio_get_gpioint (unsigned int virq,const struct rzg2l_pinctrl_data *data) {unsigned int gpioint;unsigned int i;
@@ -1131,13 +1132,13 @@ static int rzg2l_gpio_get_gpioint(unsigned int virq) port = virq /8 ; bit = virq %8 ; -if (port >=ARRAY_SIZE (rzg2l_gpio_configs) || - bit >=RZG2L_GPIO_PORT_GET_PINCNT (rzg2l_gpio_configs[port])) +if (port >= data->n_ports || + bit >=RZG2L_GPIO_PORT_GET_PINCNT (data->port_pin_configs[port]))return -EINVAL ; gpioint = bit;for (i =0 ; i < port; i++) - gpioint +=RZG2L_GPIO_PORT_GET_PINCNT (rzg2l_gpio_configs[i]); + gpioint +=RZG2L_GPIO_PORT_GET_PINCNT (data->port_pin_configs[i]);return gpioint; }
@@ -1237,7 +1238,7 @@ static int rzg2l_gpio_child_to_parent_hwirq(struct gpio_chip *gc,unsigned long flags;int gpioint, irq; - gpioint =rzg2l_gpio_get_gpioint (child); + gpioint =rzg2l_gpio_get_gpioint (child, pctrl->data);if (gpioint <0 )return gpioint;
@@ -1311,8 +1312,8 @@ static void rzg2l_init_irq_valid_mask(struct gpio_chip *gc, port = offset /8 ; bit = offset %8 ; -if (port >=ARRAY_SIZE (rzg2l_gpio_configs) || - bit >=RZG2L_GPIO_PORT_GET_PINCNT (rzg2l_gpio_configs[port])) +if (port >= pctrl->data->n_ports || + bit >=RZG2L_GPIO_PORT_GET_PINCNT (pctrl->data->port_pin_configs[port]))clear_bit (offset, valid_mask); } }
@@ -1517,6 +1518,7 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev)static struct rzg2l_pinctrl_data r9a07g043_data = { .port_pins = rzg2l_gpio_names, .port_pin_configs = r9a07g043_gpio_configs, + .n_ports =ARRAY_SIZE (r9a07g043_gpio_configs), .dedicated_pins = rzg2l_dedicated_pins.common, .n_port_pins =ARRAY_SIZE (r9a07g043_gpio_configs) *RZG2L_PINS_PER_PORT , .n_dedicated_pins =ARRAY_SIZE (rzg2l_dedicated_pins.common),
@@ -1525,6 +1527,7 @@ static struct rzg2l_pinctrl_data r9a07g043_data = {static struct rzg2l_pinctrl_data r9a07g044_data = { .port_pins = rzg2l_gpio_names, .port_pin_configs = rzg2l_gpio_configs, + .n_ports =ARRAY_SIZE (rzg2l_gpio_configs), .dedicated_pins = rzg2l_dedicated_pins.common, .n_port_pins =ARRAY_SIZE (rzg2l_gpio_names), .n_dedicated_pins = ARRAY_SIZE(rzg2l_dedicated_pins.common) +
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 322/885 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 1d233b1cb149ec78c20fac58331b27bb460f9558 ]
The function dpu_plane_sspp_atomic_update() updates pdpu->is_rt_pipe flag, but after the commit 854f6f1c653b ("drm/msm/dpu: update the qos remap only if the client type changes") it sets the flag late, after all the qos functions have updated QoS programming. Move the flag update back to the place where it happened before the mentioned commit to let the pipe be programmed according to its current RT/non-RT state.
Patchwork: https://patchwork.freedesktop.org/patch/516239/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +6 -9
@@ -1124,7 +1124,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)struct dpu_plane_state *pstate =to_dpu_plane_state (state);struct drm_crtc *crtc = state->crtc;struct drm_framebuffer *fb = state->fb; -bool is_rt_pipe, update_qos_remap; +bool is_rt_pipe;const struct dpu_format *fmt =to_dpu_format (msm_framebuffer_format (fb));struct dpu_hw_pipe_cfg pipe_cfg;
@@ -1136,6 +1136,9 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) pstate->pending = true; is_rt_pipe = (dpu_crtc_get_client_type (crtc) !=NRT_CLIENT ); + pstate->needs_qos_remap |= (is_rt_pipe != pdpu->is_rt_pipe); + pdpu->is_rt_pipe = is_rt_pipe; +_dpu_plane_set_qos_ctrl (plane, false,DPU_PLANE_QOS_PANIC_CTRL ); DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT
@@ -1217,14 +1220,8 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)_dpu_plane_set_ot_limit (plane, crtc, &pipe_cfg); } - update_qos_remap = (is_rt_pipe != pdpu->is_rt_pipe) || - pstate->needs_qos_remap; - -if (update_qos_remap) { -if (is_rt_pipe != pdpu->is_rt_pipe) - pdpu->is_rt_pipe = is_rt_pipe; -else if (pstate->needs_qos_remap) - pstate->needs_qos_remap = false; +if (pstate->needs_qos_remap) { + pstate->needs_qos_remap = false;_dpu_plane_set_qos_remap (plane); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 323/885 drm/mediatek: dsi: Reduce the time of dsi from LP11 to sending cmd
In reply to Greg Kroah-HartmanFrom: Xinlei Lee <[email protected]>
[ Upstream commit 91aeaed2c1147e3b1157dc084d23f190856a6c23 ]
According to Figure 16 Turnaround Procedure on page 36 in [1], you can see the status of LP-00 -> LP10 -> LP11. This state can correspond to the state of DSI from LP00 -> LP11 in mtk_dsi_lane_ready function in mtk_dsi.c.
LP-00 -> LP10 -> LP11 takes about 2*TLPX time (refer to [1] page 51 to see that TLPX is 50ns)
The delay at the end of the mtk_dsi_lane_ready function should be greater than the 2*TLPX specified by the DSI spec, and less than the time specified by the DSI_RX (generally 6ms to 40ms), to avoid problems caused by the RX specification
[1]:mipi_D-PHY_specification_v1-1
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +1 -1
@@ -721,7 +721,7 @@ static void mtk_dsi_lane_ready(struct mtk_dsi *dsi)mtk_dsi_clk_ulp_mode_leave (dsi);mtk_dsi_lane0_ulp_mode_leave (dsi);mtk_dsi_clk_hs_mode (dsi,0 ); -msleep (20 ); +usleep_range (1000 ,3000 );/* The reaction time after pulling up the mipi signal for dsi_rx */ } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 324/885 drm/mediatek: Use NULL instead of 0 for NULL pointer
In reply to Greg Kroah-HartmanFrom: Miles Chen <[email protected]>
[ Upstream commit 4744cde06f57dd6fbaac468663b1fe2f653eaa16 ]
Use NULL for NULL pointer to fix the following sparse warning:drivers/gpu/drm/mediatek/mtk_drm_gem.c:265:27: sparse: warning: Using plain integer as NULL pointer
--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -1
@@ -262,6 +262,6 @@ void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,return ;vunmap (vaddr); - mtk_gem->kvaddr =0 ; + mtk_gem->kvaddr =NULL ;kfree (mtk_gem->pages); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 325/885 drm/mediatek: Drop unbalanced obj unref
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 4deef811828e87e26a978d5d6433b261d4713849 ]
In the error path, mtk_drm_gem_object_mmap() is dropping an obj reference that it doesn't own.
--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +0 -2
@@ -164,8 +164,6 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, ret =dma_mmap_attrs (priv->dma_dev, vma, mtk_gem->cookie, mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs); -if (ret) -drm_gem_vm_close (vma);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 326/885 drm/mediatek: mtk_drm_crtc: Add checks for devm_kcalloc
In reply to Greg Kroah-HartmanFrom: ruanjinjie <[email protected]>
[ Upstream commit 5bf1e3bd7da625ccf9a22c8cb7d65271e6e47f4c ]
As the devm_kcalloc may return NULL, the return value needs to be checked to avoid NULL poineter dereference.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +2 -0
@@ -945,6 +945,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, mtk_crtc->planes =devm_kcalloc (dev, num_comp_planes,sizeof (struct drm_plane ),GFP_KERNEL ); +if (!mtk_crtc->planes) +return -ENOMEM ;for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) { ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, i,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 327/885 drm/mediatek: Clean dangling pointer on bind error path
In reply to Greg Kroah-HartmanFrom: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit 36aa8c61af55675ed967900fbe5deb32d776f051 ]
mtk_drm_bind() can fail, in which case drm_dev_put() is called, destroying the drm_device object. However a pointer to it was still being held in the private object, and that pointer would be passed along to DRM in mtk_drm_sys_prepare() if a suspend were triggered at that point, resulting in a panic. Clean the pointer when destroying the object in the error path to prevent this from happening.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -514,6 +514,7 @@ static int mtk_drm_bind(struct device *dev) err_deinit:mtk_drm_kms_deinit (drm); err_free: + private->drm =NULL ;drm_dev_put (drm);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 328/885 ASoC: soc-compress.c: fixup private_data on snd_soc_new_compress()
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit ffe4c0f0bfaa571a676a0e946d4a6a0607f94294 ]
commit d3268a40d4b19f ("ASoC: soc-compress.c: fix NULL dereference") enables DPCM capture, but it should independent from playback. This patch fixup it.
--- sound/soc/soc-compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-compress.c +1 -1
@@ -623,7 +623,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->fe_compr =1 ;if (rtd->dai_link->dpcm_playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream->private_data = rtd; -else if (rtd->dai_link->dpcm_capture) +if (rtd->dai_link->dpcm_capture) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream->private_data = rtd;memcpy (compr->ops, &soc_compr_dyn_ops,sizeof (soc_compr_dyn_ops)); }else {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 329/885 dt-bindings: display: mediatek: Fix the fallback for mediatek,mt8186-disp-ccorr
In reply to Greg Kroah-HartmanFrom: Allen-KH Cheng <[email protected]>
[ Upstream commit 137272ef1b0f17a1815fec00d583515a0163f85e ]
The mt8186-disp-ccorr is not fully compatible with the mt8183-disp-ccorr implementation. It causes a crash when system resumes if it binds to the device.
We should use mt8192-disp-ccorr as fallback of mt8186-disp-ccorr.
--- .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -1
@@ -32,7 +32,7 @@ properties: - items: - enum: - mediatek,mt8186-disp-ccorr - - const: mediatek,mt8183-disp-ccorr + - const: mediatek,mt8192-disp-ccorr reg: maxItems: 1
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 330/885 gpio: vf610: connect GPIO label to dev name
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
[ Upstream commit 6f8ecb7f85f441eb7d78ba2a4df45ee8a821934e ]
Current GPIO label is fixed, so can't distinguish different GPIO controllers through labels. Use dev name instead.
--- drivers/gpio/gpio-vf610.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-vf610.c +1 -1
@@ -304,7 +304,7 @@ static int vf610_gpio_probe(struct platform_device *pdev) gc = &port->gc; gc->parent = dev; - gc->label ="vf610-gpio" ; + gc->label =dev_name (dev); gc->ngpio =VF610_GPIO_PER_PORT ; gc->base =of_alias_get_id (np,"gpio" ) *VF610_GPIO_PER_PORT ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 331/885 ASoC: topology: Properly access value coming from topology file
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
[ Upstream commit c5d184c92df2b631fb81fe2ce6e96bfc5ba720e5 ]
When accessing values coming from topology, le32_to_cpu should be used. One of recent commits missed that.
--- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-topology.c +1 -1
@@ -2408,7 +2408,7 @@ static int soc_valid_header(struct soc_tplg *tplg,return -EINVAL ; } -if (soc_tplg_get_hdr_offset (tplg) + hdr->payload_size >= tplg->fw->size) { +if (soc_tplg_get_hdr_offset (tplg) +le32_to_cpu (hdr->payload_size) >= tplg->fw->size) { dev_err(tplg->dev, "ASoC: invalid header of type %d at offset %ld payload_size %d\n", le32_to_cpu(hdr->type), soc_tplg_get_hdr_offset(tplg),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 332/885 spi: dw_bt1: fix MUX_MMIO dependencies
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit d4bde04318c0d33705e9a77d4c7df72f262011e0 ]
Selecting a symbol with additional dependencies requires adding the same dependency here:
WARNING: unmet direct dependencies detected for MUX_MMIO
Depends on [n]: MULTIPLEXER [=y] && OF [=n]
Selected by [y]:
- SPI_DW_BT1 [=y] && SPI [=y] && SPI_MASTER [=y] && SPI_DESIGNWARE [=y] && (MIPS_BAIKAL_T1 || COMPILE_TEST [=y])
Drop the 'select' here to avoid the problem. Anyone using the dw-bt1 SPI driver should make sure they include the mux driver as well now.
--- drivers/spi/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/spi/Kconfig +0 -1
@@ -295,7 +295,6 @@ config SPI_DW_BT1 tristate "Baikal-T1 SPI driver for DW SPI core" depends on MIPS_BAIKAL_T1 || COMPILE_TEST select MULTIPLEXER - select MUX_MMIO help Baikal-T1 SoC is equipped with three DW APB SSI-based MMIO SPI controllers. Two of them are pretty much normal: with IRQ, DMA,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 333/885 ASoC: mchp-spdifrx: fix controls which rely on rsr register
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit fa09fa60385abbf99342494b280da8b4aebbc0e9 ]
The SPDIFRX block is clocked by 2 clocks: peripheral and generic clocks. Peripheral clock feeds user interface (registers) and generic clock feeds the receiver.
To enable the receiver the generic clock needs to be enabled and also the ENABLE bit of MCHP_SPDIFRX_MR register need to be set.
The signal control exported by mchp-spdifrx driver reports wrong status when the receiver is disabled. This can happen when requesting the signal and the capture was not previously started. To solve this the receiver needs to be enabled (by enabling generic clock and setting ENABLE bit of MR register) before reading the signal status.
As with this fix there are 2 paths now that need to control the generic clock and ENABLE bit of SPDIFRX_MR register (one path though controls, one path though configuration) a mutex has been introduced. We can't rely on subsystem locking as the controls are protected by
struct snd_card::controls_rwsem semaphore and configuration is protected by a different lock (embedded in snd_pcm_stream_lock_irq()).
The introduction of mutex is also extended to other controls which rely on SPDIFRX_RSR.ULOCK bit as it has been discovered experimentally that having both clocks enabled but not the receiver (through ENABLE bit of SPDIFRX.MR) leads to inconsistent values of SPDIFRX_RSR.ULOCK. Thus on some controls we rely on software state (dev->trigger_enabled protected by mutex) to retrieve proper values.
--- sound/soc/atmel/mchp-spdifrx.c | 192 ++++++++++++++++++++++++--------- 1 file changed, 142 insertions(+), 50 deletions(-)
sound/soc/atmel/mchp-spdifrx.c +142 -50
@@ -233,11 +233,13 @@ struct mchp_spdifrx_dev {struct mchp_spdifrx_mixer_control control;spinlock_t blockend_lock;/* protect access to blockend_refcount */ int blockend_refcount; +struct mutex mlock;struct device *dev;struct regmap *regmap;struct clk *pclk;struct clk *gclk;unsigned int fmt; +unsigned int trigger_enabled; unsigned int gclk_enabled:1; };
@@ -353,47 +355,40 @@ static int mchp_spdifrx_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) {struct mchp_spdifrx_dev *dev =snd_soc_dai_get_drvdata (dai); -u32 mr; -int running; -int ret; - -regmap_read (dev->regmap,SPDIFRX_MR , &mr); - running = !!(mr &SPDIFRX_MR_RXEN_ENABLE ); +int ret =0 ;switch (cmd) {case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : -if (!running) { - mr &= ~SPDIFRX_MR_RXEN_MASK ; - mr |=SPDIFRX_MR_RXEN_ENABLE ; -/* enable overrun interrupts */ -regmap_write (dev->regmap,SPDIFRX_IER , -SPDIFRX_IR_OVERRUN ); - } +mutex_lock (&dev->mlock); +/* Enable overrun interrupts */ +regmap_write (dev->regmap,SPDIFRX_IER ,SPDIFRX_IR_OVERRUN ); + +/* Enable receiver. */ +regmap_update_bits (dev->regmap,SPDIFRX_MR ,SPDIFRX_MR_RXEN_MASK , +SPDIFRX_MR_RXEN_ENABLE ); + dev->trigger_enabled = true; +mutex_unlock (&dev->mlock);break ;case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_PAUSE_PUSH : -if (running) { - mr &= ~SPDIFRX_MR_RXEN_MASK ; - mr |=SPDIFRX_MR_RXEN_DISABLE ; -/* disable overrun interrupts */ -regmap_write (dev->regmap,SPDIFRX_IDR , -SPDIFRX_IR_OVERRUN ); - } +mutex_lock (&dev->mlock); +/* Disable overrun interrupts */ +regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_OVERRUN ); + +/* Disable receiver. */ +regmap_update_bits (dev->regmap,SPDIFRX_MR ,SPDIFRX_MR_RXEN_MASK , +SPDIFRX_MR_RXEN_DISABLE ); + dev->trigger_enabled = false; +mutex_unlock (&dev->mlock);break ;default : -return -EINVAL ; + ret = -EINVAL ; } - ret =regmap_write (dev->regmap,SPDIFRX_MR , mr); -if (ret) { -dev_err (dev->dev,"unable to enable/disable RX: %d\n" , ret); -return ret; - } - -return 0 ; +return ret; } static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream,
@@ -413,13 +408,6 @@ static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -regmap_read (dev->regmap,SPDIFRX_MR , &mr); - -if (mr &SPDIFRX_MR_RXEN_ENABLE ) { -dev_err (dev->dev,"PCM already running\n" ); -return -EBUSY ; - } -if (params_channels (params) !=SPDIFRX_CHANNELS ) {dev_err (dev->dev,"unsupported number of channels: %d\n" ,params_channels (params));
@@ -445,6 +433,13 @@ static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } +mutex_lock (&dev->mlock); +if (dev->trigger_enabled) { +dev_err (dev->dev,"PCM already running\n" ); + ret = -EBUSY ; + goto unlock; + } +if (dev->gclk_enabled) {clk_disable_unprepare (dev->gclk); dev->gclk_enabled =0 ;
@@ -455,19 +450,24 @@ static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream,dev_err (dev->dev,"unable to set gclk min rate: rate %u * ratio %u + 1\n" ,params_rate (params),SPDIFRX_GCLK_RATIO_MIN ); -return ret; + goto unlock; } ret =clk_prepare_enable (dev->gclk);if (ret) {dev_err (dev->dev,"unable to enable gclk: %d\n" , ret); -return ret; + goto unlock; } dev->gclk_enabled =1 ;dev_dbg (dev->dev,"GCLK range min set to %d\n" ,params_rate (params) *SPDIFRX_GCLK_RATIO_MIN +1 ); -return regmap_write (dev->regmap,SPDIFRX_MR , mr); + ret =regmap_write (dev->regmap,SPDIFRX_MR , mr); + +unlock: +mutex_unlock (&dev->mlock); + +return ret; } static int mchp_spdifrx_hw_free(struct snd_pcm_substream *substream,
@@ -475,10 +475,12 @@ static int mchp_spdifrx_hw_free(struct snd_pcm_substream *substream, {struct mchp_spdifrx_dev *dev =snd_soc_dai_get_drvdata (dai); +mutex_lock (&dev->mlock);if (dev->gclk_enabled) {clk_disable_unprepare (dev->gclk); dev->gclk_enabled =0 ; } +mutex_unlock (&dev->mlock);return 0 ; }
@@ -627,10 +629,24 @@ static int mchp_spdifrx_ulock_get(struct snd_kcontrol *kcontrol,u32 val;bool ulock_old = ctrl->ulock; -regmap_read (dev->regmap,SPDIFRX_RSR , &val); - ctrl->ulock = !(val &SPDIFRX_RSR_ULOCK ); +mutex_lock (&dev->mlock); + +/* +* The RSR.ULOCK has wrong value if both pclk and gclk are enabled +* and the receiver is disabled. Thus we take into account the +* dev->trigger_enabled here to return a real status. +*/ +if (dev->trigger_enabled) { +regmap_read (dev->regmap,SPDIFRX_RSR , &val); + ctrl->ulock = !(val &SPDIFRX_RSR_ULOCK ); + }else { + ctrl->ulock =0 ; + } + uvalue->value.integer.value[0 ] = ctrl->ulock; +mutex_unlock (&dev->mlock); +return ulock_old != ctrl->ulock; }
@@ -643,8 +659,22 @@ static int mchp_spdifrx_badf_get(struct snd_kcontrol *kcontrol,u32 val;bool badf_old = ctrl->badf; -regmap_read (dev->regmap,SPDIFRX_RSR , &val); - ctrl->badf = !!(val &SPDIFRX_RSR_BADF ); +mutex_lock (&dev->mlock); + +/* +* The RSR.ULOCK has wrong value if both pclk and gclk are enabled +* and the receiver is disabled. Thus we take into account the +* dev->trigger_enabled here to return a real status. +*/ +if (dev->trigger_enabled) { +regmap_read (dev->regmap,SPDIFRX_RSR , &val); + ctrl->badf = !!(val &SPDIFRX_RSR_BADF ); + }else { + ctrl->badf =0 ; + } + +mutex_unlock (&dev->mlock); + uvalue->value.integer.value[0 ] = ctrl->badf;return badf_old != ctrl->badf;
@@ -656,11 +686,48 @@ static int mchp_spdifrx_signal_get(struct snd_kcontrol *kcontrol,struct snd_soc_dai *dai =snd_kcontrol_chip (kcontrol);struct mchp_spdifrx_dev *dev =snd_soc_dai_get_drvdata (dai);struct mchp_spdifrx_mixer_control *ctrl = &dev->control; -u32 val; +u32 val = ~0U , loops =10 ; +int ret;bool signal_old = ctrl->signal; -regmap_read (dev->regmap,SPDIFRX_RSR , &val); - ctrl->signal = !(val &SPDIFRX_RSR_NOSIGNAL ); +mutex_lock (&dev->mlock); + +/* +* To get the signal we need to have receiver enabled. This +* could be enabled also from trigger() function thus we need to +* take care of not disabling the receiver when it runs. +*/ +if (!dev->trigger_enabled) { + ret =clk_prepare_enable (dev->gclk); +if (ret) + goto unlock; + +regmap_update_bits (dev->regmap,SPDIFRX_MR ,SPDIFRX_MR_RXEN_MASK , +SPDIFRX_MR_RXEN_ENABLE ); + +/* Wait for RSR.ULOCK bit. */ +while (--loops) { +regmap_read (dev->regmap,SPDIFRX_RSR , &val); +if (!(val &SPDIFRX_RSR_ULOCK )) +break ; +usleep_range (100 ,150 ); + } + +regmap_update_bits (dev->regmap,SPDIFRX_MR ,SPDIFRX_MR_RXEN_MASK , +SPDIFRX_MR_RXEN_DISABLE ); + +clk_disable_unprepare (dev->gclk); + }else { +regmap_read (dev->regmap,SPDIFRX_RSR , &val); + } + +unlock: +mutex_unlock (&dev->mlock); + +if (!(val &SPDIFRX_RSR_ULOCK )) + ctrl->signal = !(val &SPDIFRX_RSR_NOSIGNAL ); +else + ctrl->signal =0 ; uvalue->value.integer.value[0 ] = ctrl->signal;return signal_old != ctrl->signal;
@@ -685,18 +752,32 @@ static int mchp_spdifrx_rate_get(struct snd_kcontrol *kcontrol,u32 val;int rate; -regmap_read (dev->regmap,SPDIFRX_RSR , &val); - -/* if the receiver is not locked, ISF data is invalid */ -if (val &SPDIFRX_RSR_ULOCK || !(val &SPDIFRX_RSR_IFS_MASK )) { +mutex_lock (&dev->mlock); + +/* +* The RSR.ULOCK has wrong value if both pclk and gclk are enabled +* and the receiver is disabled. Thus we take into account the +* dev->trigger_enabled here to return a real status. +*/ +if (dev->trigger_enabled) { +regmap_read (dev->regmap,SPDIFRX_RSR , &val); +/* If the receiver is not locked, ISF data is invalid. */ +if (val &SPDIFRX_RSR_ULOCK || !(val &SPDIFRX_RSR_IFS_MASK )) { + ucontrol->value.integer.value[0 ] =0 ; + goto unlock; + } + }else { +/* Reveicer is not locked, IFS data is invalid. */ ucontrol->value.integer.value[0 ] =0 ; -return 0 ; + goto unlock; } rate =clk_get_rate (dev->gclk); ucontrol->value.integer.value[0 ] = rate / (32 *SPDIFRX_RSR_IFS (val)); +unlock: +mutex_unlock (&dev->mlock);return 0 ; }
@@ -913,7 +994,18 @@ static int mchp_spdifrx_probe(struct platform_device *pdev) "failed to get the PMC generated clock: %d\n", err);return err; } + +/* +* Signal control need a valid rate on gclk. hw_params() configures +* it propertly but requesting signal before any hw_params() has been +* called lead to invalid value returned for signal. Thus, configure +* gclk at a valid rate, here, in initialization, to simplify the +* control path. +*/ +clk_set_min_rate (dev->gclk,48000 *SPDIFRX_GCLK_RATIO_MIN +1 ); +spin_lock_init (&dev->blockend_lock); +mutex_init (&dev->mlock); dev->dev = &pdev->dev; dev->regmap = regmap;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 334/885 ASoC: mchp-spdifrx: fix return value in case completion times out
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit a4c4161d6eae3ef5f486d1638ef452d9bc1376b0 ]
wait_for_completion_interruptible_timeout() returns 0 in case of timeout. Check this into account when returning from function.
--- sound/soc/atmel/mchp-spdifrx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/atmel/mchp-spdifrx.c +3 -2
@@ -524,9 +524,10 @@ static int mchp_spdifrx_cs_get(struct mchp_spdifrx_dev *dev, ret =wait_for_completion_interruptible_timeout (&ch_stat->done,msecs_to_jiffies (100 ));/* IP might not be started or valid stream might not be present */ -if (ret <0 ) { +if (ret <=0 ) {dev_dbg (dev->dev,"channel status for channel %d timeout\n" , channel); +return ret ? : -ETIMEDOUT ; } memcpy(uvalue->value.iec958.status, ch_stat->data,
@@ -580,7 +581,7 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev,dev_dbg (dev->dev,"user data for channel %d timeout\n" , channel);mchp_spdifrx_isr_blockend_dis (dev); -return ret; +return ret ? : -ETIMEDOUT ; }spin_lock_irqsave (&user_data->lock, flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 335/885 ASoC: mchp-spdifrx: fix controls that works with completion mechanism
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit d3681df44e856aab523a6eb7ba15b5e41efcbb1c ]
Channel status get and channel subcode get controls relies on data returned by controls when certain IRQs are raised. To achieve that completions are used b/w controls and interrupt service routine. The concurrent accesses to these controls are protected by struct snd_card::controls_rwsem.
Issues identified:
- reinit_completion() may be called while waiting for completion which should be avoided
- in case of multiple threads waiting, the complete() call in interrupt will signal only one waiting thread per interrupt which may lead to timeout for the others
- in case of channel status get as the CSC interrupt is not refcounted ISR may disable interrupt for threads that were just enabled it.
To solve these the access to controls were protected by a mutex. Along with this there is no need for spinlock to protect the software cache reads/updates b/w controls and ISR as the update is happening only when requested from control, and only one reader can reach the control.
--- sound/soc/atmel/mchp-spdifrx.c | 143 ++++++++++++++++++--------------- 1 file changed, 77 insertions(+), 66 deletions(-)
sound/soc/atmel/mchp-spdifrx.c +77 -66
@@ -217,7 +217,6 @@ struct mchp_spdifrx_ch_stat {struct mchp_spdifrx_user_data {unsigned char data[SPDIFRX_UD_BITS /8 ];struct completion done; -spinlock_t lock;/* protect access to user data */ };struct mchp_spdifrx_mixer_control {
@@ -231,8 +230,6 @@ struct mchp_spdifrx_mixer_control {struct mchp_spdifrx_dev {struct snd_dmaengine_dai_dma_data capture;struct mchp_spdifrx_mixer_control control; -spinlock_t blockend_lock;/* protect access to blockend_refcount */ -int blockend_refcount;struct mutex mlock;struct device *dev;struct regmap *regmap;
@@ -277,37 +274,11 @@ static void mchp_spdifrx_channel_user_data_read(struct mchp_spdifrx_dev *dev, } } -/* called from non-atomic context only */ -static void mchp_spdifrx_isr_blockend_en (struct mchp_spdifrx_dev *dev) -{ -unsigned long flags; - -spin_lock_irqsave (&dev->blockend_lock, flags); - dev->blockend_refcount++; -/* don't enable BLOCKEND interrupt if it's already enabled */ -if (dev->blockend_refcount ==1 ) -regmap_write (dev->regmap,SPDIFRX_IER ,SPDIFRX_IR_BLOCKEND ); -spin_unlock_irqrestore (&dev->blockend_lock, flags); -} - -/* called from atomic/non-atomic context */ -static void mchp_spdifrx_isr_blockend_dis (struct mchp_spdifrx_dev *dev) -{ -unsigned long flags; - -spin_lock_irqsave (&dev->blockend_lock, flags); - dev->blockend_refcount--; -/* don't enable BLOCKEND interrupt if it's already enabled */ -if (dev->blockend_refcount ==0 ) -regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_BLOCKEND ); -spin_unlock_irqrestore (&dev->blockend_lock, flags); -} -static irqreturn_t mchp_spdif_interrupt (int irq,void *dev_id) {struct mchp_spdifrx_dev *dev = dev_id;struct mchp_spdifrx_mixer_control *ctrl = &dev->control; -u32 sr, imr, pending, idr =0 ; +u32 sr, imr, pending;irqreturn_t ret =IRQ_NONE ;int ch;
@@ -322,13 +293,10 @@ static irqreturn_t mchp_spdif_interrupt(int irq, void *dev_id)if (pending &SPDIFRX_IR_BLOCKEND ) {for (ch =0 ; ch <SPDIFRX_CHANNELS ; ch++) { -spin_lock (&ctrl->user_data[ch].lock);mchp_spdifrx_channel_user_data_read (dev, ch); -spin_unlock (&ctrl->user_data[ch].lock); -complete (&ctrl->user_data[ch].done); } -mchp_spdifrx_isr_blockend_dis (dev); +regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_BLOCKEND ); ret =IRQ_HANDLED ; }
@@ -336,7 +304,7 @@ static irqreturn_t mchp_spdif_interrupt(int irq, void *dev_id)if (pending &SPDIFRX_IR_CSC (ch)) {mchp_spdifrx_channel_status_read (dev, ch);complete (&ctrl->ch_stat[ch].done); - idr |=SPDIFRX_IR_CSC (ch); +regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_CSC (ch)); ret =IRQ_HANDLED ; } }
@@ -346,8 +314,6 @@ static irqreturn_t mchp_spdif_interrupt(int irq, void *dev_id) ret =IRQ_HANDLED ; } -regmap_write (dev->regmap,SPDIFRX_IDR , idr); -return ret; }
@@ -517,23 +483,51 @@ static int mchp_spdifrx_cs_get(struct mchp_spdifrx_dev *dev, {struct mchp_spdifrx_mixer_control *ctrl = &dev->control;struct mchp_spdifrx_ch_stat *ch_stat = &ctrl->ch_stat[channel]; -int ret; +int ret =0 ; + +mutex_lock (&dev->mlock); -regmap_write (dev->regmap,SPDIFRX_IER ,SPDIFRX_IR_CSC (channel)); -/* check for new data available */ - ret =wait_for_completion_interruptible_timeout (&ch_stat->done, -msecs_to_jiffies (100 )); -/* IP might not be started or valid stream might not be present */ -if (ret <=0 ) { -dev_dbg (dev->dev,"channel status for channel %d timeout\n" , - channel); -return ret ? : -ETIMEDOUT ; +/* +* We may reach this point with both clocks enabled but the receiver +* still disabled. To void waiting for completion and return with +* timeout check the dev->trigger_enabled. +* +* To retrieve data: +* - if the receiver is enabled CSC IRQ will update the data in software +* caches (ch_stat->data) +* - otherwise we just update it here the software caches with latest +* available information and return it; in this case we don't need +* spin locking as the IRQ is disabled and will not be raised from +* anywhere else. +*/ + +if (dev->trigger_enabled) { +reinit_completion (&ch_stat->done); +regmap_write (dev->regmap,SPDIFRX_IER ,SPDIFRX_IR_CSC (channel)); +/* Check for new data available */ + ret =wait_for_completion_interruptible_timeout (&ch_stat->done, +msecs_to_jiffies (100 )); +/* Valid stream might not be present */ +if (ret <=0 ) { +dev_dbg (dev->dev,"channel status for channel %d timeout\n" , + channel); +regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_CSC (channel)); + ret = ret ? : -ETIMEDOUT ; + goto unlock; + }else { + ret =0 ; + } + }else { +/* Update software cache with latest channel status. */ +mchp_spdifrx_channel_status_read (dev, channel); }memcpy (uvalue->value.iec958.status, ch_stat->data,sizeof (ch_stat->data)); -return 0 ; +unlock: +mutex_unlock (&dev->mlock); +return ret; } static int mchp_spdifrx_cs1_get(struct snd_kcontrol *kcontrol,
@@ -567,29 +561,49 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev,int channel, struct snd_ctl_elem_value *uvalue) { - unsigned long flags; struct mchp_spdifrx_mixer_control *ctrl = &dev->control;struct mchp_spdifrx_user_data *user_data = &ctrl->user_data[channel]; -int ret; +int ret =0 ; + +mutex_lock (&dev->mlock); + +/* +* We may reach this point with both clocks enabled but the receiver +* still disabled. To void waiting for completion to just timeout we +* check here the dev->trigger_enabled flag. +* +* To retrieve data: +* - if the receiver is enabled we need to wait for blockend IRQ to read +* data to and update it for us in software caches +* - otherwise reading the SPDIFRX_CHUD() registers is enough. +*/ -reinit_completion (&user_data->done); -mchp_spdifrx_isr_blockend_en (dev); - ret =wait_for_completion_interruptible_timeout (&user_data->done, -msecs_to_jiffies (100 )); -/* IP might not be started or valid stream might not be present */ -if (ret <=0 ) { -dev_dbg (dev->dev,"user data for channel %d timeout\n" , - channel); -mchp_spdifrx_isr_blockend_dis (dev); -return ret ? : -ETIMEDOUT ; +if (dev->trigger_enabled) { +reinit_completion (&user_data->done); +regmap_write (dev->regmap,SPDIFRX_IER ,SPDIFRX_IR_BLOCKEND ); + ret =wait_for_completion_interruptible_timeout (&user_data->done, +msecs_to_jiffies (100 )); +/* Valid stream might not be present. */ +if (ret <=0 ) { +dev_dbg (dev->dev,"user data for channel %d timeout\n" , + channel); +regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_BLOCKEND ); + ret = ret ? : -ETIMEDOUT ; + goto unlock; + }else { + ret =0 ; + } + }else { +/* Update software cache with last available data. */ +mchp_spdifrx_channel_user_data_read (dev, channel); } -spin_lock_irqsave (&user_data->lock, flags);memcpy (uvalue->value.iec958.subcode, user_data->data,sizeof (user_data->data)); -spin_unlock_irqrestore (&user_data->lock, flags); -return 0 ; +unlock: +mutex_unlock (&dev->mlock); +return ret; } static int mchp_spdifrx_subcode_ch1_get(struct snd_kcontrol *kcontrol,
@@ -890,11 +904,9 @@ static int mchp_spdifrx_dai_probe(struct snd_soc_dai *dai)SPDIFRX_MR_AUTORST_NOACTION | SPDIFRX_MR_PACK_DISABLED); - dev->blockend_refcount =0 ;for (ch =0 ; ch <SPDIFRX_CHANNELS ; ch++) {init_completion (&ctrl->ch_stat[ch].done);init_completion (&ctrl->user_data[ch].done); -spin_lock_init (&ctrl->user_data[ch].lock); }/* Add controls */
@@ -1005,7 +1017,6 @@ static int mchp_spdifrx_probe(struct platform_device *pdev)*/ clk_set_min_rate (dev->gclk,48000 *SPDIFRX_GCLK_RATIO_MIN +1 ); -spin_lock_init (&dev->blockend_lock);mutex_init (&dev->mlock); dev->dev = &pdev->dev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 336/885 ASoC: mchp-spdifrx: disable all interrupts in mchp_spdifrx_dai_remove()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit aaecdc32b7e35b4f9b457fb3509414aa9a932589 ]
CSC interrupts which might be used in controls are on bits 8 and 9 of SPDIFRX_IDR register. Thus disable all the interrupts that are exported by driver.
--- sound/soc/atmel/mchp-spdifrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/atmel/mchp-spdifrx.c +1 -1
@@ -921,7 +921,7 @@ static int mchp_spdifrx_dai_remove(struct snd_soc_dai *dai)struct mchp_spdifrx_dev *dev =snd_soc_dai_get_drvdata (dai);/* Disable interrupts */ -regmap_write (dev->regmap,SPDIFRX_IDR ,0xFF ); +regmap_write (dev->regmap,SPDIFRX_IDR ,GENMASK (14 ,0 ));clk_disable_unprepare (dev->pclk);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 337/885 dm: improve shrinker debug names
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
[ Upstream commit c87791bcc455a91e51ca9800faaacc21c8d67785 ]
Commit e33c267ab70d ("mm: shrinkers: provide shrinkers with names") chose some fairly bad names for DM's shrinkers.
--- drivers/md/dm-bufio.c | 2 +- drivers/md/dm-zoned-metadata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-bufio.c +1 -1
@@ -1833,7 +1833,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign c->shrinker.scan_objects = dm_bufio_shrink_scan; c->shrinker.seeks =1 ; c->shrinker.batch =0 ; - r =register_shrinker (&c->shrinker,"md-%s:(%u:%u)" , slab_name, + r =register_shrinker (&c->shrinker,"dm-bufio:(%u:%u)" ,MAJOR (bdev->bd_dev),MINOR (bdev->bd_dev));if (r) goto bad;
drivers/md/dm-zoned-metadata.c +1 -1
@@ -2945,7 +2945,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev, zmd->mblk_shrinker.seeks =DEFAULT_SEEKS ;/* Metadata cache shrinker */ - ret =register_shrinker (&zmd->mblk_shrinker,"md-meta:(%u:%u)" , + ret =register_shrinker (&zmd->mblk_shrinker,"dm-zoned-meta:(%u:%u)" ,MAJOR (dev->bdev->bd_dev),MINOR (dev->bdev->bd_dev));if (ret) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 338/885 regmap: apply reg_base and reg_downshift for single register ops
In reply to Greg Kroah-HartmanFrom: Daniel Golle <[email protected]>
[ Upstream commit 697c3892d825fb78f42ec8e53bed065dd728db3e ]
reg_base and reg_downshift currently don't have any effect if used with a regmap_bus or regmap_config which only offers single register operations (ie. reg_read, reg_write and optionally reg_update_bits).
Fix that and take them into account also for regmap_bus with only reg_read and read_write operations by applying reg_base and reg_downshift in _regmap_bus_reg_write, _regmap_bus_reg_read.
Also apply reg_base and reg_downshift in _regmap_update_bits, but only in case the operation is carried out with a reg_update_bits call defined in either regmap_bus or regmap_config.
--- drivers/base/regmap/regmap.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/base/regmap/regmap.c +6 -0
@@ -1942,6 +1942,8 @@ static int _regmap_bus_reg_write(void *context, unsigned int reg, {struct regmap *map = context; + reg += map->reg_base; + reg >>= map->format.reg_downshift;return map->bus->reg_write (map->bus_context, reg, val); }
@@ -2840,6 +2842,8 @@ static int _regmap_bus_reg_read(void *context, unsigned int reg, {struct regmap *map = context; + reg += map->reg_base; + reg >>= map->format.reg_downshift;return map->bus->reg_read (map->bus_context, reg, val); }
@@ -3231,6 +3235,8 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, *change = false;if (regmap_volatile (map, reg) && map->reg_update_bits) { + reg += map->reg_base; + reg >>= map->format.reg_downshift; ret = map->reg_update_bits (map->bus_context, reg, mask, val);if (ret ==0 && change) *change = true;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 339/885 ASoC: rsnd: fixup #endif position
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 49123b51cd896e00b256a27c2ce9e6bfe1bbc22f ]
commit 1f9c82b5ab83ff2 ("ASoC: rsnd: add debugfs support") added CONFIG_DEBUG_FS related definitions on rsnd.h, but it should be added inside of RSND_H. This patch fixup it.
--- sound/soc/sh/rcar/rsnd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sh/rcar/rsnd.h +2 -2
@@ -901,8 +901,6 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type);if (!IS_BUILTIN (RSND_DEBUG_NO_DAI_CALL )) \ dev_dbg(dev, param) -#endif -#ifdef CONFIG_DEBUG_FS int rsnd_debugfs_probe (struct snd_soc_component *component); void rsnd_debugfs_reg_show(struct seq_file *m, phys_addr_t _addr,
@@ -913,3 +911,5 @@ void rsnd_debugfs_mod_reg_show(struct seq_file *m, struct rsnd_mod *mod,#else #define rsnd_debugfs_probe NULL#endif + +#endif /* RSND_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 340/885 ASoC: mchp-spdifrx: Fix uninitialized use of mr in mchp_spdifrx_hw_params()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 218674a45930c700486d27b765bf2f1b43f8cbf7 ]
Clang warns:
../sound/soc/atmel/mchp-spdifrx.c:455:3: error: variable 'mr' is uninitialized when used here [-Werror,-Wuninitialized]
mr |= SPDIFRX_MR_ENDIAN_BIG;
^~
../sound/soc/atmel/mchp-spdifrx.c:432:8: note: initialize the variable 'mr' to silence this warning
u32 mr;
^
= 01 error generated.
Zero initialize mr so that these bitwise OR and assignment operation works unconditionally.
--- sound/soc/atmel/mchp-spdifrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/atmel/mchp-spdifrx.c +1 -1
@@ -362,7 +362,7 @@ static int mchp_spdifrx_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) {struct mchp_spdifrx_dev *dev =snd_soc_dai_get_drvdata (dai); -u32 mr; +u32 mr =0 ;int ret; dev_dbg(dev->dev, "%s() rate=%u format=%#x width=%u channels=%u\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 341/885 ASoC: dt-bindings: meson: fix gx-card codec node regex
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit 480b26226873c88e482575ceb0d0a38d76e1be57 ]
'codec' is a valid node name when there is a single codec in the link. Fix the node regular expression to apply this.
--- .../devicetree/bindings/sound/amlogic,gx-sound-card.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +1 -1
@@ -62,7 +62,7 @@ patternProperties: description: phandle of the CPU DAI patternProperties: - "^codec-[0-9]+$": + "^codec(-[0-9]+)?$": type: object additionalProperties: false description: |-
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 342/885 regulator: tps65219: use generic set_bypass()
In reply to Greg Kroah-HartmanFrom: Jerome Neanne <[email protected]>
[ Upstream commit 0365df81145a4cfaae5f4da896160de512256e6d ]
Due to wrong interpretation of the specification, custom implementation was used instead of standard regmap helper.
Regulator does NOT require to be off to be switched to bypass mode.
--- drivers/regulator/tps65219-regulator.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/regulator/tps65219-regulator.c +1 -19
@@ -173,24 +173,6 @@ static unsigned int tps65219_get_mode(struct regulator_dev *dev)return REGULATOR_MODE_NORMAL ; } -/* -* generic regulator_set_bypass_regmap does not fully match requirements -* TPS65219 Requires explicitly that regulator is disabled before switch -*/ -static int tps65219_set_bypass (struct regulator_dev *dev,bool enable) -{ -struct tps65219 *tps =rdev_get_drvdata (dev); -unsigned int rid =rdev_get_id (dev); - -if (dev->desc->ops->is_enabled (dev)) { -dev_err (tps->dev, -"%s LDO%d enabled, must be shut down to set bypass " , - __func__, rid); -return -EBUSY ; - } -return regulator_set_bypass_regmap (dev, enable); -} -/* Operations permitted on BUCK1/2/3 */ static const struct regulator_ops tps65219_bucks_ops = { .is_enabled = regulator_is_enabled_regmap,
@@ -217,7 +199,7 @@ static const struct regulator_ops tps65219_ldos_1_2_ops = { .set_voltage_sel = regulator_set_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear_range, .map_voltage = regulator_map_voltage_linear_range, - .set_bypass = tps65219_set_bypass, + .set_bypass = regulator_set_bypass_regmap, .get_bypass = regulator_get_bypass_regmap, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 343/885 hwmon: (asus-ec-sensors) add missing mutex path
In reply to Greg Kroah-HartmanFrom: Eugene Shalygin <[email protected]>
[ Upstream commit e2de0e6abd91b05411cb1f0953115dbbbe9b11ce ]
Add missing mutex path for ProArt X570-CREATOR WIFI.
--- drivers/hwmon/asus-ec-sensors.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/asus-ec-sensors.c +1 -0
@@ -299,6 +299,7 @@ static const struct ec_board_info board_info_pro_art_x570_creator_wifi = { .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM | SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CPU_OPT | SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE, + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, .family = family_amd_500_series, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 344/885 hwmon: (ltc2945) Handle error case in ltc2945_value_store
In reply to Greg Kroah-HartmanFrom: Jonathan Cormier <[email protected]>
[ Upstream commit 178b01eccfb0b8149682f61388400bd3d903dddc ]
ltc2945_val_to_reg errors were not being handled which would have resulted in register being set to 0 (clamped) instead of being left alone.
--- drivers/hwmon/ltc2945.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwmon/ltc2945.c +2 -0
@@ -248,6 +248,8 @@ static ssize_t ltc2945_value_store(struct device *dev,/* convert to register value, then clamp and write result */ regval =ltc2945_val_to_reg (dev, reg, val); +if (regval <0 ) +return regval;if (is_power_reg (reg)) { regval =clamp_val (regval,0 ,0xffffff ); regbuf[0 ] = regval >>16 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 345/885 ALSA: hda: Fix the control element identification for multiple codecs
In reply to Greg Kroah-HartmanFrom: Jaroslav Kysela <[email protected]>
[ Upstream commit d045bceff5a904bd79d71dede9f927c00ce4906f ]
Some motherboards have multiple HDA codecs connected to the serial bus. The current code may create multiple mixer controls with the almost identical identification.
The current code use id.device field from the control element structure to store the codec address to avoid such clashes for multiple codecs. Unfortunately, the user space do not handle this correctly. For mixer controls, only name and index are used for the identifiers.
This patch fixes this problem to compose the index using the codec address as an offset in case, when the control already exists. It is really unlikely that one codec will create 10 similar controls.
This patch adds new kernel module parameter 'ctl_dev_id' to allow select the old behaviour, too. The CONFIG_SND_HDA_CTL_DEV_ID Kconfig option sets the default value.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/Kconfig | 14 ++++++++++++++ sound/pci/hda/hda_codec.c | 13 ++++++++++--- sound/pci/hda/hda_controller.c | 1 + sound/pci/hda/hda_controller.h | 1 + sound/pci/hda/hda_intel.c | 5 +++++ 6 files changed, 32 insertions(+), 3 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -259,6 +259,7 @@ struct hda_codec { unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ unsigned int forced_resume:1; /* forced resume for jack */ unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */ + unsigned int ctl_dev_id:1; /* old control element id build behaviour */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/Kconfig +14 -0
@@ -302,6 +302,20 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM This feature can impact power consumption as resources are kept reserved both at transmitter and receiver. +config SND_HDA_CTL_DEV_ID + bool "Use the device identifier field for controls" + depends on SND_HDA_INTEL + help + Say Y to use the device identifier field for (mixer) + controls (old behaviour until this option is available). + + When enabled, the multiple HDA codecs may set the device + field in control (mixer) element identifiers. The use + of this field is not recommended and defined for mixer controls. + + The old behaviour (Y) is obsolete and will be removed. Consider + to not enable this option. + endif endmenu
sound/pci/hda/hda_codec.c +10 -3
@@ -3389,7 +3389,12 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, kctl =snd_ctl_new1 (knew, codec);if (!kctl)return -ENOMEM ; -if (addr >0 ) +/* Do not use the id.device field for MIXER elements. +* This field is for real device numbers (like PCM) but codecs +* are hidden components from the user space view (unrelated +* to the mixer element identification). +*/ +if (addr >0 && codec->ctl_dev_id) kctl->id.device = addr;if (idx >0 ) kctl->id.index = idx;
@@ -3400,9 +3405,11 @@ int snd_hda_add_new_ctls(struct hda_codec *codec,* the codec addr; if it still fails (or it's the * primary codec), then try another control index */ -if (!addr && codec->core.addr) +if (!addr && codec->core.addr) { addr = codec->core.addr; -else if (!idx && !knew->index) { +if (!codec->ctl_dev_id) + idx +=10 * addr; + }else if (!idx && !knew->index) { idx =find_empty_mixer_ctl_idx (codec, knew->name,0 );if (idx <=0 )
sound/pci/hda/hda_controller.c +1 -0
@@ -1231,6 +1231,7 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots)continue ; codec->jackpoll_interval = chip->jackpoll_interval; codec->beep_mode = chip->beep_mode; + codec->ctl_dev_id = chip->ctl_dev_id; codecs++; } }
sound/pci/hda/hda_controller.h +1 -0
@@ -124,6 +124,7 @@ struct azx {/* HD codec */ int codec_probe_mask;/* copied from probe_mask option */ unsigned int beep_mode; +bool ctl_dev_id;#ifdef CONFIG_SND_HDA_PATCH_LOADER const struct firmware *fw;
sound/pci/hda/hda_intel.c +5 -0
@@ -119,6 +119,7 @@ static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = CONFIG_SND_HDA_INPUT_BEEP_MODE};#endif static bool dmic_detect =1 ; +static bool ctl_dev_id =IS_ENABLED (CONFIG_SND_HDA_CTL_DEV_ID ) ?1 :0 ;module_param_array (index, int,NULL ,0444 );MODULE_PARM_DESC (index,"Index value for Intel HD audio interface." );
@@ -157,6 +158,8 @@ module_param(dmic_detect, bool, 0444);MODULE_PARM_DESC (dmic_detect,"Allow DSP driver selection (bypass this driver) " "(0=off, 1=on) (default=1); " "deprecated, use snd-intel-dspcfg.dsp_driver option instead" ); +module_param (ctl_dev_id, bool,0444 ); +MODULE_PARM_DESC (ctl_dev_id,"Use control device identifier (based on codec address)." );#ifdef CONFIG_PM static int param_set_xint (const char *val,const struct kernel_param *kp);
@@ -2278,6 +2281,8 @@ static int azx_probe_continue(struct azx *chip) chip->beep_mode = beep_mode[dev];#endif + chip->ctl_dev_id = ctl_dev_id; +/* create codec instances */ if (bus->codec_mask) { err =azx_probe_codecs (chip, azx_max_codecs[chip->driver_type]);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 346/885 drm/amdgpu: fix enum odm_combine_mode mismatch
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 087bad7eb1f6945f8232f132953ecc2bda8bd38d ]
A conversion from 'bool' to 'enum odm_combine_mode' was incomplete, and gcc warns about this with many instances of
display/dc/dml/dcn20/display_mode_vba_20.c:3899:44: warning: implicit conversion from 'enum <anonymous>' to 'enum odm_combine_mode' [-Wenum-conversion]
3899 | locals->ODMCombineEnablePerState[i][k] = false;
Change the ones that we get a warning for, using the same numerical values to leave the behavior unchanged.
--- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 8 ++++---- .../amd/display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +++++----- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c +4 -4
@@ -3897,14 +3897,14 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] /2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine;if (mode_lib->vba.ODMCapability) {if (locals->PlaneRequiredDISPCLKWithoutODMCombine > mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; }else if (locals->HActive[k] >DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } }
@@ -3957,7 +3957,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] =0.0 ; locals->DISPCLK_DPPCLK_Support[i][j] = true;for (k =0 ; k <= mode_lib->vba.NumberOfActivePlanes -1 ; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] =1 ; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k]
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +5 -5
@@ -4008,17 +4008,17 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] /2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine;if (mode_lib->vba.ODMCapability) {if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; }else if (locals->DSCEnabled[k] && (locals->HActive[k] >DCN20_MAX_DSC_IMAGE_WIDTH )) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; }else if (locals->HActive[k] >DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } }
@@ -4071,7 +4071,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode locals->RequiredDISPCLK[i][j] =0.0 ; locals->DISPCLK_DPPCLK_Support[i][j] = true;for (k =0 ; k <= mode_lib->vba.NumberOfActivePlanes -1 ; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] =1 ; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k]
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +6 -6
@@ -4102,17 +4102,17 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] /2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading /100.0 ); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine;if (mode_lib->vba.ODMCapability) {if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; }else if (locals->DSCEnabled[k] && (locals->HActive[k] >DCN21_MAX_DSC_IMAGE_WIDTH )) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; }else if (locals->HActive[k] >DCN21_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } }
@@ -4165,7 +4165,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] =0.0 ; locals->DISPCLK_DPPCLK_Support[i][j] = true;for (k =0 ; k <= mode_lib->vba.NumberOfActivePlanes -1 ; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] =1 ; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k]
@@ -5230,7 +5230,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.ODMCombineEnabled[k] = locals->ODMCombineEnablePerState[mode_lib->vba.VoltageLevel][k]; }else { - mode_lib->vba.ODMCombineEnabled[k] = false; + mode_lib->vba.ODMCombineEnabled[k] = dm_odm_combine_mode_disabled; } mode_lib->vba.DSCEnabled[k] = locals->RequiresDSC[mode_lib->vba.VoltageLevel][k];
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 347/885 scsi: mpt3sas: Fix a memory leak
In reply to Greg Kroah-HartmanFrom: Tomas Henzl <[email protected]>
[ Upstream commit 54dd96015e8d7a2a07359e2dfebf05b529d1780c ]
Add a forgotten kfree().
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_base.c +3 -0
@@ -5850,6 +5850,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) }dma_pool_destroy (ioc->pcie_sgl_dma_pool); } +kfree (ioc->pcie_sg_lookup); + ioc->pcie_sg_lookup =NULL ; +if (ioc->config_page) { dexitprintk(ioc, ioc_info(ioc, "config_page(0x%p): free\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 348/885 scsi: aic94xx: Add missing check for dma_map_single()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 32fe45274edb5926abc0fac7263d9f889d02d9cf ]
Add check for dma_map_single() and return error if it fails in order to avoid invalid DMA address.
--- drivers/scsi/aic94xx/aic94xx_task.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/aic94xx/aic94xx_task.c +3 -0
@@ -50,6 +50,9 @@ static int asd_map_scatterlist(struct sas_task *task,dma_addr_t dma =dma_map_single (&asd_ha->pcidev->dev, p, task->total_xfer_len, task->data_dir); +if (dma_mapping_error (&asd_ha->pcidev->dev, dma)) +return -ENOMEM ; + sg_arr[0 ].bus_addr =cpu_to_le64 ((u64 )dma); sg_arr[0 ].size =cpu_to_le32 (task->total_xfer_len); sg_arr[0 ].flags |=ASD_SG_EL_LIST_EOL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 349/885 HID: multitouch: Add quirks for flipped axes
In reply to Greg Kroah-HartmanFrom: Allen Ballway <[email protected]>
[ Upstream commit a2f416bf062a38bb76cccd526d2d286b8e4db4d9 ]
Certain touchscreen devices, such as the ELAN9034, are oriented incorrectly and report touches on opposite points on the X and Y axes. For example, a 100x200 screen touched at (10,20) would report (90, 180) and vice versa.
This is fixed by adding device quirks to transform the touch points into the correct spaces, from X -> MAX(X) - X, and Y -> MAX(Y) - Y.
Stable-dep-of: 03a86105556e ("HID: retain initial quirks set up when creating HID devices")
--- drivers/hid/hid-multitouch.c | 39 ++++++++++++++++++--- drivers/hid/hid-quirks.c | 6 ++++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 43 ++++++++++++++++++++++++ drivers/hid/i2c-hid/i2c-hid.h | 3 ++ 4 files changed, 87 insertions(+), 4 deletions(-)
drivers/hid/hid-multitouch.c +35 -4
@@ -71,6 +71,7 @@ MODULE_LICENSE("GPL");#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)#define MT_QUIRK_DISABLE_WAKEUP BIT(21) +#define MT_QUIRK_ORIENTATION_INVERT BIT(22)#define MT_INPUTMODE_TOUCHSCREEN 0x02#define MT_INPUTMODE_TOUCHPAD 0x03
@@ -1009,6 +1010,7 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input, struct mt_usages *slot) {struct input_mt *mt = input->mt; +struct hid_device *hdev = td->hdev;__s32 quirks = app->quirks;bool valid = true;bool confidence_state = true;
@@ -1086,6 +1088,10 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input,int orientation = wide;int max_azimuth;int azimuth; +int x; +int y; +int cx; +int cy;if (slot->a !=DEFAULT_ZERO ) {/*
@@ -1104,6 +1110,9 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input,if (azimuth > max_azimuth *2 ) azimuth -= max_azimuth *4 ; orientation = -azimuth; +if (quirks &MT_QUIRK_ORIENTATION_INVERT ) + orientation = -orientation; + }if (quirks &MT_QUIRK_TOUCH_SIZE_SCALING ) {
@@ -1115,10 +1124,23 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input, minor = minor >>1 ; } -input_event (input,EV_ABS ,ABS_MT_POSITION_X , *slot->x); -input_event (input,EV_ABS ,ABS_MT_POSITION_Y , *slot->y); -input_event (input,EV_ABS ,ABS_MT_TOOL_X , *slot->cx); -input_event (input,EV_ABS ,ABS_MT_TOOL_Y , *slot->cy); + x = hdev->quirks &HID_QUIRK_X_INVERT ? +input_abs_get_max (input,ABS_MT_POSITION_X ) - *slot->x : + *slot->x; + y = hdev->quirks &HID_QUIRK_Y_INVERT ? +input_abs_get_max (input,ABS_MT_POSITION_Y ) - *slot->y : + *slot->y; + cx = hdev->quirks &HID_QUIRK_X_INVERT ? +input_abs_get_max (input,ABS_MT_POSITION_X ) - *slot->cx : + *slot->cx; + cy = hdev->quirks &HID_QUIRK_Y_INVERT ? +input_abs_get_max (input,ABS_MT_POSITION_Y ) - *slot->cy : + *slot->cy; + +input_event (input,EV_ABS ,ABS_MT_POSITION_X , x); +input_event (input,EV_ABS ,ABS_MT_POSITION_Y , y); +input_event (input,EV_ABS ,ABS_MT_TOOL_X , cx); +input_event (input,EV_ABS ,ABS_MT_TOOL_Y , cy);input_event (input,EV_ABS ,ABS_MT_DISTANCE , !*slot->tip_state);input_event (input,EV_ABS ,ABS_MT_ORIENTATION , orientation);input_event (input,EV_ABS ,ABS_MT_PRESSURE , *slot->p);
@@ -1735,6 +1757,15 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)if (id->vendor ==HID_ANY_ID && id->product ==HID_ANY_ID ) td->serial_maybe = true; + +/* Orientation is inverted if the X or Y axes are +* flipped, but normalized if both are inverted. +*/ +if (hdev->quirks & (HID_QUIRK_X_INVERT |HID_QUIRK_Y_INVERT ) && + !((hdev->quirks &HID_QUIRK_X_INVERT ) + && (hdev->quirks &HID_QUIRK_Y_INVERT ))) + td->mtclass.quirks =MT_QUIRK_ORIENTATION_INVERT ; +/* This allows the driver to correctly support devices * that emit events over several HID messages. */
drivers/hid/hid-quirks.c +6 -0
@@ -19,6 +19,7 @@#include <linux/input/elan-i2c-ids.h> #include "hid-ids.h" +#include "i2c-hid/i2c-hid.h" /* * Alphabetically sorted by vendor then product.
@@ -1298,6 +1299,11 @@ unsigned long hid_lookup_quirk(const struct hid_device *hdev) quirks =hid_gets_squirk (hdev);mutex_unlock (&dquirks_lock); +/* Get quirks specific to I2C devices */ +if (IS_ENABLED (CONFIG_I2C_DMI_CORE ) &&IS_ENABLED (CONFIG_DMI ) && + hdev->bus ==BUS_I2C ) + quirks |=i2c_hid_get_dmi_quirks (hdev->vendor, hdev->product); +return quirks; }EXPORT_SYMBOL_GPL (hid_lookup_quirk);
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +43 -0
60 lines not on this page · raw message
drivers/hid/i2c-hid/i2c-hid.h +3 -0
@@ -9,6 +9,7 @@struct i2c_hid_desc *i2c_hid_get_dmi_i2c_hid_desc_override (uint8_t *i2c_name);char *i2c_hid_get_dmi_hid_report_desc_override (uint8_t *i2c_name,unsigned int *size); +u32 i2c_hid_get_dmi_quirks (const u16 vendor,const u16 product);#else static inline struct i2c_hid_desc *i2c_hid_get_dmi_i2c_hid_desc_override (uint8_t *i2c_name)
@@ -16,6 +17,8 @@ static inline struct i2c_hid_descstatic inline char *i2c_hid_get_dmi_hid_report_desc_override (uint8_t *i2c_name,unsigned int *size) {return NULL ; } +static inline u32 i2c_hid_get_dmi_quirks (const u16 vendor,const u16 product) +{return 0 ; }#endif /**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 350/885 HID: retain initial quirks set up when creating HID devices
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 03a86105556e23650e4470c09f91cf7c360d5e28 ]
In certain circumstances, such as when creating I2C-connected HID devices, we want to pass and retain some quirks (axis inversion, etc). The source of such quirks may be device tree, or DMI data, or something else not readily available to the HID core itself and therefore cannot be reconstructed easily. To allow this, introduce "initial_quirks" field in hid_device structure and use it when determining the final set of quirks.
This fixes the problem with i2c-hid setting up device-tree sourced quirks too late and losing them on device rebind, and also allows to sever the tie between hid-code and i2c-hid when applying DMI-based quirks.
--- drivers/hid/hid-quirks.c | 8 +------- drivers/hid/i2c-hid/i2c-hid-core.c | 6 ++++-- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 1 - include/linux/hid.h | 1 + 4 files changed, 6 insertions(+), 10 deletions(-)
drivers/hid/hid-quirks.c +1 -7
@@ -19,7 +19,6 @@#include <linux/input/elan-i2c-ids.h> #include "hid-ids.h" -#include "i2c-hid/i2c-hid.h" /* * Alphabetically sorted by vendor then product.
@@ -1238,7 +1237,7 @@ EXPORT_SYMBOL_GPL(hid_quirks_exit);static unsigned long hid_gets_squirk (const struct hid_device *hdev) {const struct hid_device_id *bl_entry; -unsigned long quirks =0 ; +unsigned long quirks = hdev->initial_quirks;if (hid_match_id (hdev, hid_ignore_list)) quirks |=HID_QUIRK_IGNORE ;
@@ -1299,11 +1298,6 @@ unsigned long hid_lookup_quirk(const struct hid_device *hdev) quirks =hid_gets_squirk (hdev);mutex_unlock (&dquirks_lock); -/* Get quirks specific to I2C devices */ -if (IS_ENABLED (CONFIG_I2C_DMI_CORE ) &&IS_ENABLED (CONFIG_DMI ) && - hdev->bus ==BUS_I2C ) - quirks |=i2c_hid_get_dmi_quirks (hdev->vendor, hdev->product); -return quirks; }EXPORT_SYMBOL_GPL (hid_lookup_quirk);
drivers/hid/i2c-hid/i2c-hid-core.c +4 -2
@@ -1035,6 +1035,10 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, hid->vendor =le16_to_cpu (ihid->hdesc.wVendorID); hid->product =le16_to_cpu (ihid->hdesc.wProductID); + hid->initial_quirks = quirks; + hid->initial_quirks |=i2c_hid_get_dmi_quirks (hid->vendor, + hid->product); +snprintf (hid->name,sizeof (hid->name),"%s %04X:%04X" , client->name, (u16 )hid->vendor, (u16 )hid->product);strscpy (hid->phys,dev_name (&client->dev),sizeof (hid->phys));
@@ -1048,8 +1052,6 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, goto err_mem_free; } - hid->quirks |= quirks; -return 0 ; err_mem_free:
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +0 -1
@@ -492,4 +492,3 @@ u32 i2c_hid_get_dmi_quirks(const u16 vendor, const u16 product)return quirks; } -EXPORT_SYMBOL_GPL (i2c_hid_get_dmi_quirks);
include/linux/hid.h +1 -0
@@ -619,6 +619,7 @@ struct hid_device { /* device report descriptor */unsigned long status;/* see STAT flags above */ unsigned claimed;/* Claimed by hidinput, hiddev? */ unsigned quirks;/* Various quirks the device can pull on us */ +unsigned initial_quirks;/* Initial set of quirks supplied when creating device */ bool io_started;/* If IO has started */ struct list_head inputs;/* The list of inputs */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 351/885 ASoC: qcom: q6apm-lpass-dai: unprepare stream if its already prepared
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit c2ac3aec474da0455df79c4a182f19687bc98d1d ]
prepare callback can be called multiple times, so unprepare the stream if its already prepared.
Without this DSP is not happy to setting the params on a already prepared graph.
--- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/qcom/qdsp6/q6apm-lpass-dais.c +5 -0
@@ -127,6 +127,11 @@ static int q6apm_lpass_dai_prepare(struct snd_pcm_substream *substream, struct sint graph_id = dai->id;int rc; +if (dai_data->is_port_started[dai->id]) { +q6apm_graph_stop (dai_data->graph[dai->id]); + dai_data->is_port_started[dai->id] = false; + } +/** * It is recommend to load DSP with source graph first and then sink * graph, so sequence for playback and capture will be different
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 352/885 ASoC: qcom: q6apm-dai: fix race condition while updating the position pointer
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 84222ef54bfd8f043c23c8603fd5257a64b00780 ]
It is noticed that the position pointer value seems to get a get corrupted due to missing locking between updating and reading.
Fix this by adding a spinlock around the position pointer.
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
sound/soc/qcom/qdsp6/q6apm-dai.c +15 -1
@@ -8,6 +8,7 @@#include <linux/slab.h> #include <sound/soc.h> #include <sound/soc-dapm.h> +#include <linux/spinlock.h> #include <sound/pcm.h> #include <asm/dma.h> #include <linux/dma-mapping.h>
@@ -53,6 +54,7 @@ struct q6apm_dai_rtd {uint16_t session_id;enum stream_state state;struct q6apm_graph *graph; +spinlock_t lock; };struct q6apm_dai_data {
@@ -99,20 +101,25 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo {struct q6apm_dai_rtd *prtd = priv;struct snd_pcm_substream *substream = prtd->substream; +unsigned long flags;switch (opcode) {case APM_CLIENT_EVENT_CMD_EOS_DONE : prtd->state =Q6APM_STREAM_STOPPED ;break ;case APM_CLIENT_EVENT_DATA_WRITE_DONE : +spin_lock_irqsave (&prtd->lock, flags); prtd->pos += prtd->pcm_count; +spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);if (prtd->state ==Q6APM_STREAM_RUNNING )q6apm_write_async (prtd->graph, prtd->pcm_count,0 ,0 ,0 );break ;case APM_CLIENT_EVENT_DATA_READ_DONE : +spin_lock_irqsave (&prtd->lock, flags); prtd->pos += prtd->pcm_count; +spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);if (prtd->state ==Q6APM_STREAM_RUNNING )q6apm_read (prtd->graph);
@@ -253,6 +260,7 @@ static int q6apm_dai_open(struct snd_soc_component *component,if (prtd ==NULL )return -ENOMEM ; +spin_lock_init (&prtd->lock); prtd->substream = substream; prtd->graph =q6apm_graph_open (dev, (q6apm_cb )event_handler, prtd, graph_id);if (IS_ERR (prtd->graph)) {
@@ -332,11 +340,17 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component, {struct snd_pcm_runtime *runtime = substream->runtime;struct q6apm_dai_rtd *prtd = runtime->private_data; +snd_pcm_uframes_t ptr; +unsigned long flags; +spin_lock_irqsave (&prtd->lock, flags);if (prtd->pos == prtd->pcm_size) prtd->pos =0 ; -return bytes_to_frames (runtime, prtd->pos); + ptr =bytes_to_frames (runtime, prtd->pos); +spin_unlock_irqrestore (&prtd->lock, flags); + +return ptr; } static int q6apm_dai_hw_params(struct snd_soc_component *component,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 353/885 ASoC: qcom: q6apm-dai: Add SNDRV_PCM_INFO_BATCH flag
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit aa759f3f9f4394a3af65ad1772fca6cb9dd9e4cc ]
At the moment, playing audio with PulseAudio with the qdsp6 driver results in distorted sound. It seems like its timer-based scheduling does not work properly with qdsp6 since setting tsched=0 in the PulseAudio configuration avoids the issue.
Apparently this happens when the pointer() callback is not accurate enough. There is a SNDRV_PCM_INFO_BATCH flag that can be used to stop PulseAudio from using timer-based scheduling by default.
According to https://www.alsa-project.org/pipermail/alsa-devel/2014-March/073816.html:
The flag is being used in the sense explained in the previous audio meeting -- the data transfer granularity isn't fine enough but aligned to the period size (or less).
q6apm-dai reports the position as multiple of
prtd->pcm_count = snd_pcm_lib_period_bytes(substream)
so it indeed just a multiple of the period size.
Therefore adding the flag here seems appropriate and makes audio work out of the box.
Comment log inspired by Stephan Gerhold sent for q6asm-dai.c few years back.
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/qcom/qdsp6/q6apm-dai.c +4 -2
@@ -64,7 +64,8 @@ struct q6apm_dai_data {static struct snd_pcm_hardware q6apm_dai_hardware_capture = { .info = (SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_BLOCK_TRANSFER |SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_INTERLEAVED | -SNDRV_PCM_INFO_PAUSE |SNDRV_PCM_INFO_RESUME ), +SNDRV_PCM_INFO_PAUSE |SNDRV_PCM_INFO_RESUME | +SNDRV_PCM_INFO_BATCH ), .formats = (SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE ), .rates =SNDRV_PCM_RATE_8000_48000 , .rate_min =8000 ,
@@ -82,7 +83,8 @@ static struct snd_pcm_hardware q6apm_dai_hardware_capture = {static struct snd_pcm_hardware q6apm_dai_hardware_playback = { .info = (SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_BLOCK_TRANSFER |SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_INTERLEAVED | -SNDRV_PCM_INFO_PAUSE |SNDRV_PCM_INFO_RESUME ), +SNDRV_PCM_INFO_PAUSE |SNDRV_PCM_INFO_RESUME | +SNDRV_PCM_INFO_BATCH ), .formats = (SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE ), .rates =SNDRV_PCM_RATE_8000_192000 , .rate_min =8000 ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 354/885 ASoC: codecs: lpass: register mclk after runtime pm
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 1dc3459009c33e335f0d62b84dd39a6bbd7fd5d2 ]
move mclk out registration after runtime pm is enabled so that the clk framework can resume the codec if it requires to enable the mclk out.
--- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/lpass-tx-macro.c | 8 ++++---- sound/soc/codecs/lpass-va-macro.c | 20 ++++++++++---------- sound/soc/codecs/lpass-wsa-macro.c | 9 ++++----- 4 files changed, 22 insertions(+), 23 deletions(-)
sound/soc/codecs/lpass-rx-macro.c +4 -4
@@ -3601,10 +3601,6 @@ static int rx_macro_probe(struct platform_device *pdev)if (ret) goto err_fsgen; - ret =rx_macro_register_mclk_output (rx); -if (ret) - goto err_clkout; - ret =devm_snd_soc_register_component (dev, &rx_macro_component_drv, rx_macro_dai,ARRAY_SIZE (rx_macro_dai));
@@ -3618,6 +3614,10 @@ static int rx_macro_probe(struct platform_device *pdev)pm_runtime_set_active (dev);pm_runtime_enable (dev); + ret =rx_macro_register_mclk_output (rx); +if (ret) + goto err_clkout; +return 0 ; err_clkout:
sound/soc/codecs/lpass-tx-macro.c +4 -4
@@ -1889,10 +1889,6 @@ static int tx_macro_probe(struct platform_device *pdev)if (ret) goto err_fsgen; - ret =tx_macro_register_mclk_output (tx); -if (ret) - goto err_clkout; - ret =devm_snd_soc_register_component (dev, &tx_macro_component_drv, tx_macro_dai,ARRAY_SIZE (tx_macro_dai));
@@ -1905,6 +1901,10 @@ static int tx_macro_probe(struct platform_device *pdev)pm_runtime_set_active (dev);pm_runtime_enable (dev); + ret =tx_macro_register_mclk_output (tx); +if (ret) + goto err_clkout; +return 0 ; err_clkout:
sound/soc/codecs/lpass-va-macro.c +10 -10
@@ -1524,16 +1524,6 @@ static int va_macro_probe(struct platform_device *pdev)if (ret) goto err_mclk; - ret =va_macro_register_fsgen_output (va); -if (ret) - goto err_clkout; - - va->fsgen =clk_hw_get_clk (&va->hw,"fsgen" ); -if (IS_ERR (va->fsgen)) { - ret =PTR_ERR (va->fsgen); - goto err_clkout; - } -if (va->has_swr_master) {/* Set default CLK div to 1 */ regmap_update_bits(va->regmap, CDC_VA_TOP_CSR_SWR_MIC_CTL0,
@@ -1560,6 +1550,16 @@ static int va_macro_probe(struct platform_device *pdev)pm_runtime_set_active (dev);pm_runtime_enable (dev); + ret =va_macro_register_fsgen_output (va); +if (ret) + goto err_clkout; + + va->fsgen =clk_hw_get_clk (&va->hw,"fsgen" ); +if (IS_ERR (va->fsgen)) { + ret =PTR_ERR (va->fsgen); + goto err_clkout; + } +return 0 ; err_clkout:
sound/soc/codecs/lpass-wsa-macro.c +4 -5
@@ -2449,11 +2449,6 @@ static int wsa_macro_probe(struct platform_device *pdev)if (ret) goto err_fsgen; - ret =wsa_macro_register_mclk_output (wsa); -if (ret) - goto err_clkout; - - ret =devm_snd_soc_register_component (dev, &wsa_macro_component_drv, wsa_macro_dai,ARRAY_SIZE (wsa_macro_dai));
@@ -2466,6 +2461,10 @@ static int wsa_macro_probe(struct platform_device *pdev)pm_runtime_set_active (dev);pm_runtime_enable (dev); + ret =wsa_macro_register_mclk_output (wsa); +if (ret) + goto err_clkout; +return 0 ; err_clkout:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 355/885 ASoC: codecs: lpass: fix incorrect mclk rate
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit e7621434378c40b62ef858c14ae6415fb6469a8e ]
For some reason we ended up with incorrect mclk rate which should be 1920000 instead of 96000, So far we were getting lucky as the same clk is set to 192000 by wsa and va macro. This issue is discovered when there is no wsa macro active and only rx or tx path is tested.
Fix this by setting correct rate.
--- sound/soc/codecs/lpass-rx-macro.c | 4 ++-- sound/soc/codecs/lpass-tx-macro.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/lpass-rx-macro.c +2 -2
@@ -366,7 +366,7 @@#define CDC_RX_DSD1_CFG2 (0x0F8C)#define RX_MAX_OFFSET (0x0F8C) -#define MCLK_FREQ 9600000 +#define MCLK_FREQ 19200000#define RX_MACRO_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
@@ -3579,7 +3579,7 @@ static int rx_macro_probe(struct platform_device *pdev)/* set MCLK and NPL rates */ clk_set_rate (rx->mclk,MCLK_FREQ ); -clk_set_rate (rx->npl,2 *MCLK_FREQ ); +clk_set_rate (rx->npl,MCLK_FREQ ); ret =clk_prepare_enable (rx->macro);if (ret)
sound/soc/codecs/lpass-tx-macro.c +2 -2
@@ -202,7 +202,7 @@#define TX_MACRO_AMIC_UNMUTE_DELAY_MS 100#define TX_MACRO_DMIC_HPF_DELAY_MS 300#define TX_MACRO_AMIC_HPF_DELAY_MS 300 -#define MCLK_FREQ 9600000 +#define MCLK_FREQ 19200000enum {TX_MACRO_AIF_INVALID =0 ,
@@ -1867,7 +1867,7 @@ static int tx_macro_probe(struct platform_device *pdev)/* set MCLK and NPL rates */ clk_set_rate (tx->mclk,MCLK_FREQ ); -clk_set_rate (tx->npl,2 *MCLK_FREQ ); +clk_set_rate (tx->npl,MCLK_FREQ ); ret =clk_prepare_enable (tx->macro);if (ret)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 356/885 spi: bcm63xx-hsspi: Endianness fix for ARM based SoC
In reply to Greg Kroah-HartmanFrom: William Zhang <[email protected]>
[ Upstream commit 85a84a61699990db6a025b5073f337f49933a875 ]
HSSPI controller uses big endian for the opcode in the message to the controller ping pong buffer. Use cpu_to_be16 to properly handle the endianness for both big and little endian host.
--- drivers/spi/spi-bcm63xx-hsspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bcm63xx-hsspi.c +1 -1
@@ -194,7 +194,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) tx += curr_step; } -__raw_writew (opcode | curr_step, bs->fifo); +__raw_writew ((u16 )cpu_to_be16 (opcode | curr_step), bs->fifo);/* enable interrupt */ __raw_writel(HSSPI_PINGx_CMD_DONE(0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 357/885 drm/amd/display: dont call dc_interrupt_set() for disabled crtcs
In reply to Greg Kroah-HartmanFrom: Hamza Mahfooz <[email protected]>
[ Upstream commit 4936458bf989d168f5a89015dd81067c4c2bdc64 ]
As made mention of in commit 4ea7fc09539b ("drm/amd/display: Do not program interrupt status on disabled crtc"), we shouldn't program disabled crtcs. So, filter out disabled crtcs in dm_set_vupdate_irq() and dm_set_vblank().
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +7 -0
@@ -77,6 +77,9 @@ int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable)struct amdgpu_device *adev =drm_to_adev (crtc->dev);int rc; +if (acrtc->otg_inst ==-1 ) +return 0 ; + irq_source =IRQ_TYPE_VUPDATE + acrtc->otg_inst; rc =dc_interrupt_set (adev->dm.dc, irq_source, enable) ?0 : -EBUSY ;
@@ -149,6 +152,9 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)struct vblank_control_work *work;int rc =0 ; +if (acrtc->otg_inst ==-1 ) + goto skip; +if (enable) {/* vblank irq on -> Only need vupdate irq in vrr mode */ if (amdgpu_dm_vrr_active (acrtc_state))
@@ -166,6 +172,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)if (!dc_interrupt_set (adev->dm.dc, irq_source, enable))return -EBUSY ; +skip:if (amdgpu_in_reset (adev))return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 358/885 HID: logitech-hidpp: Hard-code HID++ 1.0 fast scroll support
In reply to Greg Kroah-HartmanFrom: Bastien Nocera <[email protected]>
[ Upstream commit 719acb4d3b7accc9cfbaf21c1c2d51dc7384aee2 ]
HID++ 1.0 devices only export whether Fast Scrolling is enabled, not whether they are capable of it. Reinstate the original quirks for the 3 supported mice so fast scrolling works again on those devices.
--- drivers/hid/hid-logitech-hidpp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/hid/hid-logitech-hidpp.c +9 -8
@@ -77,6 +77,7 @@ MODULE_PARM_DESC(disable_tap_to_click,#define HIDPP_QUIRK_HIDPP_WHEELS BIT(26)#define HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS BIT(27)#define HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS BIT(28) +#define HIDPP_QUIRK_HI_RES_SCROLL_1P0 BIT(29)/* These are just aliases for now */ #define HIDPP_QUIRK_KBD_SCROLL_WHEEL HIDPP_QUIRK_HIDPP_WHEELS
@@ -3472,14 +3473,8 @@ static int hidpp_initialize_hires_scroll(struct hidpp_device *hidpp)hid_dbg (hidpp->hid_dev,"Detected HID++ 2.0 hi-res scrolling\n" ); } }else { -struct hidpp_report response; - - ret =hidpp_send_rap_command_sync (hidpp, -REPORT_ID_HIDPP_SHORT , -HIDPP_GET_REGISTER , -HIDPP_ENABLE_FAST_SCROLL , -NULL ,0 , &response); -if (!ret) { +/* We cannot detect fast scrolling support on HID++ 1.0 devices */ +if (hidpp->quirks &HIDPP_QUIRK_HI_RES_SCROLL_1P0 ) { hidpp->capabilities |=HIDPP_CAPABILITY_HIDPP10_FAST_SCROLL ;hid_dbg (hidpp->hid_dev,"Detected HID++ 1.0 fast scroll\n" ); }
@@ -4297,9 +4292,15 @@ static const struct hid_device_id hidpp_devices[] = {HID_BLUETOOTH_DEVICE (USB_VENDOR_ID_LOGITECH , USB_DEVICE_ID_LOGITECH_T651), .driver_data = HIDPP_QUIRK_CLASS_WTP }, + { /* Mouse Logitech Anywhere MX */ + LDJ_DEVICE(0x1017), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 }, { /* Mouse logitech M560 */ LDJ_DEVICE(0x402d), .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_CLASS_M560 }, + { /* Mouse Logitech M705 (firmware RQM17) */ + LDJ_DEVICE(0x101b), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 }, + { /* Mouse Logitech Performance MX */ + LDJ_DEVICE(0x101a), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 }, { /* Keyboard logitech K400 */ LDJ_DEVICE(0x4024), .driver_data = HIDPP_QUIRK_CLASS_K400 },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 359/885 spi: bcm63xx-hsspi: Fix multi-bit mode setting
In reply to Greg Kroah-HartmanFrom: William Zhang <[email protected]>
[ Upstream commit 811ff802aaf878ebbbaeac0307a0164fa21e7d40 ]
Currently the driver always sets the controller to dual data bit mode for both tx and rx data in the profile mode control register even for single data bit transfer. Luckily the opcode is set correctly according to SPI transfer data bit width so it does not actually cause issues.
This change fixes the problem by setting tx and rx data bit mode field correctly according to the actual SPI transfer tx and rx data bit width.
--- drivers/spi/spi-bcm63xx-hsspi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/spi/spi-bcm63xx-hsspi.c +9 -3
@@ -163,6 +163,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t)int step_size =HSSPI_BUFFER_LEN ;const u8 *tx = t->tx_buf;u8 *rx = t->rx_buf; +u32 val =0 ;bcm63xx_hsspi_set_clk (bs, spi, t->speed_hz);bcm63xx_hsspi_set_cs (bs, spi->chip_select, true);
@@ -178,11 +179,16 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) step_size -=HSSPI_OPCODE_LEN ;if ((opcode ==HSSPI_OP_READ && t->rx_nbits ==SPI_NBITS_DUAL ) || - (opcode ==HSSPI_OP_WRITE && t->tx_nbits ==SPI_NBITS_DUAL )) + (opcode ==HSSPI_OP_WRITE && t->tx_nbits ==SPI_NBITS_DUAL )) { opcode |=HSSPI_OP_MULTIBIT ; -__raw_writel (1 <<MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT | -1 <<MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT |0xff , +if (t->rx_nbits ==SPI_NBITS_DUAL ) + val |=1 <<MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT ; +if (t->tx_nbits ==SPI_NBITS_DUAL ) + val |=1 <<MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT ; + } + +__raw_writel (val |0xff , bs->regs +HSSPI_PROFILE_MODE_CTRL_REG (chip_select));while (pending >0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 360/885 hwmon: (mlxreg-fan) Return zero speed for broken fan
In reply to Greg Kroah-HartmanFrom: Vadim Pasternak <[email protected]>
[ Upstream commit a1ffd3c46267ee5c807acd780e15df9bb692223f ]
Currently for broken fan driver returns value calculated based on error code (0xFF) in related fan speed register.
Thus, for such fan user gets fan{n}_fault to 1 and fan{n}_input with misleading value.
Add check for fan fault prior return speed value and return zero if fault is detected.
--- drivers/hwmon/mlxreg-fan.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/hwmon/mlxreg-fan.c +6 -0
@@ -155,6 +155,12 @@ mlxreg_fan_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,if (err)return err; +if (MLXREG_FAN_GET_FAULT (regval, tacho->mask)) { +/* FAN is broken - return zero for FAN speed. */ + *val =0 ; +return 0 ; + } + *val =MLXREG_FAN_GET_RPM (regval, fan->divider, fan->samples);break ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 361/885 ASoC: tlv320adcx140: fix ti,gpio-config DT property init
In reply to Greg Kroah-HartmanFrom: Steffen Aschbacher <[email protected]>
[ Upstream commit 771725efe5e2e5396dd9d1220437e5f9d6b9ca9d ]
When the 'ti,gpio-config' property is not defined, the device_property_count_u32() will return an error, rather than zero.
The current check, only handles a return value of zero, which assumes that the property is defined and has nothing defined.
This change extends the check to also check for an error case (most likely to be hit by the case that the 'ti,gpio-config' is not defined).
In case that the 'ti,gpio-config' and the returned 'gpio_count' is not correct, there is a 'if (gpio_count != ADCX140_NUM_GPIO_CFGS)' check, a few lines lower that will return -EINVAL.
This means that someone tried to define 'ti,gpio-config', but with the wrong number of GPIOs.
--- sound/soc/codecs/tlv320adcx140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tlv320adcx140.c +1 -1
@@ -925,7 +925,7 @@ static int adcx140_configure_gpio(struct adcx140_priv *adcx140) gpio_count =device_property_count_u32 (adcx140->dev,"ti,gpio-config" ); -if (gpio_count ==0 ) +if (gpio_count <=0 )return 0 ;if (gpio_count !=ADCX140_NUM_GPIO_CFGS )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 362/885 dm: remove flush_scheduled_work() during local_exit()
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
[ Upstream commit 0b22ff5360f5c4e11050b89206370fdf7dc0a226 ]
Commit acfe0ad74d2e1 ("dm: allocate a special workqueue for deferred device removal") switched from using system workqueue to a single workqueue local to DM. But it didn't eliminate the call to flush_scheduled_work() that was introduced purely for the benefit of deferred device removal with commit 2c140a246dc ("dm: allow remove to be deferred").
Since DM core uses its own workqueue (and queue_work) there is no need to call flush_scheduled_work() from local_exit(). local_exit()'s destroy_workqueue(deferred_remove_workqueue) handles flushing work started with queue_work().
--- drivers/md/dm.c | 1 - 1 file changed, 1 deletion(-)
drivers/md/dm.c +0 -1
@@ -231,7 +231,6 @@ static int __init local_init(void)static void local_exit (void ) { -flush_scheduled_work ();destroy_workqueue (deferred_remove_workqueue);unregister_blkdev (_major, _name);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 363/885 nfs4trace: fix state manager flag printing
In reply to Greg Kroah-HartmanFrom: Benjamin Coddington <[email protected]>
[ Upstream commit b46d80bd2d6e7e063c625a20de54248afe8d4889 ]
__print_flags wants a mask, not the enum value. Add two more flags.
--- fs/nfs/nfs4trace.h | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-)
fs/nfs/nfs4trace.h +22 -20
@@ -292,32 +292,34 @@ TRACE_DEFINE_ENUM(NFS4CLNT_MOVED);TRACE_DEFINE_ENUM (NFS4CLNT_LEASE_MOVED );TRACE_DEFINE_ENUM (NFS4CLNT_DELEGATION_EXPIRED );TRACE_DEFINE_ENUM (NFS4CLNT_RUN_MANAGER ); +TRACE_DEFINE_ENUM (NFS4CLNT_MANAGER_AVAILABLE );TRACE_DEFINE_ENUM (NFS4CLNT_RECALL_RUNNING );TRACE_DEFINE_ENUM (NFS4CLNT_RECALL_ANY_LAYOUT_READ );TRACE_DEFINE_ENUM (NFS4CLNT_RECALL_ANY_LAYOUT_RW ); +TRACE_DEFINE_ENUM (NFS4CLNT_DELEGRETURN_DELAYED );#define show_nfs4_clp_state (state) \ __print_flags(state, "|", \ - { NFS4CLNT_MANAGER_RUNNING, "MANAGER_RUNNING" }, \ - { NFS4CLNT_CHECK_LEASE, "CHECK_LEASE" }, \ - { NFS4CLNT_LEASE_EXPIRED, "LEASE_EXPIRED" }, \ - { NFS4CLNT_RECLAIM_REBOOT, "RECLAIM_REBOOT" }, \ - { NFS4CLNT_RECLAIM_NOGRACE, "RECLAIM_NOGRACE" }, \ - { NFS4CLNT_DELEGRETURN, "DELEGRETURN" }, \ - { NFS4CLNT_SESSION_RESET, "SESSION_RESET" }, \ - { NFS4CLNT_LEASE_CONFIRM, "LEASE_CONFIRM" }, \ - { NFS4CLNT_SERVER_SCOPE_MISMATCH, \ - "SERVER_SCOPE_MISMATCH" }, \ - { NFS4CLNT_PURGE_STATE, "PURGE_STATE" }, \ - { NFS4CLNT_BIND_CONN_TO_SESSION, \ - "BIND_CONN_TO_SESSION" }, \ - { NFS4CLNT_MOVED, "MOVED" }, \ - { NFS4CLNT_LEASE_MOVED, "LEASE_MOVED" }, \ - { NFS4CLNT_DELEGATION_EXPIRED, "DELEGATION_EXPIRED" }, \ - { NFS4CLNT_RUN_MANAGER, "RUN_MANAGER" }, \ - { NFS4CLNT_RECALL_RUNNING, "RECALL_RUNNING" }, \ - { NFS4CLNT_RECALL_ANY_LAYOUT_READ, "RECALL_ANY_LAYOUT_READ" }, \ - { NFS4CLNT_RECALL_ANY_LAYOUT_RW, "RECALL_ANY_LAYOUT_RW" }) + { BIT(NFS4CLNT_MANAGER_RUNNING), "MANAGER_RUNNING" }, \ + { BIT(NFS4CLNT_CHECK_LEASE), "CHECK_LEASE" }, \ + { BIT(NFS4CLNT_LEASE_EXPIRED), "LEASE_EXPIRED" }, \ + { BIT(NFS4CLNT_RECLAIM_REBOOT), "RECLAIM_REBOOT" }, \ + { BIT(NFS4CLNT_RECLAIM_NOGRACE), "RECLAIM_NOGRACE" }, \ + { BIT(NFS4CLNT_DELEGRETURN), "DELEGRETURN" }, \ + { BIT(NFS4CLNT_SESSION_RESET), "SESSION_RESET" }, \ + { BIT(NFS4CLNT_LEASE_CONFIRM), "LEASE_CONFIRM" }, \ + { BIT(NFS4CLNT_SERVER_SCOPE_MISMATCH), "SERVER_SCOPE_MISMATCH" }, \ + { BIT(NFS4CLNT_PURGE_STATE), "PURGE_STATE" }, \ + { BIT(NFS4CLNT_BIND_CONN_TO_SESSION), "BIND_CONN_TO_SESSION" }, \ + { BIT(NFS4CLNT_MOVED), "MOVED" }, \ + { BIT(NFS4CLNT_LEASE_MOVED), "LEASE_MOVED" }, \ + { BIT(NFS4CLNT_DELEGATION_EXPIRED), "DELEGATION_EXPIRED" }, \ + { BIT(NFS4CLNT_RUN_MANAGER), "RUN_MANAGER" }, \ + { BIT(NFS4CLNT_MANAGER_AVAILABLE), "MANAGER_AVAILABLE" }, \ + { BIT(NFS4CLNT_RECALL_RUNNING), "RECALL_RUNNING" }, \ + { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_READ), "RECALL_ANY_LAYOUT_READ" }, \ + { BIT(NFS4CLNT_RECALL_ANY_LAYOUT_RW), "RECALL_ANY_LAYOUT_RW" }, \ + { BIT(NFS4CLNT_DELEGRETURN_DELAYED), "DELERETURN_DELAYED" }) TRACE_EVENT(nfs4_state_mgr, TP_PROTO(
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 364/885 NFS: fix disabling of swap
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
[ Upstream commit 5bab56fff53ce161ed859d9559a10361d4f79578 ]
When swap is activated to a file on an NFSv4 mount we arrange that the state manager thread is always present as starting a new thread requires memory allocations that might block waiting for swap.
Unfortunately the code for allowing the state manager thread to exit when swap is disabled was not tested properly and does not work. This can be seen by examining /proc/fs/nfsfs/servers after disabling swap and unmounting the filesystem. The servers file will still list one entry. Also a "ps" listing will show the state manager thread is still present.
There are two problems.
1/ rpc_clnt_swap_deactivate() doesn't walk up the ->cl_parent list to
find the primary client on which the state manager runs.
2/ The thread is not woken up properly and it immediately goes back to
sleep without checking whether it is really needed. Using nfs4_schedule_state_manager() ensures a proper wake-up.
--- fs/nfs/nfs4proc.c | 4 +++- net/sunrpc/clnt.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
fs/nfs/nfs4proc.c +3 -1
@@ -10609,7 +10609,9 @@ static void nfs4_disable_swap(struct inode *inode)/* The state manager thread will now exit once it is * woken. */ -wake_up_var (&NFS_SERVER (inode)->nfs_client->cl_state); +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client; + +nfs4_schedule_state_manager (clp); }static const struct inode_operations nfs4_dir_inode_operations = {
net/sunrpc/clnt.c +2 -0
@@ -3350,6 +3350,8 @@ rpc_clnt_swap_deactivate_callback(struct rpc_clnt *clnt,void rpc_clnt_swap_deactivate (struct rpc_clnt *clnt) { +while (clnt != clnt->cl_parent) + clnt = clnt->cl_parent;if (atomic_dec_if_positive (&clnt->cl_swapper) ==0 )rpc_clnt_iterate_for_each_xprt (clnt, rpc_clnt_swap_deactivate_callback,NULL );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 365/885 spi: synquacer: Fix timeout handling in synquacer_spi_transfer_one()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e6a0b671880207566e1ece983bf989dde60bc1d7 ]
wait_for_completion_timeout() never returns a <0 value. It returns either on timeout or a positive value (at least 1, or number of jiffies left till timeout)
So, fix the error handling path and return -ETIMEDOUT should a timeout occur.
--- drivers/spi/spi-synquacer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/spi/spi-synquacer.c +3 -4
@@ -472,10 +472,9 @@ static int synquacer_spi_transfer_one(struct spi_master *master,read_fifo (sspi); } -if (status <0 ) { -dev_err (sspi->dev,"failed to transfer. status: 0x%x\n" , - status); -return status; +if (status ==0 ) { +dev_err (sspi->dev,"failed to transfer. Timeout.\n" ); +return -ETIMEDOUT ; }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 366/885 ASoC: soc-dapm.h: fixup warning struct snd_pcm_substream not declared
In reply to Greg Kroah-HartmanFrom: Lucas Tanure <[email protected]>
[ Upstream commit fdff966bfde7cf0c85562d2bfb1ff1ba83da5f7b ]
Add struct snd_pcm_substream forward declaration
--- include/sound/soc-dapm.h | 1 + 1 file changed, 1 insertion(+)
include/sound/soc-dapm.h +1 -0
@@ -16,6 +16,7 @@#include <sound/asoc.h> struct device ; +struct snd_pcm_substream ;struct snd_soc_pcm_runtime ;struct soc_enum ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 367/885 HID: bigben: use spinlock to protect concurrent accesses
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit 9fefb6201c4f8dd9f58c581b2a66e5cde2895ea2 ]
bigben driver has a worker that may access data concurrently. Proct the accesses using a spinlock.
--- drivers/hid/hid-bigbenff.c | 52 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-)
drivers/hid/hid-bigbenff.c +50 -2
@@ -174,6 +174,7 @@ static __u8 pid0902_rdesc_fixed[] = {struct bigben_device {struct hid_device *hid;struct hid_report *report; +spinlock_t lock;bool removed;u8 led_state;/* LED1 = 1 .. LED4 = 8 */ u8 right_motor_on;/* right motor off/on 0/1 */
@@ -190,12 +191,27 @@ static void bigben_worker(struct work_struct *work)struct bigben_device *bigben =container_of (work, struct bigben_device, worker);struct hid_field *report_field = bigben->report->field[0 ]; +bool do_work_led = false; +bool do_work_ff = false; +u8 *buf; +u32 len; +unsigned long flags;if (bigben->removed || !report_field)return ; + buf =hid_alloc_report_buf (bigben->report,GFP_KERNEL ); +if (!buf) +return ; + + len =hid_report_len (bigben->report); + +/* LED work */ +spin_lock_irqsave (&bigben->lock, flags); +if (bigben->work_led) { bigben->work_led = false; + do_work_led = true; report_field->value[0 ] =0x01 ;/* 1 = led message */ report_field->value[1 ] =0x08 ;/* reserved value, always 8 */ report_field->value[2 ] = bigben->led_state;
@@ -204,11 +220,22 @@ static void bigben_worker(struct work_struct *work) report_field->value[5 ] =0x00 ;/* padding */ report_field->value[6 ] =0x00 ;/* padding */ report_field->value[7 ] =0x00 ;/* padding */ -hid_hw_request (bigben->hid, bigben->report,HID_REQ_SET_REPORT ); +hid_output_report (bigben->report, buf); + } + +spin_unlock_irqrestore (&bigben->lock, flags); + +if (do_work_led) { +hid_hw_raw_request (bigben->hid, bigben->report->id, buf, len, + bigben->report->type,HID_REQ_SET_REPORT ); } +/* FF work */ +spin_lock_irqsave (&bigben->lock, flags); +if (bigben->work_ff) { bigben->work_ff = false; + do_work_ff = true; report_field->value[0 ] =0x02 ;/* 2 = rumble effect message */ report_field->value[1 ] =0x08 ;/* reserved value, always 8 */ report_field->value[2 ] = bigben->right_motor_on;
@@ -217,8 +244,17 @@ static void bigben_worker(struct work_struct *work) report_field->value[5 ] =0x00 ;/* padding */ report_field->value[6 ] =0x00 ;/* padding */ report_field->value[7 ] =0x00 ;/* padding */ -hid_hw_request (bigben->hid, bigben->report,HID_REQ_SET_REPORT ); +hid_output_report (bigben->report, buf); + } + +spin_unlock_irqrestore (&bigben->lock, flags); + +if (do_work_ff) { +hid_hw_raw_request (bigben->hid, bigben->report->id, buf, len, + bigben->report->type,HID_REQ_SET_REPORT ); } + +kfree (buf); } static int hid_bigben_play_effect(struct input_dev *dev, void *data,
@@ -228,6 +264,7 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data,struct bigben_device *bigben =hid_get_drvdata (hid);u8 right_motor_on;u8 left_motor_force; +unsigned long flags;if (!bigben) {hid_err (hid,"no device data\n" );
@@ -242,9 +279,12 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data,if (right_motor_on != bigben->right_motor_on || left_motor_force != bigben->left_motor_force) { +spin_lock_irqsave (&bigben->lock, flags); bigben->right_motor_on = right_motor_on; bigben->left_motor_force = left_motor_force; bigben->work_ff = true; +spin_unlock_irqrestore (&bigben->lock, flags); +schedule_work (&bigben->worker); }
@@ -259,6 +299,7 @@ static void bigben_set_led(struct led_classdev *led,struct bigben_device *bigben =hid_get_drvdata (hid);int n;bool work; +unsigned long flags;if (!bigben) {hid_err (hid,"no device data\n" );
@@ -267,6 +308,7 @@ static void bigben_set_led(struct led_classdev *led,for (n =0 ; n <NUM_LEDS ; n++) {if (led == bigben->leds[n]) { +spin_lock_irqsave (&bigben->lock, flags);if (value ==LED_OFF ) { work = (bigben->led_state &BIT (n)); bigben->led_state &= ~BIT (n);
@@ -274,6 +316,7 @@ static void bigben_set_led(struct led_classdev *led, work = !(bigben->led_state &BIT (n)); bigben->led_state |=BIT (n); } +spin_unlock_irqrestore (&bigben->lock, flags);if (work) { bigben->work_led = true;
@@ -307,8 +350,12 @@ static enum led_brightness bigben_get_led(struct led_classdev *led)static void bigben_remove (struct hid_device *hid) {struct bigben_device *bigben =hid_get_drvdata (hid); +unsigned long flags; +spin_lock_irqsave (&bigben->lock, flags); bigben->removed = true; +spin_unlock_irqrestore (&bigben->lock, flags); +cancel_work_sync (&bigben->worker);hid_hw_stop (hid); }
@@ -362,6 +409,7 @@ static int bigben_probe(struct hid_device *hid,set_bit (FF_RUMBLE , hidinput->input->ffbit);INIT_WORK (&bigben->worker, bigben_worker); +spin_lock_init (&bigben->lock); error =input_ff_create_memless (hidinput->input,NULL , hid_bigben_play_effect);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 368/885 HID: bigben_worker() remove unneeded check on report_field
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit 27d2a2fd844ec7da70d19fabb482304fd1e0595b ]
bigben_worker() checks report_field to be non-NULL. The check has been added in commit918aa1ef104d ("HID: bigbenff: prevent null pointer dereference") to prevent a NULL pointer crash.
However, the true root cause was a missing check for output reports, patched in commitc7bf714f8755 ("HID: check empty report_list in bigben_probe()"), where the type-confused report list_entry was overlapping with a NULL pointer, which was then causing the crash.
--- drivers/hid/hid-bigbenff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-bigbenff.c +1 -1
@@ -197,7 +197,7 @@ static void bigben_worker(struct work_struct *work)u32 len;unsigned long flags; -if (bigben->removed || !report_field) +if (bigben->removed)return ; buf =hid_alloc_report_buf (bigben->report,GFP_KERNEL );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 369/885 HID: bigben: use spinlock to safely schedule workers
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit 76ca8da989c7d97a7f76c75d475fe95a584439d7 ]
Use spinlocks to deal with workers introducing a wrapper bigben_schedule_work(), and several spinlock checks. Otherwise, bigben_set_led() may schedule bigben->worker after the structure has been freed, causing a use-after-free.
--- drivers/hid/hid-bigbenff.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/hid/hid-bigbenff.c +12 -6
@@ -185,6 +185,15 @@ struct bigben_device {struct work_struct worker; }; +static inline void bigben_schedule_work (struct bigben_device *bigben) +{ +unsigned long flags; + +spin_lock_irqsave (&bigben->lock, flags); +if (!bigben->removed) +schedule_work (&bigben->worker); +spin_unlock_irqrestore (&bigben->lock, flags); +}static void bigben_worker (struct work_struct *work) {
@@ -197,9 +206,6 @@ static void bigben_worker(struct work_struct *work)u32 len;unsigned long flags; -if (bigben->removed) -return ; - buf =hid_alloc_report_buf (bigben->report,GFP_KERNEL );if (!buf)return ;
@@ -285,7 +291,7 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data, bigben->work_ff = true;spin_unlock_irqrestore (&bigben->lock, flags); -schedule_work (&bigben->worker); +bigben_schedule_work (bigben); }return 0 ;
@@ -320,7 +326,7 @@ static void bigben_set_led(struct led_classdev *led,if (work) { bigben->work_led = true; -schedule_work (&bigben->worker); +bigben_schedule_work (bigben); }return ; }
@@ -450,7 +456,7 @@ static int bigben_probe(struct hid_device *hid, bigben->left_motor_force =0 ; bigben->work_led = true; bigben->work_ff = true; -schedule_work (&bigben->worker); +bigben_schedule_work (bigben);hid_info (hid,"LED and force feedback support for BigBen gamepad\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 370/885 hid: bigben_probe(): validate report count
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit b94335f899542a0da5fafc38af8edcaf90195843 ]
bigben_probe() does not validate that the output report has the needed report values in the first field.
A malicious device registering a report with one field and a single value causes an head OOB write in bigben_worker() when accessing report_field->value[1] to report_field->value[7]. Use hid_validate_values() which takes care of all the needed checks.
--- drivers/hid/hid-bigbenff.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/hid/hid-bigbenff.c +2 -5
@@ -371,7 +371,6 @@ static int bigben_probe(struct hid_device *hid, {struct bigben_device *bigben;struct hid_input *hidinput; -struct list_head *report_list;struct led_classdev *led;char *name;size_t name_sz;
@@ -396,14 +395,12 @@ static int bigben_probe(struct hid_device *hid,return error; } - report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list; -if (list_empty (report_list)) { + bigben->report =hid_validate_values (hid,HID_OUTPUT_REPORT ,0 ,0 ,8 ); +if (!bigben->report) {hid_err (hid,"no output report found\n" ); error = -ENODEV ; goto error_hw_stop; } - bigben->report =list_entry (report_list->next, - struct hid_report, list);if (list_empty (&hid->inputs)) {hid_err (hid,"no inputs found\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 371/885 ALSA: hda/hdmi: Register with vga_switcheroo on Dual GPU Macbooks
In reply to Greg Kroah-HartmanFrom: Orlando Chamberlain <[email protected]>
[ Upstream commit 5beb5627a2481aade9aa630b7ebb7f99442321b6 ]
Commit 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD") caused only AMD gpu's with PX to have their audio component register with vga_switcheroo. This meant that Apple Macbooks with apple-gmux as the gpu switcher no longer had the audio client registering, so when the gpu is powered off by vga_switcheroo snd_hda_intel is unaware that it should have suspended the device:
amdgpu: switched offsnd_hda_intel 0000:03:00.1:
Unable to change power state from D3hot to D0, device inaccessiblesnd_hda_intel 0000:03:00.1: CORB reset timeout#2, CORBRP = 65535
To resolve this, we use apple_gmux_detect() and register a vga_switcheroo audio client when apple-gmux is detected.
--- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +2 -1
@@ -50,6 +50,7 @@#include <sound/intel-dsp-config.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> +#include <linux/apple-gmux.h> #include <linux/firmware.h> #include <sound/hda_codec.h> #include "hda_controller.h"
@@ -1466,7 +1467,7 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci)* vgaswitcheroo. */ if (((p->class >>16 ) ==PCI_BASE_CLASS_DISPLAY ) && -atpx_present ()) + (atpx_present () ||apple_gmux_detect (NULL ,NULL )))return p;pci_dev_put (p); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 372/885 drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()
In reply to Greg Kroah-HartmanFrom: Asahi Lina <[email protected]>
[ Upstream commit ddddedaa0db99481c5e5abe628ad54f65e8765bc ]
Other functions touching shmem->sgt take the pages lock, so do that here too. drm_gem_shmem_get_pages() & co take the same lock, so move to the _locked() variants to avoid recursive locking.
Discovered while auditing locking to write the Rust abstractions.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 54 ++++++++++++++++---------- 1 file changed, 34 insertions(+), 20 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +34 -20
@@ -681,23 +681,7 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem) }EXPORT_SYMBOL_GPL (drm_gem_shmem_get_sg_table); -/** -* drm_gem_shmem_get_pages_sgt - Pin pages, dma map them, and return a -* scatter/gather table for a shmem GEM object. -* @shmem: shmem GEM object -* -* This function returns a scatter/gather table suitable for driver usage. If -* the sg table doesn't exist, the pages are pinned, dma-mapped, and a sg -* table created. -* -* This is the main function for drivers to get at backing storage, and it hides -* and difference between dma-buf imported and natively allocated objects. -* drm_gem_shmem_get_sg_table() should not be directly called by drivers. -* -* Returns: -* A pointer to the scatter/gather table of pinned pages or errno on failure. -*/ -struct sg_table *drm_gem_shmem_get_pages_sgt (struct drm_gem_shmem_object *shmem) +static struct sg_table *drm_gem_shmem_get_pages_sgt_locked (struct drm_gem_shmem_object *shmem) {struct drm_gem_object *obj = &shmem->base;int ret;
@@ -708,7 +692,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)WARN_ON (obj->import_attach); - ret =drm_gem_shmem_get_pages (shmem); + ret =drm_gem_shmem_get_pages_locked (shmem);if (ret)return ERR_PTR (ret);
@@ -730,10 +714,40 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)sg_free_table (sgt);kfree (sgt); err_put_pages: -drm_gem_shmem_put_pages (shmem); +drm_gem_shmem_put_pages_locked (shmem);return ERR_PTR (ret); } -EXPORT_SYMBOL_GPL (drm_gem_shmem_get_pages_sgt); + +/** +* drm_gem_shmem_get_pages_sgt - Pin pages, dma map them, and return a +* scatter/gather table for a shmem GEM object. +* @shmem: shmem GEM object +* +* This function returns a scatter/gather table suitable for driver usage. If +* the sg table doesn't exist, the pages are pinned, dma-mapped, and a sg +* table created. +* +* This is the main function for drivers to get at backing storage, and it hides +* and difference between dma-buf imported and natively allocated objects. +* drm_gem_shmem_get_sg_table() should not be directly called by drivers. +* +* Returns: +* A pointer to the scatter/gather table of pinned pages or errno on failure. +*/ +struct sg_table *drm_gem_shmem_get_pages_sgt (struct drm_gem_shmem_object *shmem) +{ +int ret; +struct sg_table *sgt; + + ret =mutex_lock_interruptible (&shmem->pages_lock); +if (ret) +return ERR_PTR (ret); + sgt =drm_gem_shmem_get_pages_sgt_locked (shmem); +mutex_unlock (&shmem->pages_lock); + +return sgt; +} +EXPORT_SYMBOL (drm_gem_shmem_get_pages_sgt);/** * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 373/885 NFSD: enhance inter-server copy cleanup
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
[ Upstream commit df24ac7a2e3a9d0bc68f1756a880e50bfe4b4522 ]
Currently nfsd4_setup_inter_ssc returns the vfsmount of the source server's export when the mount completes. After the copy is done nfsd4_cleanup_inter_ssc is called with the vfsmount of the source server and it searches nfsd_ssc_mount_list for a matching entry to do the clean up.
The problems with this approach are (1) the need to search the nfsd_ssc_mount_list and (2) the code has to handle the case where the matching entry is not found which looks ugly.
The enhancement is instead of nfsd4_setup_inter_ssc returning the vfsmount, it returns the nfsd4_ssc_umount_item which has the vfsmount embedded in it. When nfsd4_cleanup_inter_ssc is called it's passed with the nfsd4_ssc_umount_item directly to do the clean up so no searching is needed and there is no need to handle the 'not found' case.
Stable-dep-of: 34e8f9ec4c9a ("NFSD: fix leaked reference count of nfsd4_ssc_umount_item")
--- fs/nfsd/nfs4proc.c | 111 ++++++++++++++++------------------------ fs/nfsd/xdr4.h | 2 +- include/linux/nfs_ssc.h | 2 +- 3 files changed, 46 insertions(+), 69 deletions(-)
fs/nfsd/nfs4proc.c +44 -67
@@ -1306,15 +1306,15 @@ extern void nfs_sb_deactive(struct super_block *sb);* setup a work entry in the ssc delayed unmount list. */ static __be32 nfsd4_ssc_setup_dul (struct nfsd_net *nn,char *ipaddr, -struct nfsd4_ssc_umount_item **retwork,struct vfsmount **ss_mnt) +struct nfsd4_ssc_umount_item **nsui) {struct nfsd4_ssc_umount_item *ni =NULL ;struct nfsd4_ssc_umount_item *work =NULL ;struct nfsd4_ssc_umount_item *tmp;DEFINE_WAIT (wait); +__be32 status =0 ; - *ss_mnt =NULL ; - *retwork =NULL ; + *nsui =NULL ; work =kzalloc (sizeof (*work),GFP_KERNEL ); try_again:spin_lock (&nn->nfsd_ssc_lock);
@@ -1338,12 +1338,12 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,finish_wait (&nn->nfsd_ssc_waitq, &wait); goto try_again; } - *ss_mnt = ni->nsui_vfsmount; + *nsui = ni;refcount_inc (&ni->nsui_refcnt);spin_unlock (&nn->nfsd_ssc_lock);kfree (work); -/* return vfsmount in ss_mnt */ +/* return vfsmount in (*nsui)->nsui_vfsmount */ return 0 ; }if (work) {
@@ -1351,31 +1351,32 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,refcount_set (&work->nsui_refcnt,2 ); work->nsui_busy = true;list_add_tail (&work->nsui_list, &nn->nfsd_ssc_mount_list); - *retwork = work; - } + *nsui = work; + }else + status = nfserr_resource;spin_unlock (&nn->nfsd_ssc_lock); -return 0 ; +return status; } -static void nfsd4_ssc_update_dul_work (struct nfsd_net *nn, -struct nfsd4_ssc_umount_item *work,struct vfsmount *ss_mnt) +static void nfsd4_ssc_update_dul (struct nfsd_net *nn, +struct nfsd4_ssc_umount_item *nsui, +struct vfsmount *ss_mnt) { -/* set nsui_vfsmount, clear busy flag and wakeup waiters */ spin_lock (&nn->nfsd_ssc_lock); - work->nsui_vfsmount = ss_mnt; - work->nsui_busy = false; + nsui->nsui_vfsmount = ss_mnt; + nsui->nsui_busy = false;wake_up_all (&nn->nfsd_ssc_waitq);spin_unlock (&nn->nfsd_ssc_lock); } -static void nfsd4_ssc_cancel_dul_work (struct nfsd_net *nn, -struct nfsd4_ssc_umount_item *work) +static void nfsd4_ssc_cancel_dul (struct nfsd_net *nn, +struct nfsd4_ssc_umount_item *nsui) {spin_lock (&nn->nfsd_ssc_lock); -list_del (&work->nsui_list); +list_del (&nsui->nsui_list);wake_up_all (&nn->nfsd_ssc_waitq);spin_unlock (&nn->nfsd_ssc_lock); -kfree (work); +kfree (nsui); }/*
@@ -1383,7 +1384,7 @@ static void nfsd4_ssc_cancel_dul_work(struct nfsd_net *nn,*/ static __be32 nfsd4_interssc_connect (struct nl4_server *nss,struct svc_rqst *rqstp, -struct vfsmount **mount) +struct nfsd4_ssc_umount_item **nsui) {struct file_system_type *type;struct vfsmount *ss_mnt;
@@ -1394,7 +1395,6 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp,char *ipaddr, *dev_name, *raw_data;int len, raw_len;__be32 status = nfserr_inval; -struct nfsd4_ssc_umount_item *work =NULL ;struct nfsd_net *nn =net_generic (SVC_NET (rqstp), nfsd_net_id); naddr = &nss->u.nl4_addr;
@@ -1402,6 +1402,7 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp, naddr->addr_len, (struct sockaddr *)&tmp_addr, sizeof(tmp_addr)); + *nsui =NULL ;if (tmp_addrlen ==0 ) goto out_err;
@@ -1444,10 +1445,10 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp, goto out_free_rawdata;snprintf (dev_name, len +5 ,"%s%s%s:/" , startsep, ipaddr, endsep); - status =nfsd4_ssc_setup_dul (nn, ipaddr, &work, &ss_mnt); + status =nfsd4_ssc_setup_dul (nn, ipaddr, nsui);if (status) goto out_free_devname; -if (ss_mnt) +if ((*nsui)->nsui_vfsmount) goto out_done;/* Use an 'internal' mount: SB_KERNMOUNT -> MNT_INTERNAL */
@@ -1455,15 +1456,12 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp,module_put (type->owner);if (IS_ERR (ss_mnt)) { status = nfserr_nodev; -if (work) -nfsd4_ssc_cancel_dul_work (nn, work); +nfsd4_ssc_cancel_dul (nn, *nsui); goto out_free_devname; } -if (work) -nfsd4_ssc_update_dul_work (nn, work, ss_mnt); +nfsd4_ssc_update_dul (nn, *nsui, ss_mnt); out_done: status =0 ; - *mount = ss_mnt; out_free_devname:kfree (dev_name);
@@ -1487,7 +1485,7 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp,static __be32 nfsd4_setup_inter_ssc (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, -struct nfsd4_copy *copy,struct vfsmount **mount) +struct nfsd4_copy *copy) {struct svc_fh *s_fh =NULL ;stateid_t *s_stid = ©->cp_src_stateid;
@@ -1500,7 +1498,7 @@ nfsd4_setup_inter_ssc(struct svc_rqst *rqstp,if (status) goto out; - status =nfsd4_interssc_connect (copy->cp_src, rqstp, mount); + status =nfsd4_interssc_connect (copy->cp_src, rqstp, ©->ss_nsui);if (status) goto out;
@@ -1518,45 +1516,27 @@ nfsd4_setup_inter_ssc(struct svc_rqst *rqstp, }static void -nfsd4_cleanup_inter_ssc (struct vfsmount *ss_mnt,struct file *filp, +nfsd4_cleanup_inter_ssc (struct nfsd4_ssc_umount_item *nsui,struct file *filp,struct nfsd_file *dst) { -bool found = false; -long timeout; -struct nfsd4_ssc_umount_item *tmp; -struct nfsd4_ssc_umount_item *ni =NULL ;struct nfsd_net *nn =net_generic (dst->nf_net, nfsd_net_id); +long timeout =msecs_to_jiffies (nfsd4_ssc_umount_timeout);nfs42_ssc_close (filp);nfsd_file_put (dst);fput (filp); -if (!nn) { -mntput (ss_mnt); -return ; - }spin_lock (&nn->nfsd_ssc_lock); - timeout =msecs_to_jiffies (nfsd4_ssc_umount_timeout); -list_for_each_entry_safe (ni, tmp, &nn->nfsd_ssc_mount_list, nsui_list) { -if (ni->nsui_vfsmount->mnt_sb == ss_mnt->mnt_sb) { -list_del (&ni->nsui_list); -/* -* vfsmount can be shared by multiple exports, -* decrement refcnt. If the count drops to 1 it -* will be unmounted when nsui_expire expires. -*/ -refcount_dec (&ni->nsui_refcnt); - ni->nsui_expire = jiffies + timeout; -list_add_tail (&ni->nsui_list, &nn->nfsd_ssc_mount_list); - found = true; -break ; - } - } +list_del (&nsui->nsui_list); +/* +* vfsmount can be shared by multiple exports, +* decrement refcnt. If the count drops to 1 it +* will be unmounted when nsui_expire expires. +*/ +refcount_dec (&nsui->nsui_refcnt); + nsui->nsui_expire = jiffies + timeout; +list_add_tail (&nsui->nsui_list, &nn->nfsd_ssc_mount_list);spin_unlock (&nn->nfsd_ssc_lock); -if (!found) { -mntput (ss_mnt); -return ; - } }#else /* CONFIG_NFSD_V4_2_INTER_SSC */
@@ -1564,15 +1544,13 @@ nfsd4_cleanup_inter_ssc(struct vfsmount *ss_mnt, struct file *filp,static __be32 nfsd4_setup_inter_ssc (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate, -struct nfsd4_copy *copy, -struct vfsmount **mount) +struct nfsd4_copy *copy) { - *mount =NULL ;return nfserr_inval; }static void -nfsd4_cleanup_inter_ssc (struct vfsmount *ss_mnt,struct file *filp, +nfsd4_cleanup_inter_ssc (struct nfsd4_ssc_umount_item *nsui,struct file *filp,struct nfsd_file *dst) { }
@@ -1713,7 +1691,7 @@ static void dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)memcpy (dst->cp_src, src->cp_src,sizeof (struct nl4_server ));memcpy (&dst->stateid, &src->stateid,sizeof (src->stateid));memcpy (&dst->c_fh, &src->c_fh,sizeof (src->c_fh)); - dst->ss_mnt = src->ss_mnt; + dst->ss_nsui = src->ss_nsui; }static void cleanup_async_copy (struct nfsd4_copy *copy)
@@ -1762,8 +1740,8 @@ static int nfsd4_do_async_copy(void *data)if (nfsd4_ssc_is_inter (copy)) {struct file *filp; - filp =nfs42_ssc_open (copy->ss_mnt, ©->c_fh, - ©->stateid); + filp =nfs42_ssc_open (copy->ss_nsui->nsui_vfsmount, + ©->c_fh, ©->stateid);if (IS_ERR (filp)) {switch (PTR_ERR (filp)) {case -EBADF :
@@ -1777,7 +1755,7 @@ static int nfsd4_do_async_copy(void *data) } nfserr =nfsd4_do_copy (copy, filp, copy->nf_dst->nf_file, false); -nfsd4_cleanup_inter_ssc (copy->ss_mnt, filp, copy->nf_dst); +nfsd4_cleanup_inter_ssc (copy->ss_nsui, filp, copy->nf_dst); }else { nfserr =nfsd4_do_copy (copy, copy->nf_src->nf_file, copy->nf_dst->nf_file, false);
@@ -1803,8 +1781,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_notsupp; goto out; } - status =nfsd4_setup_inter_ssc (rqstp, cstate, copy, - ©->ss_mnt); + status =nfsd4_setup_inter_ssc (rqstp, cstate, copy);if (status)return nfserr_offload_denied; }else {
fs/nfsd/xdr4.h +1 -1
@@ -571,7 +571,7 @@ struct nfsd4_copy {struct task_struct *copy_task;refcount_t refcount; -struct vfsmount *ss_mnt; +struct nfsd4_ssc_umount_item *ss_nsui;struct nfs_fh c_fh;nfs4_stateid stateid; };
include/linux/nfs_ssc.h +1 -1
@@ -53,6 +53,7 @@ static inline void nfs42_ssc_close(struct file *filep)if (nfs_ssc_client_tbl.ssc_nfs4_ops) (*nfs_ssc_client_tbl.ssc_nfs4_ops->sco_close)(filep); } +#endif struct nfsd4_ssc_umount_item {struct list_head nsui_list;
@@ -66,7 +67,6 @@ struct nfsd4_ssc_umount_item {struct vfsmount *nsui_vfsmount;char nsui_ipaddr[RPC_MAX_ADDRBUFLEN +1 ]; }; -#endif /* * NFS_FS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 374/885 NFSD: fix leaked reference count of nfsd4_ssc_umount_item
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
[ Upstream commit 34e8f9ec4c9ac235f917747b23a200a5e0ec857b ]
The reference count of nfsd4_ssc_umount_item is not decremented on error conditions. This prevents the laundromat from unmounting the vfsmount of the source file.
This patch decrements the reference count of nfsd4_ssc_umount_item on error.
--- fs/nfsd/nfs4proc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/nfsd/nfs4proc.c +8 -4
@@ -1827,13 +1827,17 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, out:return status; out_err: +if (nfsd4_ssc_is_inter (copy)) { +/* +* Source's vfsmount of inter-copy will be unmounted +* by the laundromat. Use copy instead of async_copy +* since async_copy->ss_nsui might not be set yet. +*/ +refcount_dec (©->ss_nsui->nsui_refcnt); + }if (async_copy)cleanup_async_copy (async_copy); status =nfserrno (-ENOMEM ); -/* -* source's vfsmount of inter-copy will be unmounted -* by the laundromat -*/ goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 375/885 nfsd: fix race to check ls_layouts
In reply to Greg Kroah-HartmanFrom: Benjamin Coddington <[email protected]>
[ Upstream commit fb610c4dbc996415d57d7090957ecddd4fd64fb6 ]
Its possible for __break_lease to find the layout's lease before we've added the layout to the owner's ls_layouts list. In that case, setting ls_recalled = true without actually recalling the layout will cause the server to never send a recall callback.
Move the check for ls_layouts before setting ls_recalled.
--- fs/nfsd/nfs4layouts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfs4layouts.c +2 -2
@@ -323,11 +323,11 @@ nfsd4_recall_file_layout(struct nfs4_layout_stateid *ls)if (ls->ls_recalled) goto out_unlock; - ls->ls_recalled = true; -atomic_inc (&ls->ls_stid.sc_file->fi_lo_recalls);if (list_empty (&ls->ls_layouts)) goto out_unlock; + ls->ls_recalled = true; +atomic_inc (&ls->ls_stid.sc_file->fi_lo_recalls);trace_nfsd_layout_recall (&ls->ls_stid.sc_stateid);refcount_inc (&ls->ls_stid.sc_count);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 376/885 nfsd: clean up potential nfsd_file refcount leaks in COPY codepath
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
[ Upstream commit 6ba434cb1a8d403ea9aad1b667c3ea3ad8b3191f ]
There are two different flavors of the nfsd4_copy struct. One is embedded in the compound and is used directly in synchronous copies. The other is dynamically allocated, refcounted and tracked in the client struture. For the embedded one, the cleanup just involves releasing any nfsd_files held on its behalf. For the async one, the cleanup is a bit more involved, and we need to dequeue it from lists, unhash it, etc.
There is at least one potential refcount leak in this code now. If the kthread_create call fails, then both the src and dst nfsd_files in the original nfsd4_copy object are leaked.
The cleanup in this codepath is also sort of weird. In the async copy case, we'll have up to four nfsd_file references (src and dst for both flavors of copy structure). They are both put at the end of nfsd4_do_async_copy, even though the ones held on behalf of the embedded one outlive that structure.
Change it so that we always clean up the nfsd_file refs held by the embedded copy structure before nfsd4_copy returns. Rework cleanup_async_copy to handle both inter and intra copies. Eliminate nfsd4_cleanup_intra_ssc since it now becomes a no-op.
Stable-dep-of: 81e722978ad2 ("NFSD: fix problems with cleanup on errors in nfsd4_copy")
--- fs/nfsd/nfs4proc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
fs/nfsd/nfs4proc.c +10 -13
@@ -1523,7 +1523,6 @@ nfsd4_cleanup_inter_ssc(struct nfsd4_ssc_umount_item *nsui, struct file *filp,long timeout =msecs_to_jiffies (nfsd4_ssc_umount_timeout);nfs42_ssc_close (filp); -nfsd_file_put (dst);fput (filp);spin_lock (&nn->nfsd_ssc_lock);
@@ -1573,13 +1572,6 @@ nfsd4_setup_intra_ssc(struct svc_rqst *rqstp, ©->nf_dst); } -static void -nfsd4_cleanup_intra_ssc (struct nfsd_file *src,struct nfsd_file *dst) -{ -nfsd_file_put (src); -nfsd_file_put (dst); -} -static void nfsd4_cb_offload_release (struct nfsd4_callback *cb) { struct nfsd4_cb_offload *cbo =
@@ -1694,12 +1686,18 @@ static void dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst) dst->ss_nsui = src->ss_nsui; } +static void release_copy_files (struct nfsd4_copy *copy) +{ +if (copy->nf_src) +nfsd_file_put (copy->nf_src); +if (copy->nf_dst) +nfsd_file_put (copy->nf_dst); +} +static void cleanup_async_copy (struct nfsd4_copy *copy) {nfs4_free_copy_state (copy); -nfsd_file_put (copy->nf_dst); -if (!nfsd4_ssc_is_inter (copy)) -nfsd_file_put (copy->nf_src); +release_copy_files (copy);spin_lock (©->cp_clp->async_lock);list_del (©->copies);spin_unlock (©->cp_clp->async_lock);
@@ -1759,7 +1757,6 @@ static int nfsd4_do_async_copy(void *data) }else { nfserr =nfsd4_do_copy (copy, copy->nf_src->nf_file, copy->nf_dst->nf_file, false); -nfsd4_cleanup_intra_ssc (copy->nf_src, copy->nf_dst); } do_callback:
@@ -1822,9 +1819,9 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, }else { status =nfsd4_do_copy (copy, copy->nf_src->nf_file, copy->nf_dst->nf_file, true); -nfsd4_cleanup_intra_ssc (copy->nf_src, copy->nf_dst); } out: +release_copy_files (copy);return status; out_err:if (nfsd4_ssc_is_inter (copy)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 377/885 NFSD: fix problems with cleanup on errors in nfsd4_copy
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
[ Upstream commit 81e722978ad21072470b73d8f6a50ad62c7d5b7d ]
When nfsd4_copy fails to allocate memory for async_copy->cp_src, or nfs4_init_copy_state fails, it calls cleanup_async_copy to do the cleanup for the async_copy which causes page fault since async_copy is not yet initialized.
This patche rearranges the order of initializing the fields in async_copy and adds checks in cleanup_async_copy to skip un-initialized fields.
--- fs/nfsd/nfs4proc.c | 12 ++++++++---- fs/nfsd/nfs4state.c | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-)
fs/nfsd/nfs4proc.c +8 -4
@@ -1698,9 +1698,12 @@ static void cleanup_async_copy(struct nfsd4_copy *copy) {nfs4_free_copy_state (copy);release_copy_files (copy); -spin_lock (©->cp_clp->async_lock); -list_del (©->copies); -spin_unlock (©->cp_clp->async_lock); +if (copy->cp_clp) { +spin_lock (©->cp_clp->async_lock); +if (!list_empty (©->copies)) +list_del_init (©->copies); +spin_unlock (©->cp_clp->async_lock); + }nfs4_put_copy (copy); }
@@ -1797,12 +1800,13 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, async_copy =kzalloc (sizeof (struct nfsd4_copy ),GFP_KERNEL );if (!async_copy) goto out_err; +INIT_LIST_HEAD (&async_copy->copies); +refcount_set (&async_copy->refcount,1 ); async_copy->cp_src =kmalloc (sizeof (*async_copy->cp_src),GFP_KERNEL );if (!async_copy->cp_src) goto out_err;if (!nfs4_init_copy_state (nn, copy)) goto out_err; -refcount_set (&async_copy->refcount,1 );memcpy (©->cp_res.cb_stateid, ©->cp_stateid.cs_stid,sizeof (copy->cp_res.cb_stateid));dup_copy_fields (copy, async_copy);
fs/nfsd/nfs4state.c +3 -2
@@ -991,7 +991,6 @@ static int nfs4_init_cp_state(struct nfsd_net *nn, copy_stateid_t *stid, stid->cs_stid.si_opaque.so_clid.cl_boot = (u32 )nn->boot_time; stid->cs_stid.si_opaque.so_clid.cl_id = nn->s2s_cp_cl_id; - stid->cs_type = cs_type;idr_preload (GFP_KERNEL );spin_lock (&nn->s2s_cp_lock);
@@ -1002,6 +1001,7 @@ static int nfs4_init_cp_state(struct nfsd_net *nn, copy_stateid_t *stid,idr_preload_end ();if (new_id <0 )return 0 ; + stid->cs_type = cs_type;return 1 ; }
@@ -1035,7 +1035,8 @@ void nfs4_free_copy_state(struct nfsd4_copy *copy) {struct nfsd_net *nn; -WARN_ON_ONCE (copy->cp_stateid.cs_type !=NFS4_COPY_STID ); +if (copy->cp_stateid.cs_type !=NFS4_COPY_STID ) +return ; nn =net_generic (copy->cp_clp->net, nfsd_net_id);spin_lock (&nn->s2s_cp_lock); idr_remove(&nn->s2s_cp_stateids,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 378/885 nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
[ Upstream commit dcd779dc46540e174a6ac8d52fbed23593407317 ]
The nested if statements here make no sense, as you can never reach "else" branch in the nested statement. Fix the error handling for when there is a courtesy client that holds a conflicting deny mode.
--- fs/nfsd/nfs4state.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/nfsd/nfs4state.c +11 -10
@@ -5258,16 +5258,17 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp,/* test and set deny mode */ spin_lock (&fp->fi_lock); status =nfs4_file_check_deny (fp, open->op_share_deny); -if (status == nfs_ok) { -if (status != nfserr_share_denied) { -set_deny (open->op_share_deny, stp); - fp->fi_share_deny |= - (open->op_share_deny &NFS4_SHARE_DENY_BOTH ); - }else { -if (nfs4_resolve_deny_conflicts_locked (fp, false, - stp, open->op_share_deny, false)) - status = nfserr_jukebox; - } +switch (status) { +case nfs_ok: +set_deny (open->op_share_deny, stp); + fp->fi_share_deny |= + (open->op_share_deny &NFS4_SHARE_DENY_BOTH ); +break ; +case nfserr_share_denied: +if (nfs4_resolve_deny_conflicts_locked (fp, false, + stp, open->op_share_deny, false)) + status = nfserr_jukebox; +break ; }spin_unlock (&fp->fi_lock);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 379/885 nfsd: dont fsync nfsd_files on last close
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
[ Upstream commit 4c475eee02375ade6e864f1db16976ba0d96a0a2 ]
Most of the time, NFSv4 clients issue a COMMIT before the final CLOSE of an open stateid, so with NFSv4, the fsync in the nfsd_file_free path is usually a no-op and doesn't block.
We have a customer running knfsd over very slow storage (XFS over Ceph RBD). They were using the "async" export option because performance was more important than data integrity for this application. That export option turns NFSv4 COMMIT calls into no-ops. Due to the fsync in this codepath however, their final CLOSE calls would still stall (since a CLOSE effectively became a COMMIT).
I think this fsync is not strictly necessary. We only use that result to reset the write verifier. Instead of fsync'ing all of the data when we free an nfsd_file, we can just check for writeback errors when one is acquired and when it is freed.
If the client never comes back, then it'll never see the error anyway and there is no point in resetting it. If an error occurs after the nfsd_file is removed from the cache but before the inode is evicted, then it will reset the write verifier on the next nfsd_file_acquire, (since there will be an unseen error).
The only exception here is if something else opens and fsyncs the file during that window. Given that local applications work with this limitation today, I don't see that as an issue.
--- fs/nfsd/filecache.c | 44 ++++++++++++-------------------------------- fs/nfsd/trace.h | 31 ------------------------------- 2 files changed, 12 insertions(+), 63 deletions(-)
fs/nfsd/filecache.c +12 -32
@@ -309,37 +309,27 @@ nfsd_file_alloc(struct nfsd_file_lookup_key *key, unsigned int may)return nf; } +/** +* nfsd_file_check_write_error - check for writeback errors on a file +* @nf: nfsd_file to check for writeback errors +* +* Check whether a nfsd_file has an unseen error. Reset the write +* verifier if so. +*/ static void -nfsd_file_fsync (struct nfsd_file *nf) -{ -struct file *file = nf->nf_file; -int ret; - -if (!file || !(file->f_mode &FMODE_WRITE )) -return ; - ret =vfs_fsync (file,1 ); -trace_nfsd_file_fsync (nf, ret); -if (ret) -nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id)); -} - -static int nfsd_file_check_write_error (struct nfsd_file *nf) {struct file *file = nf->nf_file; -if (!file || !(file->f_mode &FMODE_WRITE )) -return 0 ; -return filemap_check_wb_err (file->f_mapping,READ_ONCE (file->f_wb_err)); +if ((file->f_mode &FMODE_WRITE ) && +filemap_check_wb_err (file->f_mapping,READ_ONCE (file->f_wb_err))) +nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id)); }static void nfsd_file_hash_remove (struct nfsd_file *nf) {trace_nfsd_file_unhash (nf); - -if (nfsd_file_check_write_error (nf)) -nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id));rhashtable_remove_fast (&nfsd_file_rhash_tbl, &nf->nf_rhash, nfsd_file_rhash_params); }
@@ -365,23 +355,12 @@ nfsd_file_free(struct nfsd_file *nf)this_cpu_add (nfsd_file_total_age, age);nfsd_file_unhash (nf); - -/* -* We call fsync here in order to catch writeback errors. It's not -* strictly required by the protocol, but an nfsd_file could get -* evicted from the cache before a COMMIT comes in. If another -* task were to open that file in the interim and scrape the error, -* then the client may never see it. By calling fsync here, we ensure -* that writeback happens before the entry is freed, and that any -* errors reported result in the write verifier changing. -*/ -nfsd_file_fsync (nf); -if (nf->nf_mark)nfsd_file_mark_put (nf->nf_mark);if (nf->nf_file) {get_file (nf->nf_file);filp_close (nf->nf_file,NULL ); +nfsd_file_check_write_error (nf);fput (nf->nf_file); }
@@ -1136,6 +1115,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, out:if (status == nfs_ok) {this_cpu_inc (nfsd_file_acquisitions); +nfsd_file_check_write_error (nf); *pnf = nf; }else {if (refcount_dec_and_test (&nf->nf_ref))
fs/nfsd/trace.h +0 -31
@@ -1143,37 +1143,6 @@ TRACE_EVENT(nfsd_file_close, ) ); -TRACE_EVENT (nfsd_file_fsync, -TP_PROTO ( - const struct nfsd_file *nf, - int ret - ), -TP_ARGS (nf, ret), -TP_STRUCT__entry ( - __field(void *, nf_inode) - __field(int, nf_ref) - __field(int, ret) - __field(unsigned long, nf_flags) - __field(unsigned char, nf_may) - __field(struct file *, nf_file) - ), -TP_fast_assign ( - __entry->nf_inode = nf->nf_inode; - __entry->nf_ref = refcount_read(&nf->nf_ref); - __entry->ret = ret; - __entry->nf_flags = nf->nf_flags; - __entry->nf_may = nf->nf_may; - __entry->nf_file = nf->nf_file; - ), -TP_printk ("inode=%p ref=%d flags=%s may=%s nf_file=%p ret=%d" , - __entry->nf_inode, - __entry->nf_ref, -show_nf_flags (__entry->nf_flags), -show_nfsd_may_flags (__entry->nf_may), - __entry->nf_file, __entry->ret - ) -); -#include "cache.h" TRACE_DEFINE_ENUM (RC_DROPIT );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 380/885 NFSD: copy the whole verifier in nfsd_copy_write_verifier
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 90d2175572470ba7f55da8447c72ddd4942923c4 ]
Currently, we're only memcpy'ing the first __be32. Ensure we copy into both words.
--- fs/nfsd/nfssvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfssvc.c +1 -1
@@ -357,7 +357,7 @@ void nfsd_copy_write_verifier(__be32 verf[2], struct nfsd_net *nn)do {read_seqbegin_or_lock (&nn->writeverf_lock, &seq); -memcpy (verf, nn->writeverf,sizeof (*verf)); +memcpy (verf, nn->writeverf,sizeof (nn->writeverf)); }while (need_seqretry (&nn->writeverf_lock, seq));done_seqretry (&nn->writeverf_lock, seq); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 381/885 cifs: Fix lost destroy smbd connection when MR allocate failed
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit e9d3401d95d62a9531082cd2453ed42f2740e3fd ]
If the MR allocate failed, the smb direct connection info is NULL, then smbd_destroy() will directly return, then the connection info will be leaked.
Let's set the smb direct connection info to the server before call smbd_destroy().
--- fs/cifs/smbdirect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/smbdirect.c +1 -0
@@ -1700,6 +1700,7 @@ static struct smbd_connection *_smbd_get_connection( allocate_mr_failed:/* At this point, need to a full transport shutdown */ + server->smbd_conn = info;smbd_destroy (server);return NULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 382/885 cifs: Fix warning and UAF when destroy the MR list
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 3e161c2791f8e661eed24a2c624087084d910215 ]
If the MR allocate failed, the MR recovery work not initialized and list not cleared. Then will be warning and UAF when release the MR:
WARNING: CPU: 4 PID: 824 at kernel/workqueue.c:3066 __flush_work.isra.0+0xf7/0x110 CPU: 4 PID: 824 Comm: mount.cifs Not tainted 6.1.0-rc5+ #82 RIP: 0010:__flush_work.isra.0+0xf7/0x110 Call Trace: <TASK> __cancel_work_timer+0x2ba/0x2e0 smbd_destroy+0x4e1/0x990 _smbd_get_connection+0x1cbd/0x2110 smbd_get_connection+0x21/0x40 cifs_get_tcp_session+0x8ef/0xda0 mount_get_conns+0x60/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 BUG: KASAN: use-after-free in smbd_destroy+0x4fc/0x990 Read of size 8 at addr ffff88810b156a08 by task mount.cifs/824 CPU: 4 PID: 824 Comm: mount.cifs Tainted: G W 6.1.0-rc5+ #82 Call Trace: dump_stack_lvl+0x34/0x44 print_report+0x171/0x472 kasan_report+0xad/0x130 smbd_destroy+0x4fc/0x990 _smbd_get_connection+0x1cbd/0x2110 smbd_get_connection+0x21/0x40 cifs_get_tcp_session+0x8ef/0xda0 mount_get_conns+0x60/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Allocated by task 824: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x7a/0x90 _smbd_get_connection+0x1b6f/0x2110 smbd_get_connection+0x21/0x40 cifs_get_tcp_session+0x8ef/0xda0 mount_get_conns+0x60/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 824: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x40 ____kasan_slab_free+0x143/0x1b0 __kmem_cache_free+0xc8/0x330 _smbd_get_connection+0x1c6a/0x2110 smbd_get_connection+0x21/0x40 cifs_get_tcp_session+0x8ef/0xda0 mount_get_conns+0x60/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
Let's initialize the MR recovery work before MR allocate to prevent the warning, remove the MRs from the list to prevent the UAF.
--- fs/cifs/smbdirect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/smbdirect.c +2 -1
@@ -2218,6 +2218,7 @@ static int allocate_mr_list(struct smbd_connection *info)atomic_set (&info->mr_ready_count,0 );atomic_set (&info->mr_used_count,0 );init_waitqueue_head (&info->wait_for_mr_cleanup); +INIT_WORK (&info->mr_recovery_work, smbd_mr_recovery_work);/* Allocate more MRs (2x) than hardware responder_resources */ for (i =0 ; i < info->responder_resources *2 ; i++) { smbdirect_mr =kzalloc (sizeof (*smbdirect_mr),GFP_KERNEL );
@@ -2245,13 +2246,13 @@ static int allocate_mr_list(struct smbd_connection *info)list_add_tail (&smbdirect_mr->list, &info->mr_list);atomic_inc (&info->mr_ready_count); } -INIT_WORK (&info->mr_recovery_work, smbd_mr_recovery_work);return 0 ; out:kfree (smbdirect_mr);list_for_each_entry_safe (smbdirect_mr, tmp, &info->mr_list, list) { +list_del (&smbdirect_mr->list);ib_dereg_mr (smbdirect_mr->mr);kfree (smbdirect_mr->sgl);kfree (smbdirect_mr);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 383/885 cifs: use tcon allocation functions even for dummy tcon
In reply to Greg Kroah-HartmanFrom: Shyam Prasad N <[email protected]>
[ Upstream commit df57109bd50b9ed6911f3c2aa914189fe4c1fe2c ]
In smb2_reconnect_server, we allocate a dummy tcon for calling reconnect for just the session. This should be allocated using tconInfoAlloc, and not kmalloc.
--- fs/cifs/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +2 -2
@@ -3898,7 +3898,7 @@ void smb2_reconnect_server(struct work_struct *work) goto done;/* allocate a dummy tcon struct used for reconnect */ - tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL ); + tcon =tconInfoAlloc ();if (!tcon) { resched = true;list_for_each_entry_safe (ses, ses2, &tmp_ses_list, rlist) {
@@ -3921,7 +3921,7 @@ void smb2_reconnect_server(struct work_struct *work)list_del_init (&ses->rlist);cifs_put_smb_ses (ses); } -kfree (tcon); +tconInfoFree (tcon); done:cifs_dbg (FYI ,"Reconnecting tcons and channels finished\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 384/885 gfs2: jdata writepage fix
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit cbb60951ce18c9b6e91d2eb97deb41d8ff616622 ]
The ->writepage() and ->writepages() operations are supposed to write entire pages. However, on filesystems with a block size smaller than PAGE_SIZE, __gfs2_jdata_writepage() only adds the first block to the current transaction instead of adding the entire page. Fix that.
--- fs/gfs2/aops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/gfs2/aops.c +1 -2
@@ -127,7 +127,6 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w {struct inode *inode = page->mapping->host;struct gfs2_inode *ip =GFS2_I (inode); -struct gfs2_sbd *sdp =GFS2_SB (inode);if (PageChecked (page)) {ClearPageChecked (page);
@@ -135,7 +134,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *wcreate_empty_buffers (page, inode->i_sb->s_blocksize,BIT (BH_Dirty)|BIT (BH_Uptodate)); } -gfs2_page_add_databufs (ip, page,0 , sdp->sd_vfs->s_blocksize); +gfs2_page_add_databufs (ip, page,0 ,PAGE_SIZE ); }return gfs2_write_jdata_page (page, wbc); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 385/885 perf llvm: Fix inadvertent file creation
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 9f19aab47ced012eddef1e2bc96007efc7713b61 ]
The LLVM template is first echo-ed into command_out and then command_out executed. The echo surrounds the template with double quotes, however, the template itself may contain quotes. This is generally innocuous but in tools/perf/tests/bpf-script-test-prologue.c we see:
...SEC("func=null_lseek file->f_mode offset orig")
...
where the first double quote ends the double quote of the echo, then the > redirects output into a file called f_mode.
To avoid this inadvertent behavior substitute redirects and similar characters to be ASCII control codes, then substitute the output in the echo back again.
--- tools/perf/util/llvm-utils.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
tools/perf/util/llvm-utils.c +24 -1
@@ -531,14 +531,37 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,pr_debug ("llvm compiling command template: %s\n" , template); +/* +* Below, substitute control characters for values that can cause the +* echo to misbehave, then substitute the values back. +*/ err = -ENOMEM ; -if (asprintf (&command_echo,"echo -n \"%s\"" , template) <0 ) +if (asprintf (&command_echo,"echo -n \a%s\a" , template) <0 ) goto errout; +#define SWAP_CHAR (a, b) do { if (*p == a) *p = b; } while (0) +for (char *p = command_echo; *p; p++) { +SWAP_CHAR ('<' ,'\001' ); +SWAP_CHAR ('>' ,'\002' ); +SWAP_CHAR ('"' ,'\003' ); +SWAP_CHAR ('\'' ,'\004' ); +SWAP_CHAR ('|' ,'\005' ); +SWAP_CHAR ('&' ,'\006' ); +SWAP_CHAR ('\a' ,'"' ); + } err =read_from_pipe (command_echo, (void **) &command_out,NULL );if (err) goto errout; +for (char *p = command_out; *p; p++) { +SWAP_CHAR ('\001' ,'<' ); +SWAP_CHAR ('\002' ,'>' ); +SWAP_CHAR ('\003' ,'"' ); +SWAP_CHAR ('\004' ,'\'' ); +SWAP_CHAR ('\005' ,'|' ); +SWAP_CHAR ('\006' ,'&' ); + } +#undef SWAP_CHARpr_debug ("llvm compiling command : %s\n" , command_out); err =read_from_pipe (template, &obj_buf, &obj_buf_sz);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 386/885 leds: led-core: Fix refcount leak in of_led_get()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit da1afe8e6099980fe1e2fd7436dca284af9d3f29 ]
class_find_device_by_of_node() calls class_find_device(), it will take the reference, use the put_device() to drop the reference when not need anymore.
--- drivers/leds/led-class.c | 1 + 1 file changed, 1 insertion(+)
drivers/leds/led-class.c +1 -0
@@ -235,6 +235,7 @@ struct led_classdev *of_led_get(struct device_node *np, int index) led_dev =class_find_device_by_of_node (leds_class, led_node);of_node_put (led_node); +put_device (led_dev);if (!led_dev)return ERR_PTR (-EPROBE_DEFER );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 387/885 leds: is31fl319x: Wrap mutex_destroy() for devm_add_action_or_rest()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit a82c7cf803d98751cd3ddb35828faad925d71982 ]
Clang complains that devm_add_action() takes a parameter with a wrong type:
warning: cast from 'void (*)(struct mutex *)' to 'void (*)(void *)' converts to incompatible function type [-Wcast-function-type-strict]
err = devm_add_action(dev, (void (*)(void *))mutex_destroy, &is31->lock);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.It appears that the commit e1af5c815586 ("leds: is31fl319x: Fix devm vs. non-devm ordering") missed two things:
- whilst the commit mentions devm_add_action_or_reset() the actual change utilised devm_add_action() call by mistake
- strictly speaking the parameter is not compatible by type
Fix both issues by switching to devm_add_action_or_reset() and adding a wrapper for mutex_destroy() call.
--- drivers/leds/leds-is31fl319x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/leds/leds-is31fl319x.c +6 -1
@@ -495,6 +495,11 @@ static inline int is31fl3196_db_to_gain(u32 dezibel)return dezibel /IS31FL3196_AUDIO_GAIN_DB_STEP ; } +static void is31f1319x_mutex_destroy (void *lock) +{ +mutex_destroy (lock); +} +static int is31fl319x_probe (struct i2c_client *client) {struct is31fl319x_chip *is31;
@@ -511,7 +516,7 @@ static int is31fl319x_probe(struct i2c_client *client)return -ENOMEM ;mutex_init (&is31->lock); - err =devm_add_action (dev, (void (*)(void *))mutex_destroy, &is31->lock); + err =devm_add_action_or_reset (dev, is31f1319x_mutex_destroy, &is31->lock);if (err)return err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 388/885 leds: simatic-ipc-leds-gpio: Make sure we have the GPIO providing driver
In reply to Greg Kroah-HartmanFrom: Henning Schild <[email protected]>
[ Upstream commit c64964ebee2a415384385205950ee7a05f78451e ]
If we register a "leds-gpio" platform device for GPIO pins that do not exist we get a -EPROBE_DEFER and the probe will be tried again later. If there is no driver to provide that pin we will poll forever and also create a lot of log messages.
So check if that GPIO driver is configured, if so it will come up eventually. If not, we exit our probe function early and do not even bother registering the "leds-gpio". This method was chosen over "Kconfig depends" since this way we can add support for more devices and GPIO backends more easily without "depends":ing on all GPIO backends.
--- drivers/leds/simple/simatic-ipc-leds-gpio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/leds/simple/simatic-ipc-leds-gpio.c +2 -0
@@ -77,6 +77,8 @@ static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev)switch (plat->devmode) {case SIMATIC_IPC_DEVICE_127E : +if (!IS_ENABLED (CONFIG_PINCTRL_BROXTON )) +return -ENODEV ; simatic_ipc_led_gpio_table = &simatic_ipc_led_gpio_table_127e;break ;case SIMATIC_IPC_DEVICE_227G :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 389/885 tools/tracing/rtla: osnoise_hist: use total duration for average calculation
In reply to Greg Kroah-HartmanFrom: Andreas Ziegler <[email protected]>
[ Upstream commit fe137a4fe0e77eb95396cfc5c3dd7df404421aa4 ]
Sampled durations must be weighted by observed quantity, to arrive at a correct average duration value.
Perform calculation of total duration by summing (duration * count).
--- tools/tracing/rtla/src/osnoise_hist.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/tracing/rtla/src/osnoise_hist.c +4 -1
@@ -121,6 +121,7 @@ static void osnoise_hist_update_multiple(struct osnoise_tool *tool, int cpu, {struct osnoise_hist_params *params = tool->params;struct osnoise_hist_data *data = tool->data; +unsigned long long total_duration;int entries = data->entries;int bucket;int *hist;
@@ -131,10 +132,12 @@ static void osnoise_hist_update_multiple(struct osnoise_tool *tool, int cpu,if (data->bucket_size) bucket = duration / data->bucket_size; + total_duration = duration * count; + hist = data->hist[cpu].samples; data->hist[cpu].count += count;update_min (&data->hist[cpu].min_sample, &duration); -update_sum (&data->hist[cpu].sum_sample, &duration); +update_sum (&data->hist[cpu].sum_sample, &total_duration);update_max (&data->hist[cpu].max_sample, &duration);if (bucket < entries)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 390/885 perf inject: Use perf_data__read() for auxtrace
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 1746212daeba95e9ae1639227dc0c3591d41deeb ]
In copy_bytes(), it reads the data from the (input) fd and writes it to the output file. But it does with the read(2) unconditionally which caused a problem of mixing buffered vs unbuffered I/O together.
You can see the problem when using pipes.
$ perf record -e intel_pt// -o- true | perf inject -b > /dev/null [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] 0x45c0 [0x30]: failed to process type: 71
It should use perf_data__read() to honor the 'use_stdio' setting.
--- tools/perf/builtin-inject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/builtin-inject.c +3 -3
@@ -215,14 +215,14 @@ static int perf_event__repipe_event_update(struct perf_tool *tool,#ifdef HAVE_AUXTRACE_SUPPORT -static int copy_bytes (struct perf_inject *inject,int fd,off_t size) +static int copy_bytes (struct perf_inject *inject,struct perf_data *data,off_t size) {char buf[4096 ];ssize_t ssz;int ret;while (size >0 ) { - ssz =read (fd, buf,min (size, (off_t )sizeof (buf))); + ssz =perf_data__read (data, buf,min (size, (off_t )sizeof (buf)));if (ssz <0 )return -errno; ret =output_bytes (inject, buf, ssz);
@@ -260,7 +260,7 @@ static s64 perf_event__repipe_auxtrace(struct perf_session *session, ret =output_bytes (inject, event, event->header.size);if (ret <0 )return ret; - ret =copy_bytes (inject,perf_data__fd (session->data), + ret =copy_bytes (inject, session->data, event->auxtrace.size); }else { ret = output_bytes(inject, event,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 391/885 perf intel-pt: Do not try to queue auxtrace data on pipe
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit aeb802f872a7c42e4381f36041e77d1745908255 ]
When it processes AUXTRACE_INFO, it calls to auxtrace_queue_data() to collect AUXTRACE data first. That won't work with pipe since it needs lseek() to read the scattered aux data.
$ perf record -o- -e intel_pt// true | perf report -i- --itrace=i100 # To display the perf.data header info, please use --header/--header-only options. # 0x4118 [0xa0]: failed to process type: 70 Error: failed to process sample
For the pipe mode, it can handle the aux data as it gets. But there's no guarantee it can get the aux data in time. So the following warning will be shown at the beginning:
WARNING: Intel PT with pipe mode is not recommended.
The output cannot relied upon. In particular, time stamps and the order of events may be incorrect.
--- tools/perf/Documentation/perf-intel-pt.txt | 30 ++++++++++++++++++++++ tools/perf/util/auxtrace.c | 3 +++ tools/perf/util/intel-pt.c | 6 +++++ 3 files changed, 39 insertions(+)
tools/perf/Documentation/perf-intel-pt.txt +30 -0
@@ -1813,6 +1813,36 @@ Can be compiled and traced: $ +Pipe mode +--------- +Pipe mode is a problem for Intel PT and possibly other auxtrace users. +It's not recommended to use a pipe as data output with Intel PT because +of the following reason. + +Essentially the auxtrace buffers do not behave like the regular perf +event buffers. That is because the head and tail are updated by +software, but in the auxtrace case the data is written by hardware. +So the head and tail do not get updated as data is written. + +In the Intel PT case, the head and tail are updated only when the trace +is disabled by software, for example: + - full-trace, system wide : when buffer passes watermark + - full-trace, not system-wide : when buffer passes watermark or + context switches + - snapshot mode : as above but also when a snapshot is made + - sample mode : as above but also when a sample is made + +That means finished-round ordering doesn't work. An auxtrace buffer +can turn up that has data that extends back in time, possibly to the +very beginning of tracing. + +For a perf.data file, that problem is solved by going through the trace +and queuing up the auxtrace buffers in advance. + +For pipe mode, the order of events and timestamps can presumably +be messed up. + + EXAMPLE -------
tools/perf/util/auxtrace.c +3 -0
@@ -1132,6 +1132,9 @@ int auxtrace_queue_data(struct perf_session *session, bool samples, bool events)if (auxtrace__dont_decode (session))return 0 ; +if (perf_data__is_pipe (session->data)) +return 0 ; +if (!session->auxtrace || !session->auxtrace->queue_data)return -EINVAL ;
tools/perf/util/intel-pt.c +6 -0
@@ -4374,6 +4374,12 @@ int intel_pt_process_auxtrace_info(union perf_event *event,intel_pt_setup_pebs_events (pt); +if (perf_data__is_pipe (session->data)) { +pr_warning ("WARNING: Intel PT with pipe mode is not recommended.\n" +" The output cannot relied upon. In particular,\n" +" timestamps and the order of events may be incorrect.\n" ); + } +if (pt->sampling_mode ||list_empty (&session->auxtrace_index)) err =auxtrace_queue_data (session, true, true);else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 392/885 perf test bpf: Skip test if kernel-debuginfo is not present
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 34266f904abd45731bdade2e92d0536c092ee9bc ]
Perf BPF filter test fails in environment where "kernel-debuginfo" is not installed.
Test failure logs:
<<>>
42: BPF filter : 42.1: Basic BPF filtering : Ok 42.2: BPF pinning : Ok 42.3: BPF prologue generation : FAILED!
<<>>
Enabling verbose option provided debug logs, which says debuginfo needs to be installed. Snippet of verbose logs:
<<>>
42.3: BPF prologue generation :
--- start ---
test child forked, pid 28218
<<>>
Rebuild with CONFIG_DEBUG_INFO=y, or install an appropriate debuginfo package.
bpf_probe: failed to convert perf probe events
Failed to add events selected by BPF
test child finished with -1
---- end ----
BPF filter subtest 3: FAILED!
<<>>
Here the subtest "BPF prologue generation" failed and logs shows debuginfo is needed. After installing kernel-debuginfo package, testcase passes.
The "BPF prologue generation" subtest failed because, the do_test() returns TEST_FAIL without checking the error type returned by parse_events_load_bpf_obj().
parse_events_load_bpf_obj() can also return error of type -ENODATA incase kernel-debuginfo package is not installed. Fix this by adding check for -ENODATA error.
Test result after the patch changes:
Test failure logs:
<<>>
42: BPF filter : 42.1: Basic BPF filtering : Ok 42.2: BPF pinning : Ok 42.3: BPF prologue generation : Skip (clang/debuginfo isn't installed or environment missing BPF support)
<<>>
--- tools/perf/tests/bpf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/tests/bpf.c +5 -1
@@ -126,6 +126,10 @@ static int do_test(struct bpf_object *obj, int (*func)(void), err =parse_events_load_bpf_obj (&parse_state, &parse_state.list, obj,NULL );parse_events_error__exit (&parse_error); +if (err == -ENODATA ) { +pr_debug ("Failed to add events selected by BPF, debuginfo package not installed\n" ); +return TEST_SKIP ; + }if (err ||list_empty (&parse_state.list)) {pr_debug ("Failed to add events selected by BPF\n" );return TEST_FAIL ;
@@ -368,7 +372,7 @@ static struct test_case bpf_tests[] = { "clang isn't installed or environment missing BPF support"),#ifdef HAVE_BPF_PROLOGUE TEST_CASE_REASON ("BPF prologue generation" , bpf_prologue_test, -"clang isn't installed or environment missing BPF support" ), +"clang/debuginfo isn't installed or environment missing BPF support" ), #else TEST_CASE_REASON("BPF prologue generation", bpf_prologue_test, "not compiled in"), #endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 393/885 perf tools: Fix auto-complete on aarch64
In reply to Greg Kroah-HartmanFrom: Yicong Yang <[email protected]>
[ Upstream commit ffd1240e8f0814262ceb957dbe961f6e0aef1e7a ]
On aarch64 CPU related events are not under event_source/devices/cpu/events, they're under event_source/devices/armv8_pmuv3_0/events on my machine. Using current auto-complete script will generate below error:
[root@localhost bin]# perf stat -e
ls: cannot access '/sys/bus/event_source/devices/cpu/events': No such file or directory
Fix this by not testing /sys/bus/event_source/devices/cpu/events on aarch64 machine.
--- tools/perf/perf-completion.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tools/perf/perf-completion.sh +8 -3
@@ -165,7 +165,12 @@ __perf_main () local cur1=${COMP_WORDS[COMP_CWORD]} local raw_evts=$($cmd list --raw-dump) - local arr s tmp result + local arr s tmp result cpu_evts + + # aarch64 doesn't have /sys/bus/event_source/devices/cpu/events + if [[ `uname -m` != aarch64 ]]; then + cpu_evts=$(ls /sys/bus/event_source/devices/cpu/events) + fi if [[ "$cur1" == */* && ${cur1#*/} =~ ^[A-Z] ]]; then OLD_IFS="$IFS"
@@ -183,9 +188,9 @@ __perf_main () fi done - evts=${result}" "$(ls /sys/bus/event_source/devices/cpu/events) + evts=${result}" "${cpu_evts} else - evts=${raw_evts}" "$(ls /sys/bus/event_source/devices/cpu/events) + evts=${raw_evts}" "${cpu_evts} fi if [[ "$cur1" == , ]]; then
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 394/885 sparc: allow PM configs for sparc32 COMPILE_TEST
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7be6a87c2473957090995b7eb541e31d57a2c801 ]
When doing randconfig builds for sparc32 with COMPILE_TEST, some (non-Sparc) drivers cause kconfig warnings with the Kconfig symbols PM, PM_GENERIC_DOMAINS, or PM_GENERIC_DOMAINS_OF.
This is due to arch/sparc/Kconfig not using the PM Kconfig for Sparc32:
if SPARC64
source "kernel/power/Kconfig"
endif
Arnd suggested adding "|| COMPILE_TEST" to the conditional, instead of trying to track down every driver that selects any of these PM symbols.
Fixes the following kconfig warnings:
WARNING: unmet direct dependencies detected for PM
Depends on [n]: SPARC64 [=n]
Selected by [y]:
- SUN20I_PPU [=y] && (ARCH_SUNXI || COMPILE_TEST [=y])
WARNING: unmet direct dependencies detected for PM
Depends on [n]: SPARC64 [=n]
Selected by [y]:
- SUN20I_PPU [=y] && (ARCH_SUNXI || COMPILE_TEST [=y])
WARNING: unmet direct dependencies detected for PM_GENERIC_DOMAINS
Depends on [n]: SPARC64 [=n] && PM [=y]
Selected by [y]:
- QCOM_GDSC [=y] && COMMON_CLK [=y] && PM [=y]
- SUN20I_PPU [=y] && (ARCH_SUNXI || COMPILE_TEST [=y])
- MESON_GX_PM_DOMAINS [=y] && (ARCH_MESON || COMPILE_TEST [=y]) && PM [=y] && OF [=y]
- BCM2835_POWER [=y] && (ARCH_BCM2835 || COMPILE_TEST [=y] && OF [=y]) && PM [=y]
- BCM_PMB [=y] && (ARCH_BCMBCA || COMPILE_TEST [=y] && OF [=y]) && PM [=y]
- ROCKCHIP_PM_DOMAINS [=y] && (ARCH_ROCKCHIP || COMPILE_TEST [=y]) && PM [=y] Selected by [m]:
- ARM_SCPI_POWER_DOMAIN [=m] && (ARM_SCPI_PROTOCOL [=m] || COMPILE_TEST [=y] && OF [=y]) && PM [=y]
- MESON_EE_PM_DOMAINS [=m] && (ARCH_MESON || COMPILE_TEST [=y]) && PM [=y] && OF [=y]
- QCOM_AOSS_QMP [=m] && (ARCH_QCOM || COMPILE_TEST [=y]) && MAILBOX [=y] && COMMON_CLK [=y] && PM [=y]
WARNING: unmet direct dependencies detected for PM_GENERIC_DOMAINS_OF
Depends on [n]: SPARC64 [=n] && PM_GENERIC_DOMAINS [=y] && OF [=y] Selected by [y]:
- MESON_GX_PM_DOMAINS [=y] && (ARCH_MESON || COMPILE_TEST [=y]) && PM [=y] && OF [=y] Selected by [m]:
- MESON_EE_PM_DOMAINS [=m] && (ARCH_MESON || COMPILE_TEST [=y]) && PM [=y] && OF [=y]
--- arch/sparc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/Kconfig +1 -1
@@ -283,7 +283,7 @@ config ARCH_FORCE_MAX_ORDER This config option is actually maximum order plus one. For example, a value of 13 means that the largest free memory block is 2^12 pages. -if SPARC64 +if SPARC64 || COMPILE_TEST source "kernel/power/Kconfig" endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 395/885 selftests: find echo binary to use -ne options
In reply to Greg Kroah-HartmanFrom: Guillaume Tucker <[email protected]>
[ Upstream commit 4ebe33398c40c1118b4d8546978036c0e0032d1b ]
Find the actual echo binary using $(which echo) and use it for formatted output with -ne. On some systems, the default echo command doesn't handle the -e option and the output looks like this (arm64 build):
-ne Emit Tests for alsa
-ne Emit Tests for amd-pstate
-ne Emit Tests for arm64
This is for example the case with the KernelCI Docker images e.g. kernelci/gcc-10:x86-kselftest-kernelci. With the actual echo binary (e.g. in /bin/echo), the output is formatted as expected (x86 build this time):
Emit Tests for alsa
Emit Tests for amd-pstate
Skipping non-existent dir: arm64
Only the install target is using "echo -ne" so keep the $ECHO variable local to it.
--- tools/testing/selftests/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/Makefile +3 -2
@@ -231,10 +231,11 @@ ifdef INSTALL_PATH @# While building kselftest-list.text skip also non-existent TARGET dirs: @# they could be the result of a build failure and should NOT be @# included in the generated runlist. + ECHO=`which echo`; \ for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - [ ! -d $(INSTALL_PATH)/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \ - echo -ne "Emit Tests for $$TARGET\n"; \ + [ ! -d $(INSTALL_PATH)/$$TARGET ] && $$ECHO "Skipping non-existent dir: $$TARGET" && continue; \ + $$ECHO -ne "Emit Tests for $$TARGET\n"; \ $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \ -C $$TARGET emit_tests >> $(TEST_LIST); \ done;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 396/885 selftests/ftrace: Fix bash specific "==" operator
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit 1e6b485c922fbedf41d5a9f4e6449c5aeb923a32 ]
Since commit a1d6cd88c897 ("selftests/ftrace: event_triggers: wait longer for test_event_enable") introduced bash specific "==" comparation operator, that test will fail when we run it on a posix-shell. checkbashisms warned it as below.
possible bashism in ftrace/func_event_triggers.tc line 45 (should be 'b = a'):
if [ "$e" == $val ]; then
This replaces it with "=".
--- .../selftests/ftrace/test.d/ftrace/func_event_triggers.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc +1 -1
@@ -42,7 +42,7 @@ test_event_enabled() { while [ $check_times -ne 0 ]; do e=`cat $EVENT_ENABLE` - if [ "$e" == $val ]; then + if [ "$e" = $val ]; then return 0 fi sleep $SLEEP_TIME
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 397/885 selftests: use printf instead of echo -ne
In reply to Greg Kroah-HartmanFrom: Guillaume Tucker <[email protected]>
[ Upstream commit 9e34fad00fc889abbb99d751a4c22cf2bded10df ]
Rather than trying to guess which implementation of "echo" to run with support for "-ne" options, use "printf" instead of "echo -ne". It handles escape characters as a standard feature and it is widespread among modern shells.
--- tools/testing/selftests/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/testing/selftests/Makefile +2 -3
@@ -231,11 +231,10 @@ ifdef INSTALL_PATH @# While building kselftest-list.text skip also non-existent TARGET dirs: @# they could be the result of a build failure and should NOT be @# included in the generated runlist. - ECHO=`which echo`; \ for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - [ ! -d $(INSTALL_PATH)/$$TARGET ] && $$ECHO "Skipping non-existent dir: $$TARGET" && continue; \ - $$ECHO -ne "Emit Tests for $$TARGET\n"; \ + [ ! -d $(INSTALL_PATH)/$$TARGET ] && printf "Skipping non-existent dir: $$TARGET\n" && continue; \ + printf "Emit Tests for $$TARGET\n"; \ $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \ -C $$TARGET emit_tests >> $(TEST_LIST); \ done;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 398/885 perf record: Fix segfault with --overwrite and --max-size
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit 91621be65d6812cd74b2ea09573ff9ee0cbf5666 ]
When --overwrite and --max-size options of perf record are used together, a segmentation fault occurs. The following is an example:
# perf record -e sched:sched* --overwrite --max-size 1K -a -- sleep 1 [ perf record: Woken up 1 times to write data ] perf: Segmentation fault Obtained 12 stack frames. ./perf/perf(+0x197673) [0x55f99710b673] /lib/x86_64-linux-gnu/libc.so.6(+0x3ef0f) [0x7fa45f3cff0f] ./perf/perf(+0x8eb40) [0x55f997002b40] ./perf/perf(+0x1f6882) [0x55f99716a882] ./perf/perf(+0x794c2) [0x55f996fed4c2] ./perf/perf(+0x7b7c7) [0x55f996fef7c7] ./perf/perf(+0x9074b) [0x55f99700474b] ./perf/perf(+0x12e23c) [0x55f9970a223c] ./perf/perf(+0x12e54a) [0x55f9970a254a] ./perf/perf(+0x7db60) [0x55f996ff1b60] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe6) [0x7fa45f3b2c86] ./perf/perf(+0x7dfe9) [0x55f996ff1fe9] Segmentation fault (core dumped)
backtrace of the core file is as follows:
(gdb) bt
#0 record__bytes_written (rec=0x55f99755a200 <record>) at builtin-record.c:234
#1 record__output_max_size_exceeded (rec=0x55f99755a200 <record>) at builtin-record.c:242
#2 record__write (map=0x0, size=12816, bf=0x55f9978da2e0, rec=0x55f99755a200 <record>) at builtin-record.c:263
#3 process_synthesized_event (tool=tool@entry=0x55f99755a200 <record>, event=event@entry=0x55f9978da2e0, sample=sample@entry=0x0, machine=machine@entry=0x55f997893658) at builtin-record.c:618
#4 0x000055f99716a883 in __perf_event__synthesize_id_index (tool=tool@entry=0x55f99755a200 <record>, process=process@entry=0x55f997002aa0 <process_synthesized_event>, evlist=0x55f9978928b0, machine=machine@entry=0x55f997893658,
from=from@entry=0) at util/synthetic-events.c:1895
#5 0x000055f99716a91f in perf_event__synthesize_id_index (tool=tool@entry=0x55f99755a200 <record>, process=process@entry=0x55f997002aa0 <process_synthesized_event>, evlist=<optimized out>, machine=machine@entry=0x55f997893658)
at util/synthetic-events.c:1905
#6 0x000055f996fed4c3 in record__synthesize (tail=tail@entry=true, rec=0x55f99755a200 <record>) at builtin-record.c:1997
#7 0x000055f996fef7c8 in __cmd_record (argc=argc@entry=2, argv=argv@entry=0x7ffc67551260, rec=0x55f99755a200 <record>) at builtin-record.c:2802
#8 0x000055f99700474c in cmd_record (argc=<optimized out>, argv=0x7ffc67551260) at builtin-record.c:4258
#9 0x000055f9970a223d in run_builtin (p=0x55f997564d88 <commands+264>, argc=10, argv=0x7ffc67551260) at perf.c:330
#10 0x000055f9970a254b in handle_internal_command (argc=10, argv=0x7ffc67551260) at perf.c:384
#11 0x000055f996ff1b61 in run_argv (argcp=<synthetic pointer>, argv=<synthetic pointer>) at perf.c:428
#12 main (argc=<optimized out>, argv=0x7ffc67551260) at perf.c:562The reason is that record__bytes_written accesses the freed memory rec->thread_data, The process is as follows:
__cmd_record
-> record__free_thread_data
-> zfree(&rec->thread_data) // free rec->thread_data
-> record__synthesize
-> perf_event__synthesize_id_index
-> process_synthesized_event
-> record__write
-> record__bytes_written // access rec->thread_dataWe add a member variable "thread_bytes_written" in the struct "record" to save the data size written by the threads.
--- tools/perf/builtin-record.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
tools/perf/builtin-record.c +6 -10
@@ -154,6 +154,7 @@ struct record {struct perf_tool tool;struct record_opts opts;u64 bytes_written; +u64 thread_bytes_written;struct perf_data data;struct auxtrace_record *itr;struct evlist *evlist;
@@ -226,14 +227,7 @@ static bool switch_output_time(struct record *rec)static u64 record__bytes_written (struct record *rec) { -int t; -u64 bytes_written = rec->bytes_written; -struct record_thread *thread_data = rec->thread_data; - -for (t =0 ; t < rec->nr_threads; t++) - bytes_written += thread_data[t].bytes_written; - -return bytes_written; +return rec->bytes_written + rec->thread_bytes_written; }static bool record__output_max_size_exceeded (struct record *rec)
@@ -255,10 +249,12 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused,return -1 ; } -if (map && map->file) +if (map && map->file) { thread->bytes_written += size; -else + rec->thread_bytes_written += size; + }else { rec->bytes_written += size; + }if (record__output_max_size_exceeded (rec) && !done) { fprintf(stderr, "[ perf record: perf size limit reached (%" PRIu64 " KB),"
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 399/885 printf: fix errname.c list
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 0c2baf6509af1d11310ae4c1c839481a6e9a4bc4 ]
On most architectures, gcc -Wextra warns about the list of error numbers containing both EDEADLK and EDEADLOCK:
lib/errname.c:15:67: warning: initialized field overwritten [-Woverride-init]
15 | #define E(err) [err + BUILD_BUG_ON_ZERO(err <= 0 || err > 300)] = "-" #err
| ^~~lib/errname.c:172:2: note: in expansion of macro 'E'
172 | E(EDEADLK), /* EDEADLOCK */
| ^On parisc, a similar error happens with -ECANCELLED, which is an alias for ECANCELED.
Make the EDEADLK printing conditional on the number being distinct from EDEADLOCK, and remove the -ECANCELLED bit completely as it can never be hit.
To ensure these are correct, add static_assert lines that verify all the remaining aliases are in fact identical to the canonical name.
--- lib/errname.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
lib/errname.c +14 -8
@@ -21,6 +21,7 @@ static const char *names_0[] = {E (EADDRNOTAVAIL ),E (EADV ),E (EAFNOSUPPORT ), +E (EAGAIN ),/* EWOULDBLOCK */ E (EALREADY ),E (EBADE ), E(EBADF),
@@ -31,15 +32,17 @@ static const char *names_0[] = {E (EBADSLT ),E (EBFONT ),E (EBUSY ), -#ifdef ECANCELLED -E (ECANCELLED ), -#endif +E (ECANCELED ),/* ECANCELLED */ E (ECHILD ),E (ECHRNG ),E (ECOMM ),E (ECONNABORTED ), +E (ECONNREFUSED ),/* EREFUSED */ E (ECONNRESET ), +E (EDEADLK ),/* EDEADLOCK */ +#if EDEADLK != EDEADLOCK /* mips, sparc, powerpc */E (EDEADLOCK ), +#endifE (EDESTADDRREQ ),E (EDOM ), E(EDOTDOT),
@@ -166,14 +169,17 @@ static const char *names_0[] = {E (EUSERS ),E (EXDEV ), E(EXFULL), - -E (ECANCELED ),/* ECANCELLED */ -E (EAGAIN ),/* EWOULDBLOCK */ -E (ECONNREFUSED ),/* EREFUSED */ - E(EDEADLK), /* EDEADLOCK */ };#undef E +#ifdef EREFUSED /* parisc */ +static_assert (EREFUSED ==ECONNREFUSED ); +#endif +#ifdef ECANCELLED /* parisc */ +static_assert (ECANCELLED ==ECANCELED ); +#endif +static_assert (EAGAIN ==EWOULDBLOCK );/* everywhere */ +#define E (err) [err - 512 + BUILD_BUG_ON_ZERO(err < 512 || err > 550)] = "-" #errstatic const char *names_512[] = {E (ERESTARTSYS ),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 400/885 perf tests stat_all_metrics: Change true workload to sleep workload for system wide check
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit f9fa0778ee7349a9aa3d2ea10e9f2ab843a0b44e ]
Testcase stat_all_metrics.sh fails in powerpc:
98: perf all metrics test : FAILED!
Logs with verbose:
[command]# ./perf test 98 -vv
98: perf all metrics test :
--- start ---
test child forked, pid 13262
Testing BRU_STALL_CPI
Testing COMPLETION_STALL_CPI
----
Testing TOTAL_LOCAL_NODE_PUMPS_P23
Metric 'TOTAL_LOCAL_NODE_PUMPS_P23' not printed in:
Error:
Invalid event (hv_24x7/PM_PB_LNS_PUMP23,chip=3/) in per-thread mode, enable system wide with '-a'. Testing TOTAL_LOCAL_NODE_PUMPS_RETRIES_P01
Metric 'TOTAL_LOCAL_NODE_PUMPS_RETRIES_P01' not printed in:
Error:
Invalid event (hv_24x7/PM_PB_RTY_LNS_PUMP01,chip=3/) in per-thread mode, enable system wide with '-a'.
----
Based on above logs, we could see some of the hv-24x7 metric events fails, and logs suggest to run the metric event with -a option. This change happened after the commit a4b8cfcabb1d90ec ("perf stat: Delay metric parsing"), which delayed the metric parsing phase and now before metric parsing phase perf tool identifies, whether target is system-wide or not. With this change, perf_event_open will fails with workload monitoring for uncore events as expected.
The perf all metric test case fails as some of the hv-24x7 metric events may need bigger workload with system wide monitoring to get the data. Fix this issue by changing current system wide check from true workload to sleep 0.01 workload.
Result with the patch changes in powerpc:
98: perf all metrics test : Ok
--- tools/perf/tests/shell/stat_all_metrics.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/stat_all_metrics.sh +1 -1
@@ -11,7 +11,7 @@ for m in $(perf list --raw-dump metrics); do continue fi # Failed so try system wide. - result=$(perf stat -M "$m" -a true 2>&1) + result=$(perf stat -M "$m" -a sleep 0.01 2>&1) if [[ "$result" =~ "${m:0:50}" ]] then continue
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 401/885 objtool: add UACCESS exceptions for __tsan_volatile_read/write
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit d5d469247264e56960705dc5ae7e1d014861fe40 ]
A lot of the tsan helpers are already excempt from the UACCESS warnings, but some more functions were added that need the same thing:
kernel/kcsan/core.o: warning: objtool: __tsan_volatile_read16+0x0: call to __tsan_unaligned_read16() with UACCESS enabled kernel/kcsan/core.o: warning: objtool: __tsan_volatile_write16+0x0: call to __tsan_unaligned_write16() with UACCESS enabled vmlinux.o: warning: objtool: __tsan_unaligned_volatile_read16+0x4: call to __tsan_unaligned_read16() with UACCESS enabled vmlinux.o: warning: objtool: __tsan_unaligned_volatile_write16+0x4: call to __tsan_unaligned_write16() with UACCESS enabled
As Marco points out, these functions don't even call each other explicitly but instead gcc (but not clang) notices the functions being identical and turns one symbol into a direct branch to the other.
--- tools/objtool/check.c | 2 ++ 1 file changed, 2 insertions(+)
tools/objtool/check.c +2 -0
@@ -1059,6 +1059,8 @@ static const char *uaccess_safe_builtin[] = {"__tsan_atomic64_compare_exchange_val" ,"__tsan_atomic_thread_fence" ,"__tsan_atomic_signal_fence" , +"__tsan_unaligned_read16" , +"__tsan_unaligned_write16" ,/* KCOV */ "write_comp_data" , "check_kcov_mode",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 402/885 mfd: cs5535: Dont build on UML
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 5ec32a3e4053c1a726b45381d56aa9e39eaf3911 ]
The cs5535-mfd driver uses CPU-specific data that is not available for ARCH=um builds, so don't allow it to be built for UML.
Prevents these build errors:
In file included from ../arch/x86/include/asm/olpc.h:7,
from ../drivers/mfd/cs5535-mfd.c:17:
../arch/x86/include/asm/geode.h: In function ‘is_geode_gx’:../arch/x86/include/asm/geode.h:16:31: error: ‘struct cpuinfo_um’ has no member named ‘x86_vendor’
16 | return ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC) &&../arch/x86/include/asm/geode.h:16:46: error: ‘X86_VENDOR_NSC’ undeclared (first use in this function); did you mean ‘X86_VENDOR_ANY’?
16 | return ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC) &&../arch/x86/include/asm/geode.h:17:31: error: ‘struct cpuinfo_um’ has no member named ‘x86’
17 | (boot_cpu_data.x86 == 5) &&../arch/x86/include/asm/geode.h:18:31: error: ‘struct cpuinfo_um’ has no member named ‘x86_model’
18 | (boot_cpu_data.x86_model == 5));../arch/x86/include/asm/geode.h: In function ‘is_geode_lx’:../arch/x86/include/asm/geode.h:23:31: error: ‘struct cpuinfo_um’ has no member named ‘x86_vendor’
23 | return ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&../arch/x86/include/asm/geode.h:23:46: error: ‘X86_VENDOR_AMD’ undeclared (first use in this function); did you mean ‘X86_VENDOR_ANY’?
23 | return ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&../arch/x86/include/asm/geode.h:24:31: error: ‘struct cpuinfo_um’ has no member named ‘x86’
24 | (boot_cpu_data.x86 == 5) &&../arch/x86/include/asm/geode.h:25:31: error: ‘struct cpuinfo_um’ has no member named ‘x86_model’
25 | (boot_cpu_data.x86_model == 10));
--- drivers/mfd/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/Kconfig +1 -0
@@ -15,6 +15,7 @@ config MFD_CS5535 tristate "AMD CS5535 and CS5536 southbridge core functions" select MFD_CORE depends on PCI && (X86_32 || (X86 && COMPILE_TEST)) + depends on !UML help This is the core driver for CS5535/CS5536 MFD functions. This is necessary for using the board's GPIO and MFGPT functionality.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 403/885 mfd: pcf50633-adc: Fix potential memleak in pcf50633_adc_async_read()
In reply to Greg Kroah-HartmanFrom: Qiheng Lin <[email protected]>
[ Upstream commit 8b450dcff23aa254844492831a8e2b508a9d522d ]
req is allocated in pcf50633_adc_async_read(), but adc_enqueue_request() could fail to insert the req into queue. We need to check the return value and free it in the case of failure.
--- drivers/mfd/pcf50633-adc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mfd/pcf50633-adc.c +6 -1
@@ -136,6 +136,7 @@ int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, void *callback_param) {struct pcf50633_adc_request *req; +int ret;/* req is freed when the result is ready, in interrupt handler */ req =kmalloc (sizeof (*req),GFP_KERNEL );
@@ -147,7 +148,11 @@ int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, req->callback = callback; req->callback_param = callback_param; -return adc_enqueue_request (pcf, req); + ret =adc_enqueue_request (pcf, req); +if (ret) +kfree (req); + +return ret; }EXPORT_SYMBOL_GPL (pcf50633_adc_async_read);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 404/885 dmaengine: idxd: Set traffic class values in GRPCFG on DSA 2.0
In reply to Greg Kroah-HartmanFrom: Fenghua Yu <[email protected]>
[ Upstream commit 9735bde36487da43d3c3fc910df49639f72decbf ]
On DSA/IAX 1.0, TC-A and TC-B in GRPCFG are set as 1 to have best performance and cannot be changed through sysfs knobs unless override option is given.
The same values should be set on DSA 2.0 as well.
--- drivers/dma/idxd/device.c | 2 +- drivers/dma/idxd/init.c | 2 +- drivers/dma/idxd/sysfs.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/dma/idxd/device.c +1 -1
@@ -702,7 +702,7 @@ static void idxd_groups_clear_state(struct idxd_device *idxd) group->use_rdbuf_limit = false; group->rdbufs_allowed =0 ; group->rdbufs_reserved =0 ; -if (idxd->hw.version <DEVICE_VERSION_2 && !tc_override) { +if (idxd->hw.version <=DEVICE_VERSION_2 && !tc_override) { group->tc_a =1 ; group->tc_b =1 ; }else {
drivers/dma/idxd/init.c +1 -1
@@ -296,7 +296,7 @@ static int idxd_setup_groups(struct idxd_device *idxd) } idxd->groups[i] = group; -if (idxd->hw.version <DEVICE_VERSION_2 && !tc_override) { +if (idxd->hw.version <=DEVICE_VERSION_2 && !tc_override) { group->tc_a =1 ; group->tc_b =1 ; }else {
drivers/dma/idxd/sysfs.c +2 -2
@@ -387,7 +387,7 @@ static ssize_t group_traffic_class_a_store(struct device *dev,if (idxd->state ==IDXD_DEV_ENABLED )return -EPERM ; -if (idxd->hw.version <DEVICE_VERSION_2 && !tc_override) +if (idxd->hw.version <=DEVICE_VERSION_2 && !tc_override)return -EPERM ;if (val <0 || val >7 )
@@ -429,7 +429,7 @@ static ssize_t group_traffic_class_b_store(struct device *dev,if (idxd->state ==IDXD_DEV_ENABLED )return -EPERM ; -if (idxd->hw.version <DEVICE_VERSION_2 && !tc_override) +if (idxd->hw.version <=DEVICE_VERSION_2 && !tc_override)return -EPERM ;if (val <0 || val >7 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 405/885 RDMA/erdma: Fix refcount leak in erdma_mmap
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ee84146c05ad2316b9a7222d0ec4413e0bf30eeb ]
rdma_user_mmap_entry_get() take reference, we should release it when not need anymore, add the missing rdma_user_mmap_entry_put() in the error path to fix it.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +3 -1
@@ -1089,12 +1089,14 @@ int erdma_mmap(struct ib_ucontext *ctx, struct vm_area_struct *vma) prot =pgprot_device (vma->vm_page_prot);break ;default : -return -EINVAL ; + err = -EINVAL ; + goto put_entry; } err =rdma_user_mmap_io (ctx, vma,PFN_DOWN (entry->address),PAGE_SIZE , prot, rdma_entry); +put_entry:rdma_user_mmap_entry_put (rdma_entry);return err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 406/885 dmaengine: HISI_DMA should depend on ARCH_HISI
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit dcca9d045c0852584ad092123c7f6e6526a633b1 ]
The HiSilicon DMA Engine is only present on HiSilicon SoCs. Hence add a dependency on ARCH_HISI, to prevent asking the user about this driver when configuring a kernel without HiSilicon SoC support.
--- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig +1 -1
@@ -244,7 +244,7 @@ config FSL_RAID config HISI_DMA tristate "HiSilicon DMA Engine support" - depends on ARM64 || COMPILE_TEST + depends on ARCH_HISI || COMPILE_TEST depends on PCI_MSI select DMA_ENGINE select DMA_VIRTUAL_CHANNELS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 407/885 RDMA/hns: Fix refcount leak in hns_roce_mmap
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit cf6a05c8494a8ae7fec8e5f1229b45ca5b4bcd30 ]
rdma_user_mmap_entry_get_pgoff() takes the reference. Add missing rdma_user_mmap_entry_put() to release the reference.
Acked-by Haoyue Xu <[email protected]>
--- drivers/infiniband/hw/hns/hns_roce_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_main.c +3 -2
@@ -443,14 +443,15 @@ static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma) prot =pgprot_device (vma->vm_page_prot);break ;default : -return -EINVAL ; + ret = -EINVAL ; + goto out; } ret =rdma_user_mmap_io (uctx, vma, pfn, rdma_entry->npages *PAGE_SIZE , prot, rdma_entry); +out:rdma_user_mmap_entry_put (rdma_entry); -return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 408/885 iio: light: tsl2563: Do not hardcode interrupt trigger type
In reply to Greg Kroah-HartmanFrom: Ferry Toth <[email protected]>
[ Upstream commit 027641b52fe37b64af61025298ce160c8b9b7a73 ]
Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_RAISING, let's respect the settings specified in the firmware description. To be compatible with the older firmware descriptions, if trigger type is not set up there, we'll set it to default (raising edge).
--- drivers/iio/light/tsl2563.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iio/light/tsl2563.c +7 -1
@@ -705,6 +705,7 @@ static int tsl2563_probe(struct i2c_client *client,struct iio_dev *indio_dev;struct tsl2563_chip *chip;struct tsl2563_platform_data *pdata = client->dev.platform_data; +unsigned long irq_flags;int err =0 ;u8 id =0 ;
@@ -760,10 +761,15 @@ static int tsl2563_probe(struct i2c_client *client, indio_dev->info = &tsl2563_info_no_irq;if (client->irq) { + irq_flags =irq_get_trigger_type (client->irq); +if (irq_flags ==IRQF_TRIGGER_NONE ) + irq_flags =IRQF_TRIGGER_RISING ; + irq_flags |=IRQF_ONESHOT ; + err =devm_request_threaded_irq (&client->dev, client->irq,NULL , &tsl2563_event_handler, -IRQF_TRIGGER_RISING |IRQF_ONESHOT , + irq_flags,"tsl2563_event" , indio_dev);if (err) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 409/885 usb: gadget: fusb300_udc: free irq on the error path in fusb300_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit a8d3392e0e5cfeb03f0cea1f2bc3f5f183c1deb4 ]
When request_irq(ires1->start) failed in w5300_hw_probe(), irq ires->start has not been freed, and on the clean_up3 error path, we also need to free ires1->start irq, fix it.
In addition, We should add free_irq in fusb300_remove(), and give the lables a proper name so that they can be understood easily, so add free_irq in fusb300_remove(), and update clean_up3 to err_alloc_request.
--- drivers/usb/gadget/udc/fusb300_udc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/usb/gadget/udc/fusb300_udc.c +7 -3
@@ -1346,6 +1346,7 @@ static int fusb300_remove(struct platform_device *pdev)usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300); +free_irq (platform_get_irq (pdev,1 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req);for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++)
@@ -1431,7 +1432,7 @@ static int fusb300_probe(struct platform_device *pdev) IRQF_SHARED, udc_name, fusb300);if (ret <0 ) {pr_err ("request_irq1 error (%d)\n" , ret); - goto clean_up; + goto err_request_irq1; }INIT_LIST_HEAD (&fusb300->gadget.ep_list);
@@ -1470,7 +1471,7 @@ static int fusb300_probe(struct platform_device *pdev) GFP_KERNEL);if (fusb300->ep0_req ==NULL ) { ret = -ENOMEM ; - goto clean_up3; + goto err_alloc_request; }init_controller (fusb300);
@@ -1485,7 +1486,10 @@ static int fusb300_probe(struct platform_device *pdev) err_add_udc:fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); -clean_up3: +err_alloc_request: +free_irq (ires1->start, fusb300); + +err_request_irq1:free_irq (ires->start, fusb300); clean_up:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 410/885 i2c: designware: fix i2c_dw_clk_rate() return size to be u32
In reply to Greg Kroah-HartmanFrom: Hanna Hawa <[email protected]>
[ Upstream commit f2e1fa99550dd7a882229e2c2cd9ecab4ce773d0 ]
Make i2c_dw_clk_rate() to return u32 instead of unsigned long, as the function return the value of get_clk_rate_khz() which returns u32.
--- drivers/i2c/busses/i2c-designware-common.c | 2 +- drivers/i2c/busses/i2c-designware-core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-designware-common.c +1 -1
@@ -465,7 +465,7 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)dev_warn (dev->dev,"timeout in disabling adapter\n" ); } -unsigned long i2c_dw_clk_rate (struct dw_i2c_dev *dev) +u32 i2c_dw_clk_rate (struct dw_i2c_dev *dev) {/* * Clock is not necessary if we got LCNT/HCNT values directly from
drivers/i2c/busses/i2c-designware-core.h +1 -1
@@ -322,7 +322,7 @@ int i2c_dw_init_regmap(struct dw_i2c_dev *dev);u32 i2c_dw_scl_hcnt (u32 ic_clk,u32 tSYMBOL,u32 tf,int cond,int offset);u32 i2c_dw_scl_lcnt (u32 ic_clk,u32 tLOW,u32 tf,int offset);int i2c_dw_set_sda_hold (struct dw_i2c_dev *dev); -unsigned long i2c_dw_clk_rate (struct dw_i2c_dev *dev); +u32 i2c_dw_clk_rate (struct dw_i2c_dev *dev);int i2c_dw_prepare_clk (struct dw_i2c_dev *dev,bool prepare);int i2c_dw_acquire_lock (struct dw_i2c_dev *dev);void i2c_dw_release_lock (struct dw_i2c_dev *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 411/885 soundwire: cadence: Dont overflow the command FIFOs
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit 7cbfee2e2e40d2be54196362a845a3ea0a3f877d ]
The command FIFOs in the Cadence IP can be configured during design up to 32 entries, and the code in cadence_master.c was assuming the full 32-entry FIFO. But all current Intel implementations use an 8-entry FIFO.
Up to now the longest message used was 6 entries so this wasn't causing any problem. But future Cirrus Logic codecs have downloadable firmware or tuning blobs. It is more efficient for the codec driver to issue long transfers that can take advantage of any queuing in the Soundwire controller and avoid the overhead of repeatedly writing the page registers.
--- drivers/soundwire/cadence_master.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/soundwire/cadence_master.c +2 -1
@@ -127,7 +127,8 @@ MODULE_PARM_DESC(cdns_mcp_int_mask, "Cadence MCP IntMask");#define CDNS_MCP_CMD_BASE 0x80#define CDNS_MCP_RESP_BASE 0x80 -#define CDNS_MCP_CMD_LEN 0x20 +/* FIFO can hold 8 commands */ +#define CDNS_MCP_CMD_LEN 8#define CDNS_MCP_CMD_WORD_LEN 0x4#define CDNS_MCP_CMD_SSP_TAG BIT(31)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 412/885 driver core: fix potential null-ptr-deref in device_add()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f6837f34a34973ef6600c08195ed300e24e97317 ]
I got the following null-ptr-deref report while doing fault injection test:
BUG: kernel NULL pointer dereference, address: 0000000000000058 CPU: 2 PID: 278 Comm: 37-i2c-ds2482 Tainted: G B W N 6.1.0-rc3+ RIP: 0010:klist_put+0x2d/0xd0 Call Trace: <TASK> klist_remove+0xf1/0x1c0 device_release_driver_internal+0x196/0x210 bus_remove_device+0x1bd/0x240 device_add+0xd3d/0x1100 w1_add_master_device+0x476/0x490 [wire] ds2482_probe+0x303/0x3e0 [ds2482]
This is how it happened:
w1_alloc_dev()
// The dev->driver is set to w1_master_driver. memcpy(&dev->dev, device, sizeof(struct device)); device_add()
bus_add_device()
dpm_sysfs_add() // It fails, calls bus_remove_device.
// error path
bus_remove_device()
// The dev->driver is not null, but driver is not bound.
__device_release_driver()
klist_remove(&dev->p->knode_driver) <-- It causes null-ptr-deref.
// normal path
bus_probe_device() // It's not called yet.
device_bind_driver()If dev->driver is set, in the error path after calling bus_add_device() in device_add(), bus_remove_device() is called, then the device will be detached from driver. But device_bind_driver() is not called yet, so it causes null-ptr-deref while access the 'knode_driver'. To fix this, set dev->driver to null in the error path before calling bus_remove_device().
--- drivers/base/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/base/core.c +1 -0
@@ -3551,6 +3551,7 @@ int device_add(struct device *dev)device_pm_remove (dev);dpm_sysfs_remove (dev); DPMError: + dev->driver =NULL ;bus_remove_device (dev); BusError:device_remove_attrs (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 413/885 kobject: modify kobject_get_path() to take a const *
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 33a0a1e3b3d17445832177981dc7a1c6a5b009f8 ]
kobject_get_path() does not modify the kobject passed to it, so make the pointer constant.
Stable-dep-of: 3bb2a01caa81 ("kobject: Fix slab-out-of-bounds in fill_kobj_path()")
--- include/linux/kobject.h | 2 +- lib/kobject.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
include/linux/kobject.h +1 -1
@@ -115,7 +115,7 @@ extern void kobject_put(struct kobject *kobj);extern const void *kobject_namespace (struct kobject *kobj);extern void kobject_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid); -extern char *kobject_get_path (struct kobject *kobj,gfp_t flag); +extern char *kobject_get_path (const struct kobject *kobj,gfp_t flag);struct kobj_type {void (*release)(struct kobject *kobj);
lib/kobject.c +5 -5
@@ -94,10 +94,10 @@ static int create_dir(struct kobject *kobj)return 0 ; } -static int get_kobj_path_length (struct kobject *kobj) +static int get_kobj_path_length (const struct kobject *kobj) {int length =1 ; -struct kobject *parent = kobj; +const struct kobject *parent = kobj;/* walk up the ancestors until we hit the one pointing to the * root.
@@ -112,9 +112,9 @@ static int get_kobj_path_length(struct kobject *kobj)return length; } -static void fill_kobj_path (struct kobject *kobj,char *path,int length) +static void fill_kobj_path (const struct kobject *kobj,char *path,int length) { -struct kobject *parent; +const struct kobject *parent; --length;for (parent = kobj; parent; parent = parent->parent) {
@@ -136,7 +136,7 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length)* * Return: The newly allocated memory, caller must free with kfree(). */ -char *kobject_get_path (struct kobject *kobj,gfp_t gfp_mask) +char *kobject_get_path (const struct kobject *kobj,gfp_t gfp_mask) {char *path;int len;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 414/885 kobject: Fix slab-out-of-bounds in fill_kobj_path()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 3bb2a01caa813d3a1845d378bbe4169ef280d394 ]
In kobject_get_path(), if kobj->name is changed between calls get_kobj_path_length() and fill_kobj_path() and the length becomes longer, then fill_kobj_path() will have an out-of-bounds bug.
The actual current problem occurs when the ixgbe probe.
In ixgbe_mii_bus_init(), if the length of netdev->dev.kobj.name length becomes longer, out-of-bounds will occur.
cpu0 cpu1ixgbe_probe
register_netdev(netdev)
netdev_register_kobject
device_add
kobject_uevent // Sending ADD events
systemd-udevd // rename netdev
dev_change_name
device_rename
kobject_rename
ixgbe_mii_bus_init |
mdiobus_register |
__mdiobus_register |
device_register |
device_add |
kobject_uevent |
kobject_get_path |
len = get_kobj_path_length // old name |
path = kzalloc(len, gfp_mask); | kobj->name = name; /* name length becomes
* longer */
fill_kobj_path /* kobj path length is
* longer than path,
* resulting in out of
* bounds when filling path
*/
This is the kasan report:
==================================================================
BUG: KASAN: slab-out-of-bounds in fill_kobj_path+0x50/0xc0 Write of size 7 at addr ff1100090573d1fd by task kworker/28:1/673 Workqueue: events work_for_cpu_fn Call Trace: <TASK> dump_stack_lvl+0x34/0x48 print_address_description.constprop.0+0x86/0x1e7 print_report+0x36/0x4f kasan_report+0xad/0x130 kasan_check_range+0x35/0x1c0 memcpy+0x39/0x60 fill_kobj_path+0x50/0xc0 kobject_get_path+0x5a/0xc0 kobject_uevent_env+0x140/0x460 device_add+0x5c7/0x910 __mdiobus_register+0x14e/0x490 ixgbe_probe.cold+0x441/0x574 [ixgbe] local_pci_probe+0x78/0xc0 work_for_cpu_fn+0x26/0x40 process_one_work+0x3b6/0x6a0 worker_thread+0x368/0x520 kthread+0x165/0x1a0 ret_from_fork+0x1f/0x30
This reproducer triggers that bug:
while:
do
rmmod ixgbe
sleep 0.5
modprobe ixgbe
sleep 0.5When calling fill_kobj_path() to fill path, if the name length of kobj becomes longer, return failure and retry. This fixes the problem.
--- lib/kobject.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
lib/kobject.c +10 -2
@@ -112,7 +112,7 @@ static int get_kobj_path_length(const struct kobject *kobj)return length; } -static void fill_kobj_path (const struct kobject *kobj,char *path,int length) +static int fill_kobj_path (const struct kobject *kobj,char *path,int length) {const struct kobject *parent;
@@ -121,12 +121,16 @@ static void fill_kobj_path(const struct kobject *kobj, char *path, int length)int cur =strlen (kobject_name (parent));/* back up enough to print this name with '/' */ length -= cur; +if (length <=0 ) +return -EINVAL ;memcpy (path + length,kobject_name (parent), cur); *(path + --length) ='/' ; }pr_debug ("kobject: '%s' (%p): %s: path = '%s'\n" ,kobject_name (kobj), kobj, __func__, path); + +return 0 ; }/**
@@ -141,13 +145,17 @@ char *kobject_get_path(const struct kobject *kobj, gfp_t gfp_mask)char *path;int len; +retry: len =get_kobj_path_length (kobj);if (len ==0 )return NULL ; path =kzalloc (len, gfp_mask);if (!path)return NULL ; -fill_kobj_path (kobj, path, len); +if (fill_kobj_path (kobj, path, len)) { +kfree (path); + goto retry; + }return path; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 415/885 alpha/boot/tools/objstrip: fix the check for ELF header
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 1878787797cbb019eeefe6f905514dcd557302b6 ]
Just memcmp() with ELFMAG - that's the normal way to do it in userland code, which that thing is. Besides, that has the benefit of actually building - str_has_prefix() is *NOT* present in <string.h>.
--- arch/alpha/boot/tools/objstrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/alpha/boot/tools/objstrip.c +1 -1
@@ -148,7 +148,7 @@ main (int argc, char *argv[])#ifdef __ELF__ elf = (struct elfhdr *) buf; -if (elf->e_ident[0 ] ==0x7f &&str_has_prefix ((char *)elf->e_ident +1 ,"ELF" )) { +if (memcmp (&elf->e_ident[EI_MAG0 ],ELFMAG ,SELFMAG ) ==0 ) {if (elf->e_type !=ET_EXEC ) {fprintf (stderr,"%s: %s is not an ELF executable\n" , prog_name, inname);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 416/885 media: uvcvideo: Check for INACTIVE in uvc_ctrl_is_accessible()
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 9f582f0418ed1c18f92c9e4628075d6ec9a7d9fb ]
Check for inactive controls in uvc_ctrl_is_accessible().
Use the new value for the master_id controls if present, otherwise use the existing value to determine if it is OK to set the control. Doing this here avoids attempting to set an inactive control, which will return an error from the USB device, which returns an invalid errorcode.
This fixes:
warn: v4l2-test-controls.cpp(483): s_ctrl returned EIO
warn: v4l2-test-controls.cpp(483): s_ctrl returned EIO test VIDIOC_G/S_CTRL: OK
warn: v4l2-test-controls.cpp(739): s_ext_ctrls returned EIO
warn: v4l2-test-controls.cpp(739): s_ext_ctrls returned EIO
warn: v4l2-test-controls.cpp(816): s_ext_ctrls returned EIO test VIDIOC_G/S/TRY_EXT_CTRLS: OK
Tested with:
v4l2-ctl -c auto_exposure=1
OK
v4l2-ctl -c exposure_time_absolute=251
OK
v4l2-ctl -c auto_exposure=3
OK
v4l2-ctl -c exposure_time_absolute=251VIDIOC_S_EXT_CTRLS: failed: Input/output errorexposure_time_absolute: Input/output error
ERROR
v4l2-ctl -c auto_exposure=3,exposure_time_absolute=251,auto_exposure=1 v4l2-ctl -C auto_exposure,exposure_time_absoluteauto_exposure: 1exposure_time_absolute: 251
--- drivers/media/usb/uvc/uvc_ctrl.c | 42 +++++++++++++++++++++++++++++++- drivers/media/usb/uvc/uvc_v4l2.c | 3 +-- drivers/media/usb/uvc/uvcvideo.h | 3 ++- 3 files changed, 44 insertions(+), 4 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +41 -1
@@ -1085,11 +1085,28 @@ static int uvc_query_v4l2_class(struct uvc_video_chain *chain, u32 req_id,return 0 ; } +/* +* Check if control @v4l2_id can be accessed by the given control @ioctl +* (VIDIOC_G_EXT_CTRLS, VIDIOC_TRY_EXT_CTRLS or VIDIOC_S_EXT_CTRLS). +* +* For set operations on slave controls, check if the master's value is set to +* manual, either in the others controls set in the same ioctl call, or from +* the master's current value. This catches VIDIOC_S_EXT_CTRLS calls that set +* both the master and slave control, such as for instance setting +* auto_exposure=1, exposure_time_absolute=251. +*/ int uvc_ctrl_is_accessible (struct uvc_video_chain *chain,u32 v4l2_id, -bool read) +const struct v4l2_ext_controls *ctrls, +unsigned long ioctl) { +struct uvc_control_mapping *master_map =NULL ; +struct uvc_control *master_ctrl =NULL ;struct uvc_control_mapping *mapping;struct uvc_control *ctrl; +bool read = ioctl ==VIDIOC_G_EXT_CTRLS ; +s32 val; +int ret; +int i;if (__uvc_query_v4l2_class (chain, v4l2_id,0 ) >=0 )return -EACCES ;
@@ -1104,6 +1121,29 @@ int uvc_ctrl_is_accessible(struct uvc_video_chain *chain, u32 v4l2_id,if (!(ctrl->info.flags &UVC_CTRL_FLAG_SET_CUR ) && !read)return -EACCES ; +if (ioctl !=VIDIOC_S_EXT_CTRLS || !mapping->master_id) +return 0 ; + +/* +* Iterate backwards in cases where the master control is accessed +* multiple times in the same ioctl. We want the last value. +*/ +for (i = ctrls->count -1 ; i >=0 ; i--) { +if (ctrls->controls[i].id == mapping->master_id) +return ctrls->controls[i].value == + mapping->master_manual ?0 : -EACCES ; + } + +__uvc_find_control (ctrl->entity, mapping->master_id, &master_map, + &master_ctrl,0 ); + +if (!master_ctrl || !(master_ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR )) +return 0 ; + + ret =__uvc_ctrl_get (chain, master_ctrl, master_map, &val); +if (ret >=0 && val != mapping->master_manual) +return -EACCES ; +return 0 ; }
drivers/media/usb/uvc/uvc_v4l2.c +1 -2
@@ -1020,8 +1020,7 @@ static int uvc_ctrl_check_access(struct uvc_video_chain *chain,int ret =0 ;for (i =0 ; i < ctrls->count; ++ctrl, ++i) { - ret =uvc_ctrl_is_accessible (chain, ctrl->id, - ioctl ==VIDIOC_G_EXT_CTRLS ); + ret =uvc_ctrl_is_accessible (chain, ctrl->id, ctrls, ioctl);if (ret)break ; }
drivers/media/usb/uvc/uvcvideo.h +2 -1
@@ -761,7 +761,8 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *handle)int uvc_ctrl_get (struct uvc_video_chain *chain,struct v4l2_ext_control *xctrl);int uvc_ctrl_set (struct uvc_fh *handle,struct v4l2_ext_control *xctrl);int uvc_ctrl_is_accessible (struct uvc_video_chain *chain,u32 v4l2_id, -bool read); +const struct v4l2_ext_controls *ctrls, +unsigned long ioctl);int uvc_xu_ctrl_query (struct uvc_video_chain *chain,struct uvc_xu_control_query *xqry);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 417/885 media: uvcvideo: Implement mask for V4L2_CTRL_TYPE_MENU
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
[ Upstream commit 40140eda661ea4be219ef194a4f43b7b5e3bbd27 ]
Replace the count with a mask field that lets us choose not only the max value, but also the minimum value and what values are valid in between.
Stable-dep-of: 3aa8628eb78a ("media: uvcvideo: Refactor power_line_frequency_controls_limited")
--- drivers/media/usb/uvc/uvc_ctrl.c | 33 +++++++++++++++++++++--------- drivers/media/usb/uvc/uvc_driver.c | 4 +++- drivers/media/usb/uvc/uvc_v4l2.c | 3 ++- drivers/media/usb/uvc/uvcvideo.h | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +23 -10
@@ -6,6 +6,7 @@* Laurent Pinchart ([email protected]) */ +#include <linux/bitops.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/module.h>
@@ -525,7 +526,8 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_MENU, .data_type = UVC_CTRL_DATA_TYPE_BITMASK, .menu_info = exposure_auto_controls, - .menu_count = ARRAY_SIZE(exposure_auto_controls), + .menu_mask = GENMASK(V4L2_EXPOSURE_APERTURE_PRIORITY, + V4L2_EXPOSURE_AUTO), .slave_ids = { V4L2_CID_EXPOSURE_ABSOLUTE, }, }, {
@@ -731,7 +733,8 @@ static const struct uvc_control_mapping uvc_ctrl_mappings_uvc11[] = { .v4l2_type = V4L2_CTRL_TYPE_MENU, .data_type = UVC_CTRL_DATA_TYPE_ENUM, .menu_info = power_line_frequency_controls, - .menu_count = ARRAY_SIZE(power_line_frequency_controls) - 1, + .menu_mask = GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_60HZ, + V4L2_CID_POWER_LINE_FREQUENCY_DISABLED), }, };
@@ -745,7 +748,8 @@ static const struct uvc_control_mapping uvc_ctrl_mappings_uvc15[] = { .v4l2_type = V4L2_CTRL_TYPE_MENU, .data_type = UVC_CTRL_DATA_TYPE_ENUM, .menu_info = power_line_frequency_controls, - .menu_count = ARRAY_SIZE(power_line_frequency_controls), + .menu_mask = GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_AUTO, + V4L2_CID_POWER_LINE_FREQUENCY_DISABLED), }, };
@@ -975,7 +979,9 @@ static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping,const struct uvc_menu_info *menu = mapping->menu_info;unsigned int i; -for (i =0 ; i < mapping->menu_count; ++i, ++menu) { +for (i =0 ;BIT (i) <= mapping->menu_mask; ++i, ++menu) { +if (!test_bit (i, &mapping->menu_mask)) +continue ;if (menu->value == value) { value = i;break ;
@@ -1209,12 +1215,14 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,switch (mapping->v4l2_type) {case V4L2_CTRL_TYPE_MENU : - v4l2_ctrl->minimum =0 ; - v4l2_ctrl->maximum = mapping->menu_count -1 ; + v4l2_ctrl->minimum =ffs (mapping->menu_mask) -1 ; + v4l2_ctrl->maximum =fls (mapping->menu_mask) -1 ; v4l2_ctrl->step =1 ; menu = mapping->menu_info; -for (i =0 ; i < mapping->menu_count; ++i, ++menu) { +for (i =0 ;BIT (i) <= mapping->menu_mask; ++i, ++menu) { +if (!test_bit (i, &mapping->menu_mask)) +continue ;if (menu->value == v4l2_ctrl->default_value) { v4l2_ctrl->default_value = i;break ;
@@ -1329,7 +1337,7 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain, goto done; } -if (query_menu->index >= mapping->menu_count) { +if (!test_bit (query_menu->index, &mapping->menu_mask)) { ret = -EINVAL ; goto done; }
@@ -1837,8 +1845,13 @@ int uvc_ctrl_set(struct uvc_fh *handle,break ;case V4L2_CTRL_TYPE_MENU : -if (xctrl->value <0 || xctrl->value >= mapping->menu_count) +if (xctrl->value < (ffs (mapping->menu_mask) -1 ) || + xctrl->value > (fls (mapping->menu_mask) -1 ))return -ERANGE ; + +if (!test_bit (xctrl->value, &mapping->menu_mask)) +return -EINVAL ; + value = mapping->menu_info[xctrl->value].value;/*
@@ -2277,7 +2290,7 @@ static int __uvc_ctrl_add_mapping(struct uvc_video_chain *chain,INIT_LIST_HEAD (&map->ev_subs); - size =sizeof (*mapping->menu_info) * mapping->menu_count; + size =sizeof (*mapping->menu_info) *fls (mapping->menu_mask); map->menu_info =kmemdup (mapping->menu_info, size,GFP_KERNEL );if (map->menu_info ==NULL ) {kfree (map->name);
drivers/media/usb/uvc/uvc_driver.c +3 -1
@@ -7,6 +7,7 @@*/ #include <linux/atomic.h> +#include <linux/bits.h> #include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/list.h>
@@ -2387,7 +2388,8 @@ static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = { .v4l2_type = V4L2_CTRL_TYPE_MENU, .data_type = UVC_CTRL_DATA_TYPE_ENUM, .menu_info = power_line_frequency_controls_limited, - .menu_count = ARRAY_SIZE(power_line_frequency_controls_limited), + .menu_mask = + GENMASK(ARRAY_SIZE(power_line_frequency_controls_limited) - 1, 0), };static const struct uvc_device_info uvc_ctrl_power_line_limited = {
drivers/media/usb/uvc/uvc_v4l2.c +2 -1
@@ -6,6 +6,7 @@* Laurent Pinchart ([email protected]) */ +#include <linux/bits.h> #include <linux/compat.h> #include <linux/kernel.h> #include <linux/list.h>
@@ -80,7 +81,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, goto free_map; } - map->menu_count = xmap->menu_count; + map->menu_mask =GENMASK (xmap->menu_count -1 ,0 );break ;default :
drivers/media/usb/uvc/uvcvideo.h +1 -1
@@ -117,7 +117,7 @@ struct uvc_control_mapping {u32 data_type;const struct uvc_menu_info *menu_info; -u32 menu_count; +unsigned long menu_mask;u32 master_id;s32 master_manual;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 418/885 media: uvcvideo: Refactor uvc_ctrl_mappings_uvcXX
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
[ Upstream commit 96a160b068e09b4ed5a32e2179e5219fc3545eca ]
Convert the array of structs into an array of pointers, that way the mappings can be reused.
Stable-dep-of: 3aa8628eb78a ("media: uvcvideo: Refactor power_line_frequency_controls_limited")
--- drivers/media/usb/uvc/uvc_ctrl.c | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +37 -37
@@ -723,34 +723,40 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { }, }; -static const struct uvc_control_mapping uvc_ctrl_mappings_uvc11[] = { - { - .id =V4L2_CID_POWER_LINE_FREQUENCY , - .entity =UVC_GUID_UVC_PROCESSING , - .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , - .size =2 , - .offset =0 , - .v4l2_type =V4L2_CTRL_TYPE_MENU , - .data_type =UVC_CTRL_DATA_TYPE_ENUM , - .menu_info = power_line_frequency_controls, - .menu_mask =GENMASK (V4L2_CID_POWER_LINE_FREQUENCY_60HZ , -V4L2_CID_POWER_LINE_FREQUENCY_DISABLED ), - }, +static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 = { + .id =V4L2_CID_POWER_LINE_FREQUENCY , + .entity =UVC_GUID_UVC_PROCESSING , + .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , + .size =2 , + .offset =0 , + .v4l2_type =V4L2_CTRL_TYPE_MENU , + .data_type =UVC_CTRL_DATA_TYPE_ENUM , + .menu_info = power_line_frequency_controls, + .menu_mask =GENMASK (V4L2_CID_POWER_LINE_FREQUENCY_60HZ , +V4L2_CID_POWER_LINE_FREQUENCY_DISABLED ), }; -static const struct uvc_control_mapping uvc_ctrl_mappings_uvc15[] = { - { - .id =V4L2_CID_POWER_LINE_FREQUENCY , - .entity =UVC_GUID_UVC_PROCESSING , - .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , - .size =2 , - .offset =0 , - .v4l2_type =V4L2_CTRL_TYPE_MENU , - .data_type =UVC_CTRL_DATA_TYPE_ENUM , - .menu_info = power_line_frequency_controls, - .menu_mask =GENMASK (V4L2_CID_POWER_LINE_FREQUENCY_AUTO , -V4L2_CID_POWER_LINE_FREQUENCY_DISABLED ), - }, +static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc11[] = { + &uvc_ctrl_power_line_mapping_uvc11, +NULL ,/* Sentinel */ +}; + +static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc15 = { + .id =V4L2_CID_POWER_LINE_FREQUENCY , + .entity =UVC_GUID_UVC_PROCESSING , + .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , + .size =2 , + .offset =0 , + .v4l2_type =V4L2_CTRL_TYPE_MENU , + .data_type =UVC_CTRL_DATA_TYPE_ENUM , + .menu_info = power_line_frequency_controls, + .menu_mask =GENMASK (V4L2_CID_POWER_LINE_FREQUENCY_AUTO , +V4L2_CID_POWER_LINE_FREQUENCY_DISABLED ), +}; + +static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc15[] = { + &uvc_ctrl_power_line_mapping_uvc15, +NULL ,/* Sentinel */ };/* ------------------------------------------------------------------------
@@ -2474,8 +2480,7 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev,static void uvc_ctrl_init_ctrl (struct uvc_video_chain *chain,struct uvc_control *ctrl) { -const struct uvc_control_mapping *mappings; -unsigned int num_mappings; +const struct uvc_control_mapping **mappings;unsigned int i;/*
@@ -2542,16 +2547,11 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, }/* Finally process version-specific mappings. */ -if (chain->dev->uvc_version <0x0150 ) { - mappings = uvc_ctrl_mappings_uvc11; - num_mappings =ARRAY_SIZE (uvc_ctrl_mappings_uvc11); - }else { - mappings = uvc_ctrl_mappings_uvc15; - num_mappings =ARRAY_SIZE (uvc_ctrl_mappings_uvc15); - } + mappings = chain->dev->uvc_version <0x0150 + ? uvc_ctrl_mappings_uvc11 : uvc_ctrl_mappings_uvc15; -for (i =0 ; i < num_mappings; ++i) { -const struct uvc_control_mapping *mapping = &mappings[i]; +for (i =0 ; mappings[i]; ++i) { +const struct uvc_control_mapping *mapping = mappings[i];if (uvc_entity_match_guid (ctrl->entity, mapping->entity) && ctrl->info.selector == mapping->selector)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 419/885 media: uvcvideo: Refactor power_line_frequency_controls_limited
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
[ Upstream commit 3aa8628eb78a63d0bf93e159846e9c92bccc8f69 ]
Move the control mapping to uvc_ctrl.c. This way we do not have references to UVC controls or V4L2 controls in uvc_driver.c.
This also fixes a bug introduced in commit 382075604a68 ("media:
uvcvideo: Limit power line control for Quanta UVC Webcam"). The offending commit caused the power line control menu entries to have incorrect indices compared to the V4L2_CID_POWER_LINE_FREQUENCY_* enumeration. Now that the limited mapping reuses the correct menu_info array, the indices correctly map to the V4L2 control specification.
--- drivers/media/usb/uvc/uvc_ctrl.c | 13 +++++++++++++ drivers/media/usb/uvc/uvc_driver.c | 18 ------------------ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 14 insertions(+), 18 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +13 -0
@@ -723,6 +723,19 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { }, }; +const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = { + .id =V4L2_CID_POWER_LINE_FREQUENCY , + .entity =UVC_GUID_UVC_PROCESSING , + .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , + .size =2 , + .offset =0 , + .v4l2_type =V4L2_CTRL_TYPE_MENU , + .data_type =UVC_CTRL_DATA_TYPE_ENUM , + .menu_info = power_line_frequency_controls, + .menu_mask =GENMASK (V4L2_CID_POWER_LINE_FREQUENCY_60HZ , +V4L2_CID_POWER_LINE_FREQUENCY_50HZ ), +}; +static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 = { .id =V4L2_CID_POWER_LINE_FREQUENCY , .entity =UVC_GUID_UVC_PROCESSING ,
drivers/media/usb/uvc/uvc_driver.c +0 -18
@@ -2374,24 +2374,6 @@ MODULE_PARM_DESC(timeout, "Streaming control requests timeout");* Driver initialization and cleanup */ -static const struct uvc_menu_info power_line_frequency_controls_limited[] = { - {1 ,"50 Hz" }, - {2 ,"60 Hz" }, -}; - -static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited = { - .id =V4L2_CID_POWER_LINE_FREQUENCY , - .entity =UVC_GUID_UVC_PROCESSING , - .selector =UVC_PU_POWER_LINE_FREQUENCY_CONTROL , - .size =2 , - .offset =0 , - .v4l2_type =V4L2_CTRL_TYPE_MENU , - .data_type =UVC_CTRL_DATA_TYPE_ENUM , - .menu_info = power_line_frequency_controls_limited, - .menu_mask = -GENMASK (ARRAY_SIZE (power_line_frequency_controls_limited) -1 ,0 ), -}; -static const struct uvc_device_info uvc_ctrl_power_line_limited = { .mappings = (const struct uvc_control_mapping *[]) { &uvc_ctrl_power_line_mapping_limited,
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -728,6 +728,7 @@ int uvc_status_start(struct uvc_device *dev, gfp_t flags);void uvc_status_stop (struct uvc_device *dev);/* Controls */ +extern const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limited;extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops; int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 420/885 coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
In reply to Greg Kroah-HartmanFrom: Junhao He <[email protected]>
[ Upstream commit 589d928248b72f8377d45904a14bcf686aa8bbeb ]
The TRCSEQRSTEVR and TRCSEQSTR registers are not implemented if the TRCIDR5.NUMSEQSTATE == 0. Skip accessing the registers in such cases.
--- .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +12 -6
@@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)etm4x_relaxed_write32 (csa, config->vipcssctlr,TRCVIPCSSCTLR );for (i =0 ; i < drvdata->nrseqstate -1 ; i++)etm4x_relaxed_write32 (csa, config->seq_ctrl[i],TRCSEQEVRn (i)); -etm4x_relaxed_write32 (csa, config->seq_rst,TRCSEQRSTEVR ); -etm4x_relaxed_write32 (csa, config->seq_state,TRCSEQSTR ); +if (drvdata->nrseqstate) { +etm4x_relaxed_write32 (csa, config->seq_rst,TRCSEQRSTEVR ); +etm4x_relaxed_write32 (csa, config->seq_state,TRCSEQSTR ); + }etm4x_relaxed_write32 (csa, config->ext_inp,TRCEXTINSELR );for (i =0 ; i < drvdata->nr_cntr; i++) {etm4x_relaxed_write32 (csa, config->cntrldvr[i],TRCCNTRLDVRn (i));
@@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)for (i =0 ; i < drvdata->nrseqstate -1 ; i++) state->trcseqevr[i] =etm4x_read32 (csa,TRCSEQEVRn (i)); - state->trcseqrstevr =etm4x_read32 (csa,TRCSEQRSTEVR ); - state->trcseqstr =etm4x_read32 (csa,TRCSEQSTR ); +if (drvdata->nrseqstate) { + state->trcseqrstevr =etm4x_read32 (csa,TRCSEQRSTEVR ); + state->trcseqstr =etm4x_read32 (csa,TRCSEQSTR ); + } state->trcextinselr =etm4x_read32 (csa,TRCEXTINSELR );for (i =0 ; i < drvdata->nr_cntr; i++) {
@@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)for (i =0 ; i < drvdata->nrseqstate -1 ; i++)etm4x_relaxed_write32 (csa, state->trcseqevr[i],TRCSEQEVRn (i)); -etm4x_relaxed_write32 (csa, state->trcseqrstevr,TRCSEQRSTEVR ); -etm4x_relaxed_write32 (csa, state->trcseqstr,TRCSEQSTR ); +if (drvdata->nrseqstate) { +etm4x_relaxed_write32 (csa, state->trcseqrstevr,TRCSEQRSTEVR ); +etm4x_relaxed_write32 (csa, state->trcseqstr,TRCSEQSTR ); + }etm4x_relaxed_write32 (csa, state->trcextinselr,TRCEXTINSELR );for (i =0 ; i < drvdata->nr_cntr; i++) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 421/885 coresight: cti: Prevent negative values of enable count
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
[ Upstream commit 3244fb6dbbf1ffc114cdf382cc167bdd8c18088a ]
Writing 0 to the enable control repeatedly results in a negative value for enable_req_count. After this, writing 1 to the enable control appears to not work until the count returns to positive.
Change it so that it's impossible for enable_req_count to be < 0. Return an error to indicate that the disable request was invalid.
--- drivers/hwtracing/coresight/coresight-cti-core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-cti-core.c +9 -2
@@ -151,9 +151,16 @@ static int cti_disable_hw(struct cti_drvdata *drvdata) {struct cti_config *config = &drvdata->config;struct coresight_device *csdev = drvdata->csdev; +int ret =0 ;spin_lock (&drvdata->spinlock); +/* don't allow negative refcounts, return an error */ +if (!atomic_read (&drvdata->config.enable_req_count)) { + ret = -EINVAL ; + goto cti_not_disabled; + } +/* check refcount - disable on 0 */ if (atomic_dec_return (&drvdata->config.enable_req_count) >0 ) goto cti_not_disabled;
@@ -171,12 +178,12 @@ static int cti_disable_hw(struct cti_drvdata *drvdata)coresight_disclaim_device_unlocked (csdev);CS_LOCK (drvdata->base);spin_unlock (&drvdata->spinlock); -return 0 ; +return ret;/* not disabled this call */ cti_not_disabled:spin_unlock (&drvdata->spinlock); -return 0 ; +return ret; }void cti_write_single_reg (struct cti_drvdata *drvdata,int offset,u32 value)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 422/885 coresight: cti: Add PM runtime call in enable_store
In reply to Greg Kroah-HartmanFrom: Mao Jinlong <[email protected]>
[ Upstream commit eff674a9b86a6ffdd10c3af3863545acf7f1ce4f ]
In commit 6746eae4bbad ("coresight: cti: Fix hang in cti_disable_hw()") PM runtime calls are removed from cti_enable_hw/cti_disable_hw. When enabling CTI by writing enable sysfs node, clock for accessing CTI register won't be enabled. Device will crash due to register access issue. Add PM runtime call in enable_store to fix this issue.
--- drivers/hwtracing/coresight/coresight-cti-sysfs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-cti-sysfs.c +11 -2
@@ -108,10 +108,19 @@ static ssize_t enable_store(struct device *dev,if (ret)return ret; -if (val) +if (val) { + ret =pm_runtime_resume_and_get (dev->parent); +if (ret) +return ret; ret =cti_enable (drvdata->csdev); -else +if (ret) +pm_runtime_put (dev->parent); + }else { ret =cti_disable (drvdata->csdev); +if (!ret) +pm_runtime_put (dev->parent); + } +if (ret)return ret;return size;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 423/885 usb: typec: intel_pmc_mux: Dont leak the ACPI device reference count
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c3194949ae8fcbe2b7e38670e7c6a5cfd2605edc ]
When acpi_dev_get_memory_resources() fails, the reference count is left bumped. Drop it as it's done in the other error paths.
--- drivers/usb/typec/mux/intel_pmc_mux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/typec/mux/intel_pmc_mux.c +3 -1
@@ -614,8 +614,10 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc)INIT_LIST_HEAD (&resource_list); ret =acpi_dev_get_memory_resources (adev, &resource_list); -if (ret <0 ) +if (ret <0 ) { +acpi_dev_put (adev);return ret; + } rentry = list_first_entry_or_null(&resource_list, struct resource_entry, node);if (rentry)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 424/885 PCI/IOV: Enlarge virtfn sysfs name buffer
In reply to Greg Kroah-HartmanFrom: Alexey V. Vissarionov <[email protected]>
[ Upstream commit ea0b5aa5f184cf8293c93163f0fb00505190d431 ]
The sysfs link name "virtfn%u" constructed by pci_iov_sysfs_link() requires 17 bytes to contain the longest possible string. Increase VIRTFN_ID_LEN to accommodate that.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/pci/iov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/iov.c +1 -1
@@ -14,7 +14,7 @@#include <linux/delay.h> #include "pci.h" -#define VIRTFN_ID_LEN 16 +#define VIRTFN_ID_LEN 17/* "virtfn%u\0" for 2^32 - 1 */ int pci_iov_virtfn_bus (struct pci_dev *dev,int vf_id) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 425/885 PCI: switchtec: Return -EFAULT for copy_to_user() errors
In reply to Greg Kroah-HartmanFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit ddc10938e08cd7aac63d8385f7305f7889df5179 ]
switchtec_dev_read() didn't handle copy_to_user() errors correctly: it assigned "rc = -EFAULT", but actually returned either "size", -ENXIO, or -EBADMSG instead.
Update the failure cases to unlock mrpc_mutex and return -EFAULT directly.
--- drivers/pci/switch/switchtec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pci/switch/switchtec.c +4 -5
@@ -606,21 +606,20 @@ static ssize_t switchtec_dev_read(struct file *filp, char __user *data, rc =copy_to_user (data, &stuser->return_code,sizeof (stuser->return_code));if (rc) { - rc = -EFAULT ; - goto out; +mutex_unlock (&stdev->mrpc_mutex); +return -EFAULT ; } data +=sizeof (stuser->return_code); rc =copy_to_user (data, &stuser->data, size -sizeof (stuser->return_code));if (rc) { - rc = -EFAULT ; - goto out; +mutex_unlock (&stdev->mrpc_mutex); +return -EFAULT ; }stuser_set_state (stuser,MRPC_IDLE ); -out:mutex_unlock (&stdev->mrpc_mutex); if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 426/885 PCI: endpoint: pci-epf-vntb: Clean up kernel_doc warning
In reply to Greg Kroah-HartmanFrom: Frank Li <[email protected]>
[ Upstream commit 9298804840457c29c7e115f3a87bec406c262c81 ]
Cleanup warning found by scripts/kernel-doc.
Consolidate terms:
- host, host1 to HOST
- vhost, vHost, Vhost, VHOST2 to VHOST
Stable-dep-of: fd858402c6d0 ("PCI: endpoint: pci-epf-vntb: Add epf_ntb_mw_bar_clear() num_mws kernel-doc")
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 83 ++++++++++++------- 1 file changed, 54 insertions(+), 29 deletions(-)
drivers/pci/endpoint/functions/pci-epf-vntb.c +54 -29
@@ -11,7 +11,7 @@* Author: Kishon Vijay Abraham I <[email protected]> */ -/** +/* * +------------+ +---------------------------------------+ * | | | | * +------------+ | +--------------+
@@ -156,12 +156,14 @@ static struct pci_epf_header epf_ntb_header = { };/** -* epf_ntb_link_up() - Raise link_up interrupt to Virtual Host +* epf_ntb_link_up() - Raise link_up interrupt to Virtual Host (VHOST) * @ntb: NTB device that facilitates communication between HOST and VHOST * @link_up: true or false indicating Link is UP or Down * * Once NTB function in HOST invoke ntb_link_enable(), -* this NTB function driver will trigger a link event to vhost. +* this NTB function driver will trigger a link event to VHOST. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_link_up (struct epf_ntb *ntb,bool link_up) {
@@ -175,9 +177,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) }/** -* epf_ntb_configure_mw() - Configure the Outbound Address Space for vhost -* to access the memory window of host -* @ntb: NTB device that facilitates communication between host and vhost +* epf_ntb_configure_mw() - Configure the Outbound Address Space for VHOST +* to access the memory window of HOST +* @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * EP Outbound Window
@@ -194,7 +196,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up)* | | | | * | | | | * +--------+ +-----------+ -* VHost PCI EP +* VHOST PCI EP +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_mw (struct epf_ntb *ntb,u32 mw) {
@@ -219,7 +223,7 @@ static int epf_ntb_configure_mw(struct epf_ntb *ntb, u32 mw)/** * epf_ntb_teardown_mw() - Teardown the configured OB ATU -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * Teardown the configured OB ATU configured in epf_ntb_configure_mw() using
@@ -234,12 +238,12 @@ static void epf_ntb_teardown_mw(struct epf_ntb *ntb, u32 mw) }/** -* epf_ntb_cmd_handler() - Handle commands provided by the NTB Host +* epf_ntb_cmd_handler() - Handle commands provided by the NTB HOST * @work: work_struct for the epf_ntb_epc * * Workqueue function that gets invoked for the two epf_ntb_epc * periodically (once every 5ms) to see if it has received any commands -* from NTB host. The host can send commands to configure doorbell or +* from NTB HOST. The HOST can send commands to configure doorbell or * configure memory window or to update link status. */ static void epf_ntb_cmd_handler (struct work_struct *work)
@@ -321,8 +325,8 @@ static void epf_ntb_cmd_handler(struct work_struct *work)/** * epf_ntb_config_sspad_bar_clear() - Clear Config + Self scratchpad BAR -* @ntb_epc: EPC associated with one of the HOST which holds peer's outbound -* address. +* @ntb: EPC associated with one of the HOST which holds peer's outbound +* address. * * Clear BAR0 of EP CONTROLLER 1 which contains the HOST1's config and * self scratchpad region (removes inbound ATU configuration). While BAR0 is
@@ -331,8 +335,10 @@ static void epf_ntb_cmd_handler(struct work_struct *work)* used for self scratchpad from epf_ntb_bar[BAR_CONFIG]. * * Please note the self scratchpad region and config region is combined to -* a single region and mapped using the same BAR. Also note HOST2's peer -* scratchpad is HOST1's self scratchpad. +* a single region and mapped using the same BAR. Also note VHOST's peer +* scratchpad is HOST's self scratchpad. +* +* Returns: void */ static void epf_ntb_config_sspad_bar_clear (struct epf_ntb *ntb) {
@@ -347,13 +353,15 @@ static void epf_ntb_config_sspad_bar_clear(struct epf_ntb *ntb)/** * epf_ntb_config_sspad_bar_set() - Set Config + Self scratchpad BAR -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST * -* Map BAR0 of EP CONTROLLER 1 which contains the HOST1's config and +* Map BAR0 of EP CONTROLLER which contains the VHOST's config and * self scratchpad region. * * Please note the self scratchpad region and config region is combined to * a single region and mapped using the same BAR. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_sspad_bar_set (struct epf_ntb *ntb) {
@@ -380,7 +388,7 @@ static int epf_ntb_config_sspad_bar_set(struct epf_ntb *ntb)/** * epf_ntb_config_spad_bar_free() - Free the physical memory associated with * config + scratchpad region -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_config_spad_bar_free (struct epf_ntb *ntb) {
@@ -393,11 +401,13 @@ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb)/** * epf_ntb_config_spad_bar_alloc() - Allocate memory for config + scratchpad * region -* @ntb: NTB device that facilitates communication between HOST1 and HOST2 +* @ntb: NTB device that facilitates communication between HOST and VHOST * * Allocate the Local Memory mentioned in the above diagram. The size of * CONFIG REGION is sizeof(struct epf_ntb_ctrl) and size of SCRATCHPAD REGION * is obtained from "spad-count" configfs entry. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_spad_bar_alloc (struct epf_ntb *ntb) {
@@ -465,11 +475,13 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) }/** -* epf_ntb_configure_interrupt() - Configure MSI/MSI-X capaiblity -* @ntb: NTB device that facilitates communication between HOST and vHOST +* epf_ntb_configure_interrupt() - Configure MSI/MSI-X capability +* @ntb: NTB device that facilitates communication between HOST and VHOST * * Configure MSI/MSI-X capability for each interface with number of * interrupts equal to "db_count" configfs entry. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_interrupt (struct epf_ntb *ntb) {
@@ -511,7 +523,9 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb)/** * epf_ntb_db_bar_init() - Configure Doorbell window BARs -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_db_bar_init (struct epf_ntb *ntb) {
@@ -566,7 +580,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws);/** * epf_ntb_db_bar_clear() - Clear doorbell BAR and free memory * allocated in peer's outbound address space -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_db_bar_clear (struct epf_ntb *ntb) {
@@ -582,8 +596,9 @@ static void epf_ntb_db_bar_clear(struct epf_ntb *ntb)/** * epf_ntb_mw_bar_init() - Configure Memory window BARs -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST * +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_mw_bar_init (struct epf_ntb *ntb) {
@@ -639,7 +654,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb)/** * epf_ntb_mw_bar_clear() - Clear Memory window BARs -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_mw_bar_clear (struct epf_ntb *ntb,int num_mws) {
@@ -662,7 +677,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws)/** * epf_ntb_epc_destroy() - Cleanup NTB EPC interface -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper for epf_ntb_epc_destroy_interface() to cleanup all the NTB interfaces */
@@ -675,7 +690,9 @@ static void epf_ntb_epc_destroy(struct epf_ntb *ntb)/** * epf_ntb_init_epc_bar() - Identify BARs to be used for each of the NTB * constructs (scratchpad region, doorbell, memorywindow) -* @ntb: NTB device that facilitates communication between HOST and vHOST +* @ntb: NTB device that facilitates communication between HOST and VHOST +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_init_epc_bar (struct epf_ntb *ntb) {
@@ -716,11 +733,13 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb)/** * epf_ntb_epc_init() - Initialize NTB interface -* @ntb: NTB device that facilitates communication between HOST and vHOST2 +* @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to initialize a particular EPC interface and start the workqueue -* to check for commands from host. This function will write to the +* to check for commands from HOST. This function will write to the * EP controller HW for configuring it. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_epc_init (struct epf_ntb *ntb) {
@@ -787,7 +806,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb)/** * epf_ntb_epc_cleanup() - Cleanup all NTB interfaces -* @ntb: NTB device that facilitates communication between HOST1 and HOST2 +* @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to cleanup all NTB interfaces. */
@@ -951,6 +970,8 @@ static const struct config_item_type ntb_group_type = {* * Add configfs directory specific to NTB. This directory will hold * NTB specific properties like db_count, spad_count, num_mws etc., +* +* Returns: Pointer to config_group */ static struct config_group *epf_ntb_add_cfs (struct pci_epf *epf,struct config_group *group)
@@ -1292,6 +1313,8 @@ static struct pci_driver vntb_pci_driver = {* Invoked when a primary interface or secondary interface is bound to EPC * device. This function will succeed only when EPC is bound to both the * interfaces. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_bind (struct pci_epf *epf) {
@@ -1377,6 +1400,8 @@ static struct pci_epf_ops epf_ntb_ops = {* * Probe NTB function driver when endpoint function bus detects a NTB * endpoint function. +* +* Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_probe (struct pci_epf *epf) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 427/885 PCI: endpoint: pci-epf-vntb: Add epf_ntb_mw_bar_clear() num_mws kernel-doc
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit fd858402c6d0a80e0b543886b9f7865c6d76d5d6 ]
8e4bfbe644a6 ("PCI: endpoint: pci-epf-vntb: fix error handle in epf_ntb_mw_bar_init()") added a "num_mws" parameter to epf_ntb_mw_bar_clear() but failed to add kernel-doc for num_mws.
Add kernel-doc for num_mws on epf_ntb_mw_bar_clear().
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/endpoint/functions/pci-epf-vntb.c +1 -0
@@ -655,6 +655,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb)/** * epf_ntb_mw_bar_clear() - Clear Memory window BARs * @ntb: NTB device that facilitates communication between HOST and VHOST +* @num_mws: the number of Memory window BARs that to be cleared */ static void epf_ntb_mw_bar_clear (struct epf_ntb *ntb,int num_mws) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 428/885 hwtracing: hisi_ptt: Only add the supported devices to the filters list
In reply to Greg Kroah-HartmanFrom: Yicong Yang <[email protected]>
[ Upstream commit b8d976c7d41a28c0fccf22c7113be9a29dc07e5c ]
The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So check when initializing the filters list.
--- drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +10 -0
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)static int hisi_ptt_init_filters (struct pci_dev *pdev,void *data) { +struct pci_dev *root_port =pcie_find_root_port (pdev);struct hisi_ptt_filter_desc *filter;struct hisi_ptt *hisi_ptt = data; +u32 port_devid; + +if (!root_port) +return 0 ; + + port_devid =PCI_DEVID (root_port->bus->number, root_port->devfn); +if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) +return 0 ;/* * We won't fail the probe if filter allocation failed here. The filters
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 429/885 tty: serial: fsl_lpuart: disable Rx/Tx DMA in lpuart32_shutdown()
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
[ Upstream commit 1d4bd0e4ae4ba95892bef919a8d4d3f08f122d7e ]
UARTBAUD_RDMAE and UARTBAUD_TDMAE are enabled in lpuart32_startup(), but lpuart32_shutdown() not disable them, only free the dma ring buffer and release the dma channels, so here disable the Rx/Tx DMA first in lpuart32_shutdown().
--- drivers/tty/serial/fsl_lpuart.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/tty/serial/fsl_lpuart.c +5 -0
@@ -1791,6 +1791,11 @@ static void lpuart32_shutdown(struct uart_port *port)spin_lock_irqsave (&port->lock, flags); +/* disable Rx/Tx DMA */ + temp =lpuart32_read (port,UARTBAUD ); + temp &= ~(UARTBAUD_TDMAE |UARTBAUD_RDMAE ); +lpuart32_write (port, temp,UARTBAUD ); +/* disable Rx/Tx and interrupts */ temp =lpuart32_read (port,UARTCTRL ); temp &= ~(UARTCTRL_TE | UARTCTRL_RE |
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 430/885 tty: serial: fsl_lpuart: clear LPUART Status Register in lpuart32_shutdown()
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
[ Upstream commit 4029dfc034febb54f6dd8ea83568accc943bc088 ]
The LPUART Status Register needs to be cleared when closing the uart port to get a clean environment when reopening the uart.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1791,6 +1791,10 @@ static void lpuart32_shutdown(struct uart_port *port)spin_lock_irqsave (&port->lock, flags); +/* clear status */ + temp =lpuart32_read (&sport->port,UARTSTAT ); +lpuart32_write (&sport->port, temp,UARTSTAT ); +/* disable Rx/Tx DMA */ temp =lpuart32_read (port,UARTBAUD ); temp &= ~(UARTBAUD_TDMAE |UARTBAUD_RDMAE );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 431/885 tty: serial: qcom-geni-serial: stop operations in progress at shutdown
In reply to Greg Kroah-HartmanFrom: Bartosz Golaszewski <[email protected]>
[ Upstream commit d8aca2f96813d51df574a811eda9a2cbed00f261 ]
We don't stop transmissions in progress at shutdown. This is fine with FIFO SE mode but with DMA (support for which we'll introduce later) it causes trouble so fix it now.
--- drivers/tty/serial/qcom_geni_serial.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/qcom_geni_serial.c +2 -0
@@ -891,6 +891,8 @@ static int setup_fifos(struct qcom_geni_serial_port *port)static void qcom_geni_serial_shutdown (struct uart_port *uport) {disable_irq (uport->irq); +qcom_geni_serial_stop_tx (uport); +qcom_geni_serial_stop_rx (uport); }static int qcom_geni_serial_port_setup (struct uart_port *uport)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 432/885 serial: tegra: Add missing clk_disable_unprepare() in tegra_uart_hw_init()
In reply to Greg Kroah-HartmanFrom: Yi Yang <[email protected]>
[ Upstream commit 38f28cfe9d08e3a47ef008798b275fef8118fc20 ]
Add the missing clk_disable_unprepare() before return from tegra_uart_hw_init() in the error handling path.
When request_irq() fails in tegra_uart_startup(), 'tup->uart_clk' has been enabled, fix it by adding clk_disable_unprepare().
--- drivers/tty/serial/serial-tegra.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/tty/serial/serial-tegra.c +6 -1
@@ -1047,6 +1047,7 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)if (tup->cdata->fifo_mode_enable_status) { ret =tegra_uart_wait_fifo_mode_enabled (tup);if (ret <0 ) { +clk_disable_unprepare (tup->uart_clk);dev_err (tup->uport.dev,"Failed to enable FIFO mode: %d\n" , ret);return ret;
@@ -1068,6 +1069,7 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)*/ ret =tegra_set_baudrate (tup,TEGRA_UART_DEFAULT_BAUD );if (ret <0 ) { +clk_disable_unprepare (tup->uart_clk);dev_err (tup->uport.dev,"Failed to set baud rate\n" );return ret; }
@@ -1227,10 +1229,13 @@ static int tegra_uart_startup(struct uart_port *u) dev_name(u->dev), tup);if (ret <0 ) {dev_err (u->dev,"Failed to register ISR for IRQ %d\n" , u->irq); - goto fail_hw_init; + goto fail_request_irq; }return 0 ; +fail_request_irq: +/* tup->uart_clk is already enabled in tegra_uart_hw_init */ +clk_disable_unprepare (tup->uart_clk); fail_hw_init:if (!tup->use_rx_pio)tegra_uart_dma_channel_free (tup, true);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 433/885 Revert "char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol"
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 70fae37a09268455b8ab4f64647086b61da6f39c ]
This reverts commit be826ada52f1fcabed5b5217c94609ebf5967211.
The function monitor_card() is a timer handler that runs in an atomic context, but it calls usleep_range() that can sleep. As a result, the sleep-in-atomic-context bugs will happen. The process is shown below:
(atomic context)monitor_card()
set_protocol()
usleep_range() //sleep
The origin commit c1986ee9bea3 ("[PATCH] New Omnikey Cardman 4000 driver") works fine.
--- drivers/char/pcmcia/cm4000_cs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/char/pcmcia/cm4000_cs.c +4 -2
@@ -529,7 +529,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)DEBUGP (5 , dev,"NumRecBytes is valid\n" );break ; } -usleep_range (10000 ,11000 ); +/* can not sleep as this is in atomic context */ +mdelay (10 ); }if (i ==100 ) { DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting "
@@ -549,7 +550,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) }break ; } -usleep_range (10000 ,11000 ); +/* can not sleep as this is in atomic context */ +mdelay (10 ); }/* check whether it is a short PTS reply? */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 434/885 eeprom: idt_89hpesx: Fix error handling in idt_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit d717a3ab282f51ec45142f911f7ef8a55c057de5 ]
A problem about idt_89hpesx create debugfs failed is triggered with the following log given:
[ 4973.269647] debugfs: Directory 'idt_csr' with parent '/' already present!
The reason is that idt_init() returns i2c_add_driver() directly without checking its return value, if i2c_add_driver() failed, it returns without destroy the newly created debugfs, resulting the debugfs of idt_csr can never be created later.
idt_init()
debugfs_create_dir() # create debugfs directory i2c_add_driver()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without destroy debugfs directory
Fix by removing debugfs when i2c_add_driver() returns error.
--- drivers/misc/eeprom/idt_89hpesx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/misc/eeprom/idt_89hpesx.c +9 -1
@@ -1566,12 +1566,20 @@ static struct i2c_driver idt_driver = {*/ static int __init idt_init (void ) { +int ret; +/* Create Debugfs directory first */ if (debugfs_initialized ()) csr_dbgdir =debugfs_create_dir ("idt_csr" ,NULL );/* Add new i2c-device driver */ -return i2c_add_driver (&idt_driver); + ret =i2c_add_driver (&idt_driver); +if (ret) { +debugfs_remove_recursive (csr_dbgdir); +return ret; + } + +return 0 ; }module_init (idt_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 435/885 applicom: Fix PCI device refcount leak in applicom_init()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit ce4273d89c52167d6fe20572136c58117eae0657 ]
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 applicom_init() with 'dev' not NULL, we need to call pci_dev_put() to decrease the refcount. Add the missing pci_dev_put() to avoid refcount leak.
--- drivers/char/applicom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/char/applicom.c +4 -1
@@ -197,8 +197,10 @@ static int __init applicom_init(void)if (!pci_match_id (applicom_pci_tbl, dev))continue ; -if (pci_enable_device (dev)) +if (pci_enable_device (dev)) { +pci_dev_put (dev);return -EIO ; + } RamIO =ioremap (pci_resource_start (dev,0 ),LEN_RAM_IO );
@@ -207,6 +209,7 @@ static int __init applicom_init(void)"space at 0x%llx\n" , (unsigned long long)pci_resource_start(dev, 0));pci_disable_device (dev); +pci_dev_put (dev);return -EIO ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 436/885 firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 9175ee1a99d57ec07d66ff572e1d5a724477ab37 ]
In error path in stratix10_svc_drv_probe(), gen_pool_destroy() should be called to destroy the memory pool that created by svc_create_memory_pool().
--- drivers/firmware/stratix10-svc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/firmware/stratix10-svc.c +11 -5
@@ -1138,13 +1138,17 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)/* allocate service controller and supporting channel */ controller =devm_kzalloc (dev,sizeof (*controller),GFP_KERNEL ); -if (!controller) -return -ENOMEM ; +if (!controller) { + ret = -ENOMEM ; + goto err_destroy_pool; + } chans =devm_kmalloc_array (dev,SVC_NUM_CHANNEL ,sizeof (*chans),GFP_KERNEL | __GFP_ZERO); -if (!chans) -return -ENOMEM ; +if (!chans) { + ret = -ENOMEM ; + goto err_destroy_pool; + } controller->dev = dev; controller->num_chans =SVC_NUM_CHANNEL ;
@@ -1159,7 +1163,7 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) ret =kfifo_alloc (&controller->svc_fifo, fifo_size,GFP_KERNEL );if (ret) {dev_err (dev,"failed to allocate FIFO\n" ); -return ret; + goto err_destroy_pool; }spin_lock_init (&controller->svc_fifo_lock);
@@ -1221,6 +1225,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) err_free_kfifo:kfifo_free (&controller->svc_fifo); +err_destroy_pool: +gen_pool_destroy (genpool);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 437/885 firmware: stratix10-svc: fix error handle while alloc/add device failed
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit d66a4c20ae55ac88136b4a3befd944c093ffa677 ]
If add device "stratix10-rsu" failed in stratix10_svc_drv_probe(), the 'svc_fifo' and 'genpool' need be freed in the error path.
If allocate or add device "intel-fcs" failed in stratix10_svc_drv_probe(), the device "stratix10-rsu" need be unregistered in the error path.
--- drivers/firmware/stratix10-svc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/firmware/stratix10-svc.c +6 -3
@@ -1202,19 +1202,20 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev) ret =platform_device_add (svc->stratix10_svc_rsu);if (ret) {platform_device_put (svc->stratix10_svc_rsu); -return ret; + goto err_free_kfifo; } svc->intel_svc_fcs =platform_device_alloc (INTEL_FCS ,1 );if (!svc->intel_svc_fcs) {dev_err (dev,"failed to allocate %s device\n" ,INTEL_FCS ); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_unregister_dev; } ret =platform_device_add (svc->intel_svc_fcs);if (ret) {platform_device_put (svc->intel_svc_fcs); -return ret; + goto err_unregister_dev; }dev_set_drvdata (dev, svc);
@@ -1223,6 +1224,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)return 0 ; +err_unregister_dev: +platform_device_unregister (svc->stratix10_svc_rsu); err_free_kfifo:kfifo_free (&controller->svc_fifo); err_destroy_pool:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 438/885 VMCI: check context->notify_page after call to get_user_pages_fast() to avoid GPF
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
[ Upstream commit 1a726cb47fd204109c767409fa9ca15a96328f14 ]
The call to get_user_pages_fast() in vmci_host_setup_notify() can return NULL context->notify_page causing a GPF. To avoid GPF check if context->notify_page == NULL and return error if so.
general protection fault, probably for non-canonical address
0xe0009d1000000060: 0000 [#1] PREEMPT SMP KASAN NOPTI
KASAN: maybe wild-memory-access in range [0x0005088000000300-
0x0005088000000307]
CPU: 2 PID: 26180 Comm: repro_34802241 Not tainted 6.1.0-rc4 #1
Hardware name: Red Hat KVM, BIOS 1.15.0-2.module+el8.6.0 04/01/2014
RIP: 0010:vmci_ctx_check_signal_notify+0x91/0xe0
Call Trace:
<TASK>
vmci_host_unlocked_ioctl+0x362/0x1f40
__x64_sys_ioctl+0x1a1/0x230
do_syscall_64+0x3a/0x90
entry_SYSCALL_64_after_hwframe+0x63/0xcd--- drivers/misc/vmw_vmci/vmci_host.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/vmw_vmci/vmci_host.c +2 -0
@@ -242,6 +242,8 @@ static int vmci_host_setup_notify(struct vmci_ctx *context, context->notify_page =NULL ;return VMCI_ERROR_GENERIC ; } +if (context->notify_page ==NULL ) +return VMCI_ERROR_UNAVAILABLE ;/* * Map the locked page and set up notify pointer.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 439/885 mei: pxp: Use correct macros to initialize uuid_le
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 503b676dde2780330c90a10b37a844686601a784 ]
GUID_INIT() is for internal guid_t type and shouldn't be used for the uuid_le. I.o.w. relying on the implementation details is layering violation. Use correct macros to initialize uuid_le.
--- drivers/misc/mei/pxp/mei_pxp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/pxp/mei_pxp.c +2 -2
@@ -206,8 +206,8 @@ static void mei_pxp_remove(struct mei_cl_device *cldev) }/* fbf6fcf1-96cf-4e2e-a6a6-1bab8cbe36b1 : PAVP GUID*/ -#define MEI_GUID_PXP GUID_INIT(0xfbf6fcf1, 0x96cf, 0x4e2e, 0xA6, \ - 0xa6, 0x1b, 0xab, 0x8c, 0xbe, 0x36, 0xb1) +#define MEI_GUID_PXP UUID_LE(0xfbf6fcf1, 0x96cf, 0x4e2e, 0xA6, \ + 0xa6, 0x1b, 0xab, 0x8c, 0xbe, 0x36, 0xb1)static struct mei_cl_device_id mei_pxp_tbl[] = { { .uuid =MEI_GUID_PXP , .version =MEI_CL_VERSION_ANY },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 440/885 misc/mei/hdcp: Use correct macros to initialize uuid_le
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 512ba04d8211dd1a54dd36adc3ecc527a28069c5 ]
GUID_INIT() is for internal guid_t type and shouldn't be used for the uuid_le. I.o.w. relying on the implementation details is layering violation. Use correct macros to initialize uuid_le.
--- drivers/misc/mei/hdcp/mei_hdcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/hdcp/mei_hdcp.c +2 -2
@@ -859,8 +859,8 @@ static void mei_hdcp_remove(struct mei_cl_device *cldev)dev_warn (&cldev->dev,"mei_cldev_disable() failed\n" ); } -#define MEI_UUID_HDCP GUID_INIT(0xB638AB7E, 0x94E2, 0x4EA2, 0xA5, \ - 0x52, 0xD1, 0xC5, 0x4B, 0x62, 0x7F, 0x04) +#define MEI_UUID_HDCP UUID_LE(0xB638AB7E, 0x94E2, 0x4EA2, 0xA5, \ + 0x52, 0xD1, 0xC5, 0x4B, 0x62, 0x7F, 0x04)static const struct mei_cl_device_id mei_hdcp_tbl[] = { { .uuid =MEI_UUID_HDCP , .version =MEI_CL_VERSION_ANY },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 441/885 misc: fastrpc: Fix an error handling path in fastrpc_rpmsg_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 11819ed2b70da94acc41fec34178a011c4d3d25d ]
If of_platform_populate() fails, some resources need to be freed as already done in the other error handling paths.
--- drivers/misc/fastrpc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/misc/fastrpc.c +12 -1
@@ -2127,7 +2127,18 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) data->domain_id = domain_id; data->rpdev = rpdev; -return of_platform_populate (rdev->of_node,NULL ,NULL , rdev); + err =of_platform_populate (rdev->of_node,NULL ,NULL , rdev); +if (err) + goto populate_error; + +return 0 ; + +populate_error: +if (data->fdevice) +misc_deregister (&data->fdevice->miscdev); +if (data->secure_fdevice) +misc_deregister (&data->secure_fdevice->miscdev); + fdev_error:kfree (data);return err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 442/885 driver core: fix resource leak in device_add()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 6977b1a5d67097eaa4d02b0c126c04cc6e8917c0 ]
When calling kobject_add() failed in device_add(), it will call cleanup_glue_dir() to free resource. But in kobject_add(), dev->kobj.parent has been set to NULL. This will cause resource leak.
The process is as follows:device_add()
get_device_parent() class_dir_create_and_add() kobject_add() //kobject_get() ... dev->kobj.parent = kobj; ... kobject_add() //failed, but set dev->kobj.parent = NULL ... glue_dir = get_glue_dir(dev) //glue_dir = NULL, and goto //"Error" label ... cleanup_glue_dir() //becaues glue_dir is NULL, not call //kobject_put()
The preceding problem may cause insmod mac80211_hwsim.ko to failed.
sysfs: cannot create duplicate filename '/devices/virtual/mac80211_hwsim'
Call Trace: <TASK> dump_stack_lvl+0x8e/0xd1 sysfs_warn_dup.cold+0x1c/0x29 sysfs_create_dir_ns+0x224/0x280 kobject_add_internal+0x2aa/0x880 kobject_add+0x135/0x1a0 get_device_parent+0x3d7/0x590 device_add+0x2aa/0x1cb0 device_create_groups_vargs+0x1eb/0x260 device_create+0xdc/0x110 mac80211_hwsim_new_radio+0x31e/0x4790 [mac80211_hwsim] init_mac80211_hwsim+0x48d/0x1000 [mac80211_hwsim] do_one_initcall+0x10f/0x630 do_init_module+0x19f/0x5e0 load_module+0x64b7/0x6eb0 __do_sys_finit_module+0x140/0x200 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
kobject_add_internal failed for mac80211_hwsim with -EEXIST, don't try to register things with the same name in the same directory.
--- drivers/base/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/core.c +1 -1
@@ -3451,7 +3451,7 @@ int device_add(struct device *dev)/* we require the name to be set before, and pass NULL */ error =kobject_add (&dev->kobj, dev->kobj.parent,NULL );if (error) { - glue_dir =get_glue_dir (dev); + glue_dir = kobj; goto Error; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 443/885 driver core: location: Free struct acpi_pld_info *pld before return false
In reply to Greg Kroah-HartmanFrom: Hanjun Guo <[email protected]>
[ Upstream commit 0d150f967e8410e1e6712484543eec709356a65d ]
struct acpi_pld_info *pld should be freed before the return of allocation failure, to prevent memory leak, add the ACPI_FREE() to fix it.
--- drivers/base/physical_location.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/physical_location.c +4 -1
@@ -24,8 +24,11 @@ bool dev_add_physical_location(struct device *dev) dev->physical_location =kzalloc (sizeof (*dev->physical_location),GFP_KERNEL ); -if (!dev->physical_location) +if (!dev->physical_location) { +ACPI_FREE (pld);return false; + } + dev->physical_location->panel = pld->panel; dev->physical_location->vertical_position = pld->vertical_position; dev->physical_location->horizontal_position = pld->horizontal_position;
Signature · 1 line
2.39.2