October 2022 - Linux-stable-mirror

Re: stable-rc/linux-5.10.y bisection: baseline.login on panda

by Mark Brown

The KernelCI bisection bot bisected a boot failure on the 5.10-rc stable tree on Panda to d86c6447ee250 ("clk: ti: Stop using legacy clkctrl names for omap4") in the v5.10 stable tree. There's a lot of clock related warnings/errors including: <4>[ 0.000000] WARNING: CPU: 0 PID: 0 at drivers/clk/clk.c:3778 __clk_register+0x464/0x868 <4>[ 0.000000] ti_dt_clocks_register: failed to lookup clock node abe-clkctrl:0008:24, ret=-517 <4>[ 0.416076] omap_hwmod: debugss: cannot _init_clocks <4>[ 0.421447] ------------[ cut here ]------------ <4>[ 0.426513] WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2371 _init+0x428/0x488 (there's a *lot* of probe deferrals and hwmods that fail to init). The last output from the kernel is: <3>[ 10.523590] twl6030_uv_to_vsel:OUT OF RANGE! non mapped vsel for 1410000 Vs max 1316660 <6>[ 10.531890] Power Management for TI OMAP4+ devices. <4>[ 10.537048] OMAP4 PM: u-boot >= v2012.07 is required for full PM support <5>[ 10.544555] Loading compiled-in X.509 certificates I've left the full report from the bot with more information including full logs and a reported-by tag below: On Sat, Oct 08, 2022 at 11:35:57AM -0700, KernelCI bot wrote: > * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * > * This automated bisection report was sent to you on the basis * > * that you may be involved with the breaking commit it has * > * found. No manual investigation has been done to verify it, * > * and the root cause of the problem may be somewhere else. * > * * > * If you do send a fix, please include this trailer: * > * Reported-by: "kernelci.org bot" <bot(a)kernelci.org> * > * * > * Hope this helps! * > * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * > > stable-rc/linux-5.10.y bisection: baseline.login on panda > > Summary: > Start: 014862eecf03f Linux 5.10.147 > Plain log: https://storage.kernelci.org/stable-rc/linux-5.10.y/v5.10.146-52-g014862eec… > HTML log: https://storage.kernelci.org/stable-rc/linux-5.10.y/v5.10.146-52-g014862eec… > Result: d86c6447ee250 clk: ti: Stop using legacy clkctrl names for omap4 and 5 > > Checks: > revert: PASS > verify: PASS > > Parameters: > Tree: stable-rc > URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git > Branch: linux-5.10.y > Target: panda > CPU arch: arm > Lab: lab-baylibre > Compiler: gcc-10 > Config: multi_v7_defconfig > Test case: baseline.login > > Breaking commit found: > > ------------------------------------------------------------------------------- > commit d86c6447ee250822256470ad43add20470d1cd3d > Author: Tony Lindgren <tony(a)atomide.com> > Date: Wed Jun 15 09:43:06 2022 +0300 > > clk: ti: Stop using legacy clkctrl names for omap4 and 5 > > [ Upstream commit 255584b138343d4a28c6d25bd82d04b09460d672 ] > > With the addition of clock-output-names, we can now unify the internal > clock naming for omap4 and 5 to follow the other TI SoCs. > > We are still using legacy clkctrl names for omap4 and 5 based on the clock > manager name which is wrong. Instead, we want to use the clkctrl clock > based naming. > > We must now also drop the legacy TI_CLK_CLKCTRL_COMPAT quirk for the > clkctrl clock. > > This change will allow further devicetree warning cleanup as already > done for am3/4 and dra7. > > Cc: linux-clk(a)vger.kernel.org > Cc: Stephen Boyd <sboyd(a)kernel.org> > Cc: Tero Kristo <kristo(a)kernel.org> > Signed-off-by: Tony Lindgren <tony(a)atomide.com> > Link: https://lore.kernel.org/r/20220615064306.22254-1-tony@atomide.com > Signed-off-by: Stephen Boyd <sboyd(a)kernel.org> > Signed-off-by: Sasha Levin <sashal(a)kernel.org> > > diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c > index a38c921539793..cbf9922d93d4e 100644 > --- a/drivers/clk/ti/clk-44xx.c > +++ b/drivers/clk/ti/clk-44xx.c > @@ -56,7 +56,7 @@ static const struct omap_clkctrl_bit_data omap4_aess_bit_data[] __initconst = { > }; > > static const char * const omap4_func_dmic_abe_gfclk_parents[] __initconst = { > - "abe_cm:clk:0018:26", > + "abe-clkctrl:0018:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -76,7 +76,7 @@ static const struct omap_clkctrl_bit_data omap4_dmic_bit_data[] __initconst = { > }; > > static const char * const omap4_func_mcasp_abe_gfclk_parents[] __initconst = { > - "abe_cm:clk:0020:26", > + "abe-clkctrl:0020:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -89,7 +89,7 @@ static const struct omap_clkctrl_bit_data omap4_mcasp_bit_data[] __initconst = { > }; > > static const char * const omap4_func_mcbsp1_gfclk_parents[] __initconst = { > - "abe_cm:clk:0028:26", > + "abe-clkctrl:0028:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -102,7 +102,7 @@ static const struct omap_clkctrl_bit_data omap4_mcbsp1_bit_data[] __initconst = > }; > > static const char * const omap4_func_mcbsp2_gfclk_parents[] __initconst = { > - "abe_cm:clk:0030:26", > + "abe-clkctrl:0030:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -115,7 +115,7 @@ static const struct omap_clkctrl_bit_data omap4_mcbsp2_bit_data[] __initconst = > }; > > static const char * const omap4_func_mcbsp3_gfclk_parents[] __initconst = { > - "abe_cm:clk:0038:26", > + "abe-clkctrl:0038:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -183,18 +183,18 @@ static const struct omap_clkctrl_bit_data omap4_timer8_bit_data[] __initconst = > > static const struct omap_clkctrl_reg_data omap4_abe_clkctrl_regs[] __initconst = { > { OMAP4_L4_ABE_CLKCTRL, NULL, 0, "ocp_abe_iclk" }, > - { OMAP4_AESS_CLKCTRL, omap4_aess_bit_data, CLKF_SW_SUP, "abe_cm:clk:0008:24" }, > + { OMAP4_AESS_CLKCTRL, omap4_aess_bit_data, CLKF_SW_SUP, "abe-clkctrl:0008:24" }, > { OMAP4_MCPDM_CLKCTRL, NULL, CLKF_SW_SUP, "pad_clks_ck" }, > - { OMAP4_DMIC_CLKCTRL, omap4_dmic_bit_data, CLKF_SW_SUP, "abe_cm:clk:0018:24" }, > - { OMAP4_MCASP_CLKCTRL, omap4_mcasp_bit_data, CLKF_SW_SUP, "abe_cm:clk:0020:24" }, > - { OMAP4_MCBSP1_CLKCTRL, omap4_mcbsp1_bit_data, CLKF_SW_SUP, "abe_cm:clk:0028:24" }, > - { OMAP4_MCBSP2_CLKCTRL, omap4_mcbsp2_bit_data, CLKF_SW_SUP, "abe_cm:clk:0030:24" }, > - { OMAP4_MCBSP3_CLKCTRL, omap4_mcbsp3_bit_data, CLKF_SW_SUP, "abe_cm:clk:0038:24" }, > - { OMAP4_SLIMBUS1_CLKCTRL, omap4_slimbus1_bit_data, CLKF_SW_SUP, "abe_cm:clk:0040:8" }, > - { OMAP4_TIMER5_CLKCTRL, omap4_timer5_bit_data, CLKF_SW_SUP, "abe_cm:clk:0048:24" }, > - { OMAP4_TIMER6_CLKCTRL, omap4_timer6_bit_data, CLKF_SW_SUP, "abe_cm:clk:0050:24" }, > - { OMAP4_TIMER7_CLKCTRL, omap4_timer7_bit_data, CLKF_SW_SUP, "abe_cm:clk:0058:24" }, > - { OMAP4_TIMER8_CLKCTRL, omap4_timer8_bit_data, CLKF_SW_SUP, "abe_cm:clk:0060:24" }, > + { OMAP4_DMIC_CLKCTRL, omap4_dmic_bit_data, CLKF_SW_SUP, "abe-clkctrl:0018:24" }, > + { OMAP4_MCASP_CLKCTRL, omap4_mcasp_bit_data, CLKF_SW_SUP, "abe-clkctrl:0020:24" }, > + { OMAP4_MCBSP1_CLKCTRL, omap4_mcbsp1_bit_data, CLKF_SW_SUP, "abe-clkctrl:0028:24" }, > + { OMAP4_MCBSP2_CLKCTRL, omap4_mcbsp2_bit_data, CLKF_SW_SUP, "abe-clkctrl:0030:24" }, > + { OMAP4_MCBSP3_CLKCTRL, omap4_mcbsp3_bit_data, CLKF_SW_SUP, "abe-clkctrl:0038:24" }, > + { OMAP4_SLIMBUS1_CLKCTRL, omap4_slimbus1_bit_data, CLKF_SW_SUP, "abe-clkctrl:0040:8" }, > + { OMAP4_TIMER5_CLKCTRL, omap4_timer5_bit_data, CLKF_SW_SUP, "abe-clkctrl:0048:24" }, > + { OMAP4_TIMER6_CLKCTRL, omap4_timer6_bit_data, CLKF_SW_SUP, "abe-clkctrl:0050:24" }, > + { OMAP4_TIMER7_CLKCTRL, omap4_timer7_bit_data, CLKF_SW_SUP, "abe-clkctrl:0058:24" }, > + { OMAP4_TIMER8_CLKCTRL, omap4_timer8_bit_data, CLKF_SW_SUP, "abe-clkctrl:0060:24" }, > { OMAP4_WD_TIMER3_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, > { 0 }, > }; > @@ -287,7 +287,7 @@ static const struct omap_clkctrl_bit_data omap4_fdif_bit_data[] __initconst = { > > static const struct omap_clkctrl_reg_data omap4_iss_clkctrl_regs[] __initconst = { > { OMAP4_ISS_CLKCTRL, omap4_iss_bit_data, CLKF_SW_SUP, "ducati_clk_mux_ck" }, > - { OMAP4_FDIF_CLKCTRL, omap4_fdif_bit_data, CLKF_SW_SUP, "iss_cm:clk:0008:24" }, > + { OMAP4_FDIF_CLKCTRL, omap4_fdif_bit_data, CLKF_SW_SUP, "iss-clkctrl:0008:24" }, > { 0 }, > }; > > @@ -320,7 +320,7 @@ static const struct omap_clkctrl_bit_data omap4_dss_core_bit_data[] __initconst > }; > > static const struct omap_clkctrl_reg_data omap4_l3_dss_clkctrl_regs[] __initconst = { > - { OMAP4_DSS_CORE_CLKCTRL, omap4_dss_core_bit_data, CLKF_SW_SUP, "l3_dss_cm:clk:0000:8" }, > + { OMAP4_DSS_CORE_CLKCTRL, omap4_dss_core_bit_data, CLKF_SW_SUP, "l3-dss-clkctrl:0000:8" }, > { 0 }, > }; > > @@ -336,7 +336,7 @@ static const struct omap_clkctrl_bit_data omap4_gpu_bit_data[] __initconst = { > }; > > static const struct omap_clkctrl_reg_data omap4_l3_gfx_clkctrl_regs[] __initconst = { > - { OMAP4_GPU_CLKCTRL, omap4_gpu_bit_data, CLKF_SW_SUP, "l3_gfx_cm:clk:0000:24" }, > + { OMAP4_GPU_CLKCTRL, omap4_gpu_bit_data, CLKF_SW_SUP, "l3-gfx-clkctrl:0000:24" }, > { 0 }, > }; > > @@ -372,12 +372,12 @@ static const struct omap_clkctrl_bit_data omap4_hsi_bit_data[] __initconst = { > }; > > static const char * const omap4_usb_host_hs_utmi_p1_clk_parents[] __initconst = { > - "l3_init_cm:clk:0038:24", > + "l3-init-clkctrl:0038:24", > NULL, > }; > > static const char * const omap4_usb_host_hs_utmi_p2_clk_parents[] __initconst = { > - "l3_init_cm:clk:0038:25", > + "l3-init-clkctrl:0038:25", > NULL, > }; > > @@ -418,7 +418,7 @@ static const struct omap_clkctrl_bit_data omap4_usb_host_hs_bit_data[] __initcon > }; > > static const char * const omap4_usb_otg_hs_xclk_parents[] __initconst = { > - "l3_init_cm:clk:0040:24", > + "l3-init-clkctrl:0040:24", > NULL, > }; > > @@ -452,14 +452,14 @@ static const struct omap_clkctrl_bit_data omap4_ocp2scp_usb_phy_bit_data[] __ini > }; > > static const struct omap_clkctrl_reg_data omap4_l3_init_clkctrl_regs[] __initconst = { > - { OMAP4_MMC1_CLKCTRL, omap4_mmc1_bit_data, CLKF_SW_SUP, "l3_init_cm:clk:0008:24" }, > - { OMAP4_MMC2_CLKCTRL, omap4_mmc2_bit_data, CLKF_SW_SUP, "l3_init_cm:clk:0010:24" }, > - { OMAP4_HSI_CLKCTRL, omap4_hsi_bit_data, CLKF_HW_SUP, "l3_init_cm:clk:0018:24" }, > + { OMAP4_MMC1_CLKCTRL, omap4_mmc1_bit_data, CLKF_SW_SUP, "l3-init-clkctrl:0008:24" }, > + { OMAP4_MMC2_CLKCTRL, omap4_mmc2_bit_data, CLKF_SW_SUP, "l3-init-clkctrl:0010:24" }, > + { OMAP4_HSI_CLKCTRL, omap4_hsi_bit_data, CLKF_HW_SUP, "l3-init-clkctrl:0018:24" }, > { OMAP4_USB_HOST_HS_CLKCTRL, omap4_usb_host_hs_bit_data, CLKF_SW_SUP, "init_60m_fclk" }, > { OMAP4_USB_OTG_HS_CLKCTRL, omap4_usb_otg_hs_bit_data, CLKF_HW_SUP, "l3_div_ck" }, > { OMAP4_USB_TLL_HS_CLKCTRL, omap4_usb_tll_hs_bit_data, CLKF_HW_SUP, "l4_div_ck" }, > { OMAP4_USB_HOST_FS_CLKCTRL, NULL, CLKF_SW_SUP, "func_48mc_fclk" }, > - { OMAP4_OCP2SCP_USB_PHY_CLKCTRL, omap4_ocp2scp_usb_phy_bit_data, CLKF_HW_SUP, "l3_init_cm:clk:00c0:8" }, > + { OMAP4_OCP2SCP_USB_PHY_CLKCTRL, omap4_ocp2scp_usb_phy_bit_data, CLKF_HW_SUP, "l3-init-clkctrl:00c0:8" }, > { 0 }, > }; > > @@ -530,7 +530,7 @@ static const struct omap_clkctrl_bit_data omap4_gpio6_bit_data[] __initconst = { > }; > > static const char * const omap4_per_mcbsp4_gfclk_parents[] __initconst = { > - "l4_per_cm:clk:00c0:26", > + "l4-per-clkctrl:00c0:26", > "pad_clks_ck", > NULL, > }; > @@ -570,12 +570,12 @@ static const struct omap_clkctrl_bit_data omap4_slimbus2_bit_data[] __initconst > }; > > static const struct omap_clkctrl_reg_data omap4_l4_per_clkctrl_regs[] __initconst = { > - { OMAP4_TIMER10_CLKCTRL, omap4_timer10_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0008:24" }, > - { OMAP4_TIMER11_CLKCTRL, omap4_timer11_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0010:24" }, > - { OMAP4_TIMER2_CLKCTRL, omap4_timer2_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0018:24" }, > - { OMAP4_TIMER3_CLKCTRL, omap4_timer3_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0020:24" }, > - { OMAP4_TIMER4_CLKCTRL, omap4_timer4_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0028:24" }, > - { OMAP4_TIMER9_CLKCTRL, omap4_timer9_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0030:24" }, > + { OMAP4_TIMER10_CLKCTRL, omap4_timer10_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0008:24" }, > + { OMAP4_TIMER11_CLKCTRL, omap4_timer11_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0010:24" }, > + { OMAP4_TIMER2_CLKCTRL, omap4_timer2_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0018:24" }, > + { OMAP4_TIMER3_CLKCTRL, omap4_timer3_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0020:24" }, > + { OMAP4_TIMER4_CLKCTRL, omap4_timer4_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0028:24" }, > + { OMAP4_TIMER9_CLKCTRL, omap4_timer9_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0030:24" }, > { OMAP4_ELM_CLKCTRL, NULL, 0, "l4_div_ck" }, > { OMAP4_GPIO2_CLKCTRL, omap4_gpio2_bit_data, CLKF_HW_SUP, "l4_div_ck" }, > { OMAP4_GPIO3_CLKCTRL, omap4_gpio3_bit_data, CLKF_HW_SUP, "l4_div_ck" }, > @@ -588,14 +588,14 @@ static const struct omap_clkctrl_reg_data omap4_l4_per_clkctrl_regs[] __initcons > { OMAP4_I2C3_CLKCTRL, NULL, CLKF_SW_SUP, "func_96m_fclk" }, > { OMAP4_I2C4_CLKCTRL, NULL, CLKF_SW_SUP, "func_96m_fclk" }, > { OMAP4_L4_PER_CLKCTRL, NULL, 0, "l4_div_ck" }, > - { OMAP4_MCBSP4_CLKCTRL, omap4_mcbsp4_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:00c0:24" }, > + { OMAP4_MCBSP4_CLKCTRL, omap4_mcbsp4_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:00c0:24" }, > { OMAP4_MCSPI1_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_MCSPI2_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_MCSPI3_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_MCSPI4_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_MMC3_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_MMC4_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > - { OMAP4_SLIMBUS2_CLKCTRL, omap4_slimbus2_bit_data, CLKF_SW_SUP, "l4_per_cm:clk:0118:8" }, > + { OMAP4_SLIMBUS2_CLKCTRL, omap4_slimbus2_bit_data, CLKF_SW_SUP, "l4-per-clkctrl:0118:8" }, > { OMAP4_UART1_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_UART2_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > { OMAP4_UART3_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, > @@ -630,7 +630,7 @@ static const struct omap_clkctrl_reg_data omap4_l4_wkup_clkctrl_regs[] __initcon > { OMAP4_L4_WKUP_CLKCTRL, NULL, 0, "l4_wkup_clk_mux_ck" }, > { OMAP4_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, > { OMAP4_GPIO1_CLKCTRL, omap4_gpio1_bit_data, CLKF_HW_SUP, "l4_wkup_clk_mux_ck" }, > - { OMAP4_TIMER1_CLKCTRL, omap4_timer1_bit_data, CLKF_SW_SUP, "l4_wkup_cm:clk:0020:24" }, > + { OMAP4_TIMER1_CLKCTRL, omap4_timer1_bit_data, CLKF_SW_SUP, "l4-wkup-clkctrl:0020:24" }, > { OMAP4_COUNTER_32K_CLKCTRL, NULL, 0, "sys_32k_ck" }, > { OMAP4_KBD_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, > { 0 }, > @@ -644,7 +644,7 @@ static const char * const omap4_pmd_stm_clock_mux_ck_parents[] __initconst = { > }; > > static const char * const omap4_trace_clk_div_div_ck_parents[] __initconst = { > - "emu_sys_cm:clk:0000:22", > + "emu-sys-clkctrl:0000:22", > NULL, > }; > > @@ -662,7 +662,7 @@ static const struct omap_clkctrl_div_data omap4_trace_clk_div_div_ck_data __init > }; > > static const char * const omap4_stm_clk_div_ck_parents[] __initconst = { > - "emu_sys_cm:clk:0000:20", > + "emu-sys-clkctrl:0000:20", > NULL, > }; > > @@ -716,73 +716,73 @@ static struct ti_dt_clk omap44xx_clks[] = { > * hwmod support. Once hwmod is removed, these can be removed > * also. > */ > - DT_CLK(NULL, "aess_fclk", "abe_cm:0008:24"), > - DT_CLK(NULL, "cm2_dm10_mux", "l4_per_cm:0008:24"), > - DT_CLK(NULL, "cm2_dm11_mux", "l4_per_cm:0010:24"), > - DT_CLK(NULL, "cm2_dm2_mux", "l4_per_cm:0018:24"), > - DT_CLK(NULL, "cm2_dm3_mux", "l4_per_cm:0020:24"), > - DT_CLK(NULL, "cm2_dm4_mux", "l4_per_cm:0028:24"), > - DT_CLK(NULL, "cm2_dm9_mux", "l4_per_cm:0030:24"), > - DT_CLK(NULL, "dmic_sync_mux_ck", "abe_cm:0018:26"), > - DT_CLK(NULL, "dmt1_clk_mux", "l4_wkup_cm:0020:24"), > - DT_CLK(NULL, "dss_48mhz_clk", "l3_dss_cm:0000:9"), > - DT_CLK(NULL, "dss_dss_clk", "l3_dss_cm:0000:8"), > - DT_CLK(NULL, "dss_sys_clk", "l3_dss_cm:0000:10"), > - DT_CLK(NULL, "dss_tv_clk", "l3_dss_cm:0000:11"), > - DT_CLK(NULL, "fdif_fck", "iss_cm:0008:24"), > - DT_CLK(NULL, "func_dmic_abe_gfclk", "abe_cm:0018:24"), > - DT_CLK(NULL, "func_mcasp_abe_gfclk", "abe_cm:0020:24"), > - DT_CLK(NULL, "func_mcbsp1_gfclk", "abe_cm:0028:24"), > - DT_CLK(NULL, "func_mcbsp2_gfclk", "abe_cm:0030:24"), > - DT_CLK(NULL, "func_mcbsp3_gfclk", "abe_cm:0038:24"), > - DT_CLK(NULL, "gpio1_dbclk", "l4_wkup_cm:0018:8"), > - DT_CLK(NULL, "gpio2_dbclk", "l4_per_cm:0040:8"), > - DT_CLK(NULL, "gpio3_dbclk", "l4_per_cm:0048:8"), > - DT_CLK(NULL, "gpio4_dbclk", "l4_per_cm:0050:8"), > - DT_CLK(NULL, "gpio5_dbclk", "l4_per_cm:0058:8"), > - DT_CLK(NULL, "gpio6_dbclk", "l4_per_cm:0060:8"), > - DT_CLK(NULL, "hsi_fck", "l3_init_cm:0018:24"), > - DT_CLK(NULL, "hsmmc1_fclk", "l3_init_cm:0008:24"), > - DT_CLK(NULL, "hsmmc2_fclk", "l3_init_cm:0010:24"), > - DT_CLK(NULL, "iss_ctrlclk", "iss_cm:0000:8"), > - DT_CLK(NULL, "mcasp_sync_mux_ck", "abe_cm:0020:26"), > - DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe_cm:0028:26"), > - DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe_cm:0030:26"), > - DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe_cm:0038:26"), > - DT_CLK(NULL, "mcbsp4_sync_mux_ck", "l4_per_cm:00c0:26"), > - DT_CLK(NULL, "ocp2scp_usb_phy_phy_48m", "l3_init_cm:00c0:8"), > - DT_CLK(NULL, "otg_60m_gfclk", "l3_init_cm:0040:24"), > - DT_CLK(NULL, "per_mcbsp4_gfclk", "l4_per_cm:00c0:24"), > - DT_CLK(NULL, "pmd_stm_clock_mux_ck", "emu_sys_cm:0000:20"), > - DT_CLK(NULL, "pmd_trace_clk_mux_ck", "emu_sys_cm:0000:22"), > - DT_CLK(NULL, "sgx_clk_mux", "l3_gfx_cm:0000:24"), > - DT_CLK(NULL, "slimbus1_fclk_0", "abe_cm:0040:8"), > - DT_CLK(NULL, "slimbus1_fclk_1", "abe_cm:0040:9"), > - DT_CLK(NULL, "slimbus1_fclk_2", "abe_cm:0040:10"), > - DT_CLK(NULL, "slimbus1_slimbus_clk", "abe_cm:0040:11"), > - DT_CLK(NULL, "slimbus2_fclk_0", "l4_per_cm:0118:8"), > - DT_CLK(NULL, "slimbus2_fclk_1", "l4_per_cm:0118:9"), > - DT_CLK(NULL, "slimbus2_slimbus_clk", "l4_per_cm:0118:10"), > - DT_CLK(NULL, "stm_clk_div_ck", "emu_sys_cm:0000:27"), > - DT_CLK(NULL, "timer5_sync_mux", "abe_cm:0048:24"), > - DT_CLK(NULL, "timer6_sync_mux", "abe_cm:0050:24"), > - DT_CLK(NULL, "timer7_sync_mux", "abe_cm:0058:24"), > - DT_CLK(NULL, "timer8_sync_mux", "abe_cm:0060:24"), > - DT_CLK(NULL, "trace_clk_div_div_ck", "emu_sys_cm:0000:24"), > - DT_CLK(NULL, "usb_host_hs_func48mclk", "l3_init_cm:0038:15"), > - DT_CLK(NULL, "usb_host_hs_hsic480m_p1_clk", "l3_init_cm:0038:13"), > - DT_CLK(NULL, "usb_host_hs_hsic480m_p2_clk", "l3_init_cm:0038:14"), > - DT_CLK(NULL, "usb_host_hs_hsic60m_p1_clk", "l3_init_cm:0038:11"), > - DT_CLK(NULL, "usb_host_hs_hsic60m_p2_clk", "l3_init_cm:0038:12"), > - DT_CLK(NULL, "usb_host_hs_utmi_p1_clk", "l3_init_cm:0038:8"), > - DT_CLK(NULL, "usb_host_hs_utmi_p2_clk", "l3_init_cm:0038:9"), > - DT_CLK(NULL, "usb_host_hs_utmi_p3_clk", "l3_init_cm:0038:10"), > - DT_CLK(NULL, "usb_otg_hs_xclk", "l3_init_cm:0040:8"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch0_clk", "l3_init_cm:0048:8"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch1_clk", "l3_init_cm:0048:9"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch2_clk", "l3_init_cm:0048:10"), > - DT_CLK(NULL, "utmi_p1_gfclk", "l3_init_cm:0038:24"), > - DT_CLK(NULL, "utmi_p2_gfclk", "l3_init_cm:0038:25"), > + DT_CLK(NULL, "aess_fclk", "abe-clkctrl:0008:24"), > + DT_CLK(NULL, "cm2_dm10_mux", "l4-per-clkctrl:0008:24"), > + DT_CLK(NULL, "cm2_dm11_mux", "l4-per-clkctrl:0010:24"), > + DT_CLK(NULL, "cm2_dm2_mux", "l4-per-clkctrl:0018:24"), > + DT_CLK(NULL, "cm2_dm3_mux", "l4-per-clkctrl:0020:24"), > + DT_CLK(NULL, "cm2_dm4_mux", "l4-per-clkctrl:0028:24"), > + DT_CLK(NULL, "cm2_dm9_mux", "l4-per-clkctrl:0030:24"), > + DT_CLK(NULL, "dmic_sync_mux_ck", "abe-clkctrl:0018:26"), > + DT_CLK(NULL, "dmt1_clk_mux", "l4-wkup-clkctrl:0020:24"), > + DT_CLK(NULL, "dss_48mhz_clk", "l3-dss-clkctrl:0000:9"), > + DT_CLK(NULL, "dss_dss_clk", "l3-dss-clkctrl:0000:8"), > + DT_CLK(NULL, "dss_sys_clk", "l3-dss-clkctrl:0000:10"), > + DT_CLK(NULL, "dss_tv_clk", "l3-dss-clkctrl:0000:11"), > + DT_CLK(NULL, "fdif_fck", "iss-clkctrl:0008:24"), > + DT_CLK(NULL, "func_dmic_abe_gfclk", "abe-clkctrl:0018:24"), > + DT_CLK(NULL, "func_mcasp_abe_gfclk", "abe-clkctrl:0020:24"), > + DT_CLK(NULL, "func_mcbsp1_gfclk", "abe-clkctrl:0028:24"), > + DT_CLK(NULL, "func_mcbsp2_gfclk", "abe-clkctrl:0030:24"), > + DT_CLK(NULL, "func_mcbsp3_gfclk", "abe-clkctrl:0038:24"), > + DT_CLK(NULL, "gpio1_dbclk", "l4-wkup-clkctrl:0018:8"), > + DT_CLK(NULL, "gpio2_dbclk", "l4-per-clkctrl:0040:8"), > + DT_CLK(NULL, "gpio3_dbclk", "l4-per-clkctrl:0048:8"), > + DT_CLK(NULL, "gpio4_dbclk", "l4-per-clkctrl:0050:8"), > + DT_CLK(NULL, "gpio5_dbclk", "l4-per-clkctrl:0058:8"), > + DT_CLK(NULL, "gpio6_dbclk", "l4-per-clkctrl:0060:8"), > + DT_CLK(NULL, "hsi_fck", "l3-init-clkctrl:0018:24"), > + DT_CLK(NULL, "hsmmc1_fclk", "l3-init-clkctrl:0008:24"), > + DT_CLK(NULL, "hsmmc2_fclk", "l3-init-clkctrl:0010:24"), > + DT_CLK(NULL, "iss_ctrlclk", "iss-clkctrl:0000:8"), > + DT_CLK(NULL, "mcasp_sync_mux_ck", "abe-clkctrl:0020:26"), > + DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe-clkctrl:0028:26"), > + DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe-clkctrl:0030:26"), > + DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe-clkctrl:0038:26"), > + DT_CLK(NULL, "mcbsp4_sync_mux_ck", "l4-per-clkctrl:00c0:26"), > + DT_CLK(NULL, "ocp2scp_usb_phy_phy_48m", "l3-init-clkctrl:00c0:8"), > + DT_CLK(NULL, "otg_60m_gfclk", "l3-init-clkctrl:0040:24"), > + DT_CLK(NULL, "per_mcbsp4_gfclk", "l4-per-clkctrl:00c0:24"), > + DT_CLK(NULL, "pmd_stm_clock_mux_ck", "emu-sys-clkctrl:0000:20"), > + DT_CLK(NULL, "pmd_trace_clk_mux_ck", "emu-sys-clkctrl:0000:22"), > + DT_CLK(NULL, "sgx_clk_mux", "l3-gfx-clkctrl:0000:24"), > + DT_CLK(NULL, "slimbus1_fclk_0", "abe-clkctrl:0040:8"), > + DT_CLK(NULL, "slimbus1_fclk_1", "abe-clkctrl:0040:9"), > + DT_CLK(NULL, "slimbus1_fclk_2", "abe-clkctrl:0040:10"), > + DT_CLK(NULL, "slimbus1_slimbus_clk", "abe-clkctrl:0040:11"), > + DT_CLK(NULL, "slimbus2_fclk_0", "l4-per-clkctrl:0118:8"), > + DT_CLK(NULL, "slimbus2_fclk_1", "l4-per-clkctrl:0118:9"), > + DT_CLK(NULL, "slimbus2_slimbus_clk", "l4-per-clkctrl:0118:10"), > + DT_CLK(NULL, "stm_clk_div_ck", "emu-sys-clkctrl:0000:27"), > + DT_CLK(NULL, "timer5_sync_mux", "abe-clkctrl:0048:24"), > + DT_CLK(NULL, "timer6_sync_mux", "abe-clkctrl:0050:24"), > + DT_CLK(NULL, "timer7_sync_mux", "abe-clkctrl:0058:24"), > + DT_CLK(NULL, "timer8_sync_mux", "abe-clkctrl:0060:24"), > + DT_CLK(NULL, "trace_clk_div_div_ck", "emu-sys-clkctrl:0000:24"), > + DT_CLK(NULL, "usb_host_hs_func48mclk", "l3-init-clkctrl:0038:15"), > + DT_CLK(NULL, "usb_host_hs_hsic480m_p1_clk", "l3-init-clkctrl:0038:13"), > + DT_CLK(NULL, "usb_host_hs_hsic480m_p2_clk", "l3-init-clkctrl:0038:14"), > + DT_CLK(NULL, "usb_host_hs_hsic60m_p1_clk", "l3-init-clkctrl:0038:11"), > + DT_CLK(NULL, "usb_host_hs_hsic60m_p2_clk", "l3-init-clkctrl:0038:12"), > + DT_CLK(NULL, "usb_host_hs_utmi_p1_clk", "l3-init-clkctrl:0038:8"), > + DT_CLK(NULL, "usb_host_hs_utmi_p2_clk", "l3-init-clkctrl:0038:9"), > + DT_CLK(NULL, "usb_host_hs_utmi_p3_clk", "l3_init-clkctrl:0038:10"), > + DT_CLK(NULL, "usb_otg_hs_xclk", "l3-init-clkctrl:0040:8"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch0_clk", "l3-init-clkctrl:0048:8"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch1_clk", "l3-init-clkctrl:0048:9"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch2_clk", "l3-init-clkctrl:0048:10"), > + DT_CLK(NULL, "utmi_p1_gfclk", "l3-init-clkctrl:0038:24"), > + DT_CLK(NULL, "utmi_p2_gfclk", "l3-init-clkctrl:0038:25"), > { .node_name = NULL }, > }; > > diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c > index 8694bc9f5fc7f..04a5408085acc 100644 > --- a/drivers/clk/ti/clk-54xx.c > +++ b/drivers/clk/ti/clk-54xx.c > @@ -50,7 +50,7 @@ static const struct omap_clkctrl_bit_data omap5_aess_bit_data[] __initconst = { > }; > > static const char * const omap5_dmic_gfclk_parents[] __initconst = { > - "abe_cm:clk:0018:26", > + "abe-clkctrl:0018:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -70,7 +70,7 @@ static const struct omap_clkctrl_bit_data omap5_dmic_bit_data[] __initconst = { > }; > > static const char * const omap5_mcbsp1_gfclk_parents[] __initconst = { > - "abe_cm:clk:0028:26", > + "abe-clkctrl:0028:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -83,7 +83,7 @@ static const struct omap_clkctrl_bit_data omap5_mcbsp1_bit_data[] __initconst = > }; > > static const char * const omap5_mcbsp2_gfclk_parents[] __initconst = { > - "abe_cm:clk:0030:26", > + "abe-clkctrl:0030:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -96,7 +96,7 @@ static const struct omap_clkctrl_bit_data omap5_mcbsp2_bit_data[] __initconst = > }; > > static const char * const omap5_mcbsp3_gfclk_parents[] __initconst = { > - "abe_cm:clk:0038:26", > + "abe-clkctrl:0038:26", > "pad_clks_ck", > "slimbus_clk", > NULL, > @@ -136,16 +136,16 @@ static const struct omap_clkctrl_bit_data omap5_timer8_bit_data[] __initconst = > > static const struct omap_clkctrl_reg_data omap5_abe_clkctrl_regs[] __initconst = { > { OMAP5_L4_ABE_CLKCTRL, NULL, 0, "abe_iclk" }, > - { OMAP5_AESS_CLKCTRL, omap5_aess_bit_data, CLKF_SW_SUP, "abe_cm:clk:0008:24" }, > + { OMAP5_AESS_CLKCTRL, omap5_aess_bit_data, CLKF_SW_SUP, "abe-clkctrl:0008:24" }, > { OMAP5_MCPDM_CLKCTRL, NULL, CLKF_SW_SUP, "pad_clks_ck" }, > - { OMAP5_DMIC_CLKCTRL, omap5_dmic_bit_data, CLKF_SW_SUP, "abe_cm:clk:0018:24" }, > - { OMAP5_MCBSP1_CLKCTRL, omap5_mcbsp1_bit_data, CLKF_SW_SUP, "abe_cm:clk:0028:24" }, > - { OMAP5_MCBSP2_CLKCTRL, omap5_mcbsp2_bit_data, CLKF_SW_SUP, "abe_cm:clk:0030:24" }, > - { OMAP5_MCBSP3_CLKCTRL, omap5_mcbsp3_bit_data, CLKF_SW_SUP, "abe_cm:clk:0038:24" }, > - { OMAP5_TIMER5_CLKCTRL, omap5_timer5_bit_data, CLKF_SW_SUP, "abe_cm:clk:0048:24" }, > - { OMAP5_TIMER6_CLKCTRL, omap5_timer6_bit_data, CLKF_SW_SUP, "abe_cm:clk:0050:24" }, > - { OMAP5_TIMER7_CLKCTRL, omap5_timer7_bit_data, CLKF_SW_SUP, "abe_cm:clk:0058:24" }, > - { OMAP5_TIMER8_CLKCTRL, omap5_timer8_bit_data, CLKF_SW_SUP, "abe_cm:clk:0060:24" }, > + { OMAP5_DMIC_CLKCTRL, omap5_dmic_bit_data, CLKF_SW_SUP, "abe-clkctrl:0018:24" }, > + { OMAP5_MCBSP1_CLKCTRL, omap5_mcbsp1_bit_data, CLKF_SW_SUP, "abe-clkctrl:0028:24" }, > + { OMAP5_MCBSP2_CLKCTRL, omap5_mcbsp2_bit_data, CLKF_SW_SUP, "abe-clkctrl:0030:24" }, > + { OMAP5_MCBSP3_CLKCTRL, omap5_mcbsp3_bit_data, CLKF_SW_SUP, "abe-clkctrl:0038:24" }, > + { OMAP5_TIMER5_CLKCTRL, omap5_timer5_bit_data, CLKF_SW_SUP, "abe-clkctrl:0048:24" }, > + { OMAP5_TIMER6_CLKCTRL, omap5_timer6_bit_data, CLKF_SW_SUP, "abe-clkctrl:0050:24" }, > + { OMAP5_TIMER7_CLKCTRL, omap5_timer7_bit_data, CLKF_SW_SUP, "abe-clkctrl:0058:24" }, > + { OMAP5_TIMER8_CLKCTRL, omap5_timer8_bit_data, CLKF_SW_SUP, "abe-clkctrl:0060:24" }, > { 0 }, > }; > > @@ -266,12 +266,12 @@ static const struct omap_clkctrl_bit_data omap5_gpio8_bit_data[] __initconst = { > }; > > static const struct omap_clkctrl_reg_data omap5_l4per_clkctrl_regs[] __initconst = { > - { OMAP5_TIMER10_CLKCTRL, omap5_timer10_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0008:24" }, > - { OMAP5_TIMER11_CLKCTRL, omap5_timer11_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0010:24" }, > - { OMAP5_TIMER2_CLKCTRL, omap5_timer2_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0018:24" }, > - { OMAP5_TIMER3_CLKCTRL, omap5_timer3_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0020:24" }, > - { OMAP5_TIMER4_CLKCTRL, omap5_timer4_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0028:24" }, > - { OMAP5_TIMER9_CLKCTRL, omap5_timer9_bit_data, CLKF_SW_SUP, "l4per_cm:clk:0030:24" }, > + { OMAP5_TIMER10_CLKCTRL, omap5_timer10_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0008:24" }, > + { OMAP5_TIMER11_CLKCTRL, omap5_timer11_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0010:24" }, > + { OMAP5_TIMER2_CLKCTRL, omap5_timer2_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0018:24" }, > + { OMAP5_TIMER3_CLKCTRL, omap5_timer3_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0020:24" }, > + { OMAP5_TIMER4_CLKCTRL, omap5_timer4_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0028:24" }, > + { OMAP5_TIMER9_CLKCTRL, omap5_timer9_bit_data, CLKF_SW_SUP, "l4per-clkctrl:0030:24" }, > { OMAP5_GPIO2_CLKCTRL, omap5_gpio2_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, > { OMAP5_GPIO3_CLKCTRL, omap5_gpio3_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, > { OMAP5_GPIO4_CLKCTRL, omap5_gpio4_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, > @@ -343,7 +343,7 @@ static const struct omap_clkctrl_bit_data omap5_dss_core_bit_data[] __initconst > }; > > static const struct omap_clkctrl_reg_data omap5_dss_clkctrl_regs[] __initconst = { > - { OMAP5_DSS_CORE_CLKCTRL, omap5_dss_core_bit_data, CLKF_SW_SUP, "dss_cm:clk:0000:8" }, > + { OMAP5_DSS_CORE_CLKCTRL, omap5_dss_core_bit_data, CLKF_SW_SUP, "dss-clkctrl:0000:8" }, > { 0 }, > }; > > @@ -376,7 +376,7 @@ static const struct omap_clkctrl_bit_data omap5_gpu_core_bit_data[] __initconst > }; > > static const struct omap_clkctrl_reg_data omap5_gpu_clkctrl_regs[] __initconst = { > - { OMAP5_GPU_CLKCTRL, omap5_gpu_core_bit_data, CLKF_SW_SUP, "gpu_cm:clk:0000:24" }, > + { OMAP5_GPU_CLKCTRL, omap5_gpu_core_bit_data, CLKF_SW_SUP, "gpu-clkctrl:0000:24" }, > { 0 }, > }; > > @@ -387,7 +387,7 @@ static const char * const omap5_mmc1_fclk_mux_parents[] __initconst = { > }; > > static const char * const omap5_mmc1_fclk_parents[] __initconst = { > - "l3init_cm:clk:0008:24", > + "l3init-clkctrl:0008:24", > NULL, > }; > > @@ -403,7 +403,7 @@ static const struct omap_clkctrl_bit_data omap5_mmc1_bit_data[] __initconst = { > }; > > static const char * const omap5_mmc2_fclk_parents[] __initconst = { > - "l3init_cm:clk:0010:24", > + "l3init-clkctrl:0010:24", > NULL, > }; > > @@ -428,12 +428,12 @@ static const char * const omap5_usb_host_hs_hsic480m_p3_clk_parents[] __initcons > }; > > static const char * const omap5_usb_host_hs_utmi_p1_clk_parents[] __initconst = { > - "l3init_cm:clk:0038:24", > + "l3init-clkctrl:0038:24", > NULL, > }; > > static const char * const omap5_usb_host_hs_utmi_p2_clk_parents[] __initconst = { > - "l3init_cm:clk:0038:25", > + "l3init-clkctrl:0038:25", > NULL, > }; > > @@ -492,8 +492,8 @@ static const struct omap_clkctrl_bit_data omap5_usb_otg_ss_bit_data[] __initcons > }; > > static const struct omap_clkctrl_reg_data omap5_l3init_clkctrl_regs[] __initconst = { > - { OMAP5_MMC1_CLKCTRL, omap5_mmc1_bit_data, CLKF_SW_SUP, "l3init_cm:clk:0008:25" }, > - { OMAP5_MMC2_CLKCTRL, omap5_mmc2_bit_data, CLKF_SW_SUP, "l3init_cm:clk:0010:25" }, > + { OMAP5_MMC1_CLKCTRL, omap5_mmc1_bit_data, CLKF_SW_SUP, "l3init-clkctrl:0008:25" }, > + { OMAP5_MMC2_CLKCTRL, omap5_mmc2_bit_data, CLKF_SW_SUP, "l3init-clkctrl:0010:25" }, > { OMAP5_USB_HOST_HS_CLKCTRL, omap5_usb_host_hs_bit_data, CLKF_SW_SUP, "l3init_60m_fclk" }, > { OMAP5_USB_TLL_HS_CLKCTRL, omap5_usb_tll_hs_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, > { OMAP5_SATA_CLKCTRL, omap5_sata_bit_data, CLKF_SW_SUP, "func_48m_fclk" }, > @@ -517,7 +517,7 @@ static const struct omap_clkctrl_reg_data omap5_wkupaon_clkctrl_regs[] __initcon > { OMAP5_L4_WKUP_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" }, > { OMAP5_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, > { OMAP5_GPIO1_CLKCTRL, omap5_gpio1_bit_data, CLKF_HW_SUP, "wkupaon_iclk_mux" }, > - { OMAP5_TIMER1_CLKCTRL, omap5_timer1_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0020:24" }, > + { OMAP5_TIMER1_CLKCTRL, omap5_timer1_bit_data, CLKF_SW_SUP, "wkupaon-clkctrl:0020:24" }, > { OMAP5_COUNTER_32K_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" }, > { OMAP5_KBD_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, > { 0 }, > @@ -547,58 +547,58 @@ const struct omap_clkctrl_data omap5_clkctrl_data[] __initconst = { > static struct ti_dt_clk omap54xx_clks[] = { > DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), > DT_CLK(NULL, "sys_clkin_ck", "sys_clkin"), > - DT_CLK(NULL, "dmic_gfclk", "abe_cm:0018:24"), > - DT_CLK(NULL, "dmic_sync_mux_ck", "abe_cm:0018:26"), > - DT_CLK(NULL, "dss_32khz_clk", "dss_cm:0000:11"), > - DT_CLK(NULL, "dss_48mhz_clk", "dss_cm:0000:9"), > - DT_CLK(NULL, "dss_dss_clk", "dss_cm:0000:8"), > - DT_CLK(NULL, "dss_sys_clk", "dss_cm:0000:10"), > - DT_CLK(NULL, "gpio1_dbclk", "wkupaon_cm:0018:8"), > - DT_CLK(NULL, "gpio2_dbclk", "l4per_cm:0040:8"), > - DT_CLK(NULL, "gpio3_dbclk", "l4per_cm:0048:8"), > - DT_CLK(NULL, "gpio4_dbclk", "l4per_cm:0050:8"), > - DT_CLK(NULL, "gpio5_dbclk", "l4per_cm:0058:8"), > - DT_CLK(NULL, "gpio6_dbclk", "l4per_cm:0060:8"), > - DT_CLK(NULL, "gpio7_dbclk", "l4per_cm:00f0:8"), > - DT_CLK(NULL, "gpio8_dbclk", "l4per_cm:00f8:8"), > - DT_CLK(NULL, "mcbsp1_gfclk", "abe_cm:0028:24"), > - DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe_cm:0028:26"), > - DT_CLK(NULL, "mcbsp2_gfclk", "abe_cm:0030:24"), > - DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe_cm:0030:26"), > - DT_CLK(NULL, "mcbsp3_gfclk", "abe_cm:0038:24"), > - DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe_cm:0038:26"), > - DT_CLK(NULL, "mmc1_32khz_clk", "l3init_cm:0008:8"), > - DT_CLK(NULL, "mmc1_fclk", "l3init_cm:0008:25"), > - DT_CLK(NULL, "mmc1_fclk_mux", "l3init_cm:0008:24"), > - DT_CLK(NULL, "mmc2_fclk", "l3init_cm:0010:25"), > - DT_CLK(NULL, "mmc2_fclk_mux", "l3init_cm:0010:24"), > - DT_CLK(NULL, "sata_ref_clk", "l3init_cm:0068:8"), > - DT_CLK(NULL, "timer10_gfclk_mux", "l4per_cm:0008:24"), > - DT_CLK(NULL, "timer11_gfclk_mux", "l4per_cm:0010:24"), > - DT_CLK(NULL, "timer1_gfclk_mux", "wkupaon_cm:0020:24"), > - DT_CLK(NULL, "timer2_gfclk_mux", "l4per_cm:0018:24"), > - DT_CLK(NULL, "timer3_gfclk_mux", "l4per_cm:0020:24"), > - DT_CLK(NULL, "timer4_gfclk_mux", "l4per_cm:0028:24"), > - DT_CLK(NULL, "timer5_gfclk_mux", "abe_cm:0048:24"), > - DT_CLK(NULL, "timer6_gfclk_mux", "abe_cm:0050:24"), > - DT_CLK(NULL, "timer7_gfclk_mux", "abe_cm:0058:24"), > - DT_CLK(NULL, "timer8_gfclk_mux", "abe_cm:0060:24"), > - DT_CLK(NULL, "timer9_gfclk_mux", "l4per_cm:0030:24"), > - DT_CLK(NULL, "usb_host_hs_hsic480m_p1_clk", "l3init_cm:0038:13"), > - DT_CLK(NULL, "usb_host_hs_hsic480m_p2_clk", "l3init_cm:0038:14"), > - DT_CLK(NULL, "usb_host_hs_hsic480m_p3_clk", "l3init_cm:0038:7"), > - DT_CLK(NULL, "usb_host_hs_hsic60m_p1_clk", "l3init_cm:0038:11"), > - DT_CLK(NULL, "usb_host_hs_hsic60m_p2_clk", "l3init_cm:0038:12"), > - DT_CLK(NULL, "usb_host_hs_hsic60m_p3_clk", "l3init_cm:0038:6"), > - DT_CLK(NULL, "usb_host_hs_utmi_p1_clk", "l3init_cm:0038:8"), > - DT_CLK(NULL, "usb_host_hs_utmi_p2_clk", "l3init_cm:0038:9"), > - DT_CLK(NULL, "usb_host_hs_utmi_p3_clk", "l3init_cm:0038:10"), > - DT_CLK(NULL, "usb_otg_ss_refclk960m", "l3init_cm:00d0:8"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch0_clk", "l3init_cm:0048:8"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch1_clk", "l3init_cm:0048:9"), > - DT_CLK(NULL, "usb_tll_hs_usb_ch2_clk", "l3init_cm:0048:10"), > - DT_CLK(NULL, "utmi_p1_gfclk", "l3init_cm:0038:24"), > - DT_CLK(NULL, "utmi_p2_gfclk", "l3init_cm:0038:25"), > + DT_CLK(NULL, "dmic_gfclk", "abe-clkctrl:0018:24"), > + DT_CLK(NULL, "dmic_sync_mux_ck", "abe-clkctrl:0018:26"), > + DT_CLK(NULL, "dss_32khz_clk", "dss-clkctrl:0000:11"), > + DT_CLK(NULL, "dss_48mhz_clk", "dss-clkctrl:0000:9"), > + DT_CLK(NULL, "dss_dss_clk", "dss-clkctrl:0000:8"), > + DT_CLK(NULL, "dss_sys_clk", "dss-clkctrl:0000:10"), > + DT_CLK(NULL, "gpio1_dbclk", "wkupaon-clkctrl:0018:8"), > + DT_CLK(NULL, "gpio2_dbclk", "l4per-clkctrl:0040:8"), > + DT_CLK(NULL, "gpio3_dbclk", "l4per-clkctrl:0048:8"), > + DT_CLK(NULL, "gpio4_dbclk", "l4per-clkctrl:0050:8"), > + DT_CLK(NULL, "gpio5_dbclk", "l4per-clkctrl:0058:8"), > + DT_CLK(NULL, "gpio6_dbclk", "l4per-clkctrl:0060:8"), > + DT_CLK(NULL, "gpio7_dbclk", "l4per-clkctrl:00f0:8"), > + DT_CLK(NULL, "gpio8_dbclk", "l4per-clkctrl:00f8:8"), > + DT_CLK(NULL, "mcbsp1_gfclk", "abe-clkctrl:0028:24"), > + DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe-clkctrl:0028:26"), > + DT_CLK(NULL, "mcbsp2_gfclk", "abe-clkctrl:0030:24"), > + DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe-clkctrl:0030:26"), > + DT_CLK(NULL, "mcbsp3_gfclk", "abe-clkctrl:0038:24"), > + DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe-clkctrl:0038:26"), > + DT_CLK(NULL, "mmc1_32khz_clk", "l3init-clkctrl:0008:8"), > + DT_CLK(NULL, "mmc1_fclk", "l3init-clkctrl:0008:25"), > + DT_CLK(NULL, "mmc1_fclk_mux", "l3init-clkctrl:0008:24"), > + DT_CLK(NULL, "mmc2_fclk", "l3init-clkctrl:0010:25"), > + DT_CLK(NULL, "mmc2_fclk_mux", "l3init-clkctrl:0010:24"), > + DT_CLK(NULL, "sata_ref_clk", "l3init-clkctrl:0068:8"), > + DT_CLK(NULL, "timer10_gfclk_mux", "l4per-clkctrl:0008:24"), > + DT_CLK(NULL, "timer11_gfclk_mux", "l4per-clkctrl:0010:24"), > + DT_CLK(NULL, "timer1_gfclk_mux", "wkupaon-clkctrl:0020:24"), > + DT_CLK(NULL, "timer2_gfclk_mux", "l4per-clkctrl:0018:24"), > + DT_CLK(NULL, "timer3_gfclk_mux", "l4per-clkctrl:0020:24"), > + DT_CLK(NULL, "timer4_gfclk_mux", "l4per-clkctrl:0028:24"), > + DT_CLK(NULL, "timer5_gfclk_mux", "abe-clkctrl:0048:24"), > + DT_CLK(NULL, "timer6_gfclk_mux", "abe-clkctrl:0050:24"), > + DT_CLK(NULL, "timer7_gfclk_mux", "abe-clkctrl:0058:24"), > + DT_CLK(NULL, "timer8_gfclk_mux", "abe-clkctrl:0060:24"), > + DT_CLK(NULL, "timer9_gfclk_mux", "l4per-clkctrl:0030:24"), > + DT_CLK(NULL, "usb_host_hs_hsic480m_p1_clk", "l3init-clkctrl:0038:13"), > + DT_CLK(NULL, "usb_host_hs_hsic480m_p2_clk", "l3init-clkctrl:0038:14"), > + DT_CLK(NULL, "usb_host_hs_hsic480m_p3_clk", "l3init-clkctrl:0038:7"), > + DT_CLK(NULL, "usb_host_hs_hsic60m_p1_clk", "l3init-clkctrl:0038:11"), > + DT_CLK(NULL, "usb_host_hs_hsic60m_p2_clk", "l3init-clkctrl:0038:12"), > + DT_CLK(NULL, "usb_host_hs_hsic60m_p3_clk", "l3init-clkctrl:0038:6"), > + DT_CLK(NULL, "usb_host_hs_utmi_p1_clk", "l3init-clkctrl:0038:8"), > + DT_CLK(NULL, "usb_host_hs_utmi_p2_clk", "l3init-clkctrl:0038:9"), > + DT_CLK(NULL, "usb_host_hs_utmi_p3_clk", "l3init-clkctrl:0038:10"), > + DT_CLK(NULL, "usb_otg_ss_refclk960m", "l3init-clkctrl:00d0:8"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch0_clk", "l3init-clkctrl:0048:8"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch1_clk", "l3init-clkctrl:0048:9"), > + DT_CLK(NULL, "usb_tll_hs_usb_ch2_clk", "l3init-clkctrl:0048:10"), > + DT_CLK(NULL, "utmi_p1_gfclk", "l3init-clkctrl:0038:24"), > + DT_CLK(NULL, "utmi_p2_gfclk", "l3init-clkctrl:0038:25"), > { .node_name = NULL }, > }; > > diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c > index 864c484bde1b4..08a85c559f795 100644 > --- a/drivers/clk/ti/clkctrl.c > +++ b/drivers/clk/ti/clkctrl.c > @@ -511,10 +511,6 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > char *c; > u16 soc_mask = 0; > > - if (!(ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) && > - of_node_name_eq(node, "clk")) > - ti_clk_features.flags |= TI_CLK_CLKCTRL_COMPAT; > - > addrp = of_get_address(node, 0, NULL, NULL); > addr = (u32)of_translate_address(node, addrp); > ------------------------------------------------------------------------------- > > > Git bisection log: > > ------------------------------------------------------------------------------- > git bisect start > # good: [6eae1503ddf94b4c3581092d566b17ed12d80f20] Linux 5.10.136 > git bisect good 6eae1503ddf94b4c3581092d566b17ed12d80f20 > # bad: [014862eecf03f58066a957027dde73cbecdf4395] Linux 5.10.147 > git bisect bad 014862eecf03f58066a957027dde73cbecdf4395 > # good: [aa16c8c4e830b9173e6a296ef88e44dc84f5a1de] spi: meson-spicc: add local pow2 clock ops to preserve rate between messages > git bisect good aa16c8c4e830b9173e6a296ef88e44dc84f5a1de > # bad: [39a90720f3abe96625d1224e7a7463410875de4c] ALSA: emu10k1: Fix out of bounds access in snd_emu10k1_pcm_channel_alloc() > git bisect bad 39a90720f3abe96625d1224e7a7463410875de4c > # bad: [297ae7e87a87a001dd3dfeac1cb26a42fd929708] s390: fix double free of GS and RI CBs on fork() failure > git bisect bad 297ae7e87a87a001dd3dfeac1cb26a42fd929708 > # bad: [4f7286422a7836459f79445fbbdacff53da3b58b] qrtr: Convert qrtr_ports from IDR to XArray > git bisect bad 4f7286422a7836459f79445fbbdacff53da3b58b > # bad: [c29a4baaad38a332c0ae480cf6d6c5bf75ac1828] scsi: lpfc: Prevent buffer overflow crashes in debugfs with malformed user input > git bisect bad c29a4baaad38a332c0ae480cf6d6c5bf75ac1828 > # good: [e2a49009ba037e3710fd1d6a285d688415ddcbe1] audit: log nftables configuration change events once per table > git bisect good e2a49009ba037e3710fd1d6a285d688415ddcbe1 > # good: [152c94c10bc470ee5aded8be5a67663398ee6c94] drm/meson: Fix overflow implicit truncation warnings > git bisect good 152c94c10bc470ee5aded8be5a67663398ee6c94 > # bad: [eddb352a807d16682ac73f6e5c2ab0a7fe1c139e] vboxguest: Do not use devm for irq > git bisect bad eddb352a807d16682ac73f6e5c2ab0a7fe1c139e > # bad: [cb5dd65e889163e723df1c2f02288cc527a57785] usb: host: ohci-ppc-of: Fix refcount leak bug > git bisect bad cb5dd65e889163e723df1c2f02288cc527a57785 > # bad: [d86c6447ee250822256470ad43add20470d1cd3d] clk: ti: Stop using legacy clkctrl names for omap4 and 5 > git bisect bad d86c6447ee250822256470ad43add20470d1cd3d > # first bad commit: [d86c6447ee250822256470ad43add20470d1cd3d] clk: ti: Stop using legacy clkctrl names for omap4 and 5 > ------------------------------------------------------------------------------- > > > -=-=-=-=-=-=-=-=-=-=-=- > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#32448): https://groups.io/g/kernelci-results/message/32448 > Mute This Topic: https://groups.io/mt/94204526/1131744 > Group Owner: kernelci-results+owner(a)groups.io > Unsubscribe: https://groups.io/g/kernelci-results/unsub [broonie(a)kernel.org] > -=-=-=-=-=-=-=-=-=-=-=- > >

