6.5.3-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 372/739 ALSA: ump: Dont create unused substreams for static blocks
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit b2bcbd031d34d1ba1f491b9152474cf9f6d4d51b ]
When the UMP Endpoint is declared as "static", that is, no dynamic reassignment of UMP Groups, it makes little sense to expose always all 16 groups with 16 substreams. Many of those substreams are disabled groups, hence they are useless, but applications don't know it and try to open / access all those substreams unnecessarily.
This patch limits the number of UMP legacy rawmidi substreams only to the active groups. The behavior is changed only for the static endpoint (i.e. devices without UMP v1.1 feature implemented or with the static block flag is set).
--- include/sound/ump.h | 1 + sound/core/ump.c | 43 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-)
include/sound/ump.h +1 -0
@@ -45,6 +45,7 @@ struct snd_ump_endpoint {spinlock_t legacy_locks[2 ];struct snd_rawmidi *legacy_rmidi;struct snd_rawmidi_substream *legacy_substreams[2 ][SNDRV_UMP_MAX_GROUPS ]; +unsigned char legacy_mapping[SNDRV_UMP_MAX_GROUPS ];/* for legacy output; need to open the actual substream unlike input */ int legacy_out_opens;
sound/core/ump.c +37 -6
80 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 373/739 ALSA: ump: Fix -Wformat-truncation warnings
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4aa69d64e43edb51a4ecff7d301e9f881eb2d3f5 ]
Filling the rawmidi name and substream name can be truncated, and this leads to spurious compiler warnings due to -Wformat-truncation. Although the truncation is the expected behavior, it'd be better to truncate the string within "(...)"
This patch puts the precision specifies to each %s for fitting the words within the size-limited strings.
--- sound/core/ump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/ump.c +2 -2
@@ -1157,7 +1157,7 @@ static void fill_substream_names(struct snd_ump_endpoint *ump,struct snd_rawmidi_substream *s;list_for_each_entry (s, &rmidi->streams[dir].substreams, list) -snprintf (s->name,sizeof (s->name),"Group %d (%s)" , +snprintf (s->name,sizeof (s->name),"Group %d (%.16s)" , ump->legacy_mapping[s->number] +1 , ump->info.name); }
@@ -1191,7 +1191,7 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,if (output)snd_rawmidi_set_ops (rmidi,SNDRV_RAWMIDI_STREAM_OUTPUT , &snd_ump_legacy_output_ops); -snprintf (rmidi->name,sizeof (rmidi->name),"%s (MIDI 1.0)" , +snprintf (rmidi->name,sizeof (rmidi->name),"%.68s (MIDI 1.0)" , ump->info.name); rmidi->info_flags = ump->core.info_flags & ~SNDRV_RAWMIDI_INFO_UMP ; rmidi->ops = &snd_ump_legacy_ops;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 374/739 ipmi:ssif: Add check for kstrdup
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
[ Upstream commit c5586d0f711e9744d0cade39b0c4a2d116a333ca ]
Add check for the return value of kstrdup() and return the error if it fails in order to avoid NULL pointer dereference.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_ssif.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/char/ipmi/ipmi_ssif.c +5 -0
@@ -1600,6 +1600,11 @@ static int ssif_add_infos(struct i2c_client *client) info->addr_src =SI_ACPI ; info->client = client; info->adapter_name =kstrdup (client->adapter->name,GFP_KERNEL ); +if (!info->adapter_name) { +kfree (info); +return -ENOMEM ; + } + info->binfo.addr = client->addr;list_add_tail (&info->link, &ssif_infos);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 375/739 ipmi:ssif: Fix a memory leak when scanning for an adapter
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corey Minyard <[email protected]>
[ Upstream commit b8d72e32e1453d37ee5c8a219f24e7eeadc471ef ]
The adapter scan ssif_info_find() sets info->adapter_name if the adapter info came from SMBIOS, as it's not set in that case. However, this function can be called more than once, and it will leak the adapter name if it had already been set. So check for NULL before setting it.
--- drivers/char/ipmi/ipmi_ssif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/ipmi/ipmi_ssif.c +1 -1
@@ -1400,7 +1400,7 @@ static struct ssif_addr_info *ssif_info_find(unsigned short addr, restart:list_for_each_entry (info, &ssif_infos, link) {if (info->binfo.addr == addr) { -if (info->addr_src ==SI_SMBIOS ) +if (info->addr_src ==SI_SMBIOS && !info->adapter_name) info->adapter_name =kstrdup (adapter_name,GFP_KERNEL );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 376/739 clk: qcom: gpucc-sm6350: Introduce index-based clk lookup
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit f6f89d194e4ddcfe197ac8a05ed4161f642a5c68 ]
Add the nowadays-prefered and marginally faster way of looking up parent clocks in the device tree. It also allows for clock-names-independent operation, so long as the order (which is enforced by schema) is kept.
Stable-dep-of: 743913b343a3 ("clk: qcom: gpucc-sm6350: Fix clock source names")
--- drivers/clk/qcom/gpucc-sm6350.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/clk/qcom/gpucc-sm6350.c +13 -5
@@ -24,6 +24,12 @@#define CX_GMU_CBCR_WAKE_MASK 0xF#define CX_GMU_CBCR_WAKE_SHIFT 8 +enum { +DT_BI_TCXO , +DT_GPLL0_OUT_MAIN , +DT_GPLL0_OUT_MAIN_DIV , +}; +enum {P_BI_TCXO ,P_GPLL0_OUT_MAIN ,
@@ -61,6 +67,7 @@ static struct clk_alpha_pll gpu_cc_pll0 = { .hw.init = &(struct clk_init_data){ .name ="gpu_cc_pll0" , .parent_data = &(const struct clk_parent_data ){ + .index =DT_BI_TCXO , .fw_name ="bi_tcxo" , }, .num_parents =1 ,
@@ -104,6 +111,7 @@ static struct clk_alpha_pll gpu_cc_pll1 = { .hw.init = &(struct clk_init_data){ .name ="gpu_cc_pll1" , .parent_data = &(const struct clk_parent_data ){ + .index =DT_BI_TCXO , .fw_name ="bi_tcxo" , }, .num_parents =1 ,
@@ -121,11 +129,11 @@ static const struct parent_map gpu_cc_parent_map_0[] = { };static const struct clk_parent_data gpu_cc_parent_data_0[] = { - { .fw_name ="bi_tcxo" }, + { .index =DT_BI_TCXO , .fw_name ="bi_tcxo" }, { .hw = &gpu_cc_pll0.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, - { .fw_name ="gcc_gpu_gpll0_clk" }, - { .fw_name ="gcc_gpu_gpll0_div_clk" }, + { .index =DT_GPLL0_OUT_MAIN , .fw_name ="gcc_gpu_gpll0_clk" }, + { .index =DT_GPLL0_OUT_MAIN_DIV , .fw_name ="gcc_gpu_gpll0_div_clk" }, };static const struct parent_map gpu_cc_parent_map_1[] = {
@@ -138,12 +146,12 @@ static const struct parent_map gpu_cc_parent_map_1[] = { };static const struct clk_parent_data gpu_cc_parent_data_1[] = { - { .fw_name ="bi_tcxo" }, + { .index =DT_BI_TCXO , .fw_name ="bi_tcxo" }, { .hw = &crc_div.hw }, { .hw = &gpu_cc_pll0.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, - { .fw_name ="gcc_gpu_gpll0_clk" }, + { .index =DT_GPLL0_OUT_MAIN , .fw_name ="gcc_gpu_gpll0_clk" }, };static const struct freq_tbl ftbl_gpu_cc_gmu_clk_src[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 377/739 clk: qcom: gpucc-sm6350: Fix clock source names
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 743913b343a3ec2510fe3c0dfaff03d049659922 ]
fw_name for GCC inputs didn't match the bindings. Fix it.
--- drivers/clk/qcom/gpucc-sm6350.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/qcom/gpucc-sm6350.c +3 -3
@@ -132,8 +132,8 @@ static const struct clk_parent_data gpu_cc_parent_data_0[] = { { .index = DT_BI_TCXO, .fw_name = "bi_tcxo" }, { .hw = &gpu_cc_pll0.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, - { .index = DT_GPLL0_OUT_MAIN, .fw_name = "gcc_gpu_gpll0_clk" }, - { .index = DT_GPLL0_OUT_MAIN_DIV, .fw_name = "gcc_gpu_gpll0_div_clk" }, + { .index = DT_GPLL0_OUT_MAIN, .fw_name = "gcc_gpu_gpll0_clk_src" }, + { .index = DT_GPLL0_OUT_MAIN_DIV, .fw_name = "gcc_gpu_gpll0_div_clk_src" }, }; static const struct parent_map gpu_cc_parent_map_1[] = {
@@ -151,7 +151,7 @@ static const struct clk_parent_data gpu_cc_parent_data_1[] = { { .hw = &gpu_cc_pll0.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, { .hw = &gpu_cc_pll1.clkr.hw }, - { .index = DT_GPLL0_OUT_MAIN, .fw_name = "gcc_gpu_gpll0_clk" }, + { .index = DT_GPLL0_OUT_MAIN, .fw_name = "gcc_gpu_gpll0_clk_src" }, }; static const struct freq_tbl ftbl_gpu_cc_gmu_clk_src[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 378/739 clk: qcom: gcc-sc8280xp: Add missing GDSC flags
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 2fd02de27054576a4a8c89302e2f77122c55e957 ]
All of the 8280's GCC GDSCs can and should use the retain registers so as not to lose their state when entering lower power modes.
--- drivers/clk/qcom/gcc-sc8280xp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/clk/qcom/gcc-sc8280xp.c +14 -7
@@ -6761,7 +6761,7 @@ static struct gdsc pcie_0_tunnel_gdsc = { .name = "pcie_0_tunnel_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE, + .flags = VOTABLE | RETAIN_FF_ENABLE, }; static struct gdsc pcie_1_tunnel_gdsc = {
@@ -6772,7 +6772,7 @@ static struct gdsc pcie_1_tunnel_gdsc = { .name = "pcie_1_tunnel_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE, + .flags = VOTABLE | RETAIN_FF_ENABLE, };/*
@@ -6787,7 +6787,7 @@ static struct gdsc pcie_2a_gdsc = { .name = "pcie_2a_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, }; static struct gdsc pcie_2b_gdsc = {
@@ -6798,7 +6798,7 @@ static struct gdsc pcie_2b_gdsc = { .name = "pcie_2b_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, }; static struct gdsc pcie_3a_gdsc = {
@@ -6809,7 +6809,7 @@ static struct gdsc pcie_3a_gdsc = { .name = "pcie_3a_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, }; static struct gdsc pcie_3b_gdsc = {
@@ -6820,7 +6820,7 @@ static struct gdsc pcie_3b_gdsc = { .name = "pcie_3b_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, }; static struct gdsc pcie_4_gdsc = {
@@ -6831,7 +6831,7 @@ static struct gdsc pcie_4_gdsc = { .name = "pcie_4_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, }; static struct gdsc ufs_card_gdsc = {
@@ -6840,6 +6840,7 @@ static struct gdsc ufs_card_gdsc = { .name = "ufs_card_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc ufs_phy_gdsc = {
@@ -6848,6 +6849,7 @@ static struct gdsc ufs_phy_gdsc = { .name = "ufs_phy_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc usb30_mp_gdsc = {
@@ -6856,6 +6858,7 @@ static struct gdsc usb30_mp_gdsc = { .name = "usb30_mp_gdsc", }, .pwrsts = PWRSTS_RET_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc usb30_prim_gdsc = {
@@ -6864,6 +6867,7 @@ static struct gdsc usb30_prim_gdsc = { .name = "usb30_prim_gdsc", }, .pwrsts = PWRSTS_RET_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc usb30_sec_gdsc = {
@@ -6872,6 +6876,7 @@ static struct gdsc usb30_sec_gdsc = { .name = "usb30_sec_gdsc", }, .pwrsts = PWRSTS_RET_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc emac_0_gdsc = {
@@ -6880,6 +6885,7 @@ static struct gdsc emac_0_gdsc = { .name = "emac_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .flags = RETAIN_FF_ENABLE, }; static struct gdsc emac_1_gdsc = {
@@ -6888,6 +6894,7 @@ static struct gdsc emac_1_gdsc = { .name = "emac_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .flags = RETAIN_FF_ENABLE, }; static struct clk_regmap *gcc_sc8280xp_clocks[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 379/739 dt-bindings: clock: qcom,gcc-sc8280xp: Add missing GDSCs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 9eba4db02a88e7a810aabd70f7a6960f184f391f ]
There are 10 more GDSCs that we've not been caring about, and by extension (and perhaps even more importantly), not putting to sleep. Add them.
Stable-dep-of: 4712eb7ff85b ("clk: qcom: gcc-sc8280xp: Add missing GDSCs")
--- include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/dt-bindings/clock/qcom,gcc-sc8280xp.h +10 -0
@@ -494,5 +494,15 @@#define USB30_SEC_GDSC 11#define EMAC_0_GDSC 12#define EMAC_1_GDSC 13 +#define USB4_1_GDSC 14 +#define USB4_GDSC 15 +#define HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC 16 +#define HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC 17 +#define HLOS1_VOTE_MMNOC_MMU_TBU_SF0_GDSC 18 +#define HLOS1_VOTE_MMNOC_MMU_TBU_SF1_GDSC 19 +#define HLOS1_VOTE_TURING_MMU_TBU0_GDSC 20 +#define HLOS1_VOTE_TURING_MMU_TBU1_GDSC 21 +#define HLOS1_VOTE_TURING_MMU_TBU2_GDSC 22 +#define HLOS1_VOTE_TURING_MMU_TBU3_GDSC 23#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 380/739 clk: qcom: gcc-sc8280xp: Add missing GDSCs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 4712eb7ff85bd3dd09c6668b8de4080e02b3eea9 ]
There are 10 more GDSCs that we've not been caring about, and by extension (and perhaps even more importantly), not putting to sleep. Add them.
--- drivers/clk/qcom/gcc-sc8280xp.c | 100 ++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+)
drivers/clk/qcom/gcc-sc8280xp.c +100 -0
@@ -6897,6 +6897,96 @@ static struct gdsc emac_1_gdsc = { .flags = RETAIN_FF_ENABLE, }; +static struct gdsc usb4_1_gdsc = { + .gdscr =0xb8004 , + .pd = { + .name ="usb4_1_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE , +}; + +static struct gdsc usb4_gdsc = { + .gdscr =0x2a004 , + .pd = { + .name ="usb4_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE , +}; + +static struct gdsc hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc = { + .gdscr =0x7d050 , + .pd = { + .name ="hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc = { + .gdscr =0x7d058 , + .pd = { + .name ="hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_mmnoc_mmu_tbu_sf0_gdsc = { + .gdscr =0x7d054 , + .pd = { + .name ="hlos1_vote_mmnoc_mmu_tbu_sf0_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_mmnoc_mmu_tbu_sf1_gdsc = { + .gdscr =0x7d06c , + .pd = { + .name ="hlos1_vote_mmnoc_mmu_tbu_sf1_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_turing_mmu_tbu0_gdsc = { + .gdscr =0x7d05c , + .pd = { + .name ="hlos1_vote_turing_mmu_tbu0_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_turing_mmu_tbu1_gdsc = { + .gdscr =0x7d060 , + .pd = { + .name ="hlos1_vote_turing_mmu_tbu1_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_turing_mmu_tbu2_gdsc = { + .gdscr =0x7d0a0 , + .pd = { + .name ="hlos1_vote_turing_mmu_tbu2_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; + +static struct gdsc hlos1_vote_turing_mmu_tbu3_gdsc = { + .gdscr =0x7d0a4 , + .pd = { + .name ="hlos1_vote_turing_mmu_tbu3_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE , +}; +static struct clk_regmap *gcc_sc8280xp_clocks[] = { [GCC_AGGRE_NOC_PCIE0_TUNNEL_AXI_CLK ] = &gcc_aggre_noc_pcie0_tunnel_axi_clk.clkr, [GCC_AGGRE_NOC_PCIE1_TUNNEL_AXI_CLK ] = &gcc_aggre_noc_pcie1_tunnel_axi_clk.clkr,
@@ -7377,6 +7467,16 @@ static struct gdsc *gcc_sc8280xp_gdscs[] = { [USB30_SEC_GDSC] = &usb30_sec_gdsc, [EMAC_0_GDSC] = &emac_0_gdsc, [EMAC_1_GDSC] = &emac_1_gdsc, + [USB4_1_GDSC] = &usb4_1_gdsc, + [USB4_GDSC] = &usb4_gdsc, + [HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC] = &hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc, + [HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC] = &hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc, + [HLOS1_VOTE_MMNOC_MMU_TBU_SF0_GDSC] = &hlos1_vote_mmnoc_mmu_tbu_sf0_gdsc, + [HLOS1_VOTE_MMNOC_MMU_TBU_SF1_GDSC] = &hlos1_vote_mmnoc_mmu_tbu_sf1_gdsc, + [HLOS1_VOTE_TURING_MMU_TBU0_GDSC] = &hlos1_vote_turing_mmu_tbu0_gdsc, + [HLOS1_VOTE_TURING_MMU_TBU1_GDSC] = &hlos1_vote_turing_mmu_tbu1_gdsc, + [HLOS1_VOTE_TURING_MMU_TBU2_GDSC] = &hlos1_vote_turing_mmu_tbu2_gdsc, + [HLOS1_VOTE_TURING_MMU_TBU3_GDSC] = &hlos1_vote_turing_mmu_tbu3_gdsc, };static const struct clk_rcg_dfs_data gcc_dfs_clocks[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 381/739 clk: qcom: gcc-sm7150: Add CLK_OPS_PARENT_ENABLE to sdcc2 rcg
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danila Tikhonov <[email protected]>
[ Upstream commit ff19022b9112d6bbd7c117c83e944cb21b438e91 ]
Set .flags = CLK_OPS_PARENT_ENABLE to fix "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error.
--- drivers/clk/qcom/gcc-sm7150.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sm7150.c +1 -0
@@ -739,6 +739,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .parent_data = gcc_parent_data_6, .num_parents = ARRAY_SIZE(gcc_parent_data_6), .ops = &clk_rcg2_floor_ops, + .flags = CLK_OPS_PARENT_ENABLE, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 382/739 clk: rockchip: rk3568: Fix PLL rate setting for 78.75MHz
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alibek Omarov <[email protected]>
[ Upstream commit dafebd0f9a4f56b10d7fbda0bff1f540d16a2ea4 ]
PLL rate on RK356x is calculated through the simple formula:
((24000000 / _refdiv) * _fbdiv) / (_postdiv1 * _postdiv2)
The PLL rate setting for 78.75MHz seems to be copied from 96MHz so this patch fixes it and configures it properly.
--- drivers/clk/rockchip/clk-rk3568.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk-rk3568.c +1 -1
@@ -81,7 +81,7 @@ static struct rockchip_pll_rate_table rk3568_pll_rates[] = {RK3036_PLL_RATE (108000000 ,2 ,45 ,5 ,1 ,1 ,0 ),RK3036_PLL_RATE (100000000 ,1 ,150 ,6 ,6 ,1 ,0 ),RK3036_PLL_RATE (96000000 ,1 ,96 ,6 ,4 ,1 ,0 ), -RK3036_PLL_RATE (78750000 ,1 ,96 ,6 ,4 ,1 ,0 ), +RK3036_PLL_RATE (78750000 ,4 ,315 ,6 ,4 ,1 ,0 ), RK3036_PLL_RATE(74250000, 2, 99, 4, 4, 1, 0), { /* sentinel */ }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 383/739 PCI: apple: Initialize pcie->nvecs before use
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Peter <[email protected]>
[ Upstream commit d8650c0c2aa2e413594e4cb0faafa9958c1d7782 ]
The apple_pcie_setup_port() function computes ilog2(pcie->nvecs) to set up the number of MSIs available for each port. However, it's called before apple_msi_init(), which initializes pcie->nvecs.
Luckily, pcie->nvecs is part of kzalloc()-ed structure and, as such, initialized as zero. ilog2(0) happens to be 0xffffffff which then simply configures more MSIs in hardware than we have. This doesn't break anything because we never hand out those vectors.
Thus, swap the order of the two calls so that the correctly initialized value is then used.
--- drivers/pci/controller/pcie-apple.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-apple.c +5 -1
@@ -783,6 +783,10 @@ static int apple_pcie_init(struct pci_config_window *cfg) cfg->priv = pcie;INIT_LIST_HEAD (&pcie->ports); + ret =apple_msi_init (pcie); +if (ret) +return ret; +for_each_child_of_node (dev->of_node, of_port) { ret =apple_pcie_setup_port (pcie, of_port);if (ret) {
@@ -792,7 +796,7 @@ static int apple_pcie_init(struct pci_config_window *cfg) } } -return apple_msi_init (pcie); +return 0 ; }static int apple_pcie_probe (struct platform_device *pdev)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 384/739 PCI: qcom-ep: Switch MHI bus master clock off during L1SS
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit b9cbc06049cb6b7a322d708c2098195fb9fdcc4c ]
Currently, as part of the qcom_pcie_perst_deassert() function, instead of writing the updated value to clear PARF_MSTR_AXI_CLK_EN, the variable "val" is re-read.
This must be fixed to ensure that the master clock supplied to the MHI bus is correctly gated during L1.1/L1.2 to save power.
Thus, replace the line that re-reads "val" with a line that writes the updated value to the register to clear PARF_MSTR_AXI_CLK_EN.
--- drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-qcom-ep.c +1 -1
@@ -415,7 +415,7 @@ static int qcom_pcie_perst_deassert(struct dw_pcie *pci)/* Gate Master AXI clock to MHI bus during L1SS */ val =readl_relaxed (pcie_ep->parf +PARF_MHI_CLOCK_RESET_CTRL ); val &= ~PARF_MSTR_AXI_CLK_EN ; - val =readl_relaxed (pcie_ep->parf +PARF_MHI_CLOCK_RESET_CTRL ); +writel_relaxed (val, pcie_ep->parf +PARF_MHI_CLOCK_RESET_CTRL );dw_pcie_ep_init_notify (&pcie_ep->pci.ep);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 385/739 clk: qcom: gcc-sc8280xp: fix runtime PM imbalance on probe errors
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 10192ab375c39c58d39cba028d9685cefe1ca3c2 ]
Make sure to decrement the runtime PM usage count before returning in case RCG dynamic frequency switch initialisation fails.
--- drivers/clk/qcom/gcc-sc8280xp.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/clk/qcom/gcc-sc8280xp.c +11 -3
@@ -7539,8 +7539,8 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev) regmap =qcom_cc_map (pdev, &gcc_sc8280xp_desc);if (IS_ERR (regmap)) { -pm_runtime_put (&pdev->dev); -return PTR_ERR (regmap); + ret =PTR_ERR (regmap); + goto err_put_rpm; }/*
@@ -7561,11 +7561,19 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev) ret =qcom_cc_register_rcg_dfs (regmap, gcc_dfs_clocks,ARRAY_SIZE (gcc_dfs_clocks));if (ret) -return ret; + goto err_put_rpm; ret =qcom_cc_really_probe (pdev, &gcc_sc8280xp_desc, regmap); +if (ret) + goto err_put_rpm; +pm_runtime_put (&pdev->dev); +return 0 ; + +err_put_rpm: +pm_runtime_put_sync (&pdev->dev); +return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 386/739 drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minjie Du <[email protected]>
[ Upstream commit a995c50db887ef97f3160775aef7d772635a6f6e ]
The function clk_register_pll() may return NULL or an ERR_PTR. Don't treat an ERR_PTR as valid.
--- drivers/clk/keystone/pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/keystone/pll.c +1 -1
@@ -209,7 +209,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl) } clk =clk_register_pll (NULL , node->name, parent_name, pll_data); -if (clk) { +if (!IS_ERR_OR_NULL (clk)) {of_clk_add_provider (node, of_clk_src_simple_get, clk);return ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 387/739 EDAC/i10nm: Skip the absent memory controllers
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
[ Upstream commit c545f5e412250555bd4e717d062b117f20bab418 ]
Some Sapphire Rapids workstations' absent memory controllers still appear as PCIe devices that fool the i10nm_edac driver and result in "shift exponent -66 is negative" call traces from skx_get_dimm_info().
Skip the absent memory controllers to avoid the call traces.
--- drivers/edac/i10nm_base.c | 54 +++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-)
drivers/edac/i10nm_base.c +49 -5
@@ -658,13 +658,49 @@ static struct pci_dev *get_ddr_munit(struct skx_dev *d, int i, u32 *offset, unsireturn mdev; } +/** +* i10nm_imc_absent() - Check whether the memory controller @imc is absent +* +* @imc : The pointer to the structure of memory controller EDAC device. +* +* RETURNS : true if the memory controller EDAC device is absent, false otherwise. +*/ +static bool i10nm_imc_absent (struct skx_imc *imc) +{ +u32 mcmtr; +int i; + +switch (res_cfg->type) { +case SPR : +for (i =0 ; i < res_cfg->ddr_chan_num; i++) { + mcmtr =I10NM_GET_MCMTR (imc, i); +edac_dbg (1 ,"ch%d mcmtr reg %x\n" , i, mcmtr); +if (mcmtr != ~0 ) +return false; + } + +/* +* Some workstations' absent memory controllers still +* appear as PCIe devices, misleading the EDAC driver. +* By observing that the MMIO registers of these absent +* memory controllers consistently hold the value of ~0. +* +* We identify a memory controller as absent by checking +* if its MMIO register "mcmtr" == ~0 in all its channels. +*/ +return true; +default : +return false; + } +} +static int i10nm_get_ddr_munits (void ) {struct pci_dev *mdev;void __iomem *mbase;unsigned long size;struct skx_dev *d; -int i, j =0 ; +int i, lmc, j =0 ;u32 reg, off;u64 base;
@@ -690,7 +726,7 @@ static int i10nm_get_ddr_munits(void)edac_dbg (2 ,"socket%d mmio base 0x%llx (reg 0x%x)\n" , j++, base, reg); -for (i =0 ; i < res_cfg->ddr_imc_num; i++) { +for (lmc =0 , i =0 ; i < res_cfg->ddr_imc_num; i++) { mdev =get_ddr_munit (d, i, &off, &size);if (i ==0 && !mdev) {
@@ -700,8 +736,6 @@ static int i10nm_get_ddr_munits(void)if (!mdev)continue ; - d->imc[i].mdev = mdev; -edac_dbg (2 ,"mc%d mmio base 0x%llx size 0x%lx (reg 0x%x)\n" , i, base + off, size, reg);
@@ -712,7 +746,17 @@ static int i10nm_get_ddr_munits(void)return -ENODEV ; } - d->imc[i].mbase = mbase; + d->imc[lmc].mbase = mbase; +if (i10nm_imc_absent (&d->imc[lmc])) { +pci_dev_put (mdev); +iounmap (mbase); + d->imc[lmc].mbase =NULL ; +edac_dbg (2 ,"Skip absent mc%d\n" , i); +continue ; + }else { + d->imc[lmc].mdev = mdev; + lmc++; + } } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 388/739 iommufd: Fix locking around hwpt allocation
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 31422dff187b243c58f3a97d16bbe9e9ada639fe ]
Due to the auto_domains mechanism the ioas->mutex must be held until the hwpt is completely setup by iommufd_object_abort_and_destroy() or iommufd_object_finalize().
This prevents a concurrent iommufd_device_auto_get_domain() from seeing an incompletely initialized object through the ioas->hwpt_list.
To make this more consistent move the unlock until after finalize.
--- drivers/iommu/iommufd/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommufd/device.c +1 -1
@@ -298,8 +298,8 @@ static int iommufd_device_auto_get_domain(struct iommufd_device *idev, } hwpt->auto_domain = true; -mutex_unlock (&ioas->mutex);iommufd_object_finalize (idev->ictx, &hwpt->obj); +mutex_unlock (&ioas->mutex);return 0 ; out_unlock:mutex_unlock (&ioas->mutex);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 389/739 PCI/DOE: Fix destroy_work_on_stack() race
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ira Weiny <[email protected]>
[ Upstream commit e3a3a097eaebaf234a482b4d2f9f18fe989208c1 ]
The following debug object splat was observed in testing:
ODEBUG: free active (active state 0) object: 0000000097d23782 object type: work_struct hint: doe_statemachine_work+0x0/0x510
WARNING: CPU: 1 PID: 71 at lib/debugobjects.c:514 debug_print_object+0x7d/0xb0 ... Workqueue: pci 0000:36:00.0 DOE [1 doe_statemachine_work RIP: 0010:debug_print_object+0x7d/0xb0 ... Call Trace: ? debug_print_object+0x7d/0xb0 ? __pfx_doe_statemachine_work+0x10/0x10 debug_object_free.part.0+0x11b/0x150 doe_statemachine_work+0x45e/0x510 process_one_work+0x1d4/0x3c0
This occurs because destroy_work_on_stack() was called after signaling the completion in the calling thread. This creates a race between destroy_work_on_stack() and the task->work struct going out of scope in pci_doe().
Signal the work complete after destroying the work struct. This is safe because signal_task_complete() is the final thing the work item does and the workqueue code is careful not to access the work struct after.
--- drivers/pci/doe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/doe.c +1 -1
@@ -293,8 +293,8 @@ static int pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *tasstatic void signal_task_complete (struct pci_doe_task *task,int rv) { task->rv = rv; - task->complete (task);destroy_work_on_stack (&task->work); + task->complete (task); }static void signal_task_abort (struct pci_doe_task *task,int rv)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 390/739 clk: qcom: dispcc-sc8280xp: Use ret registers on GDSCs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 20e1d75bc043c5ec1fd8f5169fde17db89eb11c3 ]
The DISP_CC GDSCs have not been instructed to use the ret registers. Fix that.
--- drivers/clk/qcom/dispcc-sc8280xp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/dispcc-sc8280xp.c +4 -4
@@ -3057,7 +3057,7 @@ static struct gdsc disp0_mdss_gdsc = { .name = "disp0_mdss_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = HW_CTRL, + .flags = HW_CTRL | RETAIN_FF_ENABLE, }; static struct gdsc disp1_mdss_gdsc = {
@@ -3069,7 +3069,7 @@ static struct gdsc disp1_mdss_gdsc = { .name = "disp1_mdss_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = HW_CTRL, + .flags = HW_CTRL | RETAIN_FF_ENABLE, }; static struct gdsc disp0_mdss_int2_gdsc = {
@@ -3081,7 +3081,7 @@ static struct gdsc disp0_mdss_int2_gdsc = { .name = "disp0_mdss_int2_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = HW_CTRL, + .flags = HW_CTRL | RETAIN_FF_ENABLE, }; static struct gdsc disp1_mdss_int2_gdsc = {
@@ -3093,7 +3093,7 @@ static struct gdsc disp1_mdss_int2_gdsc = { .name = "disp1_mdss_int2_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = HW_CTRL, + .flags = HW_CTRL | RETAIN_FF_ENABLE, }; static struct gdsc *disp0_cc_sc8280xp_gdscs[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 391/739 clk: sunxi-ng: Modify mismatched function name
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Jianhua <[email protected]>
[ Upstream commit 075d9ca5b4e17f84fd1c744a405e69ec743be7f0 ]
No functional modification involved.
drivers/clk/sunxi-ng/ccu_mmc_timing.c:54: warning: expecting prototype for sunxi_ccu_set_mmc_timing_mode(). Prototype was for sunxi_ccu_get_mmc_timing_mode() instead
--- drivers/clk/sunxi-ng/ccu_mmc_timing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu_mmc_timing.c +1 -1
@@ -43,7 +43,7 @@ int sunxi_ccu_set_mmc_timing_mode(struct clk *clk, bool new_mode)EXPORT_SYMBOL_GPL (sunxi_ccu_set_mmc_timing_mode);/** -* sunxi_ccu_set_mmc_timing_mode: Get the current MMC clock timing mode +* sunxi_ccu_get_mmc_timing_mode: Get the current MMC clock timing mode * @clk: clock to query * * Return: %0 if the clock is in old timing mode, > %0 if it is in
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 392/739 clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Wronek <[email protected]>
[ Upstream commit fd0b5ba87ad5709f0fd3d2bc4b7870494a75f96a ]
Set .flags = CLK_OPS_PARENT_ENABLE to fix "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error.
--- drivers/clk/qcom/gcc-sc7180.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sc7180.c +1 -0
@@ -651,6 +651,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_5, .num_parents = ARRAY_SIZE(gcc_parent_data_5), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 393/739 EDAC/igen6: Fix the issue of no error events
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
[ Upstream commit ce53ad81ed36c24aff075f94474adecfabfcf239 ]
Current igen6_edac checks for pending errors before the registration of the error handler. However, there is a possibility that the error occurs during the registration process, leading to unhandled pending errors and no future error events. This issue can be reproduced by repeatedly injecting errors during the loading of the igen6_edac.
Fix this issue by moving the pending error handler after the registration of the error handler, ensuring that no pending errors are left unhandled.
--- drivers/edac/igen6_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/edac/igen6_edac.c +4 -4
@@ -27,7 +27,7 @@#include "edac_mc.h" #include "edac_module.h" -#define IGEN6_REVISION "v2.5" +#define IGEN6_REVISION "v2.5.1"#define EDAC_MOD_STR "igen6_edac"#define IGEN6_NMI_NAME "igen6_ibecc"
@@ -1216,9 +1216,6 @@ static int igen6_probe(struct pci_dev *pdev, const struct pci_device_id *ent)INIT_WORK (&ecclog_work, ecclog_work_cb);init_irq_work (&ecclog_irq_work, ecclog_irq_work_cb); -/* Check if any pending errors before registering the NMI handler */ -ecclog_handler (); - rc =register_err_handler ();if (rc) goto fail3;
@@ -1230,6 +1227,9 @@ static int igen6_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto fail4; } +/* Check if any pending errors before/during the registration of the error handler */ +ecclog_handler (); +igen6_debug_setup ();return 0 ; fail4:
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 394/739 ext4: correct grp validation in ext4_mb_good_group
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kemeng Shi <[email protected]>
[ Upstream commit a9ce5993a0f5c0887c8a1b4ffa3b8046fbcfdc93 ]
Group corruption check will access memory of grp and will trigger kernel crash if grp is NULL. So do NULL check before corruption check.
--- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/mballoc.c +1 -1
@@ -2553,7 +2553,7 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac,BUG_ON (cr <CR_POWER2_ALIGNED || cr >=EXT4_MB_NUM_CRS ); -if (unlikely (EXT4_MB_GRP_BBITMAP_CORRUPT (grp) || !grp)) +if (unlikely (!grp ||EXT4_MB_GRP_BBITMAP_CORRUPT (grp)))return false; free = grp->bb_free;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 395/739 ext4: avoid potential data overflow in next_linear_group
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kemeng Shi <[email protected]>
[ Upstream commit 60c672b7f2d1e5dd1774f2399b355c9314e709f8 ]
ngroups is ext4_group_t (unsigned int) while next_linear_group treat it in int. If ngroups is bigger than max number described by int, it will be treat as a negative number. Then "return group + 1 >= ngroups ? 0 :
group + 1;" may keep returning 0.
Switch int to ext4_group_t in next_linear_group to fix the overflow.
--- fs/ext4/mballoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +3 -2
@@ -1080,8 +1080,9 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac)* Return next linear group for allocation. If linear traversal should not be * performed, this function just returns the same group */ -static int -next_linear_group (struct ext4_allocation_context *ac,int group,int ngroups) +static ext4_group_t +next_linear_group (struct ext4_allocation_context *ac,ext4_group_t group, +ext4_group_t ngroups) {if (!should_optimize_scan (ac)) goto inc_and_return;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 396/739 clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrick Whewell <[email protected]>
[ Upstream commit 783cb693828ce487cf0bc6ad16cbcf2caae6f8d9 ]
GPLL9 is not on by default, which causes a "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error when booting. Set .flags = CLK_OPS_PARENT_ENABLE to fix the error.
--- drivers/clk/qcom/gcc-sm8250.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sm8250.c +1 -0
@@ -721,6 +721,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_4, .num_parents = ARRAY_SIZE(gcc_parent_data_4), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 397/739 clk: qcom: fix some Kconfig corner cases
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit b6bcd1c0c27e1f210228346e6d23a2ec0c263e8c ]
The SM_GCC_8550 symbol and others can only be built for ARM64 or when compile testing, but it gets selected by other drivers that can also be built for 32-bit ARCH_QCOM when not compile testing, which results in a Kconfig warning:
WARNING: unmet direct dependencies detected for SM_GCC_8550
Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_QCOM [=m] && (ARM64 || COMPILE_TEST [=n]) Selected by [m]:
- SM_GPUCC_8550 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m]
- SM_VIDEOCC_8550 [=m] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=m]
Add further 'depends on' statements to tighten this in a way that avoids the missing dependencies.
--- drivers/clk/qcom/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/qcom/Kconfig +4 -0
@@ -995,6 +995,7 @@ config SM_GPUCC_8450 config SM_GPUCC_8550 tristate "SM8550 Graphics Clock Controller" + depends on ARM64 || COMPILE_TEST select SM_GCC_8550 help Support for the graphics clock controller on SM8550 devices.
@@ -1031,6 +1032,7 @@ config SM_VIDEOCC_8250 config SM_VIDEOCC_8350 tristate "SM8350 Video Clock Controller" + depends on ARM64 || COMPILE_TEST select SM_GCC_8350 select QCOM_GDSC help
@@ -1040,6 +1042,7 @@ config SM_VIDEOCC_8350 config SM_VIDEOCC_8550 tristate "SM8550 Video Clock Controller" + depends on ARM64 || COMPILE_TEST select SM_GCC_8550 select QCOM_GDSC help
@@ -1088,6 +1091,7 @@ config CLK_GFM_LPASS_SM8250 config SM_VIDEOCC_8450 tristate "SM8450 Video Clock Controller" + depends on ARM64 || COMPILE_TEST select SM_GCC_8450 select QCOM_GDSC help
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 398/739 kvm/vfio: Prepare for accepting vfio device fd
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yi Liu <[email protected]>
[ Upstream commit 2f99073a722beef5f74f3b0f32bda227ba3df1e0 ]
This renames kvm_vfio_group related helpers to prepare for accepting vfio device fd. No functional change is intended.
Stable-dep-of: 9e0f4f2918c2 ("kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add()")
--- virt/kvm/vfio.c | 115 ++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 57 deletions(-)
virt/kvm/vfio.c +58 -57
@@ -21,7 +21,7 @@#include <asm/kvm_ppc.h> #endif -struct kvm_vfio_group { +struct kvm_vfio_file {struct list_head node;struct file *file;#ifdef CONFIG_SPAPR_TCE_IOMMU
@@ -30,7 +30,7 @@ struct kvm_vfio_group { };struct kvm_vfio { -struct list_head group_list; +struct list_head file_list;struct mutex lock;bool noncoherent; };
@@ -98,34 +98,35 @@ static struct iommu_group *kvm_vfio_file_iommu_group(struct file *file) }static void kvm_spapr_tce_release_vfio_group (struct kvm *kvm, -struct kvm_vfio_group *kvg) +struct kvm_vfio_file *kvf) { -if (WARN_ON_ONCE (!kvg->iommu_group)) +if (WARN_ON_ONCE (!kvf->iommu_group))return ; -kvm_spapr_tce_release_iommu_group (kvm, kvg->iommu_group); -iommu_group_put (kvg->iommu_group); - kvg->iommu_group =NULL ; +kvm_spapr_tce_release_iommu_group (kvm, kvf->iommu_group); +iommu_group_put (kvf->iommu_group); + kvf->iommu_group =NULL ; }#endif /* -* Groups can use the same or different IOMMU domains. If the same then -* adding a new group may change the coherency of groups we've previously -* been told about. We don't want to care about any of that so we retest -* each group and bail as soon as we find one that's noncoherent. This -* means we only ever [un]register_noncoherent_dma once for the whole device. +* Groups/devices can use the same or different IOMMU domains. If the same +* then adding a new group/device may change the coherency of groups/devices +* we've previously been told about. We don't want to care about any of +* that so we retest each group/device and bail as soon as we find one that's +* noncoherent. This means we only ever [un]register_noncoherent_dma once +* for the whole device. */ static void kvm_vfio_update_coherency (struct kvm_device *dev) {struct kvm_vfio *kv = dev->private;bool noncoherent = false; -struct kvm_vfio_group *kvg; +struct kvm_vfio_file *kvf;mutex_lock (&kv->lock); -list_for_each_entry (kvg, &kv->group_list, node) { -if (!kvm_vfio_file_enforced_coherent (kvg->file)) { +list_for_each_entry (kvf, &kv->file_list, node) { +if (!kvm_vfio_file_enforced_coherent (kvf->file)) { noncoherent = true;break ; }
@@ -143,10 +144,10 @@ static void kvm_vfio_update_coherency(struct kvm_device *dev)mutex_unlock (&kv->lock); } -static int kvm_vfio_group_add (struct kvm_device *dev,unsigned int fd) +static int kvm_vfio_file_add (struct kvm_device *dev,unsigned int fd) {struct kvm_vfio *kv = dev->private; -struct kvm_vfio_group *kvg; +struct kvm_vfio_file *kvf;struct file *filp;int ret;
@@ -162,27 +163,27 @@ static int kvm_vfio_group_add(struct kvm_device *dev, unsigned int fd)mutex_lock (&kv->lock); -list_for_each_entry (kvg, &kv->group_list, node) { -if (kvg->file == filp) { +list_for_each_entry (kvf, &kv->file_list, node) { +if (kvf->file == filp) { ret = -EEXIST ; goto err_unlock; } } - kvg =kzalloc (sizeof (*kvg),GFP_KERNEL_ACCOUNT ); -if (!kvg) { + kvf =kzalloc (sizeof (*kvf),GFP_KERNEL_ACCOUNT ); +if (!kvf) { ret = -ENOMEM ; goto err_unlock; } - kvg->file = filp; -list_add_tail (&kvg->node, &kv->group_list); + kvf->file = filp; +list_add_tail (&kvf->node, &kv->file_list);kvm_arch_start_assignment (dev->kvm);mutex_unlock (&kv->lock); -kvm_vfio_file_set_kvm (kvg->file, dev->kvm); +kvm_vfio_file_set_kvm (kvf->file, dev->kvm);kvm_vfio_update_coherency (dev);return 0 ;
@@ -193,10 +194,10 @@ static int kvm_vfio_group_add(struct kvm_device *dev, unsigned int fd)return ret; } -static int kvm_vfio_group_del (struct kvm_device *dev,unsigned int fd) +static int kvm_vfio_file_del (struct kvm_device *dev,unsigned int fd) {struct kvm_vfio *kv = dev->private; -struct kvm_vfio_group *kvg; +struct kvm_vfio_file *kvf;struct fd f;int ret;
@@ -208,18 +209,18 @@ static int kvm_vfio_group_del(struct kvm_device *dev, unsigned int fd)mutex_lock (&kv->lock); -list_for_each_entry (kvg, &kv->group_list, node) { -if (kvg->file != f.file) +list_for_each_entry (kvf, &kv->file_list, node) { +if (kvf->file != f.file)continue ; -list_del (&kvg->node); +list_del (&kvf->node);kvm_arch_end_assignment (dev->kvm);#ifdef CONFIG_SPAPR_TCE_IOMMU -kvm_spapr_tce_release_vfio_group (dev->kvm, kvg); +kvm_spapr_tce_release_vfio_group (dev->kvm, kvf);#endif -kvm_vfio_file_set_kvm (kvg->file,NULL ); -fput (kvg->file); -kfree (kvg); +kvm_vfio_file_set_kvm (kvf->file,NULL ); +fput (kvf->file); +kfree (kvf); ret =0 ;break ; }
@@ -234,12 +235,12 @@ static int kvm_vfio_group_del(struct kvm_device *dev, unsigned int fd) }#ifdef CONFIG_SPAPR_TCE_IOMMU -static int kvm_vfio_group_set_spapr_tce (struct kvm_device *dev, -void __user *arg) +static int kvm_vfio_file_set_spapr_tce (struct kvm_device *dev, +void __user *arg) {struct kvm_vfio_spapr_tce param;struct kvm_vfio *kv = dev->private; -struct kvm_vfio_group *kvg; +struct kvm_vfio_file *kvf;struct fd f;int ret;
@@ -254,20 +255,20 @@ static int kvm_vfio_group_set_spapr_tce(struct kvm_device *dev,mutex_lock (&kv->lock); -list_for_each_entry (kvg, &kv->group_list, node) { -if (kvg->file != f.file) +list_for_each_entry (kvf, &kv->file_list, node) { +if (kvf->file != f.file)continue ; -if (!kvg->iommu_group) { - kvg->iommu_group =kvm_vfio_file_iommu_group (kvg->file); -if (WARN_ON_ONCE (!kvg->iommu_group)) { +if (!kvf->iommu_group) { + kvf->iommu_group =kvm_vfio_file_iommu_group (kvf->file); +if (WARN_ON_ONCE (!kvf->iommu_group)) { ret = -EIO ; goto err_fdput; } } ret =kvm_spapr_tce_attach_iommu_group (dev->kvm, param.tablefd, - kvg->iommu_group); + kvf->iommu_group);break ; }
@@ -278,8 +279,8 @@ static int kvm_vfio_group_set_spapr_tce(struct kvm_device *dev, }#endif -static int kvm_vfio_set_group (struct kvm_device *dev,long attr, -void __user *arg) +static int kvm_vfio_set_file (struct kvm_device *dev,long attr, +void __user *arg) {int32_t __user *argp = arg;int32_t fd;
@@ -288,16 +289,16 @@ static int kvm_vfio_set_group(struct kvm_device *dev, long attr,case KVM_DEV_VFIO_GROUP_ADD :if (get_user (fd, argp))return -EFAULT ; -return kvm_vfio_group_add (dev, fd); +return kvm_vfio_file_add (dev, fd);case KVM_DEV_VFIO_GROUP_DEL :if (get_user (fd, argp))return -EFAULT ; -return kvm_vfio_group_del (dev, fd); +return kvm_vfio_file_del (dev, fd);#ifdef CONFIG_SPAPR_TCE_IOMMU case KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE : -return kvm_vfio_group_set_spapr_tce (dev, arg); +return kvm_vfio_file_set_spapr_tce (dev, arg);#endif }
@@ -309,8 +310,8 @@ static int kvm_vfio_set_attr(struct kvm_device *dev, {switch (attr->group) {case KVM_DEV_VFIO_GROUP : -return kvm_vfio_set_group (dev, attr->attr, -u64_to_user_ptr (attr->addr)); +return kvm_vfio_set_file (dev, attr->attr, +u64_to_user_ptr (attr->addr)); }return -ENXIO ;
@@ -339,16 +340,16 @@ static int kvm_vfio_has_attr(struct kvm_device *dev,static void kvm_vfio_release (struct kvm_device *dev) {struct kvm_vfio *kv = dev->private; -struct kvm_vfio_group *kvg, *tmp; +struct kvm_vfio_file *kvf, *tmp; -list_for_each_entry_safe (kvg, tmp, &kv->group_list, node) { +list_for_each_entry_safe (kvf, tmp, &kv->file_list, node) {#ifdef CONFIG_SPAPR_TCE_IOMMU -kvm_spapr_tce_release_vfio_group (dev->kvm, kvg); +kvm_spapr_tce_release_vfio_group (dev->kvm, kvf);#endif -kvm_vfio_file_set_kvm (kvg->file,NULL ); -fput (kvg->file); -list_del (&kvg->node); -kfree (kvg); +kvm_vfio_file_set_kvm (kvf->file,NULL ); +fput (kvf->file); +list_del (&kvf->node); +kfree (kvf);kvm_arch_end_assignment (dev->kvm); }
@@ -382,7 +383,7 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type)if (!kv)return -ENOMEM ; -INIT_LIST_HEAD (&kv->group_list); +INIT_LIST_HEAD (&kv->file_list);mutex_init (&kv->lock); dev->private = kv;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 399/739 kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 9e0f4f2918c2ff145d3dedee862d9919a6ed5812 ]
kvm_vfio_group_add() creates kvg instance, links it to kv->group_list, and calls kvm_vfio_file_set_kvm() with kvg->file as an argument after dropping kv->lock. If we race group addition and deletion calls, kvg instance may get freed by the time we get around to calling kvm_vfio_file_set_kvm().
Previous iterations of the code did not reference kvg->file outside of the critical section, but used a temporary variable. Still, they had similar problem of the file reference being owned by kvg structure and potential for kvm_vfio_group_del() dropping it before kvm_vfio_group_add() had a chance to complete.
Fix this by moving call to kvm_vfio_file_set_kvm() under the protection of kv->lock. We already call it while holding the same lock when vfio group is being deleted, so it should be safe here as well.
--- virt/kvm/vfio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/vfio.c +1 -1
@@ -180,10 +180,10 @@ static int kvm_vfio_file_add(struct kvm_device *dev, unsigned int fd)list_add_tail (&kvf->node, &kv->file_list);kvm_arch_start_assignment (dev->kvm); +kvm_vfio_file_set_kvm (kvf->file, dev->kvm);mutex_unlock (&kv->lock); -kvm_vfio_file_set_kvm (kvf->file, dev->kvm);kvm_vfio_update_coherency (dev);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 400/739 clk: qcom: reset: Use the correct type of sleep/delay based on length
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 181b66ee7cdd824797fc99b53bec29cf5630a04f ]
Use the fsleep() helper that (based on the length of the delay, see: [1]) chooses the correct sleep/delay functions.
[1] https://www.kernel.org/doc/Documentation/timers/timers-howto.txt
--- drivers/clk/qcom/reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/qcom/reset.c +2 -1
@@ -16,7 +16,8 @@ static int qcom_reset(struct reset_controller_dev *rcdev, unsigned long id)struct qcom_reset_controller *rst =to_qcom_reset_controller (rcdev); rcdev->ops->assert (rcdev, id); -udelay (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ +fsleep (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ + rcdev->ops->deassert (rcdev, id);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 401/739 clk: qcom: gcc-sm6350: Fix gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit df04d166d1f346dbf740bbea64a3bed3e7f14c8d ]
GPLL7 is not on by default, which causes a "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error when booting. Set .flags = CLK_OPS_PARENT_ENABLE to fix the error.
--- drivers/clk/qcom/gcc-sm6350.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sm6350.c +1 -0
@@ -641,6 +641,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_8, .num_parents = ARRAY_SIZE(gcc_parent_data_8), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 402/739 PCI: microchip: Correct the DED and SEC interrupt bit offsets
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daire McNamara <[email protected]>
[ Upstream commit 6d473a5a26136edf55c435a1c433e52910e03926 ]
The SEC and DED interrupt bits are laid out the wrong way round so the SEC interrupt handler attempts to mask, unmask, and clear the DED interrupt and vice versa. Correct the bit offsets so that each interrupt handler operates properly.
--- drivers/pci/controller/pcie-microchip-host.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-microchip-host.c +4 -4
@@ -167,12 +167,12 @@#define EVENT_PCIE_DLUP_EXIT 2#define EVENT_SEC_TX_RAM_SEC_ERR 3#define EVENT_SEC_RX_RAM_SEC_ERR 4 -#define EVENT_SEC_AXI2PCIE_RAM_SEC_ERR 5 -#define EVENT_SEC_PCIE2AXI_RAM_SEC_ERR 6 +#define EVENT_SEC_PCIE2AXI_RAM_SEC_ERR 5 +#define EVENT_SEC_AXI2PCIE_RAM_SEC_ERR 6#define EVENT_DED_TX_RAM_DED_ERR 7#define EVENT_DED_RX_RAM_DED_ERR 8 -#define EVENT_DED_AXI2PCIE_RAM_DED_ERR 9 -#define EVENT_DED_PCIE2AXI_RAM_DED_ERR 10 +#define EVENT_DED_PCIE2AXI_RAM_DED_ERR 9 +#define EVENT_DED_AXI2PCIE_RAM_DED_ERR 10#define EVENT_LOCAL_DMA_END_ENGINE_0 11#define EVENT_LOCAL_DMA_END_ENGINE_1 12#define EVENT_LOCAL_DMA_ERROR_ENGINE_0 13
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 403/739 PCI: Mark NVIDIA T4 GPUs to avoid bus reset
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wu Zongyong <[email protected]>
[ Upstream commit d5af729dc2071273f14cbb94abbc60608142fd83 ]
NVIDIA T4 GPUs do not work with SBR. This problem is found when the T4 card is direct attached to a Root Port only. Avoid bus reset by marking T4 GPUs PCI_DEV_FLAGS_NO_BUS_RESET.
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -3724,7 +3724,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)*/ static void quirk_nvidia_no_bus_reset (struct pci_dev *dev) { -if ((dev->device &0xffc0 ) ==0x2340 ) +if ((dev->device &0xffc0 ) ==0x2340 || dev->device ==0x1eb8 )quirk_no_bus_reset (dev); } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 404/739 pinctrl: mcp23s08: check return value of devm_kasprintf()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit f941714a7c7698eadb59bc27d34d6d6f38982705 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/pinctrl/pinctrl-mcp23s08_spi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pinctrl/pinctrl-mcp23s08_spi.c +10 -0
@@ -91,18 +91,28 @@ static int mcp23s08_spi_regmap_init(struct mcp23s08 *mcp, struct device *dev, mcp->reg_shift =0 ; mcp->chip.ngpio =8 ; mcp->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"mcp23s08.%d" , addr); +if (!mcp->chip.label) +return -ENOMEM ; config = &mcp23x08_regmap; name =devm_kasprintf (dev,GFP_KERNEL ,"%d" , addr); +if (!name) +return -ENOMEM ; +break ;case MCP_TYPE_S17 : mcp->reg_shift =1 ; mcp->chip.ngpio =16 ; mcp->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"mcp23s17.%d" , addr); +if (!mcp->chip.label) +return -ENOMEM ; config = &mcp23x17_regmap; name =devm_kasprintf (dev,GFP_KERNEL ,"%d" , addr); +if (!name) +return -ENOMEM ; +break ;case MCP_TYPE_S18 :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 405/739 PCI: Add locking to RMW PCI Express Capability Register accessors
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 5e70d0acf0825f439079736080350371f8d6699a ]
Many places in the kernel write the Link Control and Root Control PCI Express Capability Registers without proper concurrency control and this could result in losing the changes one of the writers intended to make.
Add pcie_cap_lock spinlock into the struct pci_dev and use it to protect bit changes made in the RMW capability accessors. Protect only a selected set of registers by differentiating the RMW accessor internally to locked/unlocked variants using a wrapper which has the same signature as pcie_capability_clear_and_set_word(). As the Capability Register (pos) given to the wrapper is always a constant, the compiler should be able to simplify all the dead-code away.
So far only the Link Control Register (ASPM, hotplug, link retraining, various drivers) and the Root Control Register (AER & PME) seem to require RMW locking.
--- drivers/pci/access.c | 20 +++++++++++++++++--- drivers/pci/probe.c | 1 + include/linux/pci.h | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 5 deletions(-)
drivers/pci/access.c +17 -3
@@ -497,8 +497,8 @@ int pcie_capability_write_dword(struct pci_dev *dev, int pos, u32 val) }EXPORT_SYMBOL (pcie_capability_write_dword); -int pcie_capability_clear_and_set_word (struct pci_dev *dev,int pos, -u16 clear,u16 set) +int pcie_capability_clear_and_set_word_unlocked (struct pci_dev *dev,int pos, +u16 clear,u16 set) {int ret;u16 val;
@@ -512,7 +512,21 @@ int pcie_capability_clear_and_set_word(struct pci_dev *dev, int pos,return ret; } -EXPORT_SYMBOL (pcie_capability_clear_and_set_word); +EXPORT_SYMBOL (pcie_capability_clear_and_set_word_unlocked); + +int pcie_capability_clear_and_set_word_locked (struct pci_dev *dev,int pos, +u16 clear,u16 set) +{ +unsigned long flags; +int ret; + +spin_lock_irqsave (&dev->pcie_cap_lock, flags); + ret =pcie_capability_clear_and_set_word_unlocked (dev, pos, clear, set); +spin_unlock_irqrestore (&dev->pcie_cap_lock, flags); + +return ret; +} +EXPORT_SYMBOL (pcie_capability_clear_and_set_word_locked);int pcie_capability_clear_and_set_dword (struct pci_dev *dev,int pos,u32 clear,u32 set)
drivers/pci/probe.c +1 -0
@@ -2324,6 +2324,7 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus) .end = -1, }; +spin_lock_init (&dev->pcie_cap_lock);#ifdef CONFIG_PCI_MSI raw_spin_lock_init (&dev->msi_lock);#endif
include/linux/pci.h +32 -2
@@ -467,6 +467,7 @@ struct pci_dev {pci_dev_flags_t dev_flags;atomic_t enable_cnt;/* pci_enable_device has been called */ +spinlock_t pcie_cap_lock;/* Protects RMW ops in capability accessors */ u32 saved_config_space[16 ];/* Config space saved at suspend time */ struct hlist_head saved_cap_space;int rom_attr_enabled;/* Display of ROM attribute enabled? */
@@ -1217,11 +1218,40 @@ int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val);int pcie_capability_read_dword (struct pci_dev *dev,int pos,u32 *val);int pcie_capability_write_word (struct pci_dev *dev,int pos,u16 val);int pcie_capability_write_dword (struct pci_dev *dev,int pos,u32 val); -int pcie_capability_clear_and_set_word (struct pci_dev *dev,int pos, -u16 clear,u16 set); +int pcie_capability_clear_and_set_word_unlocked (struct pci_dev *dev,int pos, +u16 clear,u16 set); +int pcie_capability_clear_and_set_word_locked (struct pci_dev *dev,int pos, +u16 clear,u16 set);int pcie_capability_clear_and_set_dword (struct pci_dev *dev,int pos,u32 clear,u32 set); +/** +* pcie_capability_clear_and_set_word - RMW accessor for PCI Express Capability Registers +* @dev: PCI device structure of the PCI Express device +* @pos: PCI Express Capability Register +* @clear: Clear bitmask +* @set: Set bitmask +* +* Perform a Read-Modify-Write (RMW) operation using @clear and @set +* bitmasks on PCI Express Capability Register at @pos. Certain PCI Express +* Capability Registers are accessed concurrently in RMW fashion, hence +* require locking which is handled transparently to the caller. +*/ +static inline int pcie_capability_clear_and_set_word (struct pci_dev *dev, +int pos, +u16 clear,u16 set) +{ +switch (pos) { +case PCI_EXP_LNKCTL : +case PCI_EXP_RTCTL : +return pcie_capability_clear_and_set_word_locked (dev, pos, + clear, set); +default : +return pcie_capability_clear_and_set_word_unlocked (dev, pos, + clear, set); + } +} +static inline int pcie_capability_set_word (struct pci_dev *dev,int pos,u16 set) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 406/739 PCI: Make link retraining use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit fb0171a4c01b4825e36a5584eaa84291179c64ce ]
Don't assume that the device is fully under the control of PCI core. Use RMW capability accessors in link retraining which do proper locking to avoid losing concurrent updates to the register values.
--- drivers/pci/pci.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/pci/pci.c +2 -6
@@ -4927,7 +4927,6 @@ static int pcie_wait_for_link_status(struct pci_dev *pdev,int pcie_retrain_link (struct pci_dev *pdev,bool use_lt) {int rc; -u16 lnkctl;/* * Ensure the updated LNKCTL parameters are used during link
@@ -4939,17 +4938,14 @@ int pcie_retrain_link(struct pci_dev *pdev, bool use_lt)if (rc)return rc; -pcie_capability_read_word (pdev,PCI_EXP_LNKCTL , &lnkctl); - lnkctl |=PCI_EXP_LNKCTL_RL ; -pcie_capability_write_word (pdev,PCI_EXP_LNKCTL , lnkctl); +pcie_capability_set_word (pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_RL );if (pdev->clear_retrain_link) {/* * Due to an erratum in some devices the Retrain Link bit * needs to be cleared again manually to allow the link * training to succeed. */ - lnkctl &= ~PCI_EXP_LNKCTL_RL ; -pcie_capability_write_word (pdev,PCI_EXP_LNKCTL , lnkctl); +pcie_capability_clear_word (pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_RL ); }return pcie_wait_for_link_status (pdev, use_lt, !use_lt);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 407/739 PCI: pciehp: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 5f75f96c61039151c193775d776fde42477eace1 ]
As hotplug is not the only driver touching LNKCTL, use the RMW capability accessor which handles concurrent changes correctly.
--- drivers/pci/hotplug/pciehp_hpc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/pci/hotplug/pciehp_hpc.c +3 -9
@@ -332,17 +332,11 @@ int pciehp_check_link_status(struct controller *ctrl)static int __pciehp_link_set (struct controller *ctrl,bool enable) {struct pci_dev *pdev =ctrl_dev (ctrl); -u16 lnk_ctrl; -pcie_capability_read_word (pdev,PCI_EXP_LNKCTL , &lnk_ctrl); +pcie_capability_clear_and_set_word (pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_LD , + enable ?0 :PCI_EXP_LNKCTL_LD ); -if (enable) - lnk_ctrl &= ~PCI_EXP_LNKCTL_LD ; -else - lnk_ctrl |=PCI_EXP_LNKCTL_LD ; - -pcie_capability_write_word (pdev,PCI_EXP_LNKCTL , lnk_ctrl); -ctrl_dbg (ctrl,"%s: lnk_ctrl = %x\n" , __func__, lnk_ctrl);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 408/739 PCI/ASPM: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit e09060b3b6b4661278ff8e1b7b81a37d5ea86eae ]
Don't assume that the device is fully under the control of ASPM and use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register values.
If configuration fails in pcie_aspm_configure_common_clock(), the function attempts to restore the old PCI_EXP_LNKCTL_CCC settings. Store only the old PCI_EXP_LNKCTL_CCC bit for the relevant devices rather than the content of the whole LNKCTL registers. It aligns better with how pcie_lnkctl_clear_and_set() expects its parameter and makes the code more obvious to understand.
--- drivers/pci/pcie/aspm.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/pci/pcie/aspm.c +13 -17
@@ -199,7 +199,7 @@ static void pcie_clkpm_cap_init(struct pcie_link_state *link, int blacklist)static void pcie_aspm_configure_common_clock (struct pcie_link_state *link) {int same_clock =1 ; -u16 reg16, parent_reg, child_reg[8 ]; +u16 reg16, ccc, parent_old_ccc, child_old_ccc[8 ];struct pci_dev *child, *parent = link->pdev;struct pci_bus *linkbus = parent->subordinate;/*
@@ -221,6 +221,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)/* Port might be already in common clock mode */ pcie_capability_read_word (parent,PCI_EXP_LNKCTL , ®16); + parent_old_ccc = reg16 &PCI_EXP_LNKCTL_CCC ;if (same_clock && (reg16 &PCI_EXP_LNKCTL_CCC )) {bool consistent = true;
@@ -237,34 +238,29 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)pci_info (parent,"ASPM: current common clock configuration is inconsistent, reconfiguring\n" ); } + ccc = same_clock ?PCI_EXP_LNKCTL_CCC :0 ;/* Configure downstream component, all functions */ list_for_each_entry (child, &linkbus->devices, bus_list) {pcie_capability_read_word (child,PCI_EXP_LNKCTL , ®16); - child_reg[PCI_FUNC (child->devfn)] = reg16; -if (same_clock) - reg16 |=PCI_EXP_LNKCTL_CCC ; -else - reg16 &= ~PCI_EXP_LNKCTL_CCC ; -pcie_capability_write_word (child,PCI_EXP_LNKCTL , reg16); + child_old_ccc[PCI_FUNC (child->devfn)] = reg16 &PCI_EXP_LNKCTL_CCC ; +pcie_capability_clear_and_set_word (child,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , ccc); }/* Configure upstream component */ -pcie_capability_read_word (parent,PCI_EXP_LNKCTL , ®16); - parent_reg = reg16; -if (same_clock) - reg16 |=PCI_EXP_LNKCTL_CCC ; -else - reg16 &= ~PCI_EXP_LNKCTL_CCC ; -pcie_capability_write_word (parent,PCI_EXP_LNKCTL , reg16); +pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , ccc);if (pcie_retrain_link (link->pdev, true)) {/* Training failed. Restore common clock configurations */ pci_err (parent,"ASPM: Could not configure common clock\n" );list_for_each_entry (child, &linkbus->devices, bus_list) -pcie_capability_write_word (child,PCI_EXP_LNKCTL , - child_reg[PCI_FUNC (child->devfn)]); -pcie_capability_write_word (parent,PCI_EXP_LNKCTL , parent_reg); +pcie_capability_clear_and_set_word (child,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , + child_old_ccc[PCI_FUNC (child->devfn)]); +pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , parent_old_ccc); } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 409/739 clk: qcom: gcc-sm8450: Use floor ops for SDCC RCGs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit a27ac3806b0a0e6954fb5967223b8635242e5b8f ]
Use the floor ops to prevent warnings like this at suspend exit and boot:
mmc0: Card appears overclocked; req 800000 Hz, actual 25000000 Hz
--- drivers/clk/qcom/gcc-sm8450.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/gcc-sm8450.c +2 -2
@@ -935,7 +935,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .parent_data = gcc_parent_data_7, .num_parents = ARRAY_SIZE(gcc_parent_data_7), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
@@ -958,7 +958,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = { .parent_data = gcc_parent_data_0, .num_parents = ARRAY_SIZE(gcc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 410/739 clk: qcom: gcc-qdu1000: Fix gcc_pcie_0_pipe_clk_src clock handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imran Shaik <[email protected]>
[ Upstream commit b311f5d3c4749259043a9a458a8db07915210142 ]
Fix the gcc pcie pipe clock handling as per the clk_regmap_phy_mux_ops implementation to let the clock framework automatically park the clock at XO when the clock is switched off and restore the parent when the clock is switched on.
--- drivers/clk/qcom/gcc-qdu1000.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
drivers/clk/qcom/gcc-qdu1000.c +6 -17
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/clk-provider.h>
@@ -370,16 +370,6 @@ static const struct clk_parent_data gcc_parent_data_6[] = { { .index = DT_TCXO_IDX }, }; -static const struct parent_map gcc_parent_map_7[] = { - {P_PCIE_0_PIPE_CLK ,0 }, - {P_BI_TCXO ,2 }, -}; - -static const struct clk_parent_data gcc_parent_data_7[] = { - { .index =DT_PCIE_0_PIPE_CLK_IDX }, - { .index =DT_TCXO_IDX }, -}; -static const struct parent_map gcc_parent_map_8[] = { {P_BI_TCXO ,0 }, {P_GCC_GPLL0_OUT_MAIN ,1 },
@@ -439,16 +429,15 @@ static struct clk_regmap_mux gcc_pcie_0_phy_aux_clk_src = { }, }; -static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = { +static struct clk_regmap_phy_mux gcc_pcie_0_pipe_clk_src = { .reg =0x9d064 , - .shift =0 , - .width =2 , - .parent_map = gcc_parent_map_7, .clkr = { .hw.init = &(const struct clk_init_data ) { .name ="gcc_pcie_0_pipe_clk_src" , - .parent_data = gcc_parent_data_7, - .num_parents =ARRAY_SIZE (gcc_parent_data_7), + .parent_data = &(const struct clk_parent_data ){ + .index =DT_PCIE_0_PIPE_CLK_IDX , + }, + .num_parents =1 , .ops = &clk_regmap_phy_mux_ops, }, },
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 411/739 clk: qcom: gcc-qdu1000: Fix clkref clocks handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imran Shaik <[email protected]>
[ Upstream commit 2524dae5cd453ca39e8ba1b95c2755a8a2d94059 ]
Update the GCC clkref clock's halt_check to BRANCH_HALT, as it's status bit is not inverted in the latest hardware version of QDU1000 and QRU1000 SoCs. While at it, fix the gcc clkref clock ops as well.
--- drivers/clk/qcom/gcc-qdu1000.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clk/qcom/gcc-qdu1000.c +4 -6
@@ -1447,14 +1447,13 @@ static struct clk_branch gcc_pcie_0_cfg_ahb_clk = {static struct clk_branch gcc_pcie_0_clkref_en = { .halt_reg =0x9c004 , - .halt_bit =31 , - .halt_check =BRANCH_HALT_ENABLE , + .halt_check =BRANCH_HALT , .clkr = { .enable_reg =0x9c004 , .enable_mask =BIT (0 ), .hw.init = &(const struct clk_init_data ) { .name ="gcc_pcie_0_clkref_en" , - .ops = &clk_branch_ops, + .ops = &clk_branch2_ops, }, }, };
@@ -2274,14 +2273,13 @@ static struct clk_branch gcc_tsc_etu_clk = {static struct clk_branch gcc_usb2_clkref_en = { .halt_reg =0x9c008 , - .halt_bit =31 , - .halt_check =BRANCH_HALT_ENABLE , + .halt_check =BRANCH_HALT , .clkr = { .enable_reg =0x9c008 , .enable_mask =BIT (0 ), .hw.init = &(const struct clk_init_data ) { .name ="gcc_usb2_clkref_en" , - .ops = &clk_branch_ops, + .ops = &clk_branch2_ops, }, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 412/739 clk: imx: pllv4: Fix SPLL2 MULT range
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ye Li <[email protected]>
[ Upstream commit 3f0cdb945471f1abd1cf4d172190e9c489c5052a ]
The SPLL2 on iMX8ULP is different with other frac PLLs, it can support VCO from 650Mhz to 1Ghz. According to RM, the MULT is using a range from 27 to 54, not some fixed values. If using current PLL implementation, some clock rate can't be supported.
Fix the issue by adding new type for the SPLL2 and use MULT range to replace MULT table
--- drivers/clk/imx/clk-pllv4.c | 46 +++++++++++++++++++++++++++++-------- drivers/clk/imx/clk.h | 1 + 2 files changed, 37 insertions(+), 10 deletions(-)
drivers/clk/imx/clk-pllv4.c +36 -10
@@ -44,11 +44,15 @@ struct clk_pllv4 {u32 cfg_offset;u32 num_offset;u32 denom_offset; +bool use_mult_range; };/* Valid PLL MULT Table */ static const int pllv4_mult_table[] = {33 ,27 ,22 ,20 ,17 ,16 }; +/* Valid PLL MULT range, (max, min) */ +static const int pllv4_mult_range[] = {54 ,27 }; +#define to_clk_pllv4 (__hw) container_of(__hw, struct clk_pllv4, hw)#define LOCK_TIMEOUT_US USEC_PER_MSEC
@@ -94,17 +98,30 @@ static unsigned long clk_pllv4_recalc_rate(struct clk_hw *hw,static long clk_pllv4_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *prate) { +struct clk_pllv4 *pll =to_clk_pllv4 (hw);unsigned long parent_rate = *prate;unsigned long round_rate, i;u32 mfn, mfd =DEFAULT_MFD ;bool found = false;u64 temp64; - -for (i =0 ; i <ARRAY_SIZE (pllv4_mult_table); i++) { - round_rate = parent_rate * pllv4_mult_table[i]; -if (rate >= round_rate) { +u32 mult; + +if (pll->use_mult_range) { + temp64 = (u64 )rate; +do_div (temp64, parent_rate); + mult = temp64; +if (mult >= pllv4_mult_range[1 ] && + mult <= pllv4_mult_range[0 ]) { + round_rate = parent_rate * mult; found = true; -break ; + } + }else { +for (i =0 ; i <ARRAY_SIZE (pllv4_mult_table); i++) { + round_rate = parent_rate * pllv4_mult_table[i]; +if (rate >= round_rate) { + found = true; +break ; + } } }
@@ -138,14 +155,20 @@ static long clk_pllv4_round_rate(struct clk_hw *hw, unsigned long rate,return round_rate + (u32 )temp64; } -static bool clk_pllv4_is_valid_mult (unsigned int mult) +static bool clk_pllv4_is_valid_mult (struct clk_pllv4 *pll,unsigned int mult) {int i;/* check if mult is in valid MULT table */ -for (i =0 ; i <ARRAY_SIZE (pllv4_mult_table); i++) { -if (pllv4_mult_table[i] == mult) +if (pll->use_mult_range) { +if (mult >= pllv4_mult_range[1 ] && + mult <= pllv4_mult_range[0 ])return true; + }else { +for (i =0 ; i <ARRAY_SIZE (pllv4_mult_table); i++) { +if (pllv4_mult_table[i] == mult) +return true; + } }return false;
@@ -160,7 +183,7 @@ static int clk_pllv4_set_rate(struct clk_hw *hw, unsigned long rate, mult = rate / parent_rate; -if (!clk_pllv4_is_valid_mult (mult)) +if (!clk_pllv4_is_valid_mult (pll, mult))return -EINVAL ;if (parent_rate <=MAX_MFD )
@@ -227,10 +250,13 @@ struct clk_hw *imx_clk_hw_pllv4(enum imx_pllv4_type type, const char *name, pll->base = base; -if (type ==IMX_PLLV4_IMX8ULP ) { +if (type ==IMX_PLLV4_IMX8ULP || + type ==IMX_PLLV4_IMX8ULP_1GHZ ) { pll->cfg_offset =IMX8ULP_PLL_CFG_OFFSET ; pll->num_offset =IMX8ULP_PLL_NUM_OFFSET ; pll->denom_offset =IMX8ULP_PLL_DENOM_OFFSET ; +if (type ==IMX_PLLV4_IMX8ULP_1GHZ ) + pll->use_mult_range = true; }else { pll->cfg_offset =PLL_CFG_OFFSET ; pll->num_offset =PLL_NUM_OFFSET ;
drivers/clk/imx/clk.h +1 -0
@@ -45,6 +45,7 @@ enum imx_pll14xx_type {enum imx_pllv4_type {IMX_PLLV4_IMX7ULP ,IMX_PLLV4_IMX8ULP , +IMX_PLLV4_IMX8ULP_1GHZ , };enum imx_pfdv2_type {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 413/739 clk: imx: imx8ulp: update SPLL2 type
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 7653a59be8af043adc4c09473975a860e6055ff9 ]
The SPLL2 on iMX8ULP is different with other frac PLLs, it can support VCO from 650Mhz to 1Ghz. Following the changes to pllv4, use the new type IMX_PLLV4_IMX8ULP_1GHZ.
--- drivers/clk/imx/clk-imx8ulp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8ulp.c +1 -1
@@ -167,7 +167,7 @@ static int imx8ulp_clk_cgc1_init(struct platform_device *pdev) clks[IMX8ULP_CLK_SPLL2_PRE_SEL ] =imx_clk_hw_mux_flags ("spll2_pre_sel" , base +0x510 ,0 ,1 , pll_pre_sels,ARRAY_SIZE (pll_pre_sels),CLK_SET_PARENT_GATE ); clks[IMX8ULP_CLK_SPLL3_PRE_SEL ] =imx_clk_hw_mux_flags ("spll3_pre_sel" , base +0x610 ,0 ,1 , pll_pre_sels,ARRAY_SIZE (pll_pre_sels),CLK_SET_PARENT_GATE ); - clks[IMX8ULP_CLK_SPLL2 ] =imx_clk_hw_pllv4 (IMX_PLLV4_IMX8ULP ,"spll2" ,"spll2_pre_sel" , base +0x500 ); + clks[IMX8ULP_CLK_SPLL2 ] =imx_clk_hw_pllv4 (IMX_PLLV4_IMX8ULP_1GHZ ,"spll2" ,"spll2_pre_sel" , base +0x500 ); clks[IMX8ULP_CLK_SPLL3 ] =imx_clk_hw_pllv4 (IMX_PLLV4_IMX8ULP ,"spll3" ,"spll3_pre_sel" , base +0x600 ); clks[IMX8ULP_CLK_SPLL3_VCODIV ] =imx_clk_hw_divider ("spll3_vcodiv" ,"spll3" , base +0x604 ,0 ,6 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 414/739 clk: imx8mp: fix sai4 clock
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit c30f600f1f41dcf5ef0fb02e9a201f9b2e8f31bd ]
The reference manual don't mention a SAI4 hardware block. This would be clock slice 78 which is skipped (TRM, page 237). Remove any reference to this clock to align the driver with the reality.
--- drivers/clk/imx/clk-imx8mp.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/clk/imx/clk-imx8mp.c +0 -5
@@ -178,10 +178,6 @@ static const char * const imx8mp_sai3_sels[] = {"osc_24m", "audio_pll1_out", "au"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , "clk_ext3", "clk_ext4", }; -static const char *const imx8mp_sai4_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , -"clk_ext1" ,"clk_ext2" , }; -static const char *const imx8mp_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" ,"clk_ext2" ,"clk_ext3" , };
@@ -567,7 +563,6 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_SAI1 ] =imx8m_clk_hw_composite ("sai1" , imx8mp_sai1_sels, ccm_base +0xa580 ); hws[IMX8MP_CLK_SAI2 ] =imx8m_clk_hw_composite ("sai2" , imx8mp_sai2_sels, ccm_base +0xa600 ); hws[IMX8MP_CLK_SAI3 ] =imx8m_clk_hw_composite ("sai3" , imx8mp_sai3_sels, ccm_base +0xa680 ); - hws[IMX8MP_CLK_SAI4 ] =imx8m_clk_hw_composite ("sai4" , imx8mp_sai4_sels, ccm_base +0xa700 ); hws[IMX8MP_CLK_SAI5 ] =imx8m_clk_hw_composite ("sai5" , imx8mp_sai5_sels, ccm_base +0xa780 ); hws[IMX8MP_CLK_SAI6 ] =imx8m_clk_hw_composite ("sai6" , imx8mp_sai6_sels, ccm_base +0xa800 ); hws[IMX8MP_CLK_ENET_QOS ] =imx8m_clk_hw_composite ("enet_qos" , imx8mp_enet_qos_sels, ccm_base +0xa880 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 415/739 clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit 4dd432d985ef258e3bc436e568fba4b987b59171 ]
Reconfiguring the clock divider to the exact same value is observed on an i.MX8MN to often cause a longer than usual clock pause, probably because the divider restarts counting whenever the register is rewritten.
This issue doesn't show up normally, because the clock framework will take care to not call set_rate when the clock rate is the same. However, when we reconfigure an upstream clock, the common code will call set_rate with the newly calculated rate on all children, e.g.:
- sai5 is running normally and divides Audio PLL out by 16.
- Audio PLL rate is increased by 32Hz (glitch-free kdiv change)
- rates for children are recalculated and rates are set recursively
- imx8m_clk_composite_divider_set_rate(sai5) is called with
32/16 = 2Hz more
- imx8m_clk_composite_divider_set_rate computes same divider as before
- divider register is written, so it restarts counting from zero and MCLK is briefly paused, so instead of e.g. 40ns, MCLK is low for 120ns.
Some external clock consumers can be upset by such unexpected clock pauses, so let's make sure we only rewrite the divider value when the value to be written is actually different.
--- drivers/clk/imx/clk-composite-8m.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/clk/imx/clk-composite-8m.c +7 -5
@@ -97,7 +97,7 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,int prediv_value;int div_value;int ret; -u32 val; +u32 orig, val; ret =imx8m_clk_composite_compute_dividers (rate, parent_rate, &prediv_value, &div_value);
@@ -106,13 +106,15 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,spin_lock_irqsave (divider->lock, flags); - val =readl (divider->reg); - val &= ~((clk_div_mask (divider->width) << divider->shift) | - (clk_div_mask (PCG_DIV_WIDTH ) <<PCG_DIV_SHIFT )); + orig =readl (divider->reg); + val = orig & ~((clk_div_mask (divider->width) << divider->shift) | + (clk_div_mask (PCG_DIV_WIDTH ) <<PCG_DIV_SHIFT )); val |= (u32)(prediv_value -1 ) << divider->shift; val |= (u32)(div_value -1 ) <<PCG_DIV_SHIFT ; -writel (val, divider->reg); + +if (val != orig) +writel (val, divider->reg);spin_unlock_irqrestore (divider->lock, flags);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 416/739 powerpc/radix: Move some functions into #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 4a9dd8f292efd614f0a18452e6474fe19ae17b47 ]
With skiboot_defconfig, Clang reports:
CC arch/powerpc/mm/book3s64/radix_tlb.oarch/powerpc/mm/book3s64/radix_tlb.c:419:20: error: unused function '_tlbie_pid_lpid' [-Werror,-Wunused-function] static inline void _tlbie_pid_lpid(unsigned long pid, unsigned long lpid,
^
arch/powerpc/mm/book3s64/radix_tlb.c:663:20: error: unused function '_tlbie_va_range_lpid' [-Werror,-Wunused-function]
static inline void _tlbie_va_range_lpid(unsigned long start, unsigned long end,
^This is because those functions are only called from functions enclosed in a #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
Move below functions inside that #ifdef
* __tlbie_pid_lpid(unsigned long pid,
* __tlbie_va_lpid(unsigned long va, unsigned long pid,
* fixup_tlbie_pid_lpid(unsigned long pid, unsigned long lpid)
* _tlbie_pid_lpid(unsigned long pid, unsigned long lpid,
* fixup_tlbie_va_range_lpid(unsigned long va,
* __tlbie_va_range_lpid(unsigned long start, unsigned long end,
* _tlbie_va_range_lpid(unsigned long start, unsigned long end,
--- arch/powerpc/mm/book3s64/radix_tlb.c | 240 ++++++++++++++------------- 1 file changed, 121 insertions(+), 119 deletions(-)
arch/powerpc/mm/book3s64/radix_tlb.c +121 -119
@@ -127,21 +127,6 @@ static __always_inline void __tlbie_pid(unsigned long pid, unsigned long ric)trace_tlbie (0 ,0 , rb, rs, ric, prs, r); } -static __always_inline void __tlbie_pid_lpid(unsigned long pid, -unsigned long lpid, -unsigned long ric) -{ -unsigned long rb, rs, prs, r; - - rb =PPC_BIT (53 );/* IS = 1 */ - rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); - prs =1 ;/* process scoped */ - r =1 ;/* radix format */ - - asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) - : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); - trace_tlbie(0 ,0 , rb, rs, ric, prs, r); -} static __always_inline void __tlbie_lpid(unsigned long lpid, unsigned long ric) {unsigned long rb,rs,prs,r;
@@ -202,23 +187,6 @@ static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,trace_tlbie (0 ,0 , rb, rs, ric, prs, r); } -static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long pid, -unsigned long lpid, -unsigned long ap,unsigned long ric) -{ -unsigned long rb, rs, prs, r; - - rb = va & ~(PPC_BITMASK (52 ,63 )); - rb |= ap <<PPC_BITLSHIFT (58 ); - rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); - prs =1 ;/* process scoped */ - r =1 ;/* radix format */ - - asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) - : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); - trace_tlbie(0 ,0 , rb, rs, ric, prs, r); -} - static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,unsigned long ap,unsigned long ric) {
@@ -264,22 +232,6 @@ static inline void fixup_tlbie_va_range(unsigned long va, unsigned long pid, } } -static inline void fixup_tlbie_va_range_lpid (unsigned long va, -unsigned long pid, -unsigned long lpid, -unsigned long ap) -{ -if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); - } - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_va_lpid (va, pid, lpid, ap,RIC_FLUSH_TLB ); - } -} -static inline void fixup_tlbie_pid (unsigned long pid) {/*
@@ -299,26 +251,6 @@ static inline void fixup_tlbie_pid(unsigned long pid) } } -static inline void fixup_tlbie_pid_lpid (unsigned long pid,unsigned long lpid) -{ -/* -* We can use any address for the invalidation, pick one which is -* probably unused as an optimisation. -*/ -unsigned long va = ((1UL <<52 ) -1 ); - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); - } - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_va_lpid (va, pid, lpid,mmu_get_ap (MMU_PAGE_64K ), -RIC_FLUSH_TLB ); - } -} -static inline void fixup_tlbie_lpid_va (unsigned long va,unsigned long lpid,unsigned long ap) {
@@ -416,31 +348,6 @@ static inline void _tlbie_pid(unsigned long pid, unsigned long ric) asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); } -static inline void _tlbie_pid_lpid (unsigned long pid,unsigned long lpid, -unsigned long ric) -{ - asmvolatile ("ptesync" : : :"memory" ); - -/* -* Workaround the fact that the "ric" argument to __tlbie_pid -* must be a compile-time contraint to match the "i" constraint -* in the asm statement. -*/ -switch (ric) { -case RIC_FLUSH_TLB : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_TLB ); -fixup_tlbie_pid_lpid (pid, lpid); -break ; -case RIC_FLUSH_PWC : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); -break ; -case RIC_FLUSH_ALL : -default : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_ALL ); -fixup_tlbie_pid_lpid (pid, lpid); - } - asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); -}struct tlbiel_pid {unsigned long pid;unsigned long ric;
@@ -566,20 +473,6 @@ static inline void __tlbie_va_range(unsigned long start, unsigned long end,fixup_tlbie_va_range (addr - page_size, pid, ap); } -static inline void __tlbie_va_range_lpid (unsigned long start,unsigned long end, -unsigned long pid,unsigned long lpid, -unsigned long page_size, -unsigned long psize) -{ -unsigned long addr; -unsigned long ap =mmu_get_ap (psize); - -for (addr = start; addr < end; addr += page_size) -__tlbie_va_lpid (addr, pid, lpid, ap,RIC_FLUSH_TLB ); - -fixup_tlbie_va_range_lpid (addr - page_size, pid, lpid, ap); -} - static __always_inline void _tlbie_va(unsigned long va, unsigned long pid,unsigned long psize,unsigned long ric) {
@@ -660,18 +553,6 @@ static inline void _tlbie_va_range(unsigned long start, unsigned long end, asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); } -static inline void _tlbie_va_range_lpid (unsigned long start,unsigned long end, -unsigned long pid,unsigned long lpid, -unsigned long page_size, -unsigned long psize,bool also_pwc) -{ - asmvolatile ("ptesync" : : :"memory" ); -if (also_pwc) -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); -__tlbie_va_range_lpid (start, end, pid, lpid, page_size, psize); - asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); -} - static inline void _tlbiel_va_range_multicast(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long pid, unsigned long page_size,
@@ -1486,6 +1367,127 @@ void radix__flush_tlb_all(void) }#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +static __always_inline void __tlbie_pid_lpid(unsigned long pid, +unsigned long lpid, +unsigned long ric) +{ +unsigned long rb, rs, prs, r; + + rb =PPC_BIT (53 );/* IS = 1 */ + rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); + prs =1 ;/* process scoped */ + r =1 ;/* radix format */ + + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); + trace_tlbie(0 ,0 , rb, rs, ric, prs, r); +} + +static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long pid, +unsigned long lpid, +unsigned long ap,unsigned long ric) +{ +unsigned long rb, rs, prs, r; + + rb = va & ~(PPC_BITMASK (52 ,63 )); + rb |= ap <<PPC_BITLSHIFT (58 ); + rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); + prs =1 ;/* process scoped */ + r =1 ;/* radix format */ + + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); + trace_tlbie(0 ,0 , rb, rs, ric, prs, r); +} + +static inline void fixup_tlbie_pid_lpid (unsigned long pid,unsigned long lpid) +{ +/* +* We can use any address for the invalidation, pick one which is +* probably unused as an optimisation. +*/ +unsigned long va = ((1UL <<52 ) -1 ); + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); + } + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_va_lpid (va, pid, lpid,mmu_get_ap (MMU_PAGE_64K ), +RIC_FLUSH_TLB ); + } +} + +static inline void _tlbie_pid_lpid (unsigned long pid,unsigned long lpid, +unsigned long ric) +{ + asmvolatile ("ptesync" : : :"memory" ); + +/* +* Workaround the fact that the "ric" argument to __tlbie_pid +* must be a compile-time contraint to match the "i" constraint +* in the asm statement. +*/ +switch (ric) { +case RIC_FLUSH_TLB : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_TLB ); +fixup_tlbie_pid_lpid (pid, lpid); +break ; +case RIC_FLUSH_PWC : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); +break ; +case RIC_FLUSH_ALL : +default : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_ALL ); +fixup_tlbie_pid_lpid (pid, lpid); + } + asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); +} + +static inline void fixup_tlbie_va_range_lpid (unsigned long va, +unsigned long pid, +unsigned long lpid, +unsigned long ap) +{ +if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); + } + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_va_lpid (va, pid, lpid, ap,RIC_FLUSH_TLB ); + } +} + +static inline void __tlbie_va_range_lpid (unsigned long start,unsigned long end, +unsigned long pid,unsigned long lpid, +unsigned long page_size, +unsigned long psize) +{ +unsigned long addr; +unsigned long ap =mmu_get_ap (psize); + +for (addr = start; addr < end; addr += page_size) +__tlbie_va_lpid (addr, pid, lpid, ap,RIC_FLUSH_TLB ); + +fixup_tlbie_va_range_lpid (addr - page_size, pid, lpid, ap); +} + +static inline void _tlbie_va_range_lpid (unsigned long start,unsigned long end, +unsigned long pid,unsigned long lpid, +unsigned long page_size, +unsigned long psize,bool also_pwc) +{ + asmvolatile ("ptesync" : : :"memory" ); +if (also_pwc) +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); +__tlbie_va_range_lpid (start, end, pid, lpid, page_size, psize); + asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); +} +/* * Performs process-scoped invalidations for a given LPID * as part of H_RPT_INVALIDATE hcall.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 417/739 vfio/type1: fix cap_migration information leak
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Hajnoczi <[email protected]>
[ Upstream commit cd24e2a60af633f157d7e59c0a6dba64f131c0b1 ]
Fix an information leak where an uninitialized hole in struct vfio_iommu_type1_info_cap_migration on the stack is exposed to userspace.
The definition of struct vfio_iommu_type1_info_cap_migration contains a hole as shown in this pahole(1) output:
struct vfio_iommu_type1_info_cap_migration {
struct vfio_info_cap_header header; /* 0 8 */
__u32 flags; /* 8 4 */ /* XXX 4 bytes hole, try to pack */
__u64 pgsize_bitmap; /* 16 8 */
__u64 max_dirty_bitmap_size; /* 24 8 */
/* size: 32, cachelines: 1, members: 4 */
/* sum members: 28, holes: 1, sum holes: 4 */
/* last cacheline: 32 bytes */};
The cap_mig variable is filled in without initializing the hole:
static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
struct vfio_info_cap *caps)
{
struct vfio_iommu_type1_info_cap_migration cap_mig;
cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION;
cap_mig.header.version = 1;
cap_mig.flags = 0;
/* support minimum pgsize */
cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap);
cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX;
return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and ioctl(VFIO_IOMMU_GET_INFO) copies it to userspace later:
int vfio_info_add_capability(struct vfio_info_cap *caps,
struct vfio_info_cap_header *cap, size_t size)
{
struct vfio_info_cap_header *header;
header = vfio_info_cap_add(caps, size, cap->id, cap->version);
if (IS_ERR(header))
return PTR_ERR(header);
memcpy(header + 1, cap + 1, size - sizeof(*header));
return 0;}
This issue was found by code inspection.
--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -2732,7 +2732,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,static int vfio_iommu_migration_build_caps (struct vfio_iommu *iommu,struct vfio_info_cap *caps) { -struct vfio_iommu_type1_info_cap_migration cap_mig; +struct vfio_iommu_type1_info_cap_migration cap_mig = {}; cap_mig.header.id =VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION ; cap_mig.header.version =1 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 418/739 nvdimm: Fix memleak of pmu attr_groups in unregister_nvdimm_pmu()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Meskhidze <[email protected]>
[ Upstream commit 85ae42c72142346645e63c33835da947dfa008b3 ]
Memory pointed by 'nd_pmu->pmu.attr_groups' is allocated in function 'register_nvdimm_pmu' and is lost after 'kfree(nd_pmu)' call in function 'unregister_nvdimm_pmu'.
--- drivers/nvdimm/nd_perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvdimm/nd_perf.c +1 -0
@@ -324,6 +324,7 @@ void unregister_nvdimm_pmu(struct nvdimm_pmu *nd_pmu) {perf_pmu_unregister (&nd_pmu->pmu);nvdimm_pmu_free_hotplug_memory (nd_pmu); +kfree (nd_pmu->pmu.attr_groups);kfree (nd_pmu); }EXPORT_SYMBOL_GPL (unregister_nvdimm_pmu);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 419/739 nvdimm: Fix dereference after free in register_nvdimm_pmu()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Meskhidze <[email protected]>
[ Upstream commit 08ca6906a4b7e48f8e93b7c1f49a742a415be6d5 ]
'nd_pmu->pmu.attr_groups' is dereferenced in function 'nvdimm_pmu_free_hotplug_memory' call after it has been freed. Because in function 'nvdimm_pmu_free_hotplug_memory' memory pointed by the fields of 'nd_pmu->pmu.attr_groups' is deallocated it is necessary to call 'kfree' after 'nvdimm_pmu_free_hotplug_memory'.
--- drivers/nvdimm/nd_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/nd_perf.c +1 -1
@@ -308,8 +308,8 @@ int register_nvdimm_pmu(struct nvdimm_pmu *nd_pmu, struct platform_device *pdev) rc =perf_pmu_register (&nd_pmu->pmu, nd_pmu->pmu.name,-1 );if (rc) { -kfree (nd_pmu->pmu.attr_groups);nvdimm_pmu_free_hotplug_memory (nd_pmu); +kfree (nd_pmu->pmu.attr_groups);return rc; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 420/739 powerpc/fadump: reset dump area size if fadump memory reserve fails
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sourabh Jain <[email protected]>
[ Upstream commit d1eb75e0dfed80d2d85b664e28a39f65b290ab55 ]
In case fadump_reserve_mem() fails to reserve memory, the reserve_dump_area_size variable will retain the reserve area size. This will lead to /sys/kernel/fadump/mem_reserved node displaying an incorrect memory reserved by fadump.
To fix this problem, reserve dump area size variable is set to 0 if fadump failed to reserve memory.
--- arch/powerpc/kernel/fadump.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/fadump.c +1 -0
@@ -654,6 +654,7 @@ int __init fadump_reserve_mem(void)return ret; error_out: fw_dump.fadump_enabled =0 ; + fw_dump.reserve_dump_area_size =0 ;return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 421/739 powerpc/perf: Convert fsl_emb notifier to state machine callbacks
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 34daf445f82bd3a4df852bb5f1dffd792ac830a0 ]
CC arch/powerpc/perf/core-fsl-emb.oarch/powerpc/perf/core-fsl-emb.c:675:6: error: no previous prototype for 'hw_perf_event_setup' [-Werror=missing-prototypes]
675 | void hw_perf_event_setup(int cpu)
| ^~~~~~~~~~~~~~~~~~~
Looks like fsl_emb was completely missed by commit 3f6da3905398 ("perf:
Rework and fix the arch CPU-hotplug hooks")
So, apply same changes as commit 3f6da3905398 ("perf: Rework and fix the arch CPU-hotplug hooks") then commit 57ecde42cc74 ("powerpc/perf:
Convert book3s notifier to state machine callbacks")
While at it, also fix following error:
arch/powerpc/perf/core-fsl-emb.c: In function 'perf_event_interrupt':arch/powerpc/perf/core-fsl-emb.c:648:13: error: variable 'found' set but not used [-Werror=unused-but-set-variable]
648 | int found = 0;
| ^~~~~--- arch/powerpc/perf/core-fsl-emb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/powerpc/perf/core-fsl-emb.c +5 -3
@@ -645,7 +645,6 @@ static void perf_event_interrupt(struct pt_regs *regs)struct cpu_hw_events *cpuhw =this_cpu_ptr (&cpu_hw_events);struct perf_event *event;unsigned long val; -int found =0 ;for (i =0 ; i < ppmu->n_counter; ++i) { event = cpuhw->event[i];
@@ -654,7 +653,6 @@ static void perf_event_interrupt(struct pt_regs *regs)if ((int )val <0 ) {if (event) {/* event has overflowed */ - found =1 ;record_and_restart (event, val, regs); }else {/*
@@ -672,11 +670,13 @@ static void perf_event_interrupt(struct pt_regs *regs)isync (); } -void hw_perf_event_setup (int cpu) +static int fsl_emb_pmu_prepare_cpu (unsigned int cpu) {struct cpu_hw_events *cpuhw = &per_cpu (cpu_hw_events, cpu);memset (cpuhw,0 ,sizeof (*cpuhw)); + +return 0 ; }int register_fsl_emb_pmu (struct fsl_emb_pmu *pmu)
@@ -689,6 +689,8 @@ int register_fsl_emb_pmu(struct fsl_emb_pmu *pmu) pmu->name);perf_pmu_register (&fsl_emb_pmu,"cpu" ,PERF_TYPE_RAW ); +cpuhp_setup_state (CPUHP_PERF_POWER ,"perf/powerpc:prepare" , + fsl_emb_pmu_prepare_cpu,NULL );return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 422/739 pinctrl: mediatek: fix pull_type data for MT7981
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 8f6f16fe1553ce63edfb98a39ef9d4754a0c39bf ]
MediaTek has released pull_type data for MT7981 in their SDK. Use it and set functions to configure pin bias.
--- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 44 +++++++---------------- 1 file changed, 13 insertions(+), 31 deletions(-)
drivers/pinctrl/mediatek/pinctrl-mt7981.c +13 -31
@@ -457,37 +457,15 @@ static const unsigned int mt7981_pull_type[] = {MTK_PULL_PUPD_R1R0_TYPE ,/*34*/ MTK_PULL_PUPD_R1R0_TYPE ,/*35*/ MTK_PULL_PUPD_R1R0_TYPE ,/*36*/ MTK_PULL_PUPD_R1R0_TYPE ,/*37*/ MTK_PULL_PUPD_R1R0_TYPE ,/*38*/ MTK_PULL_PUPD_R1R0_TYPE ,/*39*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*40*/ MTK_PULL_PUPD_R1R0_TYPE ,/*41*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*42*/ MTK_PULL_PUPD_R1R0_TYPE ,/*43*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*44*/ MTK_PULL_PUPD_R1R0_TYPE ,/*45*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*46*/ MTK_PULL_PUPD_R1R0_TYPE ,/*47*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*48*/ MTK_PULL_PUPD_R1R0_TYPE ,/*49*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*50*/ MTK_PULL_PUPD_R1R0_TYPE ,/*51*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*52*/ MTK_PULL_PUPD_R1R0_TYPE ,/*53*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*54*/ MTK_PULL_PUPD_R1R0_TYPE ,/*55*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*56*/ MTK_PULL_PUPD_R1R0_TYPE ,/*57*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*58*/ MTK_PULL_PUPD_R1R0_TYPE ,/*59*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*60*/ MTK_PULL_PUPD_R1R0_TYPE ,/*61*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*62*/ MTK_PULL_PUPD_R1R0_TYPE ,/*63*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*64*/ MTK_PULL_PUPD_R1R0_TYPE ,/*65*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*66*/ MTK_PULL_PUPD_R1R0_TYPE ,/*67*/ -MTK_PULL_PUPD_R1R0_TYPE ,/*68*/ MTK_PULL_PU_PD_TYPE ,/*69*/ -MTK_PULL_PU_PD_TYPE ,/*70*/ MTK_PULL_PU_PD_TYPE ,/*71*/ -MTK_PULL_PU_PD_TYPE ,/*72*/ MTK_PULL_PU_PD_TYPE ,/*73*/ -MTK_PULL_PU_PD_TYPE ,/*74*/ MTK_PULL_PU_PD_TYPE ,/*75*/ -MTK_PULL_PU_PD_TYPE ,/*76*/ MTK_PULL_PU_PD_TYPE ,/*77*/ -MTK_PULL_PU_PD_TYPE ,/*78*/ MTK_PULL_PU_PD_TYPE ,/*79*/ -MTK_PULL_PU_PD_TYPE ,/*80*/ MTK_PULL_PU_PD_TYPE ,/*81*/ -MTK_PULL_PU_PD_TYPE ,/*82*/ MTK_PULL_PU_PD_TYPE ,/*83*/ -MTK_PULL_PU_PD_TYPE ,/*84*/ MTK_PULL_PU_PD_TYPE ,/*85*/ -MTK_PULL_PU_PD_TYPE ,/*86*/ MTK_PULL_PU_PD_TYPE ,/*87*/ -MTK_PULL_PU_PD_TYPE ,/*88*/ MTK_PULL_PU_PD_TYPE ,/*89*/ -MTK_PULL_PU_PD_TYPE ,/*90*/ MTK_PULL_PU_PD_TYPE ,/*91*/ -MTK_PULL_PU_PD_TYPE ,/*92*/ MTK_PULL_PU_PD_TYPE ,/*93*/ -MTK_PULL_PU_PD_TYPE ,/*94*/ MTK_PULL_PU_PD_TYPE ,/*95*/ -MTK_PULL_PU_PD_TYPE ,/*96*/ MTK_PULL_PU_PD_TYPE ,/*97*/ -MTK_PULL_PU_PD_TYPE ,/*98*/ MTK_PULL_PU_PD_TYPE ,/*99*/ - MTK_PULL_PU_PD_TYPE,/*100*/ +MTK_PULL_PU_PD_TYPE ,/*40*/ MTK_PULL_PU_PD_TYPE ,/*41*/ +MTK_PULL_PU_PD_TYPE ,/*42*/ MTK_PULL_PU_PD_TYPE ,/*43*/ +MTK_PULL_PU_PD_TYPE ,/*44*/ MTK_PULL_PU_PD_TYPE ,/*45*/ +MTK_PULL_PU_PD_TYPE ,/*46*/ MTK_PULL_PU_PD_TYPE ,/*47*/ +MTK_PULL_PU_PD_TYPE ,/*48*/ MTK_PULL_PU_PD_TYPE ,/*49*/ +MTK_PULL_PU_PD_TYPE ,/*50*/ MTK_PULL_PU_PD_TYPE ,/*51*/ +MTK_PULL_PU_PD_TYPE ,/*52*/ MTK_PULL_PU_PD_TYPE ,/*53*/ +MTK_PULL_PU_PD_TYPE ,/*54*/ MTK_PULL_PU_PD_TYPE ,/*55*/ + MTK_PULL_PU_PD_TYPE,/*56*/ }; static const struct mtk_pin_reg_calc mt7981_reg_cals[] = {
@@ -1014,6 +992,10 @@ static struct mtk_pin_soc mt7981_data = { .ies_present = false, .base_names = mt7981_pinctrl_register_base_names, .nbase_names = ARRAY_SIZE(mt7981_pinctrl_register_base_names), + .bias_disable_set = mtk_pinconf_bias_disable_set, + .bias_disable_get = mtk_pinconf_bias_disable_get, + .bias_set = mtk_pinconf_bias_set, + .bias_get = mtk_pinconf_bias_get, .pull_type = mt7981_pull_type, .bias_set_combo = mtk_pinconf_bias_set_combo, .bias_get_combo = mtk_pinconf_bias_get_combo,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 423/739 pinctrl: mediatek: assign functions to configure pin bias on MT7986
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 0d8387fba9f151220e48dc3dcdc2335539708f13 ]
Assign bias_disable_get/set and bias_get/set functions to allow configuring pin bias on MT7986.
--- drivers/pinctrl/mediatek/pinctrl-mt7986.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pinctrl/mediatek/pinctrl-mt7986.c +8 -0
@@ -922,6 +922,10 @@ static struct mtk_pin_soc mt7986a_data = { .ies_present = false, .base_names = mt7986_pinctrl_register_base_names, .nbase_names = ARRAY_SIZE(mt7986_pinctrl_register_base_names), + .bias_disable_set = mtk_pinconf_bias_disable_set, + .bias_disable_get = mtk_pinconf_bias_disable_get, + .bias_set = mtk_pinconf_bias_set, + .bias_get = mtk_pinconf_bias_get, .pull_type = mt7986_pull_type, .bias_set_combo = mtk_pinconf_bias_set_combo, .bias_get_combo = mtk_pinconf_bias_get_combo,
@@ -944,6 +948,10 @@ static struct mtk_pin_soc mt7986b_data = { .ies_present = false, .base_names = mt7986_pinctrl_register_base_names, .nbase_names = ARRAY_SIZE(mt7986_pinctrl_register_base_names), + .bias_disable_set = mtk_pinconf_bias_disable_set, + .bias_disable_get = mtk_pinconf_bias_disable_get, + .bias_set = mtk_pinconf_bias_set, + .bias_get = mtk_pinconf_bias_get, .pull_type = mt7986_pull_type, .bias_set_combo = mtk_pinconf_bias_set_combo, .bias_get_combo = mtk_pinconf_bias_get_combo,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 424/739 drm/amdgpu: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit ce7d88110b9ed5f33fe79ea6d4ed049fb0e57bce ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control. And in the case of upstream bridge, the driver does not even own the device it's changing the registers for.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 36 +++++++++----------------------- drivers/gpu/drm/amd/amdgpu/si.c | 36 +++++++++----------------------- 2 files changed, 20 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +10 -26
@@ -1574,17 +1574,8 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (adev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (ixPCIE_LC_STATUS1); max_lw = (tmp & PCIE_LC_STATUS1__LC_DETECTED_LINK_WIDTH_MASK) >>
@@ -1637,21 +1628,14 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (adev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (adev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (adev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
drivers/gpu/drm/amd/amdgpu/si.c +10 -26
@@ -2276,17 +2276,8 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (adev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -2331,21 +2322,14 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)mdelay (100 ); -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (adev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (adev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (adev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , &tmp16);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 425/739 drm/radeon: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 7189576e8a829130192b33c5b64e8a475369c776 ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control. And in the case of upstream bridge, the driver does not even own the device it's changing the registers for.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/gpu/drm/radeon/cik.c | 36 ++++++++++------------------------- drivers/gpu/drm/radeon/si.c | 37 ++++++++++-------------------------- 2 files changed, 20 insertions(+), 53 deletions(-)
drivers/gpu/drm/radeon/cik.c +10 -26
@@ -9534,17 +9534,8 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (rdev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE_PORT (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -9591,21 +9582,14 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (rdev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (rdev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (rdev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
drivers/gpu/drm/radeon/si.c +10 -27
@@ -7131,17 +7131,8 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (rdev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -7188,22 +7179,14 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root, -PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (rdev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (rdev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (rdev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 426/739 net/mlx5: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 30de872537bda526664d7a20b646adfb3e7ce6e6 ]
Don't assume that only the driver would be accessing LNKCTL of the upstream bridge. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +2 -7
@@ -384,16 +384,11 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)pci_cfg_access_lock (sdev); }/* PCI link toggle */ - err =pci_read_config_word (bridge, cap +PCI_EXP_LNKCTL , ®16); -if (err) -return err; - reg16 |=PCI_EXP_LNKCTL_LD ; - err =pci_write_config_word (bridge, cap +PCI_EXP_LNKCTL , reg16); + err =pcie_capability_set_word (bridge,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_LD );if (err)return err;msleep (500 ); - reg16 &= ~PCI_EXP_LNKCTL_LD ; - err =pci_write_config_word (bridge, cap +PCI_EXP_LNKCTL , reg16); + err =pcie_capability_clear_word (bridge,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_LD );if (err)return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 427/739 wifi: ath11k: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 6c1b6bdb34aaf8f94f65a9cae1d63490320c11bc ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value. On restore, clear the ASPMC field properly.
--- drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/pci.c +6 -4
@@ -581,8 +581,8 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci) u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1));/* disable L0s and L1 */ -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC ); +pcie_capability_clear_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC );set_bit (ATH11K_PCI_ASPM_RESTORE , &ab_pci->flags); }
@@ -590,8 +590,10 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)static void ath11k_pci_aspm_restore (struct ath11k_pci *ab_pci) {if (test_and_clear_bit (ATH11K_PCI_ASPM_RESTORE , &ab_pci->flags)) -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl); +pcie_capability_clear_and_set_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + ab_pci->link_ctl & +PCI_EXP_LNKCTL_ASPMC ); }static int ath11k_pci_power_up (struct ath11k_base *ab)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 428/739 wifi: ath12k: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit f5a7ac118faf6d4f794975947b3300717eae8fc5 ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value. On restore, clear the ASPMC field properly.
--- drivers/net/wireless/ath/ath12k/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/pci.c +6 -4
@@ -794,8 +794,8 @@ static void ath12k_pci_aspm_disable(struct ath12k_pci *ab_pci) u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1));/* disable L0s and L1 */ -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC ); +pcie_capability_clear_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC );set_bit (ATH12K_PCI_ASPM_RESTORE , &ab_pci->flags); }
@@ -803,8 +803,10 @@ static void ath12k_pci_aspm_disable(struct ath12k_pci *ab_pci)static void ath12k_pci_aspm_restore (struct ath12k_pci *ab_pci) {if (test_and_clear_bit (ATH12K_PCI_ASPM_RESTORE , &ab_pci->flags)) -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl); +pcie_capability_clear_and_set_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + ab_pci->link_ctl & +PCI_EXP_LNKCTL_ASPMC ); }static void ath12k_pci_kill_tasklets (struct ath12k_base *ab)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 429/739 wifi: ath10k: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit f139492a09f15254fa261245cdbd65555cdf39e3 ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which does proper locking to avoid losing concurrent updates to the register value. On restore, clear the ASPMC field properly.
--- drivers/net/wireless/ath/ath10k/pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +5 -4
@@ -1963,8 +1963,9 @@ static int ath10k_pci_hif_start(struct ath10k *ar)ath10k_pci_irq_enable (ar);ath10k_pci_rx_post (ar); -pcie_capability_write_word (ar_pci->pdev,PCI_EXP_LNKCTL , - ar_pci->link_ctl); +pcie_capability_clear_and_set_word (ar_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + ar_pci->link_ctl &PCI_EXP_LNKCTL_ASPMC );return 0 ; }
@@ -2821,8 +2822,8 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar,pcie_capability_read_word (ar_pci->pdev,PCI_EXP_LNKCTL , &ar_pci->link_ctl); -pcie_capability_write_word (ar_pci->pdev,PCI_EXP_LNKCTL , - ar_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC ); +pcie_capability_clear_word (ar_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC );/* * Bring the target up cleanly.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 430/739 NFSv4.2: Fix READ_PLUS smatch warnings
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
[ Upstream commit bb05a617f06b7a882e19c4f475b8e37f14d9ceac ]
Smatch reports:
fs/nfs/nfs42xdr.c:1131 decode_read_plus() warn: missing error code? 'status'
Which Dan suggests to fix by doing a hardcoded "return 0" from the "if (segments == 0)" check.
Additionally, smatch reports that the "status = -EIO" assignment is not used. This patch addresses both these issues.
--- fs/nfs/nfs42xdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/nfs42xdr.c +1 -2
@@ -1056,13 +1056,12 @@ static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res) res->eof =be32_to_cpup (p++); segments =be32_to_cpup (p++);if (segments ==0 ) -return status; +return 0 ; segs =kmalloc_array (segments,sizeof (*segs),GFP_KERNEL );if (!segs)return -ENOMEM ; - status = -EIO ;for (i =0 ; i < segments; i++) { status =decode_read_plus_segment (xdr, &segs[i]);if (status <0 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 431/739 NFSv4.2: Fix READ_PLUS size calculations
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
[ Upstream commit 8d18f6c5bb864d97a730f471c56cdecf313efe64 ]
I bump the decode_read_plus_maxsz to account for hole segments, but I need to subtract out this increase when calling rpc_prepare_reply_pages() so the common case of single data segment replies can be directly placed into the xdr pages without needing to be shifted around.
--- fs/nfs/nfs42xdr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/nfs/nfs42xdr.c +9 -3
@@ -54,10 +54,16 @@ (1 /* data_content4 */ + \ 2 /* data_info4.di_offset */ + \ 1 /* data_info4.di_length */) +#define NFS42_READ_PLUS_HOLE_SEGMENT_SIZE \ + (1 /* data_content4 */ + \ + 2 /* data_info4.di_offset */ + \ + 2 /* data_info4.di_length */) +#define READ_PLUS_SEGMENT_SIZE_DIFF (NFS42_READ_PLUS_HOLE_SEGMENT_SIZE - \ + NFS42_READ_PLUS_DATA_SEGMENT_SIZE)#define decode_read_plus_maxsz (op_decode_hdr_maxsz + \ 1 /* rpr_eof */ + \ 1 /* rpr_contents count */ + \ - NFS42_READ_PLUS_DATA_SEGMENT_SIZE) + NFS42_READ_PLUS_HOLE_SEGMENT_SIZE) #define encode_seek_maxsz (op_encode_hdr_maxsz + \ encode_stateid_maxsz + \ 2 /* offset */ + \
@@ -617,8 +623,8 @@ static void nfs4_xdr_enc_read_plus(struct rpc_rqst *req,encode_putfh (xdr, args->fh, &hdr);encode_read_plus (xdr, args, &hdr); -rpc_prepare_reply_pages (req, args->pages, args->pgbase, - args->count, hdr.replen); +rpc_prepare_reply_pages (req, args->pages, args->pgbase, args->count, + hdr.replen -READ_PLUS_SEGMENT_SIZE_DIFF );encode_nops (&hdr); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 432/739 NFSv4.2: Rework scratch handling for READ_PLUS (again)
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
[ Upstream commit 303a78052091c81e9003915c521fdca1c7e117af ]
I found that the read code might send multiple requests using the same nfs_pgio_header, but nfs4_proc_read_setup() is only called once. This is how we ended up occasionally double-freeing the scratch buffer, but also means we set a NULL pointer but non-zero length to the xdr scratch buffer. This results in an oops the first time decoding needs to copy something to scratch, which frequently happens when decoding READ_PLUS hole segments.
I fix this by moving scratch handling into the pageio read code. I provide a function to allocate scratch space for decoding read replies, and free the scratch buffer when the nfs_pgio_header is freed.
--- fs/nfs/internal.h | 1 + fs/nfs/nfs42.h | 1 + fs/nfs/nfs42xdr.c | 2 +- fs/nfs/nfs4proc.c | 13 +------------ fs/nfs/read.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 13 deletions(-)
fs/nfs/internal.h +1 -0
@@ -493,6 +493,7 @@ extern const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;extern void nfs_pageio_init_read (struct nfs_pageio_descriptor *pgio,struct inode *inode,bool force_mds,const struct nfs_pgio_completion_ops *compl_ops); +extern bool nfs_read_alloc_scratch (struct nfs_pgio_header *hdr,size_t size);extern int nfs_read_add_folio (struct nfs_pageio_descriptor *pgio,struct nfs_open_context *ctx,struct folio *folio);
fs/nfs/nfs42.h +1 -0
@@ -13,6 +13,7 @@* more? Need to consider not to pre-alloc too much for a compound. */ #define PNFS_LAYOUTSTATS_MAXDEV (4) +#define READ_PLUS_SCRATCH_SIZE (16)/* nfs4.2proc.c */ #ifdef CONFIG_NFS_V4_2
fs/nfs/nfs42xdr.c +1 -1
@@ -1433,7 +1433,7 @@ static int nfs4_xdr_dec_read_plus(struct rpc_rqst *rqstp,struct compound_hdr hdr;int status; -xdr_set_scratch_buffer (xdr, res->scratch,sizeof (res->scratch)); +xdr_set_scratch_buffer (xdr, res->scratch,READ_PLUS_SCRATCH_SIZE ); status =decode_compound_hdr (xdr, &hdr);if (status)
fs/nfs/nfs4proc.c +1 -12
@@ -5438,18 +5438,8 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task,return false; } -static inline void nfs4_read_plus_scratch_free (struct nfs_pgio_header *hdr) -{ -if (hdr->res.scratch) { -kfree (hdr->res.scratch); - hdr->res.scratch =NULL ; - } -} -static int nfs4_read_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -nfs4_read_plus_scratch_free (hdr); -if (!nfs4_sequence_done (task, &hdr->res.seq_res))return -EAGAIN ;if (nfs4_read_stateid_changed (task, &hdr->args))
@@ -5469,8 +5459,7 @@ static bool nfs42_read_plus_support(struct nfs_pgio_header *hdr,/* Note: We don't use READ_PLUS with pNFS yet */ if (nfs_server_capable (hdr->inode,NFS_CAP_READ_PLUS ) && !hdr->ds_clp) { msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS ]; - hdr->res.scratch =kmalloc (32 ,GFP_KERNEL ); -return hdr->res.scratch !=NULL ; +return nfs_read_alloc_scratch (hdr,READ_PLUS_SCRATCH_SIZE ); }return false; }
fs/nfs/read.c +10 -0
@@ -47,6 +47,8 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void)static void nfs_readhdr_free (struct nfs_pgio_header *rhdr) { +if (rhdr->res.scratch !=NULL ) +kfree (rhdr->res.scratch);kmem_cache_free (nfs_rdata_cachep, rhdr); }
@@ -108,6 +110,14 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio) }EXPORT_SYMBOL_GPL (nfs_pageio_reset_read_mds); +bool nfs_read_alloc_scratch (struct nfs_pgio_header *hdr,size_t size) +{ +WARN_ON (hdr->res.scratch !=NULL ); + hdr->res.scratch =kmalloc (size,GFP_KERNEL ); +return hdr->res.scratch !=NULL ; +} +EXPORT_SYMBOL_GPL (nfs_read_alloc_scratch); +static void nfs_readpage_release (struct nfs_page *req,int error) {struct folio *folio =nfs_page_to_folio (req);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 433/739 PCI: layerscape: Add workaround for lost link capabilities during reset
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaowei Bao <[email protected]>
[ Upstream commit 17cf8661ee0f065c08152e611a568dd1fb0285f1 ]
The endpoint controller loses the Maximum Link Width and Supported Link Speed value from the Link Capabilities Register - initially configured by the Reset Configuration Word (RCW) - during a link-down or hot reset event.
Address this issue in the endpoint event handler.
--- .../pci/controller/dwc/pci-layerscape-ep.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +19 -0
@@ -45,6 +45,7 @@ struct ls_pcie_ep {struct pci_epc_features *ls_epc;const struct ls_pcie_ep_drvdata *drvdata;int irq; +u32 lnkcap;bool big_endian; };
@@ -73,6 +74,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)struct ls_pcie_ep *pcie = dev_id;struct dw_pcie *pci = pcie->pci;u32 val, cfg; +u8 offset; val =ls_lut_readl (pcie,PEX_PF0_PME_MES_DR );ls_lut_writel (pcie,PEX_PF0_PME_MES_DR , val);
@@ -81,6 +83,19 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)return IRQ_NONE ;if (val &PEX_PF0_PME_MES_DR_LUD ) { + + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + +/* +* The values of the Maximum Link Width and Supported Link +* Speed from the Link Capabilities Register will be lost +* during link down or hot reset. Restore initial value +* that configured by the Reset Configuration Word (RCW). +*/ +dw_pcie_dbi_ro_wr_en (pci); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , pcie->lnkcap); +dw_pcie_dbi_ro_wr_dis (pci); + cfg =ls_lut_readl (pcie,PEX_PF0_CONFIG ); cfg |=PEX_PF0_CFG_READY ;ls_lut_writel (pcie,PEX_PF0_CONFIG , cfg);
@@ -215,6 +230,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)struct ls_pcie_ep *pcie;struct pci_epc_features *ls_epc;struct resource *dbi_base; +u8 offset;int ret; pcie =devm_kzalloc (dev,sizeof (*pcie),GFP_KERNEL );
@@ -251,6 +267,9 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)platform_set_drvdata (pdev, pcie); + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + pcie->lnkcap =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); + ret =dw_pcie_ep_init (&pci->ep);if (ret)return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 434/739 powerpc: Dont include lppaca.h in paca.h
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 1aa000667669fa855853decbb1c69e974d8ff716 ]
By adding a forward declaration for struct lppaca we can untangle paca.h and lppaca.h. Also move get_lppaca() into lppaca.h for consistency.
Add includes of lppaca.h to some files that need it.
Stable-dep-of: eac030b22ea1 ("powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT")
--- arch/powerpc/include/asm/lppaca.h | 4 ++++ arch/powerpc/include/asm/paca.h | 6 +----- arch/powerpc/include/asm/paravirt.h | 1 + arch/powerpc/include/asm/plpar_wrappers.h | 1 + arch/powerpc/kvm/book3s_hv_ras.c | 1 + arch/powerpc/mm/book3s64/slb.c | 1 + arch/powerpc/xmon/xmon.c | 1 + 7 files changed, 10 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/lppaca.h +4 -0
@@ -134,6 +134,10 @@ static inline bool lppaca_shared_proc(struct lppaca *l)return !!(l->__old_status &LPPACA_OLD_SHARED_PROC ); } +#ifdef CONFIG_PPC_PSERIES +#define get_lppaca () (get_paca()->lppaca_ptr) +#endif +/* * SLB shadow buffer structure as defined in the PAPR. The save_area * contains adjacent ESID and VSID pairs for each shadowed SLB. The
arch/powerpc/include/asm/paca.h +1 -5
@@ -15,7 +15,6 @@#include <linux/cache.h> #include <linux/string.h> #include <asm/types.h> -#include <asm/lppaca.h> #include <asm/mmu.h> #include <asm/page.h> #ifdef CONFIG_PPC_BOOK3E_64
@@ -47,14 +46,11 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */#define get_paca () local_paca#endif -#ifdef CONFIG_PPC_PSERIES -#define get_lppaca () (get_paca()->lppaca_ptr) -#endif -#define get_slb_shadow () (get_paca()->slb_shadow_ptr)struct task_struct ;struct rtas_args ; +struct lppaca ;/* * Defines the layout of the paca.
arch/powerpc/include/asm/paravirt.h +1 -0
@@ -6,6 +6,7 @@#include <asm/smp.h> #ifdef CONFIG_PPC64 #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/hvcall.h> #endif
arch/powerpc/include/asm/plpar_wrappers.h +1 -0
@@ -9,6 +9,7 @@#include <asm/hvcall.h> #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/page.h> static inline long poll_pending (void )
arch/powerpc/kvm/book3s_hv_ras.c +1 -0
@@ -9,6 +9,7 @@#include <linux/kvm.h> #include <linux/kvm_host.h> #include <linux/kernel.h> +#include <asm/lppaca.h> #include <asm/opal.h> #include <asm/mce.h> #include <asm/machdep.h>
arch/powerpc/mm/book3s64/slb.c +1 -0
@@ -13,6 +13,7 @@#include <asm/mmu.h> #include <asm/mmu_context.h> #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/ppc-opcode.h> #include <asm/cputable.h> #include <asm/cacheflush.h>
arch/powerpc/xmon/xmon.c +1 -0
@@ -58,6 +58,7 @@#ifdef CONFIG_PPC64 #include <asm/hvcall.h> #include <asm/paca.h> +#include <asm/lppaca.h> #endif #include "nonstdio.h"
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 435/739 powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit eac030b22ea12cdfcbb2e941c21c03964403c63f ]
lppaca_shared_proc() takes a pointer to the lppaca which is typically accessed through get_lppaca(). With DEBUG_PREEMPT enabled, this leads to checking if preemption is enabled, for example:
BUG: using smp_processor_id() in preemptible [00000000] code: grep/10693
caller is lparcfg_data+0x408/0x19a0
CPU: 4 PID: 10693 Comm: grep Not tainted 6.5.0-rc3 #2
Call Trace:
dump_stack_lvl+0x154/0x200 (unreliable)
check_preemption_disabled+0x214/0x220
lparcfg_data+0x408/0x19a0
...This isn't actually a problem however, as it does not matter which lppaca is accessed, the shared proc state will be the same. vcpudispatch_stats_procfs_init() already works around this by disabling preemption, but the lparcfg code does not, erroring any time /proc/powerpc/lparcfg is accessed with DEBUG_PREEMPT enabled.
Instead of disabling preemption on the caller side, rework lppaca_shared_proc() to not take a pointer and instead directly access the lppaca, bypassing any potential preemption checks.
--- arch/powerpc/include/asm/lppaca.h | 11 +++++++++-- arch/powerpc/platforms/pseries/lpar.c | 10 +--------- arch/powerpc/platforms/pseries/lparcfg.c | 4 ++-- arch/powerpc/platforms/pseries/setup.c | 2 +- drivers/cpuidle/cpuidle-pseries.c | 8 +------- 5 files changed, 14 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/lppaca.h +9 -2
@@ -45,6 +45,7 @@#include <asm/types.h> #include <asm/mmu.h> #include <asm/firmware.h> +#include <asm/paca.h> /* * The lppaca is the "virtual processor area" registered with the hypervisor,
@@ -127,14 +128,20 @@ struct lppaca {*/ #define LPPACA_OLD_SHARED_PROC 2 -static inline bool lppaca_shared_proc (struct lppaca *l) +#ifdef CONFIG_PPC_PSERIES +/* +* All CPUs should have the same shared proc value, so directly access the PACA +* to avoid false positives from DEBUG_PREEMPT. +*/ +static inline bool lppaca_shared_proc (void ) { +struct lppaca *l = local_paca->lppaca_ptr; +if (!firmware_has_feature (FW_FEATURE_SPLPAR ))return false;return !!(l->__old_status &LPPACA_OLD_SHARED_PROC ); } -#ifdef CONFIG_PPC_PSERIES #define get_lppaca () (get_paca()->lppaca_ptr)#endif
arch/powerpc/platforms/pseries/lpar.c +1 -9
@@ -639,16 +639,8 @@ static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {static int __init vcpudispatch_stats_procfs_init (void ) { -/* -* Avoid smp_processor_id while preemptible. All CPUs should have -* the same value for lppaca_shared_proc. -*/ -preempt_disable (); -if (!lppaca_shared_proc (get_lppaca ())) { -preempt_enable (); +if (!lppaca_shared_proc ())return 0 ; - } -preempt_enable ();if (!proc_create ("powerpc/vcpudispatch_stats" ,0600 ,NULL , &vcpudispatch_stats_proc_ops))
arch/powerpc/platforms/pseries/lparcfg.c +2 -2
@@ -206,7 +206,7 @@ static void parse_ppp_data(struct seq_file *m) ppp_data.active_system_procs);/* pool related entries are appropriate for shared configs */ -if (lppaca_shared_proc (get_lppaca ())) { +if (lppaca_shared_proc ()) {unsigned long pool_idle_time, pool_procs;seq_printf (m,"pool=%d\n" , ppp_data.pool_num);
@@ -560,7 +560,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v) partition_potential_processors);seq_printf (m,"shared_processor_mode=%d\n" , -lppaca_shared_proc (get_lppaca ())); +lppaca_shared_proc ());#ifdef CONFIG_PPC_64S_HASH_MMU if (!radix_enabled ())
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -847,7 +847,7 @@ static void __init pSeries_setup_arch(void)if (firmware_has_feature (FW_FEATURE_LPAR )) {vpa_init (boot_cpuid); -if (lppaca_shared_proc (get_lppaca ())) { +if (lppaca_shared_proc ()) {static_branch_enable (&shared_processor);pv_spinlocks_init ();#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING
drivers/cpuidle/cpuidle-pseries.c +1 -7
@@ -414,13 +414,7 @@ static int __init pseries_idle_probe(void)return -ENODEV ;if (firmware_has_feature (FW_FEATURE_SPLPAR )) { -/* -* Use local_paca instead of get_lppaca() since -* preemption is not disabled, and it is not required in -* fact, since lppaca_ptr does not need to be the value -* associated to the current CPU, it can be from any CPU. -*/ -if (lppaca_shared_proc (local_paca->lppaca_ptr)) { +if (lppaca_shared_proc ()) { cpuidle_state_table = shared_states; max_idle_state =ARRAY_SIZE (shared_states); }else {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 436/739 nfs/blocklayout: Use the passed in gfp flags
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 08b45fcb2d4675f6182fe0edc0d8b1fe604051fa ]
This allocation should use the passed in GFP_ flags instead of GFP_KERNEL. One places where this matters is in filelayout_pg_init_write() which uses GFP_NOFS as the allocation flags.
--- fs/nfs/blocklayout/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/blocklayout/dev.c +2 -2
@@ -404,7 +404,7 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->concat.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
@@ -433,7 +433,7 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->stripe.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 437/739 powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Piggin <[email protected]>
[ Upstream commit 750bd41aeaeb1f0e0128aa4f8fcd6dd759713641 ]
With JUMP_LABEL=n, hcall_tracepoint_refcount's address is being tested instead of its value. This results in the tracing slowpath always being taken unnecessarily.
--- arch/powerpc/platforms/pseries/hvCall.S | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/pseries/hvCall.S +1 -0
@@ -91,6 +91,7 @@ BEGIN_FTR_SECTION; \ b 1f; \ END_FTR_SECTION(0, 1); \ LOAD_REG_ADDR(r12, hcall_tracepoint_refcount) ; \ + ld r12,0(r12); \ std r12,32(r1); \ cmpdi r12,0; \ bne- LABEL; \
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 438/739 powerpc/mpc5xxx: Add missing fwnode_handle_put()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liang He <[email protected]>
[ Upstream commit b9bbbf4979073d5536b7650decd37fcb901e6556 ]
In mpc5xxx_fwnode_get_bus_frequency(), we should add fwnode_handle_put() when break out of the iteration fwnode_for_each_parent_node() as it will automatically increase and decrease the refcounter.
--- arch/powerpc/sysdev/mpc5xxx_clocks.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/sysdev/mpc5xxx_clocks.c +3 -1
@@ -25,8 +25,10 @@ unsigned long mpc5xxx_fwnode_get_bus_frequency(struct fwnode_handle *fwnode)fwnode_for_each_parent_node (fwnode, parent) { ret =fwnode_property_read_u32 (parent,"bus-frequency" , &bus_freq); -if (!ret) +if (!ret) { +fwnode_handle_put (parent);return bus_freq; + } }return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 439/739 powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit c37b6908f7b2bd24dcaaf14a180e28c9132b9c58 ]
fail_iommu_setup() registers the fail_iommu_bus_notifier struct to both PCI and VIO buses. struct notifier_block is a linked list node, so this causes any notifiers later registered to either bus type to also be registered to the other since they share the same node.
This causes issues in (at least) the vgaarb code, which registers a notifier for PCI buses. pci_notify() ends up being called on a vio device, converted with to_pci_dev() even though it's not a PCI device, and finally makes a bad access in vga_arbiter_add_pci_device() as discovered with KASAN:
BUG: KASAN: slab-out-of-bounds in vga_arbiter_add_pci_device+0x60/0xe00 Read of size 4 at addr c000000264c26fdc by task swapper/0/1 Call Trace: dump_stack_lvl+0x1bc/0x2b8 (unreliable) print_report+0x3f4/0xc60 kasan_report+0x244/0x698 __asan_load4+0xe8/0x250 vga_arbiter_add_pci_device+0x60/0xe00 pci_notify+0x88/0x444 notifier_call_chain+0x104/0x320 blocking_notifier_call_chain+0xa0/0x140 device_add+0xac8/0x1d30 device_register+0x58/0x80 vio_register_device_node+0x9ac/0xce0 vio_bus_scan_register_devices+0xc4/0x13c __machine_initcall_pseries_vio_device_init+0x94/0xf0 do_one_initcall+0x12c/0xaa8 kernel_init_freeable+0xa48/0xba8 kernel_init+0x64/0x400 ret_from_kernel_thread+0x5c/0x64
Fix this by creating separate notifier_block structs for each bus type.
--- arch/powerpc/kernel/iommu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/powerpc/kernel/iommu.c +14 -3
@@ -172,17 +172,28 @@ static int fail_iommu_bus_notify(struct notifier_block *nb,return 0 ; } -static struct notifier_block fail_iommu_bus_notifier = { +/* +* PCI and VIO buses need separate notifier_block structs, since they're linked +* list nodes. Sharing a notifier_block would mean that any notifiers later +* registered for PCI buses would also get called by VIO buses and vice versa. +*/ +static struct notifier_block fail_iommu_pci_bus_notifier = { .notifier_call = fail_iommu_bus_notify }; +#ifdef CONFIG_IBMVIO +static struct notifier_block fail_iommu_vio_bus_notifier = { + .notifier_call = fail_iommu_bus_notify +}; +#endif +static int __init fail_iommu_setup (void ) {#ifdef CONFIG_PCI -bus_register_notifier (&pci_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&pci_bus_type, &fail_iommu_pci_bus_notifier);#endif #ifdef CONFIG_IBMVIO -bus_register_notifier (&vio_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&vio_bus_type, &fail_iommu_vio_bus_notifier);#endif return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 440/739 ext4: fix unttached inode after power cut with orphan file feature enabled
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhihao Cheng <[email protected]>
[ Upstream commit 1524773425ae8113b0b782886366e68656b34e53 ]
Running generic/475(filesystem consistent tests after power cut) could easily trigger unattached inode error while doing fsck:
Unattached zero-length inode 39405. Clear? no
Unattached inode 39405
Connect to /lost+found? no
Above inconsistence is caused by following process:
P1 P2ext4_create
inode = ext4_new_inode_start_handle // itable records nlink=1 ext4_add_nondir
err = ext4_add_entry // ENOSPC
ext4_append
ext4_bread
ext4_getblk
ext4_map_blocks // returns ENOSPC
drop_nlink(inode) // won't be updated into disk inode ext4_orphan_add(handle, inode)
ext4_orphan_file_add
ext4_journal_stop(handle)
jbd2_journal_commit_transaction // commit success
>> power cut <<ext4_fill_super
ext4_load_and_init_journal // itable records nlink=1
ext4_orphan_cleanup
ext4_process_orphan
if (inode->i_nlink) // true, inode won't be deleted
Then, allocated inode will be reserved on disk and corresponds to no dentries, so e2fsck reports 'unattached inode' problem.
The problem won't happen if orphan file feature is disabled, because ext4_orphan_add() will update disk inode in orphan list mode. There are several places not updating disk inode while putting inode into orphan area, such as ext4_add_nondir(), ext4_symlink() and whiteout in ext4_rename(). Fix it by updating inode into disk in all error branches of these places.
--- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/namei.c +3 -0
@@ -2799,6 +2799,7 @@ static int ext4_add_nondir(handle_t *handle,return err; }drop_nlink (inode); +ext4_mark_inode_dirty (handle, inode);ext4_orphan_add (handle, inode);unlock_new_inode (inode);return err;
@@ -3436,6 +3437,7 @@ static int ext4_symlink(struct mnt_idmap *idmap, struct inode *dir, err_drop_inode:clear_nlink (inode); +ext4_mark_inode_dirty (handle, inode);ext4_orphan_add (handle, inode);unlock_new_inode (inode);if (handle)
@@ -4021,6 +4023,7 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir,ext4_resetent (handle, &old, old.inode->i_ino, old_file_type);drop_nlink (whiteout); +ext4_mark_inode_dirty (handle, whiteout);ext4_orphan_add (handle, whiteout); }unlock_new_inode (whiteout);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 441/739 jfs: validate max amount of blocks before allocation.
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Filippov <[email protected]>
[ Upstream commit 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 ]
The lack of checking bmp->db_max_freebud in extBalloc() can lead to shift out of bounds, so this patch prevents undefined behavior, because bmp->db_max_freebud == -1 only if there is no free space.
--- fs/jfs/jfs_extent.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/jfs/jfs_extent.c +5 -0
@@ -311,6 +311,11 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)* blocks in the map. in that case, we'll start off with the * maximum free. */ + +/* give up if no space left */ +if (bmp->db_maxfreebud ==-1 ) +return -ENOSPC ; + max = (s64 )1 << bmp->db_maxfreebud;if (*nblocks >= max && *nblocks > nbperpage) nb = nblks = (max > nbperpage) ? max : nbperpage;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 442/739 SUNRPC: Fix the recent bv_offset fix
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit f16ff1cafbf1e65cc706af912df90bcc15d39a6c ]
Jeff confirmed his original fix addressed his pynfs test failure, but this same bug also impacted qemu: accessing qcow2 virtual disks using direct I/O was failing. Jeff's fix missed that you have to shorten the bio_vec element by the same amount as you increased the page offset.
--- net/sunrpc/svcsock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sunrpc/svcsock.c +3 -1
@@ -1244,8 +1244,10 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr,if (ret != head->iov_len) goto out; -if (xdr_buf_pagecount (xdr)) +if (xdr_buf_pagecount (xdr)) { xdr->bvec[0 ].bv_offset =offset_in_page (xdr->page_base); + xdr->bvec[0 ].bv_len -=offset_in_page (xdr->page_base); + } msg.msg_flags =MSG_SPLICE_PAGES ; iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, xdr->bvec,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 443/739 fs: lockd: avoid possible wrong NULL parameter
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit de8d38cf44bac43e83bad28357ba84784c412752 ]
clang's static analysis warning: fs/lockd/mon.c: line 293, column 2:
Null pointer passed as 2nd argument to memory copy function.
Assuming 'hostname' is NULL and calling 'nsm_create_handle()', this will pass NULL as 2nd argument to memory copy function 'memcpy()'. So return NULL if 'hostname' is invalid.
--- fs/lockd/mon.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/mon.c +3 -0
@@ -276,6 +276,9 @@ static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap, {struct nsm_handle *new; +if (!hostname) +return NULL ; + new =kzalloc (sizeof (*new) + hostname_len +1 ,GFP_KERNEL );if (unlikely (new ==NULL ))return NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 444/739 NFSD: da_addr_body field missing in some GETDEVICEINFO replies
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 6372e2ee629894433fe6107d7048536a3280a284 ]
The XDR specification in RFC 8881 looks like this:
struct device_addr4 {
layouttype4 da_layout_type;
opaque da_addr_body<>;
};struct GETDEVICEINFO4resok {
device_addr4 gdir_device_addr;
bitmap4 gdir_notification;
};union GETDEVICEINFO4res switch (nfsstat4 gdir_status) { case NFS4_OK:
GETDEVICEINFO4resok gdir_resok4; case NFS4ERR_TOOSMALL: count4 gdir_mincount; default: void; };
Looking at nfsd4_encode_getdeviceinfo() ....
When the client provides a zero gd_maxcount, then the Linux NFS server implementation encodes the da_layout_type field and then skips the da_addr_body field completely, proceeding directly to encode gdir_notification field.
There does not appear to be an option in the specification to skip encoding da_addr_body. Moreover, Section 18.40.3 says:
Quoted 4 lines
If the client wants to just update or turn off notifications, it MAY send a GETDEVICEINFO operation with
gdia_maxcountset to zero. In that event, if the device ID is valid, the reply'sda_addr_bodyfield of thegdir_device_addrfield will be of zero length.
Since the layout drivers are responsible for encoding the da_addr_body field, put this fix inside the ->encode_getdeviceinfo methods.
--- fs/nfsd/blocklayoutxdr.c | 9 +++++++++ fs/nfsd/flexfilelayoutxdr.c | 9 +++++++++ fs/nfsd/nfs4xdr.c | 25 +++++++++++-------------- 3 files changed, 29 insertions(+), 14 deletions(-)
fs/nfsd/blocklayoutxdr.c +9 -0
@@ -83,6 +83,15 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,int len =sizeof (__be32), ret, i;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } + p =xdr_reserve_space (xdr, len +sizeof (__be32));if (!p)return nfserr_resource;
fs/nfsd/flexfilelayoutxdr.c +9 -0
@@ -85,6 +85,15 @@ nfsd4_ff_encode_getdeviceinfo(struct xdr_stream *xdr,int addr_len;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } +/* len + padding for two strings */ addr_len =16 + da->netaddr.netid_len + da->netaddr.addr_len; ver_len =20 ;
fs/nfsd/nfs4xdr.c +11 -14
@@ -4678,20 +4678,17 @@ nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr, *p++ =cpu_to_be32 (gdev->gd_layout_type); -/* If maxcount is 0 then just update notifications */ -if (gdev->gd_maxcount !=0 ) { - ops = nfsd4_layout_ops[gdev->gd_layout_type]; - nfserr = ops->encode_getdeviceinfo (xdr, gdev); -if (nfserr) { -/* -* We don't bother to burden the layout drivers with -* enforcing gd_maxcount, just tell the client to -* come back with a bigger buffer if it's not enough. -*/ -if (xdr->buf->len +4 > gdev->gd_maxcount) - goto toosmall; -return nfserr; - } + ops = nfsd4_layout_ops[gdev->gd_layout_type]; + nfserr = ops->encode_getdeviceinfo (xdr, gdev); +if (nfserr) { +/* +* We don't bother to burden the layout drivers with +* enforcing gd_maxcount, just tell the client to +* come back with a bigger buffer if it's not enough. +*/ +if (xdr->buf->len +4 > gdev->gd_maxcount) + goto toosmall; +return nfserr; }if (gdev->gd_notify_types) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 445/739 clk: qcom: Fix SM_GPUCC_8450 dependencies
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 75d1d3a433f0a0748a89eb074830e9b635a19fd2 ]
CONFIG_SM_GCC_8450 depends on ARM64 but it is selected by CONFIG_SM_GPUCC_8450, which can be selected on ARM, resulting in a Kconfig warning.
WARNING: unmet direct dependencies detected for SM_GCC_8450
Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_QCOM [=y] && (ARM64 || COMPILE_TEST [=n]) Selected by [y]:
- SM_GPUCC_8450 [=y] && COMMON_CLK [=y] && COMMON_CLK_QCOM [=y]
Add the same dependencies to CONFIG_SM_GPUCC_8450 to resolve the warning.
--- drivers/clk/qcom/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -987,6 +987,7 @@ config SM_GPUCC_8350 config SM_GPUCC_8450 tristate "SM8450 Graphics Clock Controller" + depends on ARM64 || COMPILE_TEST select SM_GCC_8450 help Support for the graphics clock controller on SM8450 devices.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 446/739 NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit f67b55b6588bcf9316a1e6e8d529100a5aa3ebe6 ]
Commit 64cfca85bacd asserts the only valid return values for nfs2/3_decode_dirent should not include -ENAMETOOLONG, but for a server that sends a filename3 which exceeds MAXNAMELEN in a READDIR response the client's behavior will be to endlessly retry the operation.
We could map -ENAMETOOLONG into -EBADCOOKIE, but that would produce truncated listings without any error. The client should return an error for this case to clearly assert that the server implementation must be corrected.
--- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs2xdr.c +1 -1
@@ -949,7 +949,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_filename_inline (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ;/* * The type (size and byte order) of nfscookie isn't defined in
fs/nfs/nfs3xdr.c +1 -1
@@ -1991,7 +1991,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_inline_filename3 (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ; error =decode_cookie3 (xdr, &new_cookie);if (unlikely (error))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 447/739 NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 5690eed941ab7e33c3c3d6b850100cabf740f075 ]
If the client sent a synchronous copy and the server replied with ERR_OFFLOAD_NO_REQ indicating that it wants an asynchronous copy instead, the client should retry with asynchronous copy.
--- fs/nfs/nfs42proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/nfs/nfs42proc.c +3 -2
@@ -471,8 +471,9 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,continue ; }break ; - }else if (err == -NFS4ERR_OFFLOAD_NO_REQS && !args.sync) { - args.sync = true; + }else if (err == -NFS4ERR_OFFLOAD_NO_REQS && + args.sync != res.synchronous) { + args.sync = res.synchronous; dst_exception.retry =1 ;continue ; } else if ((err == -ESTALE ||
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 448/739 pNFS: Fix assignment of xprtdata.cred
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
[ Upstream commit c4a123d2e8c4dc91d581ee7d05c0cd51a0273fab ]
The comma at the end of the line was leftover from an earlier refactor of the _nfs4_pnfs_v3_ds_connect() function. This is technically valid C, so the compilers didn't catch it, but if I'm understanding how it works correctly it assigns the return value of rpc_clnt_add_xprtr() to xprtdata.cred.
--- fs/nfs/pnfs_nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs_nfs.c +1 -1
@@ -943,7 +943,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,* Test this address for session trunking and * add as an alias */ - xprtdata.cred =nfs4_get_clid_cred (clp), + xprtdata.cred =nfs4_get_clid_cred (clp);rpc_clnt_add_xprt (clp->cl_rpcclient, &xprt_args, rpc_clnt_setup_test_and_add_xprt, &rpcdata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 449/739 cgroup/cpuset: Inherit parents load balance state in v2
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit c8c926200c55454101f072a4b16c9ff5b8c9e56f ]
Since commit f28e22441f35 ("cgroup/cpuset: Add a new isolated cpus.partition type"), the CS_SCHED_LOAD_BALANCE bit of a v2 cpuset can be on or off. The child cpusets of a partition root must have the same setting as its parent or it may screw up the rebuilding of sched domains. Fix this problem by making sure the a child v2 cpuset will follows its parent cpuset load balance state unless the child cpuset is a new partition root itself.
--- kernel/cgroup/cpuset.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
kernel/cgroup/cpuset.c +30 -3
@@ -1588,11 +1588,16 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp, }/* -* Skip the whole subtree if the cpumask remains the same -* and has no partition root state and force flag not set. +* Skip the whole subtree if +* 1) the cpumask remains the same, +* 2) has no partition root state, +* 3) force flag not set, and +* 4) for v2 load balance state same as its parent. */ if (!cp->partition_root_state && !force && -cpumask_equal (tmp->new_cpus, cp->effective_cpus)) { +cpumask_equal (tmp->new_cpus, cp->effective_cpus) && + (!cgroup_subsys_on_dfl (cpuset_cgrp_subsys) || + (is_sched_load_balance (parent) ==is_sched_load_balance (cp)))) { pos_css =css_rightmost_descendant (pos_css);continue ; }
@@ -1675,6 +1680,20 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp,update_tasks_cpumask (cp, tmp->new_cpus); +/* +* On default hierarchy, inherit the CS_SCHED_LOAD_BALANCE +* from parent if current cpuset isn't a valid partition root +* and their load balance states differ. +*/ +if (cgroup_subsys_on_dfl (cpuset_cgrp_subsys) && + !is_partition_valid (cp) && + (is_sched_load_balance (parent) !=is_sched_load_balance (cp))) { +if (is_sched_load_balance (parent)) +set_bit (CS_SCHED_LOAD_BALANCE , &cp->flags); +else +clear_bit (CS_SCHED_LOAD_BALANCE , &cp->flags); + } +/* * On legacy hierarchy, if the effective cpumask of any non- * empty cpuset is changed, we need to rebuild sched domains.
@@ -3222,6 +3241,14 @@ static int cpuset_css_online(struct cgroup_subsys_state *css) cs->use_parent_ecpus = true; parent->child_ecpus_count++; } + +/* +* For v2, clear CS_SCHED_LOAD_BALANCE if parent is isolated +*/ +if (cgroup_subsys_on_dfl (cpuset_cgrp_subsys) && + !is_sched_load_balance (parent)) +clear_bit (CS_SCHED_LOAD_BALANCE , &cs->flags); +spin_unlock_irq (&callback_lock);if (!test_bit (CGRP_CPUSET_CLONE_CHILDREN , &css->cgroup->flags))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 450/739 RDMA/qedr: Remove a duplicate assignment in irdma_query_ah()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minjie Du <[email protected]>
[ Upstream commit 65e02e840847158c7ee48ca8e6e91062b0f78662 ]
Delete a duplicate statement from this function implementation.
--- drivers/infiniband/hw/irdma/verbs.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/irdma/verbs.c +0 -1
@@ -4424,7 +4424,6 @@ static int irdma_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr) ah_attr->grh.traffic_class = ah->sc_ah.ah_info.tc_tos; ah_attr->grh.hop_limit = ah->sc_ah.ah_info.hop_ttl; ah_attr->grh.sgid_index = ah->sgid_index; - ah_attr->grh.sgid_index = ah->sgid_index;memcpy (&ah_attr->grh.dgid, &ah->dgid,sizeof (ah_attr->grh.dgid)); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 451/739 media: ov5640: fix low resolution image abnormal issue
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoniu.zhou <[email protected]>
[ Upstream commit a828002f38c5ee49d3f0c0e64c0f0caa1aec8dc2 ]
OV5640 will output abnormal image data when work at low resolution (320x240, 176x144 and 160x120) after switching from high resolution, such as 1080P, the time interval between high and low switching must be less than 1000ms in order to OV5640 don't enter suspend state during the time.
The reason is by 0x3824 value don't restore to initialize value when do resolution switching. In high resolution setting array, 0x3824 is set to 0x04, but low resolution setting array remove 0x3824 in commit db15c1957a2d ("media: ov5640: Remove duplicated mode settings"). So when do resolution switching from high to low, such as 1080P to 320x240, and the time interval is less than auto suspend delay time which means global initialize setting array will not be loaded, the output image data are abnormal. Hence move 0x3824 from ov5640_init_setting[] table to ov5640_setting_low_res[] table and also move 0x4407 0x460b, 0x460c to avoid same issue.
--- drivers/media/i2c/ov5640.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/media/i2c/ov5640.c +3 -4
@@ -568,9 +568,7 @@ static const struct reg_value ov5640_init_setting[] = { {0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, {0x3000, 0x00, 0, 0}, {0x3002, 0x1c, 0, 0}, {0x3004, 0xff, 0, 0}, {0x3006, 0xc3, 0, 0}, {0x302e, 0x08, 0, 0}, {0x4300, 0x3f, 0, 0}, - {0x501f, 0x00, 0, 0}, {0x4407, 0x04, 0, 0}, - {0x440e, 0x00, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0}, - {0x4837, 0x0a, 0, 0}, {0x3824, 0x02, 0, 0}, + {0x501f, 0x00, 0, 0}, {0x440e, 0x00, 0, 0}, {0x4837, 0x0a, 0, 0}, {0x5000, 0xa7, 0, 0}, {0x5001, 0xa3, 0, 0}, {0x5180, 0xff, 0, 0}, {0x5181, 0xf2, 0, 0}, {0x5182, 0x00, 0, 0}, {0x5183, 0x14, 0, 0}, {0x5184, 0x25, 0, 0}, {0x5185, 0x24, 0, 0}, {0x5186, 0x09, 0, 0},
@@ -634,7 +632,8 @@ static const struct reg_value ov5640_setting_low_res[] = { {0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0}, {0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0}, {0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0}, - {0x4407, 0x04, 0, 0}, {0x5001, 0xa3, 0, 0}, + {0x4407, 0x04, 0, 0}, {0x460b, 0x35, 0, 0}, {0x460c, 0x22, 0, 0}, + {0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0}, }; static const struct reg_value ov5640_setting_720P_1280_720[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 452/739 media: i2c: imx290: drop format param from imx290_ctrl_update
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tommaso Merciai <[email protected]>
[ Upstream commit 9b4e0e7a570d222be5f5e0f914d3c4528eadeeb4 ]
The format param actually is not used in imx290_ctrl_update function, let's drop this
--- drivers/media/i2c/imx290.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/media/i2c/imx290.c +2 -5
@@ -902,7 +902,6 @@ static const char * const imx290_test_pattern_menu[] = { };static void imx290_ctrl_update (struct imx290 *imx290, -const struct v4l2_mbus_framefmt *format,const struct imx290_mode *mode) {unsigned int hblank_min = mode->hmax_min - mode->width;
@@ -1195,7 +1194,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,if (fmt->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) { imx290->current_mode = mode; -imx290_ctrl_update (imx290, &fmt->format, mode); +imx290_ctrl_update (imx290, mode);imx290_exposure_update (imx290, mode); }
@@ -1300,7 +1299,6 @@ static const struct media_entity_operations imx290_subdev_entity_ops = {static int imx290_subdev_init (struct imx290 *imx290) {struct i2c_client *client =to_i2c_client (imx290->dev); -const struct v4l2_mbus_framefmt *format;struct v4l2_subdev_state *state;int ret;
@@ -1335,8 +1333,7 @@ static int imx290_subdev_init(struct imx290 *imx290) } state =v4l2_subdev_lock_and_get_active_state (&imx290->sd); - format =v4l2_subdev_get_pad_format (&imx290->sd, state,0 ); -imx290_ctrl_update (imx290, format, imx290->current_mode); +imx290_ctrl_update (imx290, imx290->current_mode);v4l2_subdev_unlock_state (state);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 453/739 media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit f126ff7e4024f6704e6ec0d4137037568708a3c7 ]
The supported ad5820 and ad5821 VCMs both use a single 16 bit register which is written by sending 2 bytes with the data directly after sending the i2c-client address.
The ad5823 OTOH has a more typical i2c / smbus device setup with multiple 8 bit registers where the first byte send after the i2c-client address is the register address and the actual data only starts from the second byte after the i2c-client address.
The ad5823 i2c_ and of_device_id-s was added at the same time as the ad5821 ids with as rationale:
"""
Some camera modules also refer that AD5823 is a replacement of AD5820:
https://download.kamami.com/p564094-OV8865_DS.pdf
"""
The AD5823 may be an electrical and functional replacement of the AD5820, but from a software pov it is not compatible at all and it is going to need its own driver, drop its id from the ad5820 driver.
--- drivers/media/i2c/ad5820.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/i2c/ad5820.c +0 -2
@@ -349,7 +349,6 @@ static void ad5820_remove(struct i2c_client *client)static const struct i2c_device_id ad5820_id_table[] = { {"ad5820" ,0 }, {"ad5821" ,0 }, - {"ad5823" ,0 }, { } };MODULE_DEVICE_TABLE (i2c, ad5820_id_table);
@@ -357,7 +356,6 @@ MODULE_DEVICE_TABLE(i2c, ad5820_id_table);static const struct of_device_id ad5820_of_table[] = { { .compatible ="adi,ad5820" }, { .compatible ="adi,ad5821" }, - { .compatible ="adi,ad5823" }, { } };MODULE_DEVICE_TABLE (of, ad5820_of_table);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 454/739 media: i2c: tvp5150: check return value of devm_kasprintf()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 26ce7054d804be73935b9268d6e0ecf2fbbc8aef ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/media/i2c/tvp5150.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/tvp5150.c +4 -0
@@ -2068,6 +2068,10 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np) tvpc->ent.name =devm_kasprintf (dev,GFP_KERNEL ,"%s %s" , v4l2c->name, v4l2c->label ? v4l2c->label :"" ); +if (!tvpc->ent.name) { + ret = -ENOMEM ; + goto err_free; + } } ep_np =of_graph_get_endpoint_by_regs (np,TVP5150_PAD_VID_OUT ,0 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 455/739 media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit d7b13edd4cb4bfa335b6008ab867ac28582d3e5c ]
If fwnode_graph_get_remote_endpoint() fails, 'fwnode' is known to be NULL, so fwnode_handle_put() is a no-op.
Release the reference taken from a previous fwnode_graph_get_port_parent() call instead.
Also handle fwnode_graph_get_port_parent() failures.
In order to fix these issues, add an error handling path to the function and the needed gotos.
--- drivers/media/v4l2-core/v4l2-fwnode.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-fwnode.c +14 -4
@@ -568,19 +568,29 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode, link->local_id = fwep.id; link->local_port = fwep.port; link->local_node =fwnode_graph_get_port_parent (fwnode); +if (!link->local_node) +return -ENOLINK ; fwnode =fwnode_graph_get_remote_endpoint (fwnode); -if (!fwnode) { -fwnode_handle_put (fwnode); -return -ENOLINK ; - } +if (!fwnode) + goto err_put_local_node;fwnode_graph_parse_endpoint (fwnode, &fwep); link->remote_id = fwep.id; link->remote_port = fwep.port; link->remote_node =fwnode_graph_get_port_parent (fwnode); +if (!link->remote_node) + goto err_put_remote_endpoint;return 0 ; + +err_put_remote_endpoint: +fwnode_handle_put (fwnode); + +err_put_local_node: +fwnode_handle_put (link->local_node); + +return -ENOLINK ; }EXPORT_SYMBOL_GPL (v4l2_fwnode_parse_link);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 456/739 iommu/amd/iommu_v2: Fix pasid_state refcount dec hit 0 warning on pasid unbind
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Marcovitch <[email protected]>
[ Upstream commit 534103bcd52ca9c1fecbc70e717b4a538dc4ded8 ]
When unbinding pasid - a race condition exists vs outstanding page faults.
To prevent this, the pasid_state object contains a refcount.
* set to 1 on pasid bind
* incremented on each ppr notification start
* decremented on each ppr notification done
* decremented on pasid unbind
Since refcount_dec assumes that refcount will never reach 0:
the current implementation causes the following to be invoked on pasid unbind:
REFCOUNT_WARN("decrement hit 0; leaking memory")
Fix this issue by changing refcount_dec to refcount_dec_and_test to explicitly handle refcount=1.
--- drivers/iommu/amd/iommu_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/amd/iommu_v2.c +2 -2
@@ -262,8 +262,8 @@ static void put_pasid_state(struct pasid_state *pasid_state)static void put_pasid_state_wait (struct pasid_state *pasid_state) { -refcount_dec (&pasid_state->count); -wait_event (pasid_state->wq, !refcount_read (&pasid_state->count)); +if (!refcount_dec_and_test (&pasid_state->count)) +wait_event (pasid_state->wq, !refcount_read (&pasid_state->count));free_pasid_state (pasid_state); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 457/739 iommu: rockchip: Fix directory table address encoding
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 6df63b7ebdaf5fcd75dceedf6967d0761e56eca1 ]
The physical address to the directory table is currently encoded using the following bit layout for IOMMU v2.
31:12 - Address bit 31:0
11: 4 - Address bit 39:32
This is also the bit layout used by the vendor kernel.
However, testing has shown that addresses to the directory/page tables and memory pages are all encoded using the same bit layout.
IOMMU v1:
31:12 - Address bit 31:0
IOMMU v2:
31:12 - Address bit 31:0
11: 8 - Address bit 35:32
7: 4 - Address bit 39:36
Change to use the mk_dtentries ops to encode the directory table address correctly. The value written to DTE_ADDR may include the valid bit set, a bit that is ignored and DTE_ADDR reg read it back as 0.
This also update the bit layout comment for the page address and the number of nybbles that are read back for DTE_ADDR comment.
These changes render the dte_addr_phys and dma_addr_dte ops unused and is removed.
--- drivers/iommu/rockchip-iommu.c | 43 ++++------------------------------ 1 file changed, 5 insertions(+), 38 deletions(-)
drivers/iommu/rockchip-iommu.c +5 -38
@@ -98,8 +98,6 @@ struct rk_iommu_ops {phys_addr_t (*pt_address)(u32 dte);u32 (*mk_dtentries)(dma_addr_t pt_dma);u32 (*mk_ptentries)(phys_addr_t page,int prot); -phys_addr_t (*dte_addr_phys)(u32 addr); -u32 (*dma_addr_dte)(dma_addr_t dt_dma);u64 dma_bit_mask; };
@@ -278,8 +276,8 @@ static u32 rk_mk_pte(phys_addr_t page, int prot)/* * In v2: * 31:12 - Page address bit 31:0 -* 11:9 - Page address bit 34:32 -* 8:4 - Page address bit 39:35 +* 11: 8 - Page address bit 35:32 +* 7: 4 - Page address bit 39:36 * 3 - Security * 2 - Writable * 1 - Readable
@@ -506,7 +504,7 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)/* * Check if register DTE_ADDR is working by writing DTE_ADDR_DUMMY -* and verifying that upper 5 nybbles are read back. +* and verifying that upper 5 (v1) or 7 (v2) nybbles are read back. */ for (i =0 ; i < iommu->num_mmu; i++) { dte_addr = rk_ops->pt_address (DTE_ADDR_DUMMY );
@@ -531,33 +529,6 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)return 0 ; } -static inline phys_addr_t rk_dte_addr_phys (u32 addr) -{ -return (phys_addr_t )addr; -} - -static inline u32 rk_dma_addr_dte (dma_addr_t dt_dma) -{ -return dt_dma; -} - -#define DT_HI_MASK GENMASK_ULL(39, 32) -#define DTE_BASE_HI_MASK GENMASK(11, 4) -#define DT_SHIFT 28 - -static inline phys_addr_t rk_dte_addr_phys_v2 (u32 addr) -{ -u64 addr64 = addr; -return (phys_addr_t)(addr64 &RK_DTE_PT_ADDRESS_MASK ) | - ((addr64 &DTE_BASE_HI_MASK ) <<DT_SHIFT ); -} - -static inline u32 rk_dma_addr_dte_v2 (dma_addr_t dt_dma) -{ -return (dt_dma &RK_DTE_PT_ADDRESS_MASK ) | - ((dt_dma &DT_HI_MASK ) >>DT_SHIFT ); -} -static void log_iova (struct rk_iommu *iommu,int index,dma_addr_t iova) {void __iomem *base = iommu->bases[index];
@@ -577,7 +548,7 @@ static void log_iova(struct rk_iommu *iommu, int index, dma_addr_t iova) page_offset =rk_iova_page_offset (iova); mmu_dte_addr =rk_iommu_read (base,RK_MMU_DTE_ADDR ); - mmu_dte_addr_phys = rk_ops->dte_addr_phys (mmu_dte_addr); + mmu_dte_addr_phys = rk_ops->pt_address (mmu_dte_addr); dte_addr_phys = mmu_dte_addr_phys + (4 * dte_index); dte_addr =phys_to_virt (dte_addr_phys);
@@ -967,7 +938,7 @@ static int rk_iommu_enable(struct rk_iommu *iommu)for (i =0 ; i < iommu->num_mmu; i++) {rk_iommu_write (iommu->bases[i],RK_MMU_DTE_ADDR , - rk_ops->dma_addr_dte (rk_domain->dt_dma)); + rk_ops->mk_dtentries (rk_domain->dt_dma));rk_iommu_base_command (iommu->bases[i],RK_MMU_CMD_ZAP_CACHE );rk_iommu_write (iommu->bases[i],RK_MMU_INT_MASK ,RK_MMU_IRQ_MASK ); }
@@ -1405,8 +1376,6 @@ static struct rk_iommu_ops iommu_data_ops_v1 = { .pt_address = &rk_dte_pt_address, .mk_dtentries = &rk_mk_dte, .mk_ptentries = &rk_mk_pte, - .dte_addr_phys = &rk_dte_addr_phys, - .dma_addr_dte = &rk_dma_addr_dte, .dma_bit_mask = DMA_BIT_MASK(32), };
@@ -1414,8 +1383,6 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dte_addr_phys = &rk_dte_addr_phys_v2, - .dma_addr_dte = &rk_dma_addr_dte_v2, .dma_bit_mask = DMA_BIT_MASK(40), };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 458/739 drivers: usb: smsusb: fix error handling code in smsusb_init_device
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongliang Mu <[email protected]>
[ Upstream commit b9c7141f384097fa4fa67d2f72e5731d628aef7c ]
The previous commit 4b208f8b561f ("[media] siano: register media controller earlier")moves siano_media_device_register before smscore_register_device, and adds corresponding error handling code if smscore_register_device fails. However, it misses the following error handling code of smsusb_init_device.
Fix this by moving error handling code at the end of smsusb_init_device and adding a goto statement in the following error handling parts.
--- drivers/media/usb/siano/smsusb.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/media/usb/siano/smsusb.c +11 -10
@@ -455,12 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_register_device (¶ms, &dev->coredev,0 , mdev);if (rc <0 ) {pr_err ("smscore_register_device(...) failed, rc %d\n" , rc); -smsusb_term_device (intf); -#ifdef CONFIG_MEDIA_CONTROLLER_DVB -media_device_unregister (mdev); -#endif -kfree (mdev); -return rc; + goto err_unregister_device; }smscore_set_board_id (dev->coredev, board_id);
@@ -477,8 +472,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smsusb_start_streaming (dev);if (rc <0 ) {pr_err ("smsusb_start_streaming(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; } dev->state =SMSUSB_ACTIVE ;
@@ -486,13 +480,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_start_device (dev->coredev);if (rc <0 ) {pr_err ("smscore_start_device(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; }pr_debug ("device 0x%p created\n" , dev);return rc; + +err_unregister_device: +smsusb_term_device (intf); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +media_device_unregister (mdev); +#endif +kfree (mdev); +return rc; } static int smsusb_probe(struct usb_interface *intf,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 459/739 media: dib7000p: Fix potential division by zero
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit a1db7b2c5533fc67e2681eb5efc921a67bc7d5b8 ]
Variable loopdiv can be assigned 0, then it is used as a denominator, without checking it for 0.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/dib7000p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/dib7000p.c +1 -1
@@ -497,7 +497,7 @@ static int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth prediv = reg_1856 &0x3f ; loopdiv = (reg_1856 >>6 ) &0x3f ; -if ((bw !=NULL ) && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) { +if (loopdiv && bw && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) {dprintk ("Updating pll (prediv: old = %d new = %d ; loopdiv : old = %d new = %d)\n" , prediv, bw->pll_prediv, loopdiv, bw->pll_ratio); reg_1856 &=0xf000 ; reg_1857 =dib7000p_read_word (state,1857 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 460/739 media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit ea9ef6c2e001c5dc94bee35ebd1c8a98621cf7b8 ]
'read' is freed when it is known to be NULL, but not when a read error occurs.
Revert the logic to avoid a small leak, should a m920x_read() call fail.
--- drivers/media/usb/dvb-usb/m920x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/m920x.c +3 -2
@@ -277,7 +277,6 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuchar *read =kmalloc (1 ,GFP_KERNEL );if (!read) { ret = -ENOMEM ; -kfree (read); goto unlock; }
@@ -288,8 +287,10 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuif ((ret =m920x_read (d->udev,M9206_I2C ,0x0 ,0x20 | stop, - read,1 )) !=0 ) + read,1 )) !=0 ) { +kfree (read); goto unlock; + } msg[i].buf[j] = read[0 ]; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 461/739 media: cx24120: Add retval check for cx24120_message_send()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit 96002c0ac824e1773d3f706b1f92e2a9f2988047 ]
If cx24120_message_send() returns error, we should keep local struct unchanged.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/cx24120.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/cx24120.c +3 -1
@@ -973,7 +973,9 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) cmd.arg[8 ] = (clock_ratios_table[idx].rate >>8 ) &0xff ; cmd.arg[9 ] = (clock_ratios_table[idx].rate >>0 ) &0xff ; -cx24120_message_send (state, &cmd); + ret =cx24120_message_send (state, &cmd); +if (ret !=0 ) +return ;/* Calculate ber window rates for stat work */ cx24120_calculate_ber_window (state, clock_ratios_table[idx].rate);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 462/739 RDMA/siw: Fabricate a GID on tun and loopback devices
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit bad5b6e34ffbaacc77ad28a0f482e33b3929e635 ]
LOOPBACK and NONE (tunnel) devices have all-zero MAC addresses. Currently, siw_device_create() falls back to copying the IB device's name in those cases, because an all-zero MAC address breaks the RDMA core address resolution mechanism.
However, at the point when siw_device_create() constructs a GID, the ib_device::name field is uninitialized, leaving the MAC address to remain in an all-zero state.
Fabricate a random artificial GID for such devices, and ensure this artificial GID is returned for all device query operations.
--- drivers/infiniband/sw/siw/siw.h | 1 + drivers/infiniband/sw/siw/siw_main.c | 22 ++++++++-------------- drivers/infiniband/sw/siw/siw_verbs.c | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-)
drivers/infiniband/sw/siw/siw.h +1 -0
@@ -74,6 +74,7 @@ struct siw_device {u32 vendor_part_id;int numa_node; +char raw_gid[ETH_ALEN ];/* physical port state (only one port per device) */ enum ib_port_state state;
drivers/infiniband/sw/siw/siw_main.c +8 -14
@@ -75,8 +75,7 @@ static int siw_device_register(struct siw_device *sdev, const char *name)return rv; } -siw_dbg (base_dev,"HWaddr=%pM\n" , sdev->netdev->dev_addr); - +siw_dbg (base_dev,"HWaddr=%pM\n" , sdev->raw_gid);return 0 ; }
@@ -313,24 +312,19 @@ static struct siw_device *siw_device_create(struct net_device *netdev)return NULL ; base_dev = &sdev->base_dev; - sdev->netdev = netdev; -if (netdev->type !=ARPHRD_LOOPBACK && netdev->type !=ARPHRD_NONE ) { -addrconf_addr_eui48 ((unsigned char *)&base_dev->node_guid, - netdev->dev_addr); +if (netdev->addr_len) { +memcpy (sdev->raw_gid, netdev->dev_addr, + min_t(unsigned int, netdev->addr_len, ETH_ALEN)); }else {/* -* This device does not have a HW address, -* but connection mangagement lib expects gid != 0 +* This device does not have a HW address, but +* connection mangagement requires a unique gid. */ -size_t len =min_t (size_t,strlen (base_dev->name),6 ); -char addr[6 ] = { }; - -memcpy (addr, base_dev->name, len); -addrconf_addr_eui48 ((unsigned char *)&base_dev->node_guid, - addr); +eth_random_addr (sdev->raw_gid); } +addrconf_addr_eui48 ((u8 *)&base_dev->node_guid, sdev->raw_gid); base_dev->uverbs_cmd_mask |=BIT_ULL (IB_USER_VERBS_CMD_POST_SEND );
drivers/infiniband/sw/siw/siw_verbs.c +2 -2
@@ -157,7 +157,7 @@ int siw_query_device(struct ib_device *base_dev, struct ib_device_attr *attr, attr->vendor_part_id = sdev->vendor_part_id;addrconf_addr_eui48 ((u8 *)&attr->sys_image_guid, - sdev->netdev->dev_addr); + sdev->raw_gid);return 0 ; }
@@ -218,7 +218,7 @@ int siw_query_gid(struct ib_device *base_dev, u32 port, int idx,/* subnet_prefix == interface_id == 0; */ memset (gid,0 ,sizeof (*gid)); -memcpy (&gid->raw[0 ], sdev->netdev->dev_addr,6 ); +memcpy (gid->raw, sdev->raw_gid,ETH_ALEN );return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 463/739 scsi: hisi_sas: Fix normally completed I/O analysed as failed
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit f5393a5602cacfda2014e0ff8220e5a7564e7cd1 ]
The PIO read command has no response frame and the struct iu[1024] won't be filled. I/Os which are normally completed will be treated as failed in sas_ata_task_done() when iu contains abnormal dirty data.
Consequently ending_fis should not be filled by iu when the response frame hasn't been written to memory.
--- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 11 +++++++++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +9 -2
@@ -2026,6 +2026,11 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,u16 dma_tx_err_type =le16_to_cpu (err_record->dma_tx_err_type);u16 sipc_rx_err_type =le16_to_cpu (err_record->sipc_rx_err_type);u32 dma_rx_err_type =le32_to_cpu (err_record->dma_rx_err_type); +struct hisi_sas_complete_v2_hdr *complete_queue = + hisi_hba->complete_hdr[slot->cmplt_queue]; +struct hisi_sas_complete_v2_hdr *complete_hdr = + &complete_queue[slot->cmplt_queue_slot]; +u32 dw0 =le32_to_cpu (complete_hdr->dw0);int error =-1 ;if (err_phase ==1 ) {
@@ -2310,7 +2315,8 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,break ; } } -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot); }break ;default :
@@ -2443,7 +2449,8 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba,case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : { ts->stat =SAS_SAM_STAT_GOOD ; -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ; }default :
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 -2
@@ -2257,7 +2257,8 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task, ts->stat =SAS_OPEN_REJECT ; ts->open_rej_reason =SAS_OREJ_RSVD_RETRY ; } -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ;case SAS_PROTOCOL_SMP : ts->stat =SAS_SAM_STAT_CHECK_CONDITION ;
@@ -2384,7 +2385,8 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba,case SAS_PROTOCOL_STP :case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : ts->stat =SAS_SAM_STAT_GOOD ; -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ;default : ts->stat =SAS_SAM_STAT_CHECK_CONDITION ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 464/739 dt-bindings: extcon: maxim,max77843: restrict connector properties
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit fb2c3f72e819254d8c76de95917e5f9ff232586c ]
Do not allow any other properties in connector child, except what usb-connector.yaml evaluates.
--- Documentation/devicetree/bindings/extcon/maxim,max77843.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/extcon/maxim,max77843.yaml +1 -0
@@ -23,6 +23,7 @@ properties: connector: $ref: /schemas/connector/usb-connector.yaml# + unevaluatedProperties: false ports: $ref: /schemas/graph.yaml#/properties/ports
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 465/739 media: amphion: reinit vpu if reqbufs output 0
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit 73e3f09292a0492a3fe0f87a8170a74f12624c5e ]
according to v4l2 stateful decoder document 4.5.1.3. State Machine, the state should change from seek to initialization
if call VIDIOC_REQBUFS(OUTPUT, 0).
so reinit the vpu decoder if reqbufs output 0
--- drivers/media/platform/amphion/vdec.c | 2 -- drivers/media/platform/amphion/vpu_v4l2.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/amphion/vdec.c +0 -2
@@ -1453,9 +1453,7 @@ static void vdec_release(struct vpu_inst *inst) {if (inst->id !=VPU_INST_NULL_ID )vpu_trace (inst->dev,"[%d]\n" , inst->id); -vpu_inst_lock (inst);vdec_stop (inst, true); -vpu_inst_unlock (inst); }static void vdec_cleanup (struct vpu_inst *inst)
drivers/media/platform/amphion/vpu_v4l2.c +6 -1
@@ -489,6 +489,11 @@ static int vpu_vb2_queue_setup(struct vb2_queue *vq,for (i =0 ; i < cur_fmt->mem_planes; i++) psize[i] =vpu_get_fmt_plane_size (cur_fmt, i); +if (V4L2_TYPE_IS_OUTPUT (vq->type) && inst->state ==VPU_CODEC_STATE_SEEK ) { +vpu_trace (inst->dev,"reinit when VIDIOC_REQBUFS(OUTPUT, 0)\n" ); +call_void_vop (inst, release); + } +return 0 ; }
@@ -773,9 +778,9 @@ int vpu_v4l2_close(struct file *file)v4l2_m2m_ctx_release (inst->fh.m2m_ctx); inst->fh.m2m_ctx =NULL ; } +call_void_vop (inst, release);vpu_inst_unlock (inst); -call_void_vop (inst, release);vpu_inst_unregister (inst);vpu_inst_put (inst);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 466/739 media: amphion: add helper function to get id name
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit 12cd8b8ac02525977b2e860a877add10e8ce7468 ]
convert numbers into meaningful names,
then it can improve the log readability
--- drivers/media/platform/amphion/vdec.c | 9 +-- drivers/media/platform/amphion/vpu.h | 3 + drivers/media/platform/amphion/vpu_cmds.c | 11 ++-- drivers/media/platform/amphion/vpu_dbg.c | 6 +- drivers/media/platform/amphion/vpu_helpers.c | 61 ++++++++++++++++++++ drivers/media/platform/amphion/vpu_msgs.c | 2 +- 6 files changed, 79 insertions(+), 13 deletions(-)
drivers/media/platform/amphion/vdec.c +5 -4
@@ -299,7 +299,8 @@ static int vdec_update_state(struct vpu_inst *inst, enum vpu_codec_state state, vdec->state =VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE ;if (inst->state != pre_state) -vpu_trace (inst->dev,"[%d] %d -> %d\n" , inst->id, pre_state, inst->state); +vpu_trace (inst->dev,"[%d] %s -> %s\n" , inst->id, +vpu_codec_state_name (pre_state),vpu_codec_state_name (inst->state));if (inst->state ==VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE )vdec_handle_resolution_change (inst);
@@ -1037,8 +1038,8 @@ static int vdec_response_frame(struct vpu_inst *inst, struct vb2_v4l2_buffer *vbreturn -EINVAL ; } -dev_dbg (inst->dev,"[%d] state = %d, alloc fs %d, tag = 0x%x\n" , - inst->id, inst->state, vbuf->vb2_buf.index, vdec->seq_tag); +dev_dbg (inst->dev,"[%d] state = %s, alloc fs %d, tag = 0x%x\n" , + inst->id,vpu_codec_state_name (inst->state), vbuf->vb2_buf.index, vdec->seq_tag); vpu_buf =to_vpu_vb2_buffer (vbuf);memset (&info,0 ,sizeof (info));
@@ -1400,7 +1401,7 @@ static void vdec_abort(struct vpu_inst *inst)struct vpu_rpc_buffer_desc desc;int ret; -vpu_trace (inst->dev,"[%d] state = %d\n" , inst->id, inst->state); +vpu_trace (inst->dev,"[%d] state = %s\n" , inst->id,vpu_codec_state_name (inst->state)); vdec->aborting = true;vpu_iface_add_scode (inst,SCODE_PADDING_ABORT );
drivers/media/platform/amphion/vpu.h +3 -0
@@ -355,6 +355,9 @@ void vpu_inst_record_flow(struct vpu_inst *inst, u32 flow);int vpu_core_driver_init (void );void vpu_core_driver_exit (void ); +const char *vpu_id_name (u32 id); +const char *vpu_codec_state_name (enum vpu_codec_state state); +extern bool debug; #define vpu_trace(dev, fmt, arg...) \ do { \
drivers/media/platform/amphion/vpu_cmds.c +6 -5
@@ -98,7 +98,7 @@ static struct vpu_cmd_t *vpu_alloc_cmd(struct vpu_inst *inst, u32 id, void *data cmd->id = id; ret =vpu_iface_pack_cmd (inst->core, cmd->pkt, inst->id, id, data);if (ret) { -dev_err (inst->dev,"iface pack cmd(%d) fail\n" , id); +dev_err (inst->dev,"iface pack cmd %s fail\n" ,vpu_id_name (id));vfree (cmd->pkt);vfree (cmd);return NULL ;
@@ -125,14 +125,14 @@ static int vpu_session_process_cmd(struct vpu_inst *inst, struct vpu_cmd_t *cmd) {int ret; -dev_dbg (inst->dev,"[%d]send cmd(0x%x)\n" , inst->id, cmd->id); +dev_dbg (inst->dev,"[%d]send cmd %s\n" , inst->id,vpu_id_name (cmd->id));vpu_iface_pre_send_cmd (inst); ret =vpu_cmd_send (inst->core, cmd->pkt);if (!ret) {vpu_iface_post_send_cmd (inst);vpu_inst_record_flow (inst, cmd->id); }else { -dev_err (inst->dev,"[%d] iface send cmd(0x%x) fail\n" , inst->id, cmd->id); +dev_err (inst->dev,"[%d] iface send cmd %s fail\n" , inst->id,vpu_id_name (cmd->id)); }return ret;
@@ -149,7 +149,8 @@ static void vpu_process_cmd_request(struct vpu_inst *inst)list_for_each_entry_safe (cmd, tmp, &inst->cmd_q, list) {list_del_init (&cmd->list);if (vpu_session_process_cmd (inst, cmd)) -dev_err (inst->dev,"[%d] process cmd(%d) fail\n" , inst->id, cmd->id); +dev_err (inst->dev,"[%d] process cmd %s fail\n" , + inst->id,vpu_id_name (cmd->id));if (cmd->request) { inst->pending = (void *)cmd;break ;
@@ -339,7 +340,7 @@ static int vpu_session_send_cmd(struct vpu_inst *inst, u32 id, void *data) exit:if (ret) -dev_err (inst->dev,"[%d] send cmd(0x%x) fail\n" , inst->id, id); +dev_err (inst->dev,"[%d] send cmd %s fail\n" , inst->id,vpu_id_name (id));return ret; }
drivers/media/platform/amphion/vpu_dbg.c +3 -3
@@ -67,7 +67,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) num =scnprintf (str,sizeof (str),"tgig = %d,pid = %d\n" , inst->tgid, inst->pid);if (seq_write (s, str, num))return 0 ; - num =scnprintf (str,sizeof (str),"state = %d\n" , inst->state); + num =scnprintf (str,sizeof (str),"state = %s\n" ,vpu_codec_state_name (inst->state));if (seq_write (s, str, num))return 0 ; num = scnprintf(str, sizeof(str),
@@ -188,9 +188,9 @@ static int vpu_dbg_instance(struct seq_file *s, void *data)if (!inst->flows[idx])continue ; - num =scnprintf (str,sizeof (str),"\t[%s]0x%x\n" , + num =scnprintf (str,sizeof (str),"\t[%s] %s\n" , inst->flows[idx] >=VPU_MSG_ID_NOOP ?"M" :"C" , - inst->flows[idx]); +vpu_id_name (inst->flows[idx]));if (seq_write (s, str, num)) {mutex_unlock (&inst->core->cmd_lock);return 0 ;
drivers/media/platform/amphion/vpu_helpers.c +61 -0
70 lines not on this page · raw message
drivers/media/platform/amphion/vpu_msgs.c +1 -1
@@ -210,7 +210,7 @@ static int vpu_session_handle_msg(struct vpu_inst *inst, struct vpu_rpc_event *mreturn -EINVAL ; msg_id = ret; -dev_dbg (inst->dev,"[%d] receive event(0x%x)\n" , inst->id, msg_id); +dev_dbg (inst->dev,"[%d] receive event(%s)\n" , inst->id,vpu_id_name (msg_id));for (i =0 ; i <ARRAY_SIZE (handlers); i++) {if (handlers[i].id == msg_id) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 467/739 media: verisilicon: Fix TRY_FMT on encoder OUTPUT
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Tretter <[email protected]>
[ Upstream commit b3b4c9d3cb3bf8725a3ded26f7042b1a37f25333 ]
Commit f100ce3bbd6a ("media: verisilicon: Fix crash when probing encoder") removed vpu_fmt from hantro_try_fmt(), since it was initialized from vpu_dst_fmt, which may not be initialized, when TRY_FMT is called. It was replaced by fmt, which is found using the pixelformat.
For the encoder, this changed the fmt to contain the raw format instead of the coded format. The format constraints as of fmt->frmsize are only valid for the coded format and are 0 for the raw formats. Therefore, the size of a encoder OUTPUT device is constrained to 0 and the v4l2-compliance tests for G_FMT, TRY_FMT, and SET_FMT fail.
Bring back vpu_fmt to use the coded format on an encoder OUTPUT device, but initialize it using the currently set pixelformat on dst_fmt, which is the coded format on an encoder.
--- drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/platform/verisilicon/hantro_v4l2.c +7 -2
@@ -297,6 +297,7 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx, enum v4l2_buf_type type) {const struct hantro_fmt *fmt; +const struct hantro_fmt *vpu_fmt;bool capture =V4L2_TYPE_IS_CAPTURE (type);bool coded;
@@ -316,19 +317,23 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,if (coded) { pix_mp->num_planes =1 ; - }else if (!ctx->is_encoder) { + vpu_fmt = fmt; + }else if (ctx->is_encoder) { + vpu_fmt =hantro_find_format (ctx, ctx->dst_fmt.pixelformat); + }else {/* * Width/height on the CAPTURE end of a decoder are ignored and * replaced by the OUTPUT ones. */ pix_mp->width = ctx->src_fmt.width; pix_mp->height = ctx->src_fmt.height; + vpu_fmt = fmt; } pix_mp->field =V4L2_FIELD_NONE ;v4l2_apply_frmsize_constraints (&pix_mp->width, &pix_mp->height, - &fmt->frmsize); + &vpu_fmt->frmsize);if (!coded) {/* Fill remaining fields */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 468/739 media: mtk-jpeg: Fix use after free bug due to uncanceled work
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Wang <[email protected]>
[ Upstream commit c677d7ae83141d390d1253abebafa49c962afb52 ]
In mtk_jpeg_probe, &jpeg->job_timeout_work is bound with mtk_jpeg_job_timeout_work. Then mtk_jpeg_dec_device_run and mtk_jpeg_enc_device_run may be called to start the work.
If we remove the module which will call mtk_jpeg_remove to make cleanup, there may be a unfinished work. The possible sequence is as follows, which will cause a typical UAF bug.
Fix it by canceling the work before cleanup in the mtk_jpeg_remove
CPU0 CPU1
|mtk_jpeg_job_timeout_work
mtk_jpeg_remove |
v4l2_m2m_release |
kfree(m2m_dev); |
|
| v4l2_m2m_get_curr_priv
| m2m_dev->curr_ctx //use--- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +1 -0
@@ -1403,6 +1403,7 @@ static void mtk_jpeg_remove(struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg =platform_get_drvdata (pdev); +cancel_delayed_work_sync (&jpeg->job_timeout_work);pm_runtime_disable (&pdev->dev);video_unregister_device (jpeg->vdev);v4l2_m2m_release (jpeg->m2m_dev);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 469/739 media: amphion: decoder support display delay for all formats
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit b69713f502027150ecc08e663fa1804d78b3ef42 ]
the firmware only support low latency mode for h264, but firmware will notify an event to driver
when one frame is decoded,
if V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE is enabled, and V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY is set to 0, driver can display the decoded frame immediately.
--- drivers/media/platform/amphion/vdec.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
drivers/media/platform/amphion/vdec.c +22 -3
@@ -742,6 +742,21 @@ static int vdec_frame_decoded(struct vpu_inst *inst, void *arg)dev_info (inst->dev,"[%d] buf[%d] has been decoded\n" , inst->id, info->id);vpu_set_buffer_state (vbuf,VPU_BUF_STATE_DECODED ); vdec->decoded_frame_count++; +if (vdec->params.display_delay_enable) { +struct vpu_format *cur_fmt; + + cur_fmt =vpu_get_format (inst, inst->cap_format.type); +vpu_set_buffer_state (vbuf,VPU_BUF_STATE_READY ); +for (int i =0 ; i < vbuf->vb2_buf.num_planes; i++) +vb2_set_plane_payload (&vbuf->vb2_buf, + i,vpu_get_fmt_plane_size (cur_fmt, i)); + vbuf->field = cur_fmt->field; + vbuf->sequence = vdec->sequence++; +dev_dbg (inst->dev,"[%d][OUTPUT TS]%32lld\n" , inst->id, vbuf->vb2_buf.timestamp); + +v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_DONE ); + vdec->display_frame_count++; + } exit:vpu_inst_unlock (inst);
@@ -769,14 +784,14 @@ static void vdec_buf_done(struct vpu_inst *inst, struct vpu_frame_info *frame)struct vpu_format *cur_fmt;struct vpu_vb2_buffer *vpu_buf;struct vb2_v4l2_buffer *vbuf; -u32 sequence;int i;if (!frame)return ;vpu_inst_lock (inst); - sequence = vdec->sequence++; +if (!vdec->params.display_delay_enable) + vdec->sequence++; vpu_buf =vdec_find_buffer (inst, frame->luma);vpu_inst_unlock (inst);if (!vpu_buf) {
@@ -795,13 +810,17 @@ static void vdec_buf_done(struct vpu_inst *inst, struct vpu_frame_info *frame)dev_err (inst->dev,"[%d] buffer id(%d, %d) dismatch\n" , inst->id, vbuf->vb2_buf.index, frame->id); +if (vpu_get_buffer_state (vbuf) ==VPU_BUF_STATE_READY && vdec->params.display_delay_enable) +return ; +if (vpu_get_buffer_state (vbuf) !=VPU_BUF_STATE_DECODED )dev_err (inst->dev,"[%d] buffer(%d) ready without decoded\n" , inst->id, frame->id); +vpu_set_buffer_state (vbuf,VPU_BUF_STATE_READY );for (i =0 ; i < vbuf->vb2_buf.num_planes; i++)vb2_set_plane_payload (&vbuf->vb2_buf, i,vpu_get_fmt_plane_size (cur_fmt, i)); vbuf->field = cur_fmt->field; - vbuf->sequence = sequence; + vbuf->sequence = vdec->sequence;dev_dbg (inst->dev,"[%d][OUTPUT TS]%32lld\n" , inst->id, vbuf->vb2_buf.timestamp);v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_DONE );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 470/739 media: rkvdec: increase max supported height for H.264
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Gaignard <[email protected]>
[ Upstream commit f000e6ca2d60fefd02a180a57df2c4162fa0c1b7 ]
After testing it is possible for the hardware to decode H264 bistream with a height up to 2560.
--- drivers/staging/media/rkvdec/rkvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/rkvdec/rkvdec.c +1 -1
@@ -120,7 +120,7 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = { .max_width = 4096, .step_width = 16, .min_height = 48, - .max_height = 2304, + .max_height = 2560, .step_height = 16, }, .ctrls = &rkvdec_h264_ctrls,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 471/739 media: amphion: fix CHECKED_RETURN issues reported by coverity
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit b237b058adbc7825da9c8f358f1ff3f0467d623a ]
calling "vpu_cmd_send/vpu_get_buffer_state/vpu_session_alloc_fs" without checking return value
--- drivers/media/platform/amphion/vdec.c | 5 ++++- drivers/media/platform/amphion/vpu_cmds.c | 3 ++- drivers/media/platform/amphion/vpu_dbg.c | 11 +++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/media/platform/amphion/vdec.c +4 -1
@@ -1019,6 +1019,7 @@ static int vdec_response_frame_abnormal(struct vpu_inst *inst) {struct vdec_t *vdec = inst->priv;struct vpu_fs_info info; +int ret;if (!vdec->req_frame_count)return 0 ;
@@ -1026,7 +1027,9 @@ static int vdec_response_frame_abnormal(struct vpu_inst *inst)memset (&info,0 ,sizeof (info)); info.type =MEM_RES_FRAME ; info.tag = vdec->seq_tag +0xf0 ; -vpu_session_alloc_fs (inst, &info); + ret =vpu_session_alloc_fs (inst, &info); +if (ret) +return ret; vdec->req_frame_count--;return 0 ;
drivers/media/platform/amphion/vpu_cmds.c +2 -1
@@ -306,7 +306,8 @@ static void vpu_core_keep_active(struct vpu_core *core)dev_dbg (core->dev,"try to wake up\n" );mutex_lock (&core->cmd_lock); -vpu_cmd_send (core, &pkt); +if (vpu_cmd_send (core, &pkt)) +dev_err (core->dev,"fail to keep active\n" );mutex_unlock (&core->cmd_lock); }
drivers/media/platform/amphion/vpu_dbg.c +9 -2
@@ -50,6 +50,13 @@ static char *vpu_stat_name[] = { [VPU_BUF_STATE_ERROR] = "error", }; +static inline const char *to_vpu_stat_name (int state) +{ +if (state <=VPU_BUF_STATE_ERROR ) +return vpu_stat_name[state]; +return "unknown" ; +} +static int vpu_dbg_instance (struct seq_file *s,void *data) {struct vpu_inst *inst = s->private;
@@ -141,7 +148,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) num =scnprintf (str,sizeof (str),"output [%2d] state = %10s, %8s\n" , i, vb2_stat_name[vb->state], - vpu_stat_name[vpu_get_buffer_state (vbuf)]); +to_vpu_stat_name (vpu_get_buffer_state (vbuf)));if (seq_write (s, str, num))return 0 ; }
@@ -156,7 +163,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) num =scnprintf (str,sizeof (str),"capture[%2d] state = %10s, %8s\n" , i, vb2_stat_name[vb->state], - vpu_stat_name[vpu_get_buffer_state (vbuf)]); +to_vpu_stat_name (vpu_get_buffer_state (vbuf)));if (seq_write (s, str, num))return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 472/739 media: amphion: fix REVERSE_INULL issues reported by coverity
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit 79d3bafaecc13bccab1ebbd28a15e669c5a4cdaf ]
null-checking of a pointor is suggested before dereferencing it
--- drivers/media/platform/amphion/venc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/amphion/venc.c +4 -2
@@ -268,7 +268,7 @@ static int venc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *parm {struct vpu_inst *inst =to_inst (file);struct venc_t *venc = inst->priv; -struct v4l2_fract *timeperframe = &parm->parm.capture.timeperframe; +struct v4l2_fract *timeperframe;if (!parm)return -EINVAL ;
@@ -279,6 +279,7 @@ static int venc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *parmif (!vpu_helper_check_type (inst, parm->type))return -EINVAL ; + timeperframe = &parm->parm.capture.timeperframe; parm->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; parm->parm.capture.readbuffers =0 ; timeperframe->numerator = venc->params.frame_rate.numerator;
@@ -291,7 +292,7 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *parm {struct vpu_inst *inst =to_inst (file);struct venc_t *venc = inst->priv; -struct v4l2_fract *timeperframe = &parm->parm.capture.timeperframe; +struct v4l2_fract *timeperframe;unsigned long n, d;if (!parm)
@@ -303,6 +304,7 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *parmif (!vpu_helper_check_type (inst, parm->type))return -EINVAL ; + timeperframe = &parm->parm.capture.timeperframe;if (!timeperframe->numerator) timeperframe->numerator = venc->params.frame_rate.numerator;if (!timeperframe->denominator)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 473/739 media: amphion: fix UNINIT issues reported by coverity
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit c224d0497a31ea2d173e1ea16af308945bff9037 ]
using uninitialized value may introduce risk
--- drivers/media/platform/amphion/vpu_msgs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/platform/amphion/vpu_msgs.c +6 -6
@@ -32,7 +32,7 @@ static void vpu_session_handle_start_done(struct vpu_inst *inst, struct vpu_rpc_static void vpu_session_handle_mem_request (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -struct vpu_pkt_mem_req_data req_data; +struct vpu_pkt_mem_req_data req_data = {0 };vpu_iface_unpack_msg_data (inst->core, pkt, (void *)&req_data); vpu_trace(inst->dev, "[%d] %d:%d %d:%d %d:%d\n",
@@ -80,7 +80,7 @@ static void vpu_session_handle_resolution_change(struct vpu_inst *inst, struct vstatic void vpu_session_handle_enc_frame_done (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -struct vpu_enc_pic_info info; +struct vpu_enc_pic_info info = {0 };vpu_iface_unpack_msg_data (inst->core, pkt, (void *)&info); dev_dbg(inst->dev, "[%d] frame id = %d, wptr = 0x%x, size = %d\n",
@@ -90,7 +90,7 @@ static void vpu_session_handle_enc_frame_done(struct vpu_inst *inst, struct vpu_static void vpu_session_handle_frame_request (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -struct vpu_fs_info fs; +struct vpu_fs_info fs = {0 };vpu_iface_unpack_msg_data (inst->core, pkt, &fs);call_void_vop (inst, event_notify,VPU_MSG_ID_FRAME_REQ , &fs);
@@ -107,7 +107,7 @@ static void vpu_session_handle_frame_release(struct vpu_inst *inst, struct vpu_r info.type = inst->out_format.type;call_void_vop (inst, buf_done, &info); }else if (inst->core->type ==VPU_CORE_TYPE_DEC ) { -struct vpu_fs_info fs; +struct vpu_fs_info fs = {0 };vpu_iface_unpack_msg_data (inst->core, pkt, &fs);call_void_vop (inst, event_notify,VPU_MSG_ID_FRAME_RELEASE , &fs);
@@ -122,7 +122,7 @@ static void vpu_session_handle_input_done(struct vpu_inst *inst, struct vpu_rpc_static void vpu_session_handle_pic_decoded (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -struct vpu_dec_pic_info info; +struct vpu_dec_pic_info info = {0 };vpu_iface_unpack_msg_data (inst->core, pkt, (void *)&info);call_void_vop (inst, get_one_frame, &info);
@@ -130,7 +130,7 @@ static void vpu_session_handle_pic_decoded(struct vpu_inst *inst, struct vpu_rpcstatic void vpu_session_handle_pic_done (struct vpu_inst *inst,struct vpu_rpc_event *pkt) { -struct vpu_dec_pic_info info; +struct vpu_dec_pic_info info = {0 };struct vpu_frame_info frame;memset (&frame,0 ,sizeof (frame));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 474/739 media: amphion: fix UNUSED_VALUE issue reported by coverity
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit cf6a06354989c41b536be8e094561ee16223cf1f ]
assign value '-EINVAL' to ret, but the stored value is overwritten before it can be used
--- drivers/media/platform/amphion/vpu_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/amphion/vpu_cmds.c +1 -1
@@ -315,7 +315,7 @@ static int vpu_session_send_cmd(struct vpu_inst *inst, u32 id, void *data) {unsigned long key;int sync = false; -int ret = -EINVAL ; +int ret;if (inst->id <0 )return -EINVAL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 475/739 media: amphion: ensure the bitops dont cross boundaries
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit 5bd28eae48589694ff4e5badb03bf75dae695b3f ]
the supported_instance_count determine the instance index range, it shouldn't exceed the bits number of instance_mask, otherwise the bitops of instance_mask may cross boundaries
--- drivers/media/platform/amphion/vpu_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/amphion/vpu_core.c +2 -0
@@ -88,6 +88,8 @@ static int vpu_core_boot_done(struct vpu_core *core) core->supported_instance_count =min (core->supported_instance_count, count); } +if (core->supported_instance_count >=BITS_PER_TYPE (core->instance_mask)) + core->supported_instance_count =BITS_PER_TYPE (core->instance_mask); core->fw_version = fw_version;vpu_core_set_state (core,VPU_CORE_ACTIVE );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 476/739 media: mediatek: vcodec: fix AV1 decode fail for 36bit iova
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaoyong Lu <[email protected]>
[ Upstream commit 89a4f369b20810a8365f87badf7862c67d344bbe ]
Fix av1 decode fail when iova is 36bit.
Decoder hardware will access incorrect iova address when tile buffer is 36bit, it will lead to iommu fault when hardware access dram data.
--- .../mediatek/vcodec/vdec/vdec_av1_req_lat_if.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/platform/mediatek/vcodec/vdec/vdec_av1_req_lat_if.c +8 -4
@@ -1658,9 +1658,9 @@ static void vdec_av1_slice_setup_tile_buffer(struct vdec_av1_slice_instance *insu32 allow_update_cdf =0 ;u32 sb_boundary_x_m1 =0 , sb_boundary_y_m1 =0 ;int tile_info_base; -u32 tile_buf_pa; +u64 tile_buf_pa;u32 *tile_info_buf = instance->tile.va; -u32 pa = (u32 )bs->dma_addr; +u64 pa = (u64 )bs->dma_addr;if (uh->disable_cdf_update ==0 ) allow_update_cdf =1 ;
@@ -1673,8 +1673,12 @@ static void vdec_av1_slice_setup_tile_buffer(struct vdec_av1_slice_instance *ins tile_info_buf[tile_info_base +0 ] = (tile_group->tile_size[tile_num] <<3 ); tile_buf_pa = pa + tile_group->tile_start_offset[tile_num]; - tile_info_buf[tile_info_base +1 ] = (tile_buf_pa >>4 ) <<4 ; - tile_info_buf[tile_info_base +2 ] = (tile_buf_pa %16 ) <<3 ; +/* save av1 tile high 4bits(bit 32-35) address in lower 4 bits position +* and clear original for hw requirement. +*/ + tile_info_buf[tile_info_base +1 ] = (tile_buf_pa &0xFFFFFFF0ull ) | + ((tile_buf_pa &0xF00000000ull ) >>32 ); + tile_info_buf[tile_info_base +2 ] = (tile_buf_pa &0xFull ) <<3 ; sb_boundary_x_m1 = (tile->mi_col_starts[tile_col + 1] - tile->mi_col_starts[tile_col] - 1) &
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 477/739 media: mediatek: vcodec: Return NULL if no vdec_fb is found
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Irui Wang <[email protected]>
[ Upstream commit dfa2d6e07432270330ae191f50a0e70636a4cd2b ]
"fb_use_list" is used to store used or referenced frame buffers for vp9 stateful decoder. "NULL" should be returned when getting target frame buffer failed from "fb_use_list", not a random unexpected one.
--- drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c +3 -2
@@ -226,10 +226,11 @@ static struct vdec_fb *vp9_rm_from_fb_use_list(struct vdec_vp9_instif (fb->base_y.va == addr) {list_move_tail (&node->list, &inst->available_fb_node_list); -break ; +return fb; } } -return fb; + +return NULL ; } static void vp9_add_to_fb_free_list(struct vdec_vp9_inst *inst,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 478/739 media: mediatek: vcodec: fix potential double free
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit be40f524b6edac4fb9a98ef79620fd9b9497a998 ]
The "lat_buf->private_data" needs to be set to NULL to prevent a double free. How this would happen is if vdec_msg_queue_init() failed twice in a row and on the second time it failed earlier than on the first time.
The vdec_msg_queue_init() function has a loop which does:
for (i = 0; i < NUM_BUFFER_COUNT; i++) {Each iteration initializes one element in the msg_queue->lat_buf[] array and then the clean up function vdec_msg_queue_deinit() frees each element of the msg_queue->lat_buf[] array. This clean up code relies on the assumption that every element is either initialized or zeroed. Leaving a freed pointer which is non-zero breaks the assumption.
--- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c +1 -0
@@ -231,6 +231,7 @@ void vdec_msg_queue_deinit(struct vdec_msg_queue *msg_queue,mtk_vcodec_mem_free (ctx, mem);kfree (lat_buf->private_data); + lat_buf->private_data =NULL ; }if (msg_queue->wdma_addr.size)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 479/739 media: mediatek: vcodec: fix resource leaks in vdec_msg_queue_init()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit cf10b0bb503c974ba049d6f888b21178be20a962 ]
If we encounter any error in the vdec_msg_queue_init() then we need to set "msg_queue->wdma_addr.size = 0;". Normally, this is done inside the vdec_msg_queue_deinit() function. However, if the first call to allocate &msg_queue->wdma_addr fails, then the vdec_msg_queue_deinit() function is a no-op. For that situation, just set the size to zero explicitly and return.
There were two other error paths which did not clean up before returning. Change those error paths to goto mem_alloc_err.
--- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c +3 -2
@@ -308,6 +308,7 @@ int vdec_msg_queue_init(struct vdec_msg_queue *msg_queue, err =mtk_vcodec_mem_alloc (ctx, &msg_queue->wdma_addr);if (err) {mtk_v4l2_err ("failed to allocate wdma_addr buf" ); + msg_queue->wdma_addr.size =0 ;return -ENOMEM ; } msg_queue->wdma_rptr_addr = msg_queue->wdma_addr.dma_addr;
@@ -339,14 +340,14 @@ int vdec_msg_queue_init(struct vdec_msg_queue *msg_queue, err =mtk_vcodec_mem_alloc (ctx, &lat_buf->rd_mv_addr);if (err) {mtk_v4l2_err ("failed to allocate rd_mv_addr buf[%d]" , i); -return -ENOMEM ; + goto mem_alloc_err; } lat_buf->tile_addr.size =VDEC_LAT_TILE_SZ ; err =mtk_vcodec_mem_alloc (ctx, &lat_buf->tile_addr);if (err) {mtk_v4l2_err ("failed to allocate tile_addr buf[%d]" , i); -return -ENOMEM ; + goto mem_alloc_err; } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 480/739 usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
[ Upstream commit 5eda42aebb7668b4dcff025cd3ccb0d3d7c53da6 ]
The function mxs_phy_is_otg_host() will return true if OTG_ID_VALUE is 0 at USBPHY_CTRL register. However, OTG_ID_VALUE will not reflect the real state if the ID pin is float, such as Host-only or Type-C cases. The value of OTG_ID_VALUE is always 1 which means device mode.
This patch will fix the issue by judging the current mode based on last_event. The controller will update last_event in time.
--- drivers/usb/phy/phy-mxs-usb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +2 -8
@@ -388,14 +388,8 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect)static bool mxs_phy_is_otg_host (struct mxs_phy *mxs_phy) { -void __iomem *base = mxs_phy->phy.io_priv; -u32 phyctrl =readl (base +HW_USBPHY_CTRL ); - -if (IS_ENABLED (CONFIG_USB_OTG ) && - !(phyctrl &BM_USBPHY_CTRL_OTG_ID_VALUE )) -return true; - -return false; +return IS_ENABLED (CONFIG_USB_OTG ) && + mxs_phy->phy.last_event ==USB_EVENT_ID ; }static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 481/739 scsi: RDMA/srp: Fix residual handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 89e637c19b2441aabc8dbf22a8745b932fd6996e ]
Although the code for residual handling in the SRP initiator follows the SCSI documentation, that documentation has never been correct. Because scsi_finish_command() starts from the data buffer length and subtracts the residual, scsi_set_resid() must not be called if a residual overflow occurs. Hence remove the scsi_set_resid() calls from the SRP initiator if a residual overflow occurrs.
--- drivers/infiniband/ulp/srp/ib_srp.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +0 -4
@@ -1979,12 +1979,8 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp)if (unlikely (rsp->flags &SRP_RSP_FLAG_DIUNDER ))scsi_set_resid (scmnd,be32_to_cpu (rsp->data_in_res_cnt)); -else if (unlikely (rsp->flags &SRP_RSP_FLAG_DIOVER )) -scsi_set_resid (scmnd, -be32_to_cpu (rsp->data_in_res_cnt));else if (unlikely (rsp->flags &SRP_RSP_FLAG_DOUNDER ))scsi_set_resid (scmnd,be32_to_cpu (rsp->data_out_res_cnt)); -else if (unlikely (rsp->flags &SRP_RSP_FLAG_DOOVER )) -scsi_set_resid (scmnd, -be32_to_cpu (rsp->data_out_res_cnt));srp_free_req (ch, req, scmnd,be32_to_cpu (rsp->req_lim_delta));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 482/739 scsi: ufs: Fix residual handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 2903265e27bfc6dea915dd9e17a1b2587f621f73 ]
Only call scsi_set_resid() in case of an underflow. Do not call scsi_set_resid() in case of an overflow.
--- drivers/ufs/core/ufshcd.c | 12 ++++++++++-- include/ufs/ufs.h | 6 ++++++ 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/ufs/core/ufshcd.c +10 -2
@@ -5251,9 +5251,17 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,int result =0 ;int scsi_status;enum utp_ocs ocs; +u8 upiu_flags; +u32 resid; -scsi_set_resid (lrbp->cmd, -be32_to_cpu (lrbp->ucd_rsp_ptr->sr.residual_transfer_count)); + upiu_flags =be32_to_cpu (lrbp->ucd_rsp_ptr->header.dword_0) >>16 ; + resid =be32_to_cpu (lrbp->ucd_rsp_ptr->sr.residual_transfer_count); +/* +* Test !overflow instead of underflow to support UFS devices that do +* not set either flag. +*/ +if (resid && !(upiu_flags &UPIU_RSP_FLAG_OVERFLOW )) +scsi_set_resid (lrbp->cmd, resid);/* overall command status of utrd */ ocs =ufshcd_get_tr_ocs (lrbp, cqe);
include/ufs/ufs.h +6 -0
@@ -102,6 +102,12 @@ enum { UPIU_CMD_FLAGS_READ = 0x40, }; +/* UPIU response flags */ +enum { +UPIU_RSP_FLAG_UNDERFLOW =0x20 , +UPIU_RSP_FLAG_OVERFLOW =0x40 , +}; +/* UPIU Task Attributes */ enum {UPIU_TASK_ATTR_SIMPLE =0x00 ,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 483/739 scsi: iscsi: Add length check for nlattr payload
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 971dfcb74a800047952f5288512b9c7ddedb050a ]
The current NETLINK_ISCSI netlink parsing loop checks every nlmsg to make sure the length is bigger than sizeof(struct iscsi_uevent) and then calls iscsi_if_recv_msg().
nlh = nlmsg_hdr(skb);
if (nlh->nlmsg_len < sizeof(*nlh) + sizeof(*ev) ||
skb->len < nlh->nlmsg_len) {
break;
}
...
err = iscsi_if_recv_msg(skb, nlh, &group);Hence, in iscsi_if_recv_msg() the nlmsg_data can be safely converted to iscsi_uevent as the length is already checked.
However, in other cases the length of nlattr payload is not checked before the payload is converted to other data structures. One example is iscsi_set_path() which converts the payload to type iscsi_path without any checks:
params = (struct iscsi_path *)((char *)ev + sizeof(*ev));
Whereas iscsi_if_transport_conn() correctly checks the pdu_len:
pdu_len = nlh->nlmsg_len - sizeof(*nlh) - sizeof(*ev);
if ((ev->u.send_pdu.hdr_size > pdu_len) ..
err = -EINVAL;To sum up, some code paths called in iscsi_if_recv_msg() do not check the length of the data (see below picture) and directly convert the data to another data structure. This could result in an out-of-bound reads and heap dirty data leakage.
_________ nlmsg_len(nlh) _______________
/ \
+----------+--------------+---------------------------+
| nlmsghdr | iscsi_uevent | data |
+----------+--------------+---------------------------+
\ /
iscsi_uevent->u.set_param.lenFix the issue by adding the length check before accessing it. To clean up the code, an additional parameter named rlen is added. The rlen is calculated at the beginning of iscsi_if_recv_msg() which avoids duplicated calculation.
--- drivers/scsi/scsi_transport_iscsi.c | 72 +++++++++++++++++------------ 1 file changed, 43 insertions(+), 29 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +43 -29
@@ -3014,14 +3014,15 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev }static int -iscsi_if_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_if_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {char *data = (char *)ev +sizeof (*ev);struct iscsi_cls_conn *conn;struct iscsi_cls_session *session;int err =0 , value =0 , state; -if (ev->u.set_param.len >PAGE_SIZE ) +if (ev->u.set_param.len > rlen || + ev->u.set_param.len >PAGE_SIZE )return -EINVAL ; session =iscsi_session_lookup (ev->u.set_param.sid);
@@ -3118,7 +3119,7 @@ static int iscsi_if_ep_disconnect(struct iscsi_transport *transport,static int iscsi_if_transport_ep (struct iscsi_transport *transport, -struct iscsi_uevent *ev,int msg_type) +struct iscsi_uevent *ev,int msg_type,u32 rlen) {struct iscsi_endpoint *ep;int rc =0 ;
@@ -3126,7 +3127,10 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,switch (msg_type) {case ISCSI_UEVENT_TRANSPORT_EP_CONNECT_THROUGH_HOST :case ISCSI_UEVENT_TRANSPORT_EP_CONNECT : - rc =iscsi_if_ep_connect (transport, ev, msg_type); +if (rlen <sizeof (struct sockaddr )) + rc = -EINVAL ; +else + rc =iscsi_if_ep_connect (transport, ev, msg_type);break ;case ISCSI_UEVENT_TRANSPORT_EP_POLL :if (!transport->ep_poll)
@@ -3150,12 +3154,15 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,static int iscsi_tgt_dscvr (struct iscsi_transport *transport, -struct iscsi_uevent *ev) +struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct sockaddr *dst_addr;int err; +if (rlen <sizeof (*dst_addr)) +return -EINVAL ; +if (!transport->tgt_dscvr)return -EINVAL ;
@@ -3176,7 +3183,7 @@ iscsi_tgt_dscvr(struct iscsi_transport *transport,static int iscsi_set_host_param (struct iscsi_transport *transport, -struct iscsi_uevent *ev) +struct iscsi_uevent *ev,u32 rlen) {char *data = (char *)ev +sizeof (*ev);struct Scsi_Host *shost;
@@ -3185,7 +3192,8 @@ iscsi_set_host_param(struct iscsi_transport *transport,if (!transport->set_host_param)return -ENOSYS ; -if (ev->u.set_host_param.len >PAGE_SIZE ) +if (ev->u.set_host_param.len > rlen || + ev->u.set_host_param.len >PAGE_SIZE )return -EINVAL ; shost =scsi_host_lookup (ev->u.set_host_param.host_no);
@@ -3202,12 +3210,15 @@ iscsi_set_host_param(struct iscsi_transport *transport, }static int -iscsi_set_path (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_set_path (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct iscsi_path *params;int err; +if (rlen <sizeof (*params)) +return -EINVAL ; +if (!transport->set_path)return -ENOSYS ;
@@ -3267,12 +3278,15 @@ iscsi_set_iface_params(struct iscsi_transport *transport, }static int -iscsi_send_ping (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_send_ping (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct sockaddr *dst_addr;int err; +if (rlen <sizeof (*dst_addr)) +return -EINVAL ; +if (!transport->send_ping)return -ENOSYS ;
@@ -3770,13 +3784,12 @@ iscsi_get_host_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) }static int iscsi_if_transport_conn (struct iscsi_transport *transport, -struct nlmsghdr *nlh) +struct nlmsghdr *nlh,u32 pdu_len) {struct iscsi_uevent *ev =nlmsg_data (nlh);struct iscsi_cls_session *session;struct iscsi_cls_conn *conn =NULL ;struct iscsi_endpoint *ep; -uint32_t pdu_len;int err =0 ;switch (nlh->nlmsg_type) {
@@ -3861,8 +3874,6 @@ static int iscsi_if_transport_conn(struct iscsi_transport *transport,break ;case ISCSI_UEVENT_SEND_PDU : - pdu_len = nlh->nlmsg_len -sizeof (*nlh) -sizeof (*ev); -if ((ev->u.send_pdu.hdr_size > pdu_len) || (ev->u.send_pdu.data_size > (pdu_len - ev->u.send_pdu.hdr_size))) { err = -EINVAL ;
@@ -3892,6 +3903,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)struct iscsi_internal *priv;struct iscsi_cls_session *session;struct iscsi_endpoint *ep =NULL ; +u32 rlen;if (!netlink_capable (skb,CAP_SYS_ADMIN ))return -EPERM ;
@@ -3911,6 +3923,13 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) portid =NETLINK_CB (skb).portid; +/* +* Even though the remaining payload may not be regarded as nlattr, +* (like address or something else), calculate the remaining length +* here to ease following length checks. +*/ + rlen =nlmsg_attrlen (nlh,sizeof (*ev)); +switch (nlh->nlmsg_type) {case ISCSI_UEVENT_CREATE_SESSION : err = iscsi_if_create_session(priv, ep, ev,
@@ -3967,7 +3986,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err = -EINVAL ;break ;case ISCSI_UEVENT_SET_PARAM : - err =iscsi_if_set_param (transport, ev); + err =iscsi_if_set_param (transport, ev, rlen);break ;case ISCSI_UEVENT_CREATE_CONN :case ISCSI_UEVENT_DESTROY_CONN :
@@ -3975,7 +3994,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)case ISCSI_UEVENT_START_CONN :case ISCSI_UEVENT_BIND_CONN :case ISCSI_UEVENT_SEND_PDU : - err =iscsi_if_transport_conn (transport, nlh); + err =iscsi_if_transport_conn (transport, nlh, rlen);break ;case ISCSI_UEVENT_GET_STATS : err =iscsi_if_get_stats (transport, nlh);
@@ -3984,23 +4003,22 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)case ISCSI_UEVENT_TRANSPORT_EP_POLL :case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT :case ISCSI_UEVENT_TRANSPORT_EP_CONNECT_THROUGH_HOST : - err =iscsi_if_transport_ep (transport, ev, nlh->nlmsg_type); + err =iscsi_if_transport_ep (transport, ev, nlh->nlmsg_type, rlen);break ;case ISCSI_UEVENT_TGT_DSCVR : - err =iscsi_tgt_dscvr (transport, ev); + err =iscsi_tgt_dscvr (transport, ev, rlen);break ;case ISCSI_UEVENT_SET_HOST_PARAM : - err =iscsi_set_host_param (transport, ev); + err =iscsi_set_host_param (transport, ev, rlen);break ;case ISCSI_UEVENT_PATH_UPDATE : - err =iscsi_set_path (transport, ev); + err =iscsi_set_path (transport, ev, rlen);break ;case ISCSI_UEVENT_SET_IFACE_PARAMS : - err =iscsi_set_iface_params (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_set_iface_params (transport, ev, rlen);break ;case ISCSI_UEVENT_PING : - err =iscsi_send_ping (transport, ev); + err =iscsi_send_ping (transport, ev, rlen);break ;case ISCSI_UEVENT_GET_CHAP : err =iscsi_get_chap (transport, nlh);
@@ -4009,13 +4027,10 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err =iscsi_delete_chap (transport, ev);break ;case ISCSI_UEVENT_SET_FLASHNODE_PARAMS : - err =iscsi_set_flashnode_param (transport, ev, -nlmsg_attrlen (nlh, -sizeof (*ev))); + err =iscsi_set_flashnode_param (transport, ev, rlen);break ;case ISCSI_UEVENT_NEW_FLASHNODE : - err =iscsi_new_flashnode (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_new_flashnode (transport, ev, rlen);break ;case ISCSI_UEVENT_DEL_FLASHNODE : err =iscsi_del_flashnode (transport, ev);
@@ -4030,8 +4045,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err =iscsi_logout_flashnode_sid (transport, ev);break ;case ISCSI_UEVENT_SET_CHAP : - err =iscsi_set_chap (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_set_chap (transport, ev, rlen);break ;case ISCSI_UEVENT_GET_HOST_STATS : err =iscsi_get_host_stats (transport, nlh);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 484/739 scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ce51c817008450ef4188471db31639d42d37a5e1 ]
The functions iscsi_if_set_param() and iscsi_if_set_host_param() convert an nlattr payload to type char* and then call C string handling functions like sscanf and kstrdup:
char *data = (char*)ev + sizeof(*ev); ... sscanf(data, "%d", &value);
However, since the nlattr is provided by the user-space program and the nlmsg skb is allocated with GFP_KERNEL instead of GFP_ZERO flag (see netlink_alloc_large_skb() in netlink_sendmsg()), dirty data on the heap can lead to an OOB access for those string handling functions.
By investigating how the bug is introduced, we find it is really interesting as the old version parsing code starting from commit fd7255f51a13 ("[SCSI] iscsi: add sysfs attrs for uspace sync up") treated the nlattr as integer bytes instead of string and had length check in iscsi_copy_param():
if (ev->u.set_param.len != sizeof(uint32_t))
BUG();But, since the commit a54a52caad4b ("[SCSI] iscsi: fixup set/get param functions"), the code treated the nlattr as C string while forgetting to add any strlen checks(), opening the possibility of an OOB access.
Fix the potential OOB by adding the strlen() check before accessing the buf. If the data passes this check, all low-level set_param handlers can safely treat this buf as legal C string.
--- drivers/scsi/scsi_transport_iscsi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +8 -0
@@ -3030,6 +3030,10 @@ iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev, uif (!conn || !session)return -EINVAL ; +/* data will be regarded as NULL-ended string, do length check */ +if (strlen (data) > ev->u.set_param.len) +return -EINVAL ; +switch (ev->u.set_param.param) {case ISCSI_PARAM_SESS_RECOVERY_TMO :sscanf (data,"%d" , &value);
@@ -3203,6 +3207,10 @@ iscsi_set_host_param(struct iscsi_transport *transport,return -ENODEV ; } +/* see similar check in iscsi_if_set_param() */ +if (strlen (data) > ev->u.set_host_param.len) +return -EINVAL ; + err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len);scsi_host_put (shost);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 485/739 scsi: be2iscsi: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ee0268f230f66cb472df3424f380ea668da2749a ]
beiscsi_iface_set_param() parses nlattr with nla_for_each_attr and assumes every attributes can be viewed as struct iscsi_iface_param_info.
This is not true because there is no any nla_policy to validate the attributes passed from the upper function iscsi_set_iface_params().
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/be2iscsi/be_iscsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/be2iscsi/be_iscsi.c +4 -0
@@ -450,6 +450,10 @@ int beiscsi_iface_set_param(struct Scsi_Host *shost, }nla_for_each_attr (attrib, data, dt_len, rm_len) { +/* ignore nla_type as it is never used */ +if (nla_len (attrib) <sizeof (*iface_param)) +return -EINVAL ; + iface_param =nla_data (attrib);if (iface_param->param_type !=ISCSI_NET_PARAM )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 486/739 scsi: qla4xxx: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 47cd3770e31df942e2bb925a9a855c79ed0662eb ]
There are three places that qla4xxx parses nlattrs:
- qla4xxx_set_chap_entry()
- qla4xxx_iface_set_param()
- qla4xxx_sysfs_ddb_set_param()
and each of them directly converts the nlattr to specific pointer of structure without length checking. This could be dangerous as those attributes are not validated and a malformed nlattr (e.g., length 0) could result in an OOB read that leaks heap dirty data.
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/qla4xxx/ql4_os.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +15 -0
@@ -968,6 +968,11 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)memset (&chap_rec,0 ,sizeof (chap_rec));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*param_info)) { + rc = -EINVAL ; + goto exit_set_chap; + } + param_info =nla_data (attr);switch (param_info->param) {
@@ -2750,6 +2755,11 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len) }nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*iface_param)) { + rval = -EINVAL ; + goto exit_init_fw_cb; + } + iface_param =nla_data (attr);if (iface_param->param_type ==ISCSI_NET_PARAM ) {
@@ -8104,6 +8114,11 @@ qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess,memset ((void *)&chap_tbl,0 ,sizeof (chap_tbl));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*fnode_param)) { + rc = -EINVAL ; + goto exit_set_param; + } + fnode_param =nla_data (attr);switch (fnode_param->param) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 487/739 iio: accel: adxl313: Fix adxl313_i2c_id[] table
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit f636554c4cd1c644109cc525900a056495b86cc9 ]
The .driver_data in adxl313_i2c_id[] for adxl312 and adxl314 is wrong. Fix this issue by adding corresponding adxl31x_chip_info data.
--- drivers/iio/accel/adxl313_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/adxl313_i2c.c +2 -2
@@ -40,8 +40,8 @@ static const struct regmap_config adxl31x_i2c_regmap_config[] = {static const struct i2c_device_id adxl313_i2c_id[] = { { .name ="adxl312" , .driver_data = (kernel_ulong_t)&adxl31x_chip_info[ADXL312 ] }, - { .name ="adxl313" , .driver_data = (kernel_ulong_t)&adxl31x_chip_info[ADXL312 ] }, - { .name ="adxl314" , .driver_data = (kernel_ulong_t)&adxl31x_chip_info[ADXL312 ] }, + { .name ="adxl313" , .driver_data = (kernel_ulong_t)&adxl31x_chip_info[ADXL313 ] }, + { .name ="adxl314" , .driver_data = (kernel_ulong_t)&adxl31x_chip_info[ADXL314 ] }, { } };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 488/739 serial: sprd: Assign sprd_port after initialized to avoid wrong access
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit f9608f1887568b728839d006024585ab02ef29e5 ]
The global pointer 'sprd_port' may not zero when sprd_probe returns failure, that is a risk for sprd_port to be accessed afterward, and may lead to unexpected errors.
For example:
There are two UART ports, UART1 is used for console and configured in kernel command line, i.e. "console=";
The UART1 probe failed and the memory allocated to sprd_port[1] was released, but sprd_port[1] was not set to NULL;
In UART2 probe, the same virtual address was allocated to sprd_port[2], and UART2 probe process finally will go into sprd_console_setup() to register UART1 as console since it is configured as preferred console (filled to console_cmdline[]), but the console parameters (sprd_port[1]) belong to UART2.
So move the sprd_port[] assignment to where the port already initialized can avoid the above issue.
--- drivers/tty/serial/sprd_serial.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/tty/serial/sprd_serial.c +17 -8
@@ -1106,7 +1106,7 @@ static bool sprd_uart_is_console(struct uart_port *uport)static int sprd_clk_init (struct uart_port *uport) {struct clk *clk_uart, *clk_parent; -struct sprd_uart_port *u = sprd_port[uport->line]; + struct sprd_uart_port *u = container_of(uport, struct sprd_uart_port, port); clk_uart =devm_clk_get (uport->dev,"uart" );if (IS_ERR (clk_uart)) {
@@ -1149,22 +1149,22 @@ static int sprd_probe(struct platform_device *pdev) {struct resource *res;struct uart_port *up; +struct sprd_uart_port *sport;int irq;int index;int ret; index =of_alias_get_id (pdev->dev.of_node,"serial" ); -if (index <0 || index >=ARRAY_SIZE (sprd_port)) { +if (index <0 || index >=UART_NR_MAX ) {dev_err (&pdev->dev,"got a wrong serial alias id %d\n" , index);return -EINVAL ; } - sprd_port[index] =devm_kzalloc (&pdev->dev,sizeof (*sprd_port[index]), -GFP_KERNEL ); -if (!sprd_port[index]) + sport =devm_kzalloc (&pdev->dev,sizeof (*sport),GFP_KERNEL ); +if (!sport)return -ENOMEM ; - up = &sprd_port[index]->port; + up = &sport->port; up->dev = &pdev->dev; up->line = index; up->type =PORT_SPRD ;
@@ -1195,7 +1195,7 @@ static int sprd_probe(struct platform_device *pdev)* Allocate one dma buffer to prepare for receive transfer, in case * memory allocation failure at runtime. */ - ret =sprd_rx_alloc_buf (sprd_port[index]); + ret =sprd_rx_alloc_buf (sport);if (ret)return ret;
@@ -1206,14 +1206,23 @@ static int sprd_probe(struct platform_device *pdev)return ret; } } + sprd_ports_num++; + sprd_port[index] = sport; ret =uart_add_one_port (&sprd_uart_driver, up);if (ret) -sprd_remove (pdev); + goto clean_port;platform_set_drvdata (pdev, up); +return 0 ; + +clean_port: + sprd_port[index] =NULL ; +if (--sprd_ports_num ==0 ) +uart_unregister_driver (&sprd_uart_driver); +sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 489/739 serial: sprd: Fix DMA buffer leak issue
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit cd119fdc3ee1450fbf7f78862b5de44c42b6e47f ]
Release DMA buffer when _probe() returns failure to avoid memory leak.
--- drivers/tty/serial/sprd_serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/sprd_serial.c +3 -2
@@ -364,7 +364,7 @@ static void sprd_rx_free_buf(struct sprd_uart_port *sp)if (sp->rx_dma.virt)dma_free_coherent (sp->port.dev,SPRD_UART_RX_SIZE , sp->rx_dma.virt, sp->rx_dma.phys_addr); - + sp->rx_dma.virt =NULL ; }static int sprd_rx_dma_config (struct uart_port *port,u32 burst)
@@ -1203,7 +1203,7 @@ static int sprd_probe(struct platform_device *pdev) ret =uart_register_driver (&sprd_uart_driver);if (ret <0 ) {pr_err ("Failed to register SPRD-UART driver\n" ); -return ret; + goto free_rx_buf; } }
@@ -1222,6 +1222,7 @@ static int sprd_probe(struct platform_device *pdev) sprd_port[index] =NULL ;if (--sprd_ports_num ==0 )uart_unregister_driver (&sprd_uart_driver); +free_rx_buf:sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 490/739 x86/APM: drop the duplicate APM_MINOR_DEV macro
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 4ba2909638a29630a346d6c4907a3105409bee7d ]
This source file already includes <linux/miscdevice.h>, which contains the same macro. It doesn't need to be defined here again.
--- arch/x86/kernel/apm_32.c | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/kernel/apm_32.c +0 -6
@@ -238,12 +238,6 @@extern int (*console_blank_hook)(int );#endif -/* -* The apm_bios device is one of the misc char devices. -* This is its minor number. -*/ -#define APM_MINOR_DEV 134 -/* * Various options can be changed at boot time as follows: * (We allow underscores for compatibility with the modules code)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 491/739 RDMA/rxe: Move work queue code to subroutines
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Pearson <[email protected]>
[ Upstream commit e0ba8ff46704fc924e2ef0451ba196cbdc0d68f2 ]
This patch:
- Moves code to initialize a qp send work queue to a subroutine named rxe_init_sq.
- Moves code to initialize a qp recv work queue to a subroutine named rxe_init_rq.
- Moves initialization of qp request and response packet queues ahead of work queue initialization so that cleanup of a qp if it is not fully completed can successfully attempt to drain the packet queues without a seg fault.
- Makes minor whitespace cleanups.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 159 ++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 51 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +108 -51
@@ -183,13 +183,63 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp,atomic_set (&qp->skb_out,0 ); } +static int rxe_init_sq (struct rxe_qp *qp,struct ib_qp_init_attr *init, +struct ib_udata *udata, +struct rxe_create_qp_resp __user *uresp) +{ +struct rxe_dev *rxe =to_rdev (qp->ibqp.device); +int wqe_size; +int err; + + qp->sq.max_wr = init->cap.max_send_wr; + wqe_size =max_t (int, init->cap.max_send_sge *sizeof (struct ib_sge ), + init->cap.max_inline_data); + qp->sq.max_sge = wqe_size /sizeof (struct ib_sge ); + qp->sq.max_inline = wqe_size; + wqe_size +=sizeof (struct rxe_send_wqe ); + + qp->sq.queue =rxe_queue_init (rxe, &qp->sq.max_wr, wqe_size, +QUEUE_TYPE_FROM_CLIENT ); +if (!qp->sq.queue) { +rxe_err_qp (qp,"Unable to allocate send queue" ); + err = -ENOMEM ; + goto err_out; + } + +/* prepare info for caller to mmap send queue if user space qp */ + err =do_mmap_info (rxe, uresp ? &uresp->sq_mi :NULL , udata, + qp->sq.queue->buf, qp->sq.queue->buf_size, + &qp->sq.queue->ip); +if (err) { +rxe_err_qp (qp,"do_mmap_info failed, err = %d" , err); + goto err_free; + } + +/* return actual capabilities to caller which may be larger +* than requested +*/ + init->cap.max_send_wr = qp->sq.max_wr; + init->cap.max_send_sge = qp->sq.max_sge; + init->cap.max_inline_data = qp->sq.max_inline; + +return 0 ; + +err_free: +vfree (qp->sq.queue->buf); +kfree (qp->sq.queue); + qp->sq.queue =NULL ; +err_out: +return err; +} +static int rxe_qp_init_req (struct rxe_dev *rxe,struct rxe_qp *qp,struct ib_qp_init_attr *init,struct ib_udata *udata,struct rxe_create_qp_resp __user *uresp) {int err; -int wqe_size; -enum queue_type type; + +/* if we don't finish qp create make sure queue is valid */ +skb_queue_head_init (&qp->req_pkts); err =sock_create_kern (&init_net,AF_INET ,SOCK_DGRAM ,0 , &qp->sk);if (err <0 )
@@ -204,32 +254,10 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp,* (0xc000 - 0xffff). */ qp->src_port =RXE_ROCE_V2_SPORT + (hash_32 (qp_num (qp),14 ) &0x3fff ); - qp->sq.max_wr = init->cap.max_send_wr; - -/* These caps are limited by rxe_qp_chk_cap() done by the caller */ - wqe_size =max_t (int, init->cap.max_send_sge *sizeof (struct ib_sge ), - init->cap.max_inline_data); - qp->sq.max_sge = init->cap.max_send_sge = - wqe_size /sizeof (struct ib_sge ); - qp->sq.max_inline = init->cap.max_inline_data = wqe_size; - wqe_size +=sizeof (struct rxe_send_wqe ); - type =QUEUE_TYPE_FROM_CLIENT ; - qp->sq.queue =rxe_queue_init (rxe, &qp->sq.max_wr, - wqe_size, type); -if (!qp->sq.queue) -return -ENOMEM ; - - err =do_mmap_info (rxe, uresp ? &uresp->sq_mi :NULL , udata, - qp->sq.queue->buf, qp->sq.queue->buf_size, - &qp->sq.queue->ip); - -if (err) { -vfree (qp->sq.queue->buf); -kfree (qp->sq.queue); - qp->sq.queue =NULL ; + err =rxe_init_sq (qp, init, udata, uresp); +if (err)return err; - } qp->req.wqe_index =queue_get_producer (qp->sq.queue,QUEUE_TYPE_FROM_CLIENT );
@@ -248,36 +276,65 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp,return 0 ; } +static int rxe_init_rq (struct rxe_qp *qp,struct ib_qp_init_attr *init, +struct ib_udata *udata, +struct rxe_create_qp_resp __user *uresp) +{ +struct rxe_dev *rxe =to_rdev (qp->ibqp.device); +int wqe_size; +int err; + + qp->rq.max_wr = init->cap.max_recv_wr; + qp->rq.max_sge = init->cap.max_recv_sge; + wqe_size =sizeof (struct rxe_recv_wqe ) + + qp->rq.max_sge*sizeof (struct ib_sge ); + + qp->rq.queue =rxe_queue_init (rxe, &qp->rq.max_wr, wqe_size, +QUEUE_TYPE_FROM_CLIENT ); +if (!qp->rq.queue) { +rxe_err_qp (qp,"Unable to allocate recv queue" ); + err = -ENOMEM ; + goto err_out; + } + +/* prepare info for caller to mmap recv queue if user space qp */ + err =do_mmap_info (rxe, uresp ? &uresp->rq_mi :NULL , udata, + qp->rq.queue->buf, qp->rq.queue->buf_size, + &qp->rq.queue->ip); +if (err) { +rxe_err_qp (qp,"do_mmap_info failed, err = %d" , err); + goto err_free; + } + +/* return actual capabilities to caller which may be larger +* than requested +*/ + init->cap.max_recv_wr = qp->rq.max_wr; + +return 0 ; + +err_free: +vfree (qp->rq.queue->buf); +kfree (qp->rq.queue); + qp->rq.queue =NULL ; +err_out: +return err; +} +static int rxe_qp_init_resp (struct rxe_dev *rxe,struct rxe_qp *qp,struct ib_qp_init_attr *init,struct ib_udata *udata,struct rxe_create_qp_resp __user *uresp) {int err; -int wqe_size; -enum queue_type type; + +/* if we don't finish qp create make sure queue is valid */ +skb_queue_head_init (&qp->resp_pkts);if (!qp->srq) { - qp->rq.max_wr = init->cap.max_recv_wr; - qp->rq.max_sge = init->cap.max_recv_sge; - - wqe_size =rcv_wqe_size (qp->rq.max_sge); - - type =QUEUE_TYPE_FROM_CLIENT ; - qp->rq.queue =rxe_queue_init (rxe, &qp->rq.max_wr, - wqe_size, type); -if (!qp->rq.queue) -return -ENOMEM ; - - err =do_mmap_info (rxe, uresp ? &uresp->rq_mi :NULL , udata, - qp->rq.queue->buf, qp->rq.queue->buf_size, - &qp->rq.queue->ip); -if (err) { -vfree (qp->rq.queue->buf); -kfree (qp->rq.queue); - qp->rq.queue =NULL ; + err =rxe_init_rq (qp, init, udata, uresp); +if (err)return err; - } }rxe_init_task (&qp->resp.task, qp, rxe_responder);
@@ -307,10 +364,10 @@ int rxe_qp_from_init(struct rxe_dev *rxe, struct rxe_qp *qp, struct rxe_pd *pd,if (srq)rxe_get (srq); - qp->pd = pd; - qp->rcq = rcq; - qp->scq = scq; - qp->srq = srq; + qp->pd = pd; + qp->rcq = rcq; + qp->scq = scq; + qp->srq = srq;atomic_inc (&rcq->num_wq);atomic_inc (&scq->num_wq);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 492/739 RDMA/rxe: Fix unsafe drain work queue code
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Pearson <[email protected]>
[ Upstream commit 5993b75d0bc71cd2b441d174b028fc36180f032c ]
If create_qp does not fully succeed it is possible for qp cleanup code to attempt to drain the send or recv work queues before the queues have been created causing a seg fault. This patch checks to see if the queues exist before attempting to drain them.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 4 ++++ drivers/infiniband/sw/rxe/rxe_resp.c | 4 ++++ 2 files changed, 8 insertions(+)
drivers/infiniband/sw/rxe/rxe_comp.c +4 -0
@@ -597,6 +597,10 @@ static void flush_send_queue(struct rxe_qp *qp, bool notify)struct rxe_queue *q = qp->sq.queue;int err; +/* send queue never got created. nothing to do. */ +if (!qp->sq.queue) +return ; +while ((wqe =queue_head (q, q->type))) {if (notify) { err =flush_send_wqe (qp, wqe);
drivers/infiniband/sw/rxe/rxe_resp.c +4 -0
@@ -1469,6 +1469,10 @@ static void flush_recv_queue(struct rxe_qp *qp, bool notify)return ; } +/* recv queue not created. nothing to do. */ +if (!qp->rq.queue) +return ; +while ((wqe =queue_head (q, q->type))) {if (notify) { err =flush_recv_wqe (qp, wqe);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 493/739 RDMA/rxe: Fix rxe_modify_srq
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Pearson <[email protected]>
[ Upstream commit cc28f351155def8db209647f2e20a59a7080825b ]
This patch corrects an error in rxe_modify_srq where if the caller changes the srq size the actual new value is not returned to the caller since it may be larger than what is requested. Additionally it open codes the subroutine rcv_wqe_size() which adds very little value, and makes some whitespace changes.
--- drivers/infiniband/sw/rxe/rxe_loc.h | 6 --- drivers/infiniband/sw/rxe/rxe_srq.c | 60 +++++++++++++++++------------ 2 files changed, 36 insertions(+), 30 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +0 -6
@@ -136,12 +136,6 @@ static inline int qp_mtu(struct rxe_qp *qp)return IB_MTU_4096 ; } -static inline int rcv_wqe_size (int max_sge) -{ -return sizeof (struct rxe_recv_wqe ) + - max_sge *sizeof (struct ib_sge ); -} -void free_rd_atomic_resource (struct resp_res *res);static inline void rxe_advance_resp_resource (struct rxe_qp *qp)
drivers/infiniband/sw/rxe/rxe_srq.c +36 -24
110 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 494/739 RDMA/rxe: Fix incomplete state save in rxe_requester
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Pearson <[email protected]>
[ Upstream commit 5d122db2ff80cd2aed4dcd630befb56b51ddf947 ]
If a send packet is dropped by the IP layer in rxe_requester() the call to rxe_xmit_packet() can fail with err == -EAGAIN. To recover, the state of the wqe is restored to the state before the packet was sent so it can be resent. However, the routines that save and restore the state miss a significnt part of the variable state in the wqe, the dma struct which is used to process through the sge table. And, the state is not saved before the packet is built which modifies the dma struct.
Under heavy stress testing with many QPs on a fast node sending large messages to a slow node dropped packets are observed and the resent packets are corrupted because the dma struct was not restored. This patch fixes this behavior and allows the test cases to succeed.
--- drivers/infiniband/sw/rxe/rxe_req.c | 45 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 20 deletions(-)
drivers/infiniband/sw/rxe/rxe_req.c +25 -20
@@ -578,10 +578,11 @@ static void save_state(struct rxe_send_wqe *wqe,struct rxe_send_wqe *rollback_wqe, u32 *rollback_psn) { - rollback_wqe->state = wqe->state; + rollback_wqe->state = wqe->state; rollback_wqe->first_psn = wqe->first_psn; - rollback_wqe->last_psn = wqe->last_psn; - *rollback_psn = qp->req.psn; + rollback_wqe->last_psn = wqe->last_psn; + rollback_wqe->dma = wqe->dma; + *rollback_psn = qp->req.psn; } static void rollback_state(struct rxe_send_wqe *wqe,
@@ -589,10 +590,11 @@ static void rollback_state(struct rxe_send_wqe *wqe, struct rxe_send_wqe *rollback_wqe, u32 rollback_psn) { - wqe->state = rollback_wqe->state; + wqe->state = rollback_wqe->state; wqe->first_psn = rollback_wqe->first_psn; - wqe->last_psn = rollback_wqe->last_psn; - qp->req.psn = rollback_psn; + wqe->last_psn = rollback_wqe->last_psn; + wqe->dma = rollback_wqe->dma; + qp->req.psn = rollback_psn; }static void update_state (struct rxe_qp *qp,struct rxe_pkt_info *pkt)
@@ -797,6 +799,9 @@ int rxe_requester(struct rxe_qp *qp) pkt.mask = rxe_opcode[opcode].mask; pkt.wqe = wqe; +/* save wqe state before we build and send packet */ +save_state (wqe, qp, &rollback_wqe, &rollback_psn); + av =rxe_get_av (&pkt, &ah);if (unlikely (!av)) {rxe_dbg_qp (qp,"Failed no address vector\n" );
@@ -829,29 +834,29 @@ int rxe_requester(struct rxe_qp *qp)if (ah)rxe_put (ah); -/* -* To prevent a race on wqe access between requester and completer, -* wqe members state and psn need to be set before calling -* rxe_xmit_packet(). -* Otherwise, completer might initiate an unjustified retry flow. -*/ -save_state (wqe, qp, &rollback_wqe, &rollback_psn); +/* update wqe state as though we had sent it */ update_wqe_state (qp, wqe, &pkt);update_wqe_psn (qp, wqe, &pkt, payload); err =rxe_xmit_packet (qp, &pkt, skb);if (err) { - qp->need_req_skb =1 ; +if (err != -EAGAIN ) { + wqe->status =IB_WC_LOC_QP_OP_ERR ; + goto err; + } +/* the packet was dropped so reset wqe to the state +* before we sent it so we can try to resend +*/ rollback_state (wqe, qp, &rollback_wqe, rollback_psn); -if (err == -EAGAIN ) { -rxe_sched_task (&qp->req.task); - goto exit; - } +/* force a delay until the dropped packet is freed and +* the send queue is drained below the low water mark +*/ + qp->need_req_skb =1 ; - wqe->status =IB_WC_LOC_QP_OP_ERR ; - goto err; +rxe_sched_task (&qp->req.task); + goto exit; }update_state (qp, &pkt);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 495/739 scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 7d3d20dee4f648ec44e9717d5f647d594d184433 ]
The qedf_dbg_stop_io_on_error_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -185,18 +185,17 @@ qedf_dbg_stop_io_on_error_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { int cnt; +char cbuf[7 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;struct qedf_ctx *qedf =container_of (qedf_dbg, struct qedf_ctx, dbg_ctx);QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"%s\n" , + cnt =scnprintf (cbuf,sizeof (cbuf),"%s\n" , qedf->stop_io_on_error ?"true" :"false" ); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 496/739 scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 31b5991a9a91ba97237ac9da509d78eec453ff72 ]
The qedf_dbg_debug_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -138,15 +138,14 @@ qedf_dbg_debug_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) {int cnt; +char cbuf[32 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"debug mask=0x%x\n" , qedf_debug); - cnt =sprintf (buffer,"debug mask = 0x%x\n" , qedf_debug); + cnt =scnprintf (cbuf,sizeof (cbuf),"debug mask = 0x%x\n" , qedf_debug); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 497/739 scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 25dbc20deab5165f847b4eb42f376f725a986ee8 ]
The qedf_dbg_fp_int_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by vmalloc()'ating a buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_dbg.h | 2 ++ drivers/scsi/qedf/qedf_debugfs.c | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-)
drivers/scsi/qedf/qedf_dbg.h +2 -0
@@ -59,6 +59,8 @@ extern uint qedf_debug;#define QEDF_LOG_NOTICE 0x40000000/* Notice logs */ #define QEDF_LOG_WARN 0x80000000/* Warning logs */ +#define QEDF_DEBUGFS_LOG_LEN (2 * PAGE_SIZE) +/* Debug context structure */ struct qedf_dbg_ctx {unsigned int host_no;
drivers/scsi/qedf/qedf_debugfs.c +15 -6
@@ -8,6 +8,7 @@#include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/module.h> +#include <linux/vmalloc.h> #include "qedf.h" #include "qedf_dbg.h"
@@ -98,7 +99,9 @@ static ssize_t qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { + ssize_t ret;size_t cnt =0 ; +char *cbuf;int id;struct qedf_fastpath *fp =NULL ; struct qedf_dbg_ctx *qedf_dbg =
@@ -108,19 +111,25 @@ qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count,QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"\nFastpath I/O completions\n\n" ); + cbuf =vmalloc (QEDF_DEBUGFS_LOG_LEN ); +if (!cbuf) +return 0 ; + + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt,"\nFastpath I/O completions\n\n" );for (id =0 ; id < qedf->num_queues; id++) { fp = &(qedf->fp_array[id]);if (fp->sb_id ==QEDF_SB_ID_NULL )continue ; - cnt +=sprintf ((buffer + cnt),"#%d: %lu\n" , id, - fp->completions); + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt, +"#%d: %lu\n" , id, fp->completions); } - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; + ret =simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); + +vfree (cbuf); + +return ret; } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 498/739 RDMA/irdma: Replace one-element array with flexible-array member
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 38313c6d2a02c28162e06753b01bd885caf9386d ]
One-element and zero-length arrays are deprecated. So, replace one-element array in struct irdma_qvlist_info with flexible-array member.
A patch for this was sent a while ago[1]. However, it seems that, at the time, the changes were partially folded[2][3], and the actual flexible-array transformation was omitted. This patch fixes that.
The only binary difference seen before/after changes is shown below:
| drivers/infiniband/hw/irdma/hw.o | @@ -868,7 +868,7 @@ | drivers/infiniband/hw/irdma/hw.c:484 (discriminator 2) | size += struct_size(iw_qvlist, qv_info, rf->msix_count); | 55b: imul $0x45c,%rdi,%rdi |- 562: add $0x10,%rdi |+ 562: add $0x4,%rdi
which is, of course, expected as it reflects the mistake made while folding the patch I've mentioned above.
Worth mentioning is the fact that with this change we save 12 bytes of memory, as can be inferred from the diff snapshot above. Notice that:
$ pahole -C rdma_qv_info idrivers/infiniband/hw/irdma/hw.o
struct irdma_qv_info {
u32 v_idx; /* 0 4 */
u16 ceq_idx; /* 4 2 */
u16 aeq_idx; /* 6 2 */
u8 itr_idx; /* 8 1 *//* size: 12, cachelines: 1, members: 4 */ /* padding: 3 */ /* last cacheline: 12 bytes */ };
--- drivers/infiniband/hw/irdma/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/irdma/main.h +1 -1
@@ -239,7 +239,7 @@ struct irdma_qv_info {struct irdma_qvlist_info {u32 num_vectors; -struct irdma_qv_info qv_info[1 ]; +struct irdma_qv_info qv_info[]; };struct irdma_gen_ops {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 499/739 coresight: tmc: Explicit type conversions to prevent integer overflow
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruidong Tian <[email protected]>
[ Upstream commit fd380097cdb305582b7a1f9476391330299d2c59 ]
Perf cs_etm session executed unexpectedly when AUX buffer > 1G.
perf record -C 0 -m ,2G -e cs_etm// -- <workload> [ perf record: Captured and wrote 2.615 MB perf.data ]
Perf only collect about 2M perf data rather than 2G. This is becasuse the operation, "nr_pages << PAGE_SHIFT", in coresight tmc driver, will overflow when nr_pages >= 0x80000(correspond to 1G AUX buffer). The overflow cause buffer allocation to fail, and TMC driver will alloc minimal buffer size(1M). You can just get about 2M perf data(1M AUX buffer + perf data header) at least.
Explicit convert nr_pages to 64 bit to avoid overflow.
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +++-- drivers/hwtracing/coresight/coresight-tmc.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -452,7 +452,7 @@ static int tmc_set_etf_buffer(struct coresight_device *csdev,return -EINVAL ;/* wrap head around to the amount of space we have */ - head = handle->head & ((buf->nr_pages <<PAGE_SHIFT ) -1 ); + head = handle->head & (((unsigned long )buf->nr_pages <<PAGE_SHIFT ) -1 );/* find the page to write to */ buf->cur = head /PAGE_SIZE ;
drivers/hwtracing/coresight/coresight-tmc-etr.c +3 -2
@@ -45,7 +45,8 @@ struct etr_perf_buffer { };/* Convert the perf index to an offset within the ETR buffer */ -#define PERF_IDX2OFF (idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT)) +#define PERF_IDX2OFF (idx, buf) \ + ((idx) % ((unsigned long)(buf)->nr_pages << PAGE_SHIFT))/* Lower limit for ETR hardware buffer */ #define TMC_ETR_PERF_MIN_BUF_SIZE SZ_1M
@@ -1267,7 +1268,7 @@ alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,* than the size requested via sysfs. */ if ((nr_pages <<PAGE_SHIFT ) > drvdata->size) { - etr_buf =tmc_alloc_etr_buf (drvdata, (nr_pages <<PAGE_SHIFT ), + etr_buf =tmc_alloc_etr_buf (drvdata, ((ssize_t )nr_pages <<PAGE_SHIFT ),0 , node,NULL );if (!IS_ERR (etr_buf)) goto done;
drivers/hwtracing/coresight/coresight-tmc.h +1 -1
@@ -325,7 +325,7 @@ ssize_t tmc_sg_table_get_data(struct tmc_sg_table *sg_table,static inline unsigned long tmc_sg_table_buf_size (struct tmc_sg_table *sg_table) { -return sg_table->data_pages.nr_pages <<PAGE_SHIFT ; +return (unsigned long )sg_table->data_pages.nr_pages <<PAGE_SHIFT ; }struct coresight_device *tmc_etr_get_catu_device (struct tmc_drvdata *drvdata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 500/739 interconnect: qcom: qcm2290: Enable sync state
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 4e048e9b7a160f7112069c0ec2947be15f3e8154 ]
Enable the generic .sync_state callback to ensure there are no outstanding votes that would waste power.
Generally one would need a bunch of interface clocks to access the QoS registers when trying to go over all possible nodes during sync_state, but QCM2290 surprisingly does not seem to require any such handling.
--- drivers/interconnect/qcom/qcm2290.c | 1 + 1 file changed, 1 insertion(+)
drivers/interconnect/qcom/qcm2290.c +1 -0
@@ -1355,6 +1355,7 @@ static struct platform_driver qcm2290_noc_driver = { .driver = { .name = "qnoc-qcm2290", .of_match_table = qcm2290_noc_of_match, + .sync_state = icc_sync_state, }, };module_platform_driver (qcm2290_noc_driver);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 501/739 dma-buf/sync_file: Fix docs syntax
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 05d56d8079d510a2994039470f65bea85f0075ee ]
Fixes the warning:
include/uapi/linux/sync_file.h:77: warning: Function parameter or member 'num_fences' not described in 'sync_file_info'
--- include/uapi/linux/sync_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/sync_file.h +1 -1
@@ -56,7 +56,7 @@ struct sync_fence_info {* @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error * @flags: sync_file_info flags -* @num_fences number of fences in the sync_file +* @num_fences: number of fences in the sync_file * @pad: padding for 64-bit alignment, should always be zero * @sync_fence_info: pointer to array of struct &sync_fence_info with all * fences in the sync_file
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 502/739 driver core: test_async: fix an error code
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 22d2381bbd70a5853c2ee77522f4965139672db9 ]
The test_platform_device_register_node() function should return error pointers instead of NULL. That is what the callers are expecting.
--- drivers/base/test/test_async_driver_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/test/test_async_driver_probe.c +1 -1
@@ -84,7 +84,7 @@ test_platform_device_register_node(char *name, int id, int nid) pdev =platform_device_alloc (name, id);if (!pdev) -return NULL ; +return ERR_PTR (-ENOMEM );if (nid !=NUMA_NO_NODE )set_dev_node (&pdev->dev, nid);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 503/739 driver core: Call dma_cleanup() on the test_remove path
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit f429378a9bf84d79a7e2cae05d2e3384cf7d68ba ]
When test_remove is enabled really_probe() does not properly pair dma_configure() with dma_remove(), it will end up calling dma_configure() twice. This corrupts the owner_cnt and renders the group unusable with VFIO/etc.
Add the missing cleanup before going back to re_probe.
--- drivers/base/dd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/dd.c +2 -0
@@ -693,6 +693,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)device_remove (dev);driver_sysfs_remove (dev); +if (dev->bus && dev->bus->dma_cleanup) + dev->bus->dma_cleanup (dev);device_unbind_cleanup (dev); goto re_probe;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 504/739 kernfs: add stub helper for kernfs_generic_poll()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 79038a99445f69c5d28494dd4f8c6f0509f65b2e ]
In some randconfig builds, kernfs ends up being disabled, so there is no prototype for kernfs_generic_poll()
In file included from kernel/sched/build_utility.c:97:kernel/sched/psi.c:1479:3: error: implicit declaration of function 'kernfs_generic_poll' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
kernfs_generic_poll(t->of, wait);
^Add a stub helper for it, as we have it for other kernfs functions.
--- include/linux/kernfs.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/kernfs.h +4 -0
@@ -550,6 +550,10 @@ static inline int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr) {return -ENOSYS ; } +static inline __poll_t kernfs_generic_poll (struct kernfs_open_file *of, +struct poll_table_struct *pt) +{return -ENOSYS ; } +static inline void kernfs_notify (struct kernfs_node *kn) { } static inline int kernfs_xattr_get(struct kernfs_node *kn, const char *name,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 505/739 extcon: cht_wc: add POWER_SUPPLY dependency
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit d20a3a8a32e3fa564ff25da860c5fc1a97642dfe ]
The driver fails to link when CONFIG_POWER_SUPPLY is disabled:
x86_64-linux-ld: vmlinux.o: in function `cht_wc_extcon_psy_get_prop':
extcon-intel-cht-wc.c:(.text+0x15ccda7): undefined reference to `power_supply_get_drvdata'
x86_64-linux-ld: vmlinux.o: in function `cht_wc_extcon_pwrsrc_event':
extcon-intel-cht-wc.c:(.text+0x15cd3e9): undefined reference to `power_supply_changed'
x86_64-linux-ld: vmlinux.o: in function `cht_wc_extcon_probe':
extcon-intel-cht-wc.c:(.text+0x15cd596): undefined reference to `devm_power_supply_register'
It should be possible to change the driver to not require this at compile time and still provide other functions, but adding a hard Kconfig dependency does not seem to have any practical downsides and is simpler since the option is normally enabled anyway.
--- drivers/extcon/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/extcon/Kconfig +1 -0
@@ -62,6 +62,7 @@ config EXTCON_INTEL_CHT_WC tristate "Intel Cherrytrail Whiskey Cove PMIC extcon driver" depends on INTEL_SOC_PMIC_CHTWC depends on USB_SUPPORT + depends on POWER_SUPPLY select USB_ROLE_SWITCH help Say Y here to enable extcon support for charger detection / control
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 506/739 iommu/mediatek: Fix two IOMMU share pagetable issue
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengci.Xu <[email protected]>
[ Upstream commit cf69ef46dbd980a0b1c956d668e066a73e0acd0f ]
Prepare for mt8188 to fix a two IOMMU HWs share pagetable issue.
We have two MM IOMMU HWs in mt8188, one is VPP-IOMMU, the other is VDO-IOMMU. The 2 MM IOMMU HWs share pagetable don't work in this case:
a) VPP-IOMMU probe firstly.
b) VDO-IOMMU probe.
c) The master for VDO-IOMMU probe (means frstdata is vpp-iommu).
d) The master in another domain probe. No matter it is vdo or vpp.
Then it still create a new pagetable in step d). The problem is "frstdata->bank[0]->m4u_dom" was not initialized. Then when d) enter, it still create a new one.
In this patch, we create a new variable "share_dom" for this share pgtable case, it should be helpful for readable. and put all the share pgtable logic in the mtk_iommu_domain_finalise.
In mt8195, the master of VPP-IOMMU probes before than VDO-IOMMU from its dtsi node sequence, we don't see this issue in it. Prepare for mt8188.
--- drivers/iommu/mtk_iommu.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/iommu/mtk_iommu.c +14 -8
@@ -258,6 +258,8 @@ struct mtk_iommu_data {struct device *smicomm_dev;struct mtk_iommu_bank_data *bank; +struct mtk_iommu_domain *share_dom;/* For 2 HWs share pgtable */ +struct regmap *pericfg;struct mutex mutex;/* Protect m4u_group/m4u_dom above */
@@ -620,15 +622,14 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,struct mtk_iommu_data *data, unsigned int region_id) { + struct mtk_iommu_domain *share_dom = data->share_dom;const struct mtk_iommu_iova_region *region; -struct mtk_iommu_domain *m4u_dom; - -/* Always use bank0 in sharing pgtable case */ - m4u_dom = data->bank[0 ].m4u_dom; -if (m4u_dom) { - dom->iop = m4u_dom->iop; - dom->cfg = m4u_dom->cfg; - dom->domain.pgsize_bitmap = m4u_dom->cfg.pgsize_bitmap; + +/* Always use share domain in sharing pgtable case */ +if (MTK_IOMMU_HAS_FLAG (data->plat_data,SHARE_PGTABLE ) && share_dom) { + dom->iop = share_dom->iop; + dom->cfg = share_dom->cfg; + dom->domain.pgsize_bitmap = share_dom->cfg.pgsize_bitmap; goto update_iova_region; }
@@ -658,6 +659,9 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,/* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,SHARE_PGTABLE )) + data->share_dom = dom; + update_iova_region:/* Update the iova region for this domain */ region = data->plat_data->iova_region + region_id;
@@ -708,7 +712,9 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_frst_data (hw_list); +mutex_lock (&frstdata->mutex); ret =mtk_iommu_domain_finalise (dom, frstdata, region_id); +mutex_unlock (&frstdata->mutex);if (ret) {mutex_unlock (&dom->mutex);return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 507/739 iommu/sprd: Add missing force_aperture
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit d48a51286c698f7fe8efc688f23a532f4fe9a904 ]
force_aperture was intended to false only by GART drivers that have an identity translation outside the aperture. This does not describe sprd, so add the missing 'force_aperture = true'.
--- drivers/iommu/sprd-iommu.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/sprd-iommu.c +1 -0
@@ -148,6 +148,7 @@ static struct iommu_domain *sprd_iommu_domain_alloc(unsigned int domain_type) dom->domain.geometry.aperture_start =0 ; dom->domain.geometry.aperture_end =SZ_256M -1 ; + dom->domain.geometry.force_aperture = true;return &dom->domain; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 508/739 iommu: Remove kernel-doc warnings
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Wang <[email protected]>
[ Upstream commit 6b7867b5b8a6b14c487bf04a693ab424c7a8718d ]
Remove kernel-doc warnings:
drivers/iommu/iommu.c:3261: warning: Function parameter or member 'group' not described in 'iommu_group_release_dma_owner' drivers/iommu/iommu.c:3261: warning: Excess function parameter 'dev' description in 'iommu_group_release_dma_owner' drivers/iommu/iommu.c:3275: warning: Function parameter or member 'dev' not described in 'iommu_device_release_dma_owner' drivers/iommu/iommu.c:3275: warning: Excess function parameter 'group' description in 'iommu_device_release_dma_owner'
--- drivers/iommu/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/iommu.c +2 -2
@@ -3203,7 +3203,7 @@ static void __iommu_release_dma_ownership(struct iommu_group *group)/** * iommu_group_release_dma_owner() - Release DMA ownership of a group -* @dev: The device +* @group: The group * * Release the DMA ownership claimed by iommu_group_claim_dma_owner(). */
@@ -3217,7 +3217,7 @@ EXPORT_SYMBOL_GPL(iommu_group_release_dma_owner);/** * iommu_device_release_dma_owner() - Release DMA ownership of a device -* @group: The device. +* @dev: The device. * * Release the DMA ownership claimed by iommu_device_claim_dma_owner(). */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 509/739 bnxt_en: Update HW interface headers
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandramohan Akula <[email protected]>
[ Upstream commit cf1694f09894e760f4e2cf068ee6519d11cd0ede ]
Updating the HW structures for the doorbell pacing related information. Newly added interface structures will be used in the followup patches.
Stable-dep-of: f19fba1f79dc ("RDMA/bnxt_re: Fix max_qp count for virtual functions")
--- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h +54 -0
@@ -3721,6 +3721,60 @@ struct hwrm_func_backing_store_qcaps_v2_output {u8 valid; }; +/* hwrm_func_dbr_pacing_qcfg_input (size:128b/16B) */ +struct hwrm_func_dbr_pacing_qcfg_input { +__le16 req_type; +__le16 cmpl_ring; +__le16 seq_id; +__le16 target_id; +__le64 resp_addr; +}; + +/* hwrm_func_dbr_pacing_qcfg_output (size:512b/64B) */ +struct hwrm_func_dbr_pacing_qcfg_output { +__le16 error_code; +__le16 req_type; +__le16 seq_id; +__le16 resp_len; +u8 flags; +#define FUNC_DBR_PACING_QCFG_RESP_FLAGS_DBR_NQ_EVENT_ENABLED 0x1UL +u8 unused_0[7 ]; +__le32 dbr_stat_db_fifo_reg; +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_MASK 0x3UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_SFT 0 +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_PCIE_CFG 0x0UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_GRC 0x1UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR0 0x2UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR1 0x3UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_LAST \ + FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR1 +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_MASK 0xfffffffcUL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SFT 2 +__le32 dbr_stat_db_fifo_reg_watermark_mask; +u8 dbr_stat_db_fifo_reg_watermark_shift; +u8 unused_1[3 ]; +__le32 dbr_stat_db_fifo_reg_fifo_room_mask; +u8 dbr_stat_db_fifo_reg_fifo_room_shift; +u8 unused_2[3 ]; +__le32 dbr_throttling_aeq_arm_reg; +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_MASK 0x3UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_SFT 0 +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_PCIE_CFG 0x0UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_GRC 0x1UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR0 0x2UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR1 0x3UL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_LAST \ + FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR1 +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_MASK 0xfffffffcUL +#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SFT 2 +u8 dbr_throttling_aeq_arm_reg_val; +u8 unused_3[7 ]; +__le32 primary_nq_id; +__le32 pacing_threshold; +u8 unused_4[7 ]; +u8 valid; +}; +/* hwrm_func_drv_if_change_input (size:192b/24B) */ struct hwrm_func_drv_if_change_input {__le16 req_type;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 510/739 bnxt_en: Share the bar0 address with the RoCE driver
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandramohan Akula <[email protected]>
[ Upstream commit 61220e098e858951f1926d66c1490a96351e1c85 ]
Add a parameter in the bnxt_en_dev structure to share the bar0 address with RoCE driver.
Stable-dep-of: f19fba1f79dc ("RDMA/bnxt_re: Fix max_qp count for virtual functions")
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +1 -1
@@ -345,7 +345,7 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp) edev->hw_ring_stats_size = bp->hw_ring_stats_size; edev->pf_port_id = bp->pf.port_id; edev->en_state = bp->state; - + edev->bar0 = bp->bar0; edev->ulp_tbl->msix_requested =bnxt_get_ulp_msix_num (bp); }
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +1 -0
@@ -81,6 +81,7 @@ struct bnxt_en_dev {* mode only. Will be * updated in resume. */ +void __iomem *bar0; };static inline bool bnxt_ulp_registered (struct bnxt_en_dev *edev)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 511/739 RDMA/bnxt_re: Initialize Doorbell pacing feature
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandramohan Akula <[email protected]>
[ Upstream commit 586e613d37ec35572a332839973b9c3bccd0c545 ]
Checks for pacing feature capability and get the doorbell pacing configuration using FW commands. Allocate a page and initialize the pacing parameters for the applications. Cleanup the page and de-initialize the pacing during device removal.
Stable-dep-of: f19fba1f79dc ("RDMA/bnxt_re: Fix max_qp count for virtual functions")
--- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 22 ++++++ drivers/infiniband/hw/bnxt_re/main.c | 96 +++++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_res.h | 19 +++++ 3 files changed, 137 insertions(+)
drivers/infiniband/hw/bnxt_re/bnxt_re.h +22 -0
@@ -112,6 +112,27 @@ struct bnxt_re_gsi_context {#define BNXT_RE_NQ_IDX 1#define BNXT_RE_GEN_P5_MAX_VF 64 +struct bnxt_re_pacing { +u64 dbr_db_fifo_reg_off; +void *dbr_page; +u64 dbr_bar_addr; +u32 pacing_algo_th; +u32 do_pacing_save; +u32 dbq_pacing_time;/* ms */ +u32 dbr_def_do_pacing; +bool dbr_pacing; +}; + +#define BNXT_RE_DBR_PACING_TIME 5/* ms */ +#define BNXT_RE_PACING_ALGO_THRESHOLD 250/* Entries in DB FIFO */ +#define BNXT_RE_PACING_ALARM_TH_MULTIPLE 2/* Multiple of pacing algo threshold */ +/* Default do_pacing value when there is no congestion */ +#define BNXT_RE_DBR_DO_PACING_NO_CONGESTION 0x7F/* 1 in 512 probability */ +#define BNXT_RE_DB_FIFO_ROOM_MASK 0x1FFF8000 +#define BNXT_RE_MAX_FIFO_DEPTH 0x2c00 +#define BNXT_RE_DB_FIFO_ROOM_SHIFT 15 +#define BNXT_RE_GRC_FIFO_REG_BASE 0x2000 +struct bnxt_re_dev {struct ib_device ibdev;struct list_head list;
@@ -171,6 +192,7 @@ struct bnxt_re_dev {atomic_t nq_alloc_cnt;u32 is_virtfn;u32 num_vfs; +struct bnxt_re_pacing pacing; };#define to_bnxt_re_dev (ptr, member) \
drivers/infiniband/hw/bnxt_re/main.c +96 -0
117 lines not on this page · raw message
drivers/infiniband/hw/bnxt_re/qplib_res.h +19 -0
@@ -48,6 +48,7 @@ extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;struct bnxt_qplib_drv_modes {u8 wqe_mode;bool db_push; +bool dbr_pacing; };struct bnxt_qplib_chip_ctx {
@@ -58,6 +59,17 @@ struct bnxt_qplib_chip_ctx {u16 hwrm_cmd_max_timeout;struct bnxt_qplib_drv_modes modes;u64 hwrm_intf_ver; +u32 dbr_stat_db_fifo; +}; + +struct bnxt_qplib_db_pacing_data { +u32 do_pacing; +u32 pacing_th; +u32 alarm_th; +u32 fifo_max_depth; +u32 fifo_room_mask; +u32 fifo_room_shift; +u32 grc_reg_offset; };#define BNXT_QPLIB_DBR_PF_DB_OFFSET 0x10000
@@ -271,6 +283,7 @@ struct bnxt_qplib_res {struct mutex dpi_tbl_lock;bool prio;bool is_vf; +struct bnxt_qplib_db_pacing_data *pacing_data; };static inline bool bnxt_qplib_is_chip_gen_p5 (struct bnxt_qplib_chip_ctx *cctx)
@@ -467,4 +480,10 @@ static inline bool _is_ext_stats_supported(u16 dev_cap_flags)return dev_cap_flags & CREQ_QUERY_FUNC_RESP_SB_EXT_STATS; } + +static inline u8 bnxt_qplib_dbr_pacing_en (struct bnxt_qplib_chip_ctx *cctx) +{ +return cctx->modes.dbr_pacing; +} +#endif /* __BNXT_QPLIB_RES_H__ */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 512/739 RDMA/bnxt_re: Fix max_qp count for virtual functions
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh AP <[email protected]>
[ Upstream commit f19fba1f79dc1fb298de7dcbaae9f6299381aeea ]
Driver has not accounted QP1 for virtual functions when fetching device attributes and hence max_qp count is one less than active_qp count. Fixed driver so that it counts QP1 for virtual functions as well while fetching device attributes
--- drivers/infiniband/hw/bnxt_re/main.c | 6 ++---- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +++---- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +2 -4
@@ -1025,8 +1025,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev)/* Configure and allocate resources for qplib */ rdev->qplib_res.rcfw = &rdev->rcfw; - rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr, - rdev->is_virtfn); + rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr);if (rc) goto fail;
@@ -1407,8 +1406,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode) rdev->pacing.dbr_pacing = false; } } - rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr, - rdev->is_virtfn); + rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr);if (rc) goto disable_rcfw;
drivers/infiniband/hw/bnxt_re/qplib_sp.c +3 -4
@@ -89,7 +89,7 @@ static void bnxt_qplib_query_version(struct bnxt_qplib_rcfw *rcfw, }int bnxt_qplib_get_dev_attr (struct bnxt_qplib_rcfw *rcfw, -struct bnxt_qplib_dev_attr *attr,bool vf) +struct bnxt_qplib_dev_attr *attr) {struct creq_query_func_resp resp = {};struct bnxt_qplib_cmdqmsg msg = {};
@@ -121,9 +121,8 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,/* Extract the context from the side buffer */ attr->max_qp =le32_to_cpu (sb->max_qp); -/* max_qp value reported by FW for PF doesn't include the QP1 for PF */ -if (!vf) - attr->max_qp +=1 ; +/* max_qp value reported by FW doesn't include the QP1 */ + attr->max_qp +=1 ; attr->max_qp_rd_atom = sb->max_qp_rd_atom >BNXT_QPLIB_MAX_OUT_RD_ATOM ?BNXT_QPLIB_MAX_OUT_RD_ATOM : sb->max_qp_rd_atom;
drivers/infiniband/hw/bnxt_re/qplib_sp.h +1 -1
@@ -322,7 +322,7 @@ int bnxt_qplib_update_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, struct bnxt_qplib_gid *gid, u16 gid_idx, const u8 *smac);int bnxt_qplib_get_dev_attr (struct bnxt_qplib_rcfw *rcfw, -struct bnxt_qplib_dev_attr *attr,bool vf); +struct bnxt_qplib_dev_attr *attr);int bnxt_qplib_set_func_resources (struct bnxt_qplib_res *res,struct bnxt_qplib_rcfw *rcfw,struct bnxt_qplib_ctx *ctx);
Signature · 1 line
2.40.1