3 years, 2 months

4
3
0 0

[PATCH AUTOSEL 5.10 01/10] rcu: Back off upon fill_page_cache_func() allocation failure

by Sasha Levin

From: Michal Hocko <mhocko(a)suse.com> [ Upstream commit 093590c16b447f53e66771c8579ae66c96f6ef61 ] The fill_page_cache_func() function allocates couple of pages to store kvfree_rcu_bulk_data structures. This is a lightweight (GFP_NORETRY) allocation which can fail under memory pressure. The function will, however keep retrying even when the previous attempt has failed. This retrying is in theory correct, but in practice the allocation is invoked from workqueue context, which means that if the memory reclaim gets stuck, these retries can hog the worker for quite some time. Although the workqueues subsystem automatically adjusts concurrency, such adjustment is not guaranteed to happen until the worker context sleeps. And the fill_page_cache_func() function's retry loop is not guaranteed to sleep (see the should_reclaim_retry() function). And we have seen this function cause workqueue lockups: kernel: BUG: workqueue lockup - pool cpus=93 node=1 flags=0x1 nice=0 stuck for 32s! [...] kernel: pool 74: cpus=37 node=0 flags=0x1 nice=0 hung=32s workers=2 manager: 2146 kernel: pwq 498: cpus=249 node=1 flags=0x1 nice=0 active=4/256 refcnt=5 kernel: in-flight: 1917:fill_page_cache_func kernel: pending: dbs_work_handler, free_work, kfree_rcu_monitor Originally, we thought that the root cause of this lockup was several retries with direct reclaim, but this is not yet confirmed. Furthermore, we have seen similar lockups without any heavy memory pressure. This suggests that there are other factors contributing to these lockups. However, it is not really clear that endless retries are desireable. So let's make the fill_page_cache_func() function back off after allocation failure. Cc: Uladzislau Rezki (Sony) <urezki(a)gmail.com> Cc: "Paul E. McKenney" <paulmck(a)kernel.org> Cc: Frederic Weisbecker <frederic(a)kernel.org> Cc: Neeraj Upadhyay <quic_neeraju(a)quicinc.com> Cc: Josh Triplett <josh(a)joshtriplett.org> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Lai Jiangshan <jiangshanlai(a)gmail.com> Cc: Joel Fernandes <joel(a)joelfernandes.org> Signed-off-by: Michal Hocko <mhocko(a)suse.com> Reviewed-by: Uladzislau Rezki (Sony) <urezki(a)gmail.com> Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- kernel/rcu/tree.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index b41009a283ca..b10d6bcea77d 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -3393,15 +3393,16 @@ static void fill_page_cache_func(struct work_struct *work) bnode = (struct kvfree_rcu_bulk_data *) __get_free_page(GFP_KERNEL | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN); - if (bnode) { - raw_spin_lock_irqsave(&krcp->lock, flags); - pushed = put_cached_bnode(krcp, bnode); - raw_spin_unlock_irqrestore(&krcp->lock, flags); + if (!bnode) + break; - if (!pushed) { - free_page((unsigned long) bnode); - break; - } + raw_spin_lock_irqsave(&krcp->lock, flags); + pushed = put_cached_bnode(krcp, bnode); + raw_spin_unlock_irqrestore(&krcp->lock, flags); + + if (!pushed) { + free_page((unsigned long) bnode); + break; } } -- 2.35.1

3 years, 2 months

2
10
0 0

[PATCH AUTOSEL 4.19 1/6] ACPI: video: Add Toshiba Satellite/Portege Z830 quirk

by Sasha Levin

From: Arvid Norlander <lkml(a)vorpal.se> [ Upstream commit 574160b8548deff8b80b174f03201e94ab8431e2 ] Toshiba Satellite Z830 needs the quirk video_disable_backlight_sysfs_if for proper backlight control after suspend/resume cycles. Toshiba Portege Z830 is simply the same laptop rebranded for certain markets (I looked through the manual to other language sections to confirm this) and thus also needs this quirk. Thanks to Hans de Goede for suggesting this fix. Link: https://www.spinics.net/lists/platform-driver-x86/msg34394.html Suggested-by: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Arvid Norlander <lkml(a)vorpal.se> Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Tested-by: Arvid Norlander <lkml(a)vorpal.se> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/acpi/acpi_video.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index ac54fc03cf81..eb7fca6f9444 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -511,6 +511,22 @@ static const struct dmi_system_id video_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"), }, }, + { + .callback = video_disable_backlight_sysfs_if, + .ident = "Toshiba Satellite Z830", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Z830"), + }, + }, + { + .callback = video_disable_backlight_sysfs_if, + .ident = "Toshiba Portege Z830", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE Z830"), + }, + }, /* * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set * but the IDs actually follow the Device ID Scheme. -- 2.35.1

3 years, 2 months

2
6
0 0

Re: {Contract/Job Offer}Liaison Needed In Your State...

by Ms. Kelvin Lin

Dear Sir/Ma, A reputable pharmaceutical company from Vietnam is in need of a reliable individual or corporate entity in your state to act as their Liaison; this will not affect your current job or business operations in anyway. If interested, reply for more information. Sincerely, Ms. Lan Nguyen

3 years, 2 months

1
0
0 0

[PATCH net 4/4] can: kvaser_usb_leaf: Fix CAN state after restart

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> can_restart() expects CMD_START_CHIP to set the error state to ERROR_ACTIVE as it calls netif_carrier_on() immediately afterwards. Otherwise the user may immediately trigger restart again and hit a BUG_ON() in can_restart(). Fix kvaser_usb_leaf set_mode(CMD_START_CHIP) to set the expected state. Cc: stable(a)vger.kernel.org Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20221010150829.199676-5-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index 59c220ef3049..50f2ac8319ff 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1431,6 +1431,8 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP); if (err) return err; + + priv->can.state = CAN_STATE_ERROR_ACTIVE; break; default: return -EOPNOTSUPP; -- 2.35.1

3 years, 2 months

1
0
0 0

[PATCH net 3/4] can: kvaser_usb_leaf: Fix TX queue out of sync after restart

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> The TX queue seems to be implicitly flushed by the hardware during bus-off or bus-off recovery, but the driver does not reset the TX bookkeeping. Despite not resetting TX bookkeeping the driver still re-enables TX queue unconditionally, leading to "cannot find free context" / NETDEV_TX_BUSY errors if the TX queue was full at bus-off time. Fix that by resetting TX bookkeeping on CAN restart. Tested with 0bfd:0124 Kvaser Mini PCI Express 2xHS FW 4.18.778. Cc: stable(a)vger.kernel.org Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20221010150829.199676-4-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 ++ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h index 841da29cef93..f6c0938027ec 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h @@ -178,6 +178,8 @@ struct kvaser_usb_dev_cfg { extern const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops; extern const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops; +void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv); + int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len, int *actual_len); diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c index c2bce6773adc..e91648ed7386 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c @@ -477,7 +477,7 @@ static void kvaser_usb_reset_tx_urb_contexts(struct kvaser_usb_net_priv *priv) /* This method might sleep. Do not call it in the atomic context * of URB completions. */ -static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv) +void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv) { usb_kill_anchored_urbs(&priv->tx_submitted); kvaser_usb_reset_tx_urb_contexts(priv); diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index 8e11cda85624..59c220ef3049 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1426,6 +1426,8 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, switch (mode) { case CAN_MODE_START: + kvaser_usb_unlink_tx_urbs(priv); + err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP); if (err) return err; -- 2.35.1

3 years, 2 months

1
0
0 0

[PATCH net 2/4] can: kvaser_usb: Fix use of uninitialized completion

by Marc Kleine-Budde

From: Anssi Hannula <anssi.hannula(a)bitwise.fi> flush_comp is initialized when CMD_FLUSH_QUEUE is sent to the device and completed when the device sends CMD_FLUSH_QUEUE_RESP. This causes completion of uninitialized completion if the device sends CMD_FLUSH_QUEUE_RESP before CMD_FLUSH_QUEUE is ever sent (e.g. as a response to a flush by a previously bound driver, or a misbehaving device). Fix that by initializing flush_comp in kvaser_usb_init_one() like the other completions. This issue is only triggerable after RX URBs have been set up, i.e. the interface has been opened at least once. Cc: stable(a)vger.kernel.org Fixes: aec5fb2268b7 ("can: kvaser_usb: Add support for Kvaser USB hydra family") Tested-by: Jimmy Assarsson <extja(a)kvaser.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)bitwise.fi> Signed-off-by: Jimmy Assarsson <extja(a)kvaser.com> Link: https://lore.kernel.org/all/20221010150829.199676-3-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c index 824cab80aa02..c2bce6773adc 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c @@ -729,6 +729,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) init_usb_anchor(&priv->tx_submitted); init_completion(&priv->start_comp); init_completion(&priv->stop_comp); + init_completion(&priv->flush_comp); priv->can.ctrlmode_supported = 0; priv->dev = dev; diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c index 6871d474dabf..7b52fda73d82 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c @@ -1916,7 +1916,7 @@ static int kvaser_usb_hydra_flush_queue(struct kvaser_usb_net_priv *priv) { int err; - init_completion(&priv->flush_comp); + reinit_completion(&priv->flush_comp); err = kvaser_usb_hydra_send_simple_cmd(priv->dev, CMD_FLUSH_QUEUE, priv->channel); -- 2.35.1

3 years, 2 months

1
0
0 0

[PATCH 5.19 00/48] 5.19.15-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.19.15 release. There are 48 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 12 Oct 2022 07:03:19 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.15-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.19.15-rc1 Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Bluetooth: use hdev->workqueue when queuing hdev->{cmd,ncmd}_timer works Jules Irenge <jbi.octave(a)gmail.com> bpf: Fix resetting logic for unreferenced kptrs Daniel Golle <daniel(a)makrotopia.org> net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear Kumar Kartikeya Dwivedi <memxor(a)gmail.com> bpf: Gate dynptr API behind CAP_BPF Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> rpmsg: qcom: glink: replace strncpy() with strscpy_pad() Brian Norris <briannorris(a)chromium.org> mmc: core: Terminate infinite loop in SD-UHS voltage switch ChanWoo Lee <cw9316.lee(a)samsung.com> mmc: core: Replace with already defined values for readability Mario Limonciello <mario.limonciello(a)amd.com> gpiolib: acpi: Add a quirk for Asus UM325UAZ Mario Limonciello <mario.limonciello(a)amd.com> gpiolib: acpi: Add support to ignore programming an interrupt Johan Hovold <johan(a)kernel.org> USB: serial: ftdi_sio: fix 300 bps rate for SIO Tadeusz Struk <tadeusz.struk(a)linaro.org> usb: mon: make mmapped memory read only Zhang Qilong <zhangqilong3(a)huawei.com> i2c: davinci: fix PM disable depth imbalance in davinci_i2c_probe Al Viro <viro(a)zeniv.linux.org.uk> don't use __kernel_write() on kmap_local_page() Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Fix unchecked MSR access error for Alder Lake N Dmytro Laktyushkin <Dmytro.Laktyushkin(a)amd.com> drm/amd/display: increase dcn315 pstate change latency Cruise Hung <Cruise.Hung(a)amd.com> drm/amd/display: Fix DP MST timeslot issue when fallback happened zhikzhai <zhikai.zhai(a)amd.com> drm/amd/display: skip audio setup when audio stream is enabled Hugo Hu <hugo.hu(a)amd.com> drm/amd/display: update gamut remap if plane has changed Michael Strauss <michael.strauss(a)amd.com> drm/amd/display: Assume an LTTPR is always present on fixed_vs links Leo Li <sunpeng.li(a)amd.com> drm/amd/display: Fix double cursor on non-video RGB MPO Janis Schoetterl-Glausch <scgl(a)linux.ibm.com> KVM: s390: Pass initialized arg even if unused Jianglei Nie <niejianglei2021(a)163.com> net: atlantic: fix potential memory leak in aq_ndev_close() David Gow <davidgow(a)google.com> arch: um: Mark the stack non-executable to fix a binutils warning Linus Walleij <linus.walleij(a)linaro.org> gpio: ftgpio010: Make irqchip immutable Lukas Straub <lukasstraub2(a)web.de> um: Cleanup compiler warning in arch/x86/um/tls_32.c Lukas Straub <lukasstraub2(a)web.de> um: Cleanup syscall_handler_t cast in syscalls_32.h Jaroslav Kysela <perex(a)perex.cz> ALSA: hda/hdmi: Fix the converter reuse for the silent stream Oleksandr Mazur <oleksandr.mazur(a)plvision.eu> net: marvell: prestera: add support for for Aldrin2 Haimin Zhang <tcs.kernel(a)gmail.com> net/ieee802154: fix uninit value bug in dgram_sendmsg Letu Ren <fantasquex(a)gmail.com> scsi: qedf: Fix a UAF bug in __qedf_probe() Yifan Zhang <yifan1.zhang(a)amd.com> drm/amdgpu/mes: zero the sdma_hqd_mask of 2nd SDMA engine for SDMA 6.0.1 Sergei Antonov <saproj(a)gmail.com> ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer Jason A. Donenfeld <Jason(a)zx2c4.com> wifi: iwlwifi: don't spam logs with NSS>2 messages Swati Agarwal <swati.agarwal(a)xilinx.com> dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure Swati Agarwal <swati.agarwal(a)xilinx.com> dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property Swati Agarwal <swati.agarwal(a)xilinx.com> dmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handling Frank Wunderlich <frank-w(a)public-files.de> arm64: dts: rockchip: fix upper usb port on BPI-R2-Pro Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Add SCMI PM driver remove routine Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Harden accesses to the sensor domains Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Improve checks in the info_get operations Dongliang Mu <mudongliangabcd(a)gmail.com> fs: fix UAF/GPF bug in nilfs_mdt_destroy Mikulas Patocka <mpatocka(a)redhat.com> provide arch_test_bit_acquire for architectures that define test_bit Mikulas Patocka <mpatocka(a)redhat.com> wait_on_bit: add an acquire memory barrier Jalal Mostafa <jalal.a.mostapha(a)gmail.com> xsk: Inherit need_wakeup flag for shared sockets Shuah Khan <skhan(a)linuxfoundation.org> docs: update mediator information in CoC docs Kees Cook <keescook(a)chromium.org> hardening: Remove Clang's enable flag for -ftrivial-auto-var-init=zero Sami Tolvanen <samitolvanen(a)google.com> Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 Bart Van Assche <bvanassche(a)acm.org> sparc: Unbreak the build ------------- Diffstat: .../devicetree/bindings/dma/moxa,moxart-dma.txt | 4 +-- .../process/code-of-conduct-interpretation.rst | 2 +- Makefile | 8 ++--- arch/alpha/include/asm/bitops.h | 7 ++++ arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 4 +-- arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 +- arch/hexagon/include/asm/bitops.h | 15 ++++++++ arch/ia64/include/asm/bitops.h | 7 ++++ arch/m68k/include/asm/bitops.h | 6 ++++ arch/s390/include/asm/bitops.h | 7 ++++ arch/s390/kvm/gaccess.c | 16 +++++++-- arch/sh/include/asm/bitops-op32.h | 7 ++++ arch/sparc/include/asm/smp_32.h | 15 ++++---- arch/sparc/kernel/leon_smp.c | 12 ++++--- arch/sparc/kernel/sun4d_smp.c | 12 ++++--- arch/sparc/kernel/sun4m_smp.c | 10 +++--- arch/sparc/mm/srmmu.c | 29 +++++++-------- arch/um/Makefile | 8 +++++ arch/x86/events/intel/core.c | 40 ++++++++++++++++++++- arch/x86/events/intel/ds.c | 9 +++-- arch/x86/events/perf_event.h | 2 ++ arch/x86/include/asm/bitops.h | 21 +++++++++++ arch/x86/um/shared/sysdep/syscalls_32.h | 5 ++- arch/x86/um/tls_32.c | 6 ---- arch/x86/um/vdso/Makefile | 2 +- drivers/dma/xilinx/xilinx_dma.c | 21 ++++++----- drivers/firmware/arm_scmi/clock.c | 6 +++- drivers/firmware/arm_scmi/scmi_pm_domain.c | 20 +++++++++++ drivers/firmware/arm_scmi/sensors.c | 25 ++++++++++--- drivers/gpio/gpio-ftgpio010.c | 22 +++++++----- drivers/gpio/gpiolib-acpi.c | 38 +++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 ++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++-- .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 22 +++++++----- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 ++++++++- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 ++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + drivers/i2c/busses/i2c-davinci.c | 3 +- drivers/mmc/core/sd.c | 3 +- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 3 -- .../net/ethernet/marvell/prestera/prestera_pci.c | 1 + drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +-- drivers/rpmsg/qcom_glink_native.c | 2 +- drivers/rpmsg/qcom_smd.c | 4 +-- drivers/scsi/qedf/qedf_main.c | 5 --- drivers/usb/mon/mon_bin.c | 5 +++ drivers/usb/serial/ftdi_sio.c | 3 +- fs/coredump.c | 38 +++++++++++++++++--- fs/inode.c | 7 ++-- fs/internal.h | 3 ++ fs/read_write.c | 22 +++++++----- .../asm-generic/bitops/instrumented-non-atomic.h | 12 +++++++ include/asm-generic/bitops/non-atomic.h | 14 ++++++++ include/linux/buffer_head.h | 2 +- include/linux/scmi_protocol.h | 4 +-- include/linux/wait_bit.h | 8 ++--- include/net/ieee802154_netdev.h | 37 +++++++++++++++++++ include/net/xsk_buff_pool.h | 2 +- kernel/bpf/helpers.c | 28 +++++++-------- kernel/bpf/syscall.c | 2 +- kernel/sched/wait_bit.c | 2 +- net/bluetooth/hci_core.c | 15 ++++++-- net/bluetooth/hci_event.c | 6 ++-- net/ieee802154/socket.c | 42 ++++++++++++---------- net/xdp/xsk.c | 4 +-- net/xdp/xsk_buff_pool.c | 5 +-- scripts/Makefile.extrawarn | 1 + security/Kconfig.hardening | 14 +++++--- sound/pci/hda/patch_hdmi.c | 1 + 71 files changed, 559 insertions(+), 195 deletions(-)

3 years, 2 months

6
53
0 0

[PATCH v5 0/4] can: kvaser_usb: Various fixes

by Jimmy Assarsson

Changes in v5: - Split series [1], keept only critical bug fixes that should go into stable, since v4 got rejected [2]. Non-critical fixes are posted in a separate series. [1] https://lore.kernel.org/linux-can/20220903182344.139-1-extja@kvaser.com [2] https://lore.kernel.org/linux-can/20220920192708.jcvyph3ec7lscuqj@pengutron… Anssi Hannula (4): can: kvaser_usb_leaf: Fix overread with an invalid command can: kvaser_usb: Fix use of uninitialized completion can: kvaser_usb_leaf: Fix TX queue out of sync after restart can: kvaser_usb_leaf: Fix CAN state after restart drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 + .../net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 79 +++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) -- 2.38.0

3 years, 2 months

2
5
0 0

stable-rc/queue/5.15 baseline: 115 runs, 4 regressions (v5.15.72-35-gd53b3c6ae238)

by kernelci.org bot

stable-rc/queue/5.15 baseline: 115 runs, 4 regressions (v5.15.72-35-gd53b3c6ae238) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+--------------------+------------ imx7ulp-evk | arm | lab-nxp | gcc-10 | multi_v7_defconfig | 1 meson-g12b-odroid-n2 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 panda | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 r8a77950-salvator-x | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.15/kernel/v5.15.72… Test: baseline Tree: stable-rc Branch: queue/5.15 Describe: v5.15.72-35-gd53b3c6ae238 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: d53b3c6ae238ade336409227d0efd20a8347c288 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+--------------------+------------ imx7ulp-evk | arm | lab-nxp | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6344b88d4cc8dc279acab650 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… HTML log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6344b88d4cc8dc279acab651 failing since 15 days (last pass: v5.15.69-44-g09c929d3da79, first fail: v5.15.70-123-gaf951c1b9b36) platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+--------------------+------------ meson-g12b-odroid-n2 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6344b6b3b0e10f64afcab69b Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… HTML log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6344b6b3b0e10f64afcab69c new failure (last pass: v5.15.72-37-g16538c20c2add) platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+--------------------+------------ panda | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6344b8760665089d77cab5f4 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… HTML log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6344b8760665089d77cab5f5 failing since 56 days (last pass: v5.15.60-48-g789367af88749, first fail: v5.15.60-779-ge1dae9850fdff) platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+--------------------+------------ r8a77950-salvator-x | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6344b91cf0a4e8e23bcab5f1 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… HTML log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.72-35-gd53b3c6ae23… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6344b91cf0a4e8e23bcab5f2 new failure (last pass: v5.15.72-37-g16538c20c2add)

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2022