6.1.2-rc1 review
Subsystems (14)
Greg Kroah-Hartman
maintainerPATCH 818/1146 phy: usb: Use slow clock for wake enabled suspend
In reply to Greg Kroah-HartmanFrom: Justin Chen <[email protected]>
[ Upstream commit 700c44b508020a3ea29d297c677f8d4ab14b7e6a ]
The logic was incorrect when switching to slow clock. We want the slow clock if wake_enabled is set.
--- drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +3 -4
@@ -331,13 +331,12 @@ static void usb_uninit_common_7216(struct brcm_usb_init_params *params)pr_debug ("%s\n" , __func__); -if (!params->wake_enabled) { -USB_CTRL_SET (ctrl,USB_PM ,USB_PWRDN ); - +if (params->wake_enabled) {/* Switch to using slower clock during suspend to save power */ USB_CTRL_SET (ctrl,USB_PM ,XHC_S2_CLK_SWITCH_EN ); - }else {usb_wake_enable_7216 (params, true); + }else { +USB_CTRL_SET (ctrl,USB_PM ,USB_PWRDN ); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 819/1146 phy: usb: Fix clock imbalance for suspend/resume
In reply to Greg Kroah-HartmanFrom: Justin Chen <[email protected]>
[ Upstream commit 8484199c09347bdd5d81ee8a2bc530850f900797 ]
We should be disabling clocks when wake from USB is not needed. Since this wasn't done, we had a clock imbalance since clocks were always being enabled on resume.
--- drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 2 -- drivers/phy/broadcom/phy-brcm-usb-init.h | 1 - drivers/phy/broadcom/phy-brcm-usb.c | 8 +++++--- 3 files changed, 5 insertions(+), 6 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +0 -2
@@ -424,7 +424,6 @@ void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params) params->family_name ="7216" ; params->ops = &bcm7216_ops; - params->suspend_with_clocks = true; }void brcm_usb_dvr_init_7211b0 (struct brcm_usb_init_params *params)
@@ -434,5 +433,4 @@ void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params) params->family_name ="7211" ; params->ops = &bcm7211b0_ops; - params->suspend_with_clocks = true; }
drivers/phy/broadcom/phy-brcm-usb-init.h +0 -1
@@ -61,7 +61,6 @@ struct brcm_usb_init_params {const struct brcm_usb_init_ops *ops;struct regmap *syscon_piarbctl;bool wake_enabled; -bool suspend_with_clocks; };void brcm_usb_dvr_init_4908 (struct brcm_usb_init_params *params);
drivers/phy/broadcom/phy-brcm-usb.c +5 -3
@@ -598,7 +598,7 @@ static int brcm_usb_phy_suspend(struct device *dev)* and newer XHCI->2.0-clks/3.0-clks. */ -if (!priv->ini.suspend_with_clocks) { +if (!priv->ini.wake_enabled) {if (priv->phys[BRCM_USB_PHY_3_0 ].inited)clk_disable_unprepare (priv->usb_30_clk); if (priv->phys[BRCM_USB_PHY_2_0].inited ||
@@ -615,8 +615,10 @@ static int brcm_usb_phy_resume(struct device *dev) {struct brcm_usb_phy_data *priv =dev_get_drvdata (dev); -clk_prepare_enable (priv->usb_20_clk); -clk_prepare_enable (priv->usb_30_clk); +if (!priv->ini.wake_enabled) { +clk_prepare_enable (priv->usb_20_clk); +clk_prepare_enable (priv->usb_30_clk); + }brcm_usb_init_ipp (&priv->ini);/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 820/1146 include/uapi/linux/swab: Fix potentially missing __always_inline
In reply to Greg Kroah-HartmanFrom: Matt Redfearn <[email protected]>
[ Upstream commit defbab270d45e32b068e7e73c3567232d745c60f ]
Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining of some byteswap operations") added __always_inline to swab functions and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") added a definition of __always_inline for use in exported headers when the kernel's compiler.h is not available.
However, since swab.h does not include stddef.h, if the header soup does not indirectly include it, the definition of __always_inline is missing, resulting in a compilation failure, which was observed compiling the perf tool using exported headers containing this commit:
In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
from /usr/include/asm/byteorder.h:14,
from tools/include/uapi/linux/perf_event.h:20,
from perf.h:8,
from builtin-bench.c:18:/usr/include/linux/swab.h:160:8: error: unknown type name `__always_inline'
static __always_inline __u16 __swab16p(const __u16 *p)
Fix this by replacing the inclusion of linux/compiler.h with linux/stddef.h to ensure that we pick up that definition if required, without relying on it's indirect inclusion. compiler.h is then included indirectly, via stddef.h.
--- include/uapi/linux/swab.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/swab.h +1 -1
@@ -3,7 +3,7 @@#define _UAPI_LINUX_SWAB_H#include <linux/types.h> -#include <linux/compiler.h> +#include <linux/stddef.h> #include <asm/bitsperlong.h> #include <asm/swab.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 821/1146 pwm: tegra: Improve required rate calculation
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
[ Upstream commit f271946117dde2ca8741b8138b347b2d68e6ad56 ]
For the case where dev_pm_opp_set_rate() is called to set the PWM clock rate, the requested rate is calculated as ...
required_clk_rate = (NSEC_PER_SEC / period_ns) << PWM_DUTY_WIDTH;
The above calculation may lead to rounding errors because the NSEC_PER_SEC is divided by 'period_ns' before applying the PWM_DUTY_WIDTH multiplication factor. For example, if the period is 45334ns, the above calculation yields a rate of 5646848Hz instead of 5646976Hz. Fix this by applying the multiplication factor before dividing and using the DIV_ROUND_UP macro which yields the expected result of 5646976Hz.
--- drivers/pwm/pwm-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-tegra.c +2 -2
@@ -145,8 +145,8 @@ static int tegra_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,* source clock rate as required_clk_rate, PWM controller will * be able to configure the requested period. */ - required_clk_rate = - (NSEC_PER_SEC / period_ns) <<PWM_DUTY_WIDTH ; + required_clk_rate =DIV_ROUND_UP_ULL (NSEC_PER_SEC <<PWM_DUTY_WIDTH , + period_ns); err =dev_pm_opp_set_rate (pc->dev, required_clk_rate);if (err <0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 822/1146 pwm: tegra: Ensure the clock rate is not less than needed
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
[ Upstream commit 5eccd0d9fabc4d2ab8d2a0c056fb1d7e2ff892fc ]
When dynamically scaling the PWM clock, the function dev_pm_opp_set_rate() may set the PWM clock to a rate that is lower than what is required. The clock rate requested when calling dev_pm_opp_set_rate() is the minimum clock rate that is needed to drive the PWM to achieve the required period. Hence, if the actual clock rate is less than the requested clock rate, then the required period cannot be achieved and configuring the PWM fails. Fix this by calling clk_round_rate() to check if the clock rate that will be provided is sufficient and if not, double the required clock rate to ensure the required period can be attained.
--- drivers/pwm/pwm-tegra.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/pwm/pwm-tegra.c +11 -0
@@ -148,6 +148,17 @@ static int tegra_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, required_clk_rate =DIV_ROUND_UP_ULL (NSEC_PER_SEC <<PWM_DUTY_WIDTH , period_ns); +if (required_clk_rate >clk_round_rate (pc->clk, required_clk_rate)) +/* +* required_clk_rate is a lower bound for the input +* rate; for lower rates there is no value for PWM_SCALE +* that yields a period less than or equal to the +* requested period. Hence, for lower rates, double the +* required_clk_rate to get a clock rate that can meet +* the requested period. +*/ + required_clk_rate *=2 ; + err =dev_pm_opp_set_rate (pc->dev, required_clk_rate);if (err <0 )return -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 823/1146 phy: qcom-qmp-pcie: split register tables into common and extra parts
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 2566ad8ec418934c213cb50fd2084ffd896a2fea ]
SM8250 configuration tables are split into two parts: the common one and the PHY-specific tables. Make this split more formal. Rather than having a blind renamed copy of all QMP table fields, add separate struct qmp_phy_cfg_tables and add two instances of this structure to the struct qmp_phy_cfg. Later on this will be used to support different PHY modes (RC vs EP).
Stable-dep-of: 2584068a9ef4 ("phy: qcom-qmp-pcie: split pcs_misc init cfg for ipq8074 pcs table")
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 406 +++++++++++++---------- 1 file changed, 222 insertions(+), 184 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +222 -184
@@ -1300,31 +1300,30 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = { QMP_PHY_INIT_CFG(QPHY_V5_20_PCS_PCIE_G4_PRE_GAIN, 0x2e), }; +struct qmp_phy_cfg_tables { +const struct qmp_phy_init_tbl *serdes; +int serdes_num; +const struct qmp_phy_init_tbl *tx; +int tx_num; +const struct qmp_phy_init_tbl *rx; +int rx_num; +const struct qmp_phy_init_tbl *pcs; +int pcs_num; +const struct qmp_phy_init_tbl *pcs_misc; +int pcs_misc_num; +}; +/* struct qmp_phy_cfg - per-PHY initialization config */ struct qmp_phy_cfg {int lanes; -/* Init sequence for PHY blocks - serdes, tx, rx, pcs */ -const struct qmp_phy_init_tbl *serdes_tbl; -int serdes_tbl_num; -const struct qmp_phy_init_tbl *serdes_tbl_sec; -int serdes_tbl_num_sec; -const struct qmp_phy_init_tbl *tx_tbl; -int tx_tbl_num; -const struct qmp_phy_init_tbl *tx_tbl_sec; -int tx_tbl_num_sec; -const struct qmp_phy_init_tbl *rx_tbl; -int rx_tbl_num; -const struct qmp_phy_init_tbl *rx_tbl_sec; -int rx_tbl_num_sec; -const struct qmp_phy_init_tbl *pcs_tbl; -int pcs_tbl_num; -const struct qmp_phy_init_tbl *pcs_tbl_sec; -int pcs_tbl_num_sec; -const struct qmp_phy_init_tbl *pcs_misc_tbl; -int pcs_misc_tbl_num; -const struct qmp_phy_init_tbl *pcs_misc_tbl_sec; -int pcs_misc_tbl_num_sec; +/* Main init sequence for PHY blocks - serdes, tx, rx, pcs */ +const struct qmp_phy_cfg_tables tables; +/* +* Additional init sequence for PHY blocks, providing additional +* register programming. Unless required it can be left omitted. +*/ +const struct qmp_phy_cfg_tables *tables_rc;/* clock ids to be requested */ const char *const *clk_list;
@@ -1455,14 +1454,16 @@ static const char * const sdm845_pciephy_reset_l[] = {static const struct qmp_phy_cfg ipq8074_pciephy_cfg = { .lanes =1 , - .serdes_tbl = ipq8074_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (ipq8074_pcie_serdes_tbl), - .tx_tbl = ipq8074_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (ipq8074_pcie_tx_tbl), - .rx_tbl = ipq8074_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (ipq8074_pcie_rx_tbl), - .pcs_tbl = ipq8074_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (ipq8074_pcie_pcs_tbl), + .tables = { + .serdes = ipq8074_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (ipq8074_pcie_serdes_tbl), + .tx = ipq8074_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (ipq8074_pcie_tx_tbl), + .rx = ipq8074_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (ipq8074_pcie_rx_tbl), + .pcs = ipq8074_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (ipq8074_pcie_pcs_tbl), + }, .clk_list = ipq8074_pciephy_clk_l, .num_clks =ARRAY_SIZE (ipq8074_pciephy_clk_l), .reset_list = ipq8074_pciephy_reset_l,
@@ -1479,14 +1480,16 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = {static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = { .lanes =1 , - .serdes_tbl = ipq8074_pcie_gen3_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (ipq8074_pcie_gen3_serdes_tbl), - .tx_tbl = ipq8074_pcie_gen3_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (ipq8074_pcie_gen3_tx_tbl), - .rx_tbl = ipq8074_pcie_gen3_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (ipq8074_pcie_gen3_rx_tbl), - .pcs_tbl = ipq8074_pcie_gen3_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (ipq8074_pcie_gen3_pcs_tbl), + .tables = { + .serdes = ipq8074_pcie_gen3_serdes_tbl, + .serdes_num =ARRAY_SIZE (ipq8074_pcie_gen3_serdes_tbl), + .tx = ipq8074_pcie_gen3_tx_tbl, + .tx_num =ARRAY_SIZE (ipq8074_pcie_gen3_tx_tbl), + .rx = ipq8074_pcie_gen3_rx_tbl, + .rx_num =ARRAY_SIZE (ipq8074_pcie_gen3_rx_tbl), + .pcs = ipq8074_pcie_gen3_pcs_tbl, + .pcs_num =ARRAY_SIZE (ipq8074_pcie_gen3_pcs_tbl), + }, .clk_list = ipq8074_pciephy_clk_l, .num_clks =ARRAY_SIZE (ipq8074_pciephy_clk_l), .reset_list = ipq8074_pciephy_reset_l,
@@ -1505,16 +1508,18 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = {static const struct qmp_phy_cfg ipq6018_pciephy_cfg = { .lanes =1 , - .serdes_tbl = ipq6018_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (ipq6018_pcie_serdes_tbl), - .tx_tbl = ipq6018_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (ipq6018_pcie_tx_tbl), - .rx_tbl = ipq6018_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (ipq6018_pcie_rx_tbl), - .pcs_tbl = ipq6018_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (ipq6018_pcie_pcs_tbl), - .pcs_misc_tbl = ipq6018_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (ipq6018_pcie_pcs_misc_tbl), + .tables = { + .serdes = ipq6018_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (ipq6018_pcie_serdes_tbl), + .tx = ipq6018_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (ipq6018_pcie_tx_tbl), + .rx = ipq6018_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (ipq6018_pcie_rx_tbl), + .pcs = ipq6018_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (ipq6018_pcie_pcs_tbl), + .pcs_misc = ipq6018_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (ipq6018_pcie_pcs_misc_tbl), + }, .clk_list = ipq8074_pciephy_clk_l, .num_clks =ARRAY_SIZE (ipq8074_pciephy_clk_l), .reset_list = ipq8074_pciephy_reset_l,
@@ -1531,16 +1536,18 @@ static const struct qmp_phy_cfg ipq6018_pciephy_cfg = {static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = { .lanes =1 , - .serdes_tbl = sdm845_qmp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sdm845_qmp_pcie_serdes_tbl), - .tx_tbl = sdm845_qmp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sdm845_qmp_pcie_tx_tbl), - .rx_tbl = sdm845_qmp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sdm845_qmp_pcie_rx_tbl), - .pcs_tbl = sdm845_qmp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sdm845_qmp_pcie_pcs_tbl), - .pcs_misc_tbl = sdm845_qmp_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sdm845_qmp_pcie_pcs_misc_tbl), + .tables = { + .serdes = sdm845_qmp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sdm845_qmp_pcie_serdes_tbl), + .tx = sdm845_qmp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sdm845_qmp_pcie_tx_tbl), + .rx = sdm845_qmp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sdm845_qmp_pcie_rx_tbl), + .pcs = sdm845_qmp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sdm845_qmp_pcie_pcs_tbl), + .pcs_misc = sdm845_qmp_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sdm845_qmp_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1557,14 +1564,16 @@ static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = { .lanes =1 , - .serdes_tbl = sdm845_qhp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sdm845_qhp_pcie_serdes_tbl), - .tx_tbl = sdm845_qhp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sdm845_qhp_pcie_tx_tbl), - .rx_tbl = sdm845_qhp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sdm845_qhp_pcie_rx_tbl), - .pcs_tbl = sdm845_qhp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sdm845_qhp_pcie_pcs_tbl), + .tables = { + .serdes = sdm845_qhp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sdm845_qhp_pcie_serdes_tbl), + .tx = sdm845_qhp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sdm845_qhp_pcie_tx_tbl), + .rx = sdm845_qhp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sdm845_qhp_pcie_rx_tbl), + .pcs = sdm845_qhp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sdm845_qhp_pcie_pcs_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1581,24 +1590,28 @@ static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = {static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = { .lanes =1 , - .serdes_tbl = sm8250_qmp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_serdes_tbl), - .serdes_tbl_sec = sm8250_qmp_gen3x1_pcie_serdes_tbl, - .serdes_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_serdes_tbl), - .tx_tbl = sm8250_qmp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_tx_tbl), - .rx_tbl = sm8250_qmp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_rx_tbl), - .rx_tbl_sec = sm8250_qmp_gen3x1_pcie_rx_tbl, - .rx_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_rx_tbl), - .pcs_tbl = sm8250_qmp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_tbl), - .pcs_tbl_sec = sm8250_qmp_gen3x1_pcie_pcs_tbl, - .pcs_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_pcs_tbl), - .pcs_misc_tbl = sm8250_qmp_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_misc_tbl), - .pcs_misc_tbl_sec = sm8250_qmp_gen3x1_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_pcs_misc_tbl), + .tables = { + .serdes = sm8250_qmp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8250_qmp_pcie_serdes_tbl), + .tx = sm8250_qmp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sm8250_qmp_pcie_tx_tbl), + .rx = sm8250_qmp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8250_qmp_pcie_rx_tbl), + .pcs = sm8250_qmp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_tbl), + .pcs_misc = sm8250_qmp_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_misc_tbl), + }, + .tables_rc = &(const struct qmp_phy_cfg_tables ) { + .serdes = sm8250_qmp_gen3x1_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_serdes_tbl), + .rx = sm8250_qmp_gen3x1_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_rx_tbl), + .pcs = sm8250_qmp_gen3x1_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_pcs_tbl), + .pcs_misc = sm8250_qmp_gen3x1_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8250_qmp_gen3x1_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1615,24 +1628,28 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = {static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = { .lanes =2 , - .serdes_tbl = sm8250_qmp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_serdes_tbl), - .tx_tbl = sm8250_qmp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_tx_tbl), - .tx_tbl_sec = sm8250_qmp_gen3x2_pcie_tx_tbl, - .tx_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_tx_tbl), - .rx_tbl = sm8250_qmp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_rx_tbl), - .rx_tbl_sec = sm8250_qmp_gen3x2_pcie_rx_tbl, - .rx_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_rx_tbl), - .pcs_tbl = sm8250_qmp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_tbl), - .pcs_tbl_sec = sm8250_qmp_gen3x2_pcie_pcs_tbl, - .pcs_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_pcs_tbl), - .pcs_misc_tbl = sm8250_qmp_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_misc_tbl), - .pcs_misc_tbl_sec = sm8250_qmp_gen3x2_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num_sec =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_pcs_misc_tbl), + .tables = { + .serdes = sm8250_qmp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8250_qmp_pcie_serdes_tbl), + .tx = sm8250_qmp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sm8250_qmp_pcie_tx_tbl), + .rx = sm8250_qmp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8250_qmp_pcie_rx_tbl), + .pcs = sm8250_qmp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_tbl), + .pcs_misc = sm8250_qmp_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8250_qmp_pcie_pcs_misc_tbl), + }, + .tables_rc = &(const struct qmp_phy_cfg_tables ) { + .tx = sm8250_qmp_gen3x2_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_tx_tbl), + .rx = sm8250_qmp_gen3x2_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_rx_tbl), + .pcs = sm8250_qmp_gen3x2_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_pcs_tbl), + .pcs_misc = sm8250_qmp_gen3x2_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8250_qmp_gen3x2_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1649,14 +1666,16 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = {static const struct qmp_phy_cfg msm8998_pciephy_cfg = { .lanes =1 , - .serdes_tbl = msm8998_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (msm8998_pcie_serdes_tbl), - .tx_tbl = msm8998_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (msm8998_pcie_tx_tbl), - .rx_tbl = msm8998_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (msm8998_pcie_rx_tbl), - .pcs_tbl = msm8998_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (msm8998_pcie_pcs_tbl), + .tables = { + .serdes = msm8998_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (msm8998_pcie_serdes_tbl), + .tx = msm8998_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (msm8998_pcie_tx_tbl), + .rx = msm8998_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (msm8998_pcie_rx_tbl), + .pcs = msm8998_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (msm8998_pcie_pcs_tbl), + }, .clk_list = msm8996_phy_clk_l, .num_clks =ARRAY_SIZE (msm8996_phy_clk_l), .reset_list = ipq8074_pciephy_reset_l,
@@ -1675,16 +1694,18 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = {static const struct qmp_phy_cfg sc8180x_pciephy_cfg = { .lanes =1 , - .serdes_tbl = sc8180x_qmp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sc8180x_qmp_pcie_serdes_tbl), - .tx_tbl = sc8180x_qmp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sc8180x_qmp_pcie_tx_tbl), - .rx_tbl = sc8180x_qmp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sc8180x_qmp_pcie_rx_tbl), - .pcs_tbl = sc8180x_qmp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sc8180x_qmp_pcie_pcs_tbl), - .pcs_misc_tbl = sc8180x_qmp_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sc8180x_qmp_pcie_pcs_misc_tbl), + .tables = { + .serdes = sc8180x_qmp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sc8180x_qmp_pcie_serdes_tbl), + .tx = sc8180x_qmp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sc8180x_qmp_pcie_tx_tbl), + .rx = sc8180x_qmp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sc8180x_qmp_pcie_rx_tbl), + .pcs = sc8180x_qmp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sc8180x_qmp_pcie_pcs_tbl), + .pcs_misc = sc8180x_qmp_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sc8180x_qmp_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1701,16 +1722,18 @@ static const struct qmp_phy_cfg sc8180x_pciephy_cfg = {static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = { .lanes =2 , - .serdes_tbl = sdx55_qmp_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sdx55_qmp_pcie_serdes_tbl), - .tx_tbl = sdx55_qmp_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sdx55_qmp_pcie_tx_tbl), - .rx_tbl = sdx55_qmp_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sdx55_qmp_pcie_rx_tbl), - .pcs_tbl = sdx55_qmp_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sdx55_qmp_pcie_pcs_tbl), - .pcs_misc_tbl = sdx55_qmp_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sdx55_qmp_pcie_pcs_misc_tbl), + .tables = { + .serdes = sdx55_qmp_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sdx55_qmp_pcie_serdes_tbl), + .tx = sdx55_qmp_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sdx55_qmp_pcie_tx_tbl), + .rx = sdx55_qmp_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sdx55_qmp_pcie_rx_tbl), + .pcs = sdx55_qmp_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sdx55_qmp_pcie_pcs_tbl), + .pcs_misc = sdx55_qmp_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sdx55_qmp_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1727,16 +1750,18 @@ static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = {static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = { .lanes =1 , - .serdes_tbl = sm8450_qmp_gen3x1_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_serdes_tbl), - .tx_tbl = sm8450_qmp_gen3x1_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_tx_tbl), - .rx_tbl = sm8450_qmp_gen3x1_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_rx_tbl), - .pcs_tbl = sm8450_qmp_gen3x1_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_pcs_tbl), - .pcs_misc_tbl = sm8450_qmp_gen3x1_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_pcs_misc_tbl), + .tables = { + .serdes = sm8450_qmp_gen3x1_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_serdes_tbl), + .tx = sm8450_qmp_gen3x1_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_tx_tbl), + .rx = sm8450_qmp_gen3x1_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_rx_tbl), + .pcs = sm8450_qmp_gen3x1_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_pcs_tbl), + .pcs_misc = sm8450_qmp_gen3x1_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8450_qmp_gen3x1_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1753,16 +1778,18 @@ static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = {static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = { .lanes =2 , - .serdes_tbl = sm8450_qmp_gen4x2_pcie_serdes_tbl, - .serdes_tbl_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_serdes_tbl), - .tx_tbl = sm8450_qmp_gen4x2_pcie_tx_tbl, - .tx_tbl_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_tx_tbl), - .rx_tbl = sm8450_qmp_gen4x2_pcie_rx_tbl, - .rx_tbl_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_rx_tbl), - .pcs_tbl = sm8450_qmp_gen4x2_pcie_pcs_tbl, - .pcs_tbl_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_pcs_tbl), - .pcs_misc_tbl = sm8450_qmp_gen4x2_pcie_pcs_misc_tbl, - .pcs_misc_tbl_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_pcs_misc_tbl), + .tables = { + .serdes = sm8450_qmp_gen4x2_pcie_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_serdes_tbl), + .tx = sm8450_qmp_gen4x2_pcie_tx_tbl, + .tx_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_tx_tbl), + .rx = sm8450_qmp_gen4x2_pcie_rx_tbl, + .rx_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_rx_tbl), + .pcs = sm8450_qmp_gen4x2_pcie_pcs_tbl, + .pcs_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_pcs_tbl), + .pcs_misc = sm8450_qmp_gen4x2_pcie_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_pcs_misc_tbl), + }, .clk_list = sdm845_pciephy_clk_l, .num_clks =ARRAY_SIZE (sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
@@ -1807,17 +1834,49 @@ static void qmp_pcie_configure(void __iomem *base,qmp_pcie_configure_lane (base, regs, tbl, num,0xff ); } -static int qmp_pcie_serdes_init (struct qmp_phy *qphy) +static void qmp_pcie_serdes_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables) {const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *serdes = qphy->serdes; -const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl; -int serdes_tbl_num = cfg->serdes_tbl_num; -qmp_pcie_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); -qmp_pcie_configure (serdes, cfg->regs, cfg->serdes_tbl_sec, cfg->serdes_tbl_num_sec); +if (!tables) +return ; -return 0 ; +qmp_pcie_configure (serdes, cfg->regs, tables->serdes, tables->serdes_num); +} + +static void qmp_pcie_lanes_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables) +{ +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *tx = qphy->tx; +void __iomem *rx = qphy->rx; + +if (!tables) +return ; + +qmp_pcie_configure_lane (tx, cfg->regs, tables->tx, tables->tx_num,1 ); + +if (cfg->lanes >=2 ) +qmp_pcie_configure_lane (qphy->tx2, cfg->regs, tables->tx, tables->tx_num,2 ); + +qmp_pcie_configure_lane (rx, cfg->regs, tables->rx, tables->rx_num,1 ); +if (cfg->lanes >=2 ) +qmp_pcie_configure_lane (qphy->rx2, cfg->regs, tables->rx, tables->rx_num,2 ); +} + +static void qmp_pcie_pcs_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables) +{ +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *pcs = qphy->pcs; +void __iomem *pcs_misc = qphy->pcs_misc; + +if (!tables) +return ; + +qmp_pcie_configure (pcs, cfg->regs, + tables->pcs, tables->pcs_num); +qmp_pcie_configure (pcs_misc, cfg->regs, + tables->pcs_misc, tables->pcs_misc_num); }static int qmp_pcie_init (struct phy *phy)
@@ -1889,15 +1948,13 @@ static int qmp_pcie_power_on(struct phy *phy)struct qmp_phy *qphy =phy_get_drvdata (phy);struct qcom_qmp *qmp = qphy->qmp;const struct qmp_phy_cfg *cfg = qphy->cfg; -void __iomem *tx = qphy->tx; -void __iomem *rx = qphy->rx;void __iomem *pcs = qphy->pcs; -void __iomem *pcs_misc = qphy->pcs_misc;void __iomem *status;unsigned int mask, val, ready;int ret; -qmp_pcie_serdes_init (qphy); +qmp_pcie_serdes_init (qphy, &cfg->tables); +qmp_pcie_serdes_init (qphy, cfg->tables_rc); ret =clk_prepare_enable (qphy->pipe_clk);if (ret) {
@@ -1906,31 +1963,11 @@ static int qmp_pcie_power_on(struct phy *phy) }/* Tx, Rx, and PCS configurations */ -qmp_pcie_configure_lane (tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num,1 ); -qmp_pcie_configure_lane (tx, cfg->regs, cfg->tx_tbl_sec, cfg->tx_tbl_num_sec,1 ); - -if (cfg->lanes >=2 ) { -qmp_pcie_configure_lane (qphy->tx2, cfg->regs, cfg->tx_tbl, - cfg->tx_tbl_num,2 ); -qmp_pcie_configure_lane (qphy->tx2, cfg->regs, cfg->tx_tbl_sec, - cfg->tx_tbl_num_sec,2 ); - } - -qmp_pcie_configure_lane (rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,1 ); -qmp_pcie_configure_lane (rx, cfg->regs, cfg->rx_tbl_sec, cfg->rx_tbl_num_sec,1 ); - -if (cfg->lanes >=2 ) { -qmp_pcie_configure_lane (qphy->rx2, cfg->regs, cfg->rx_tbl, - cfg->rx_tbl_num,2 ); -qmp_pcie_configure_lane (qphy->rx2, cfg->regs, cfg->rx_tbl_sec, - cfg->rx_tbl_num_sec,2 ); - } - -qmp_pcie_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); -qmp_pcie_configure (pcs, cfg->regs, cfg->pcs_tbl_sec, cfg->pcs_tbl_num_sec); +qmp_pcie_lanes_init (qphy, &cfg->tables); +qmp_pcie_lanes_init (qphy, cfg->tables_rc); -qmp_pcie_configure (pcs_misc, cfg->regs, cfg->pcs_misc_tbl, cfg->pcs_misc_tbl_num); -qmp_pcie_configure (pcs_misc, cfg->regs, cfg->pcs_misc_tbl_sec, cfg->pcs_misc_tbl_num_sec); +qmp_pcie_pcs_init (qphy, &cfg->tables); +qmp_pcie_pcs_init (qphy, cfg->tables_rc);/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );
@@ -2191,7 +2228,8 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id, qphy->pcs_misc = qphy->pcs +0x400 ;if (IS_ERR (qphy->pcs_misc)) { -if (cfg->pcs_misc_tbl || cfg->pcs_misc_tbl_sec) +if (cfg->tables.pcs_misc || + (cfg->tables_rc && cfg->tables_rc->pcs_misc))return PTR_ERR (qphy->pcs_misc); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 824/1146 phy: qcom-qmp-pcie: split pcs_misc init cfg for ipq8074 pcs table
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit 2584068a9ef4a7bff3b9302dd058a4c95ce68631 ]
Commit af6643242d3a ("phy: qcom-qmp-pcie: split pcs_misc region for ipq6018 pcie gen3") reworked the pcs regs values and removed the 0x400 offset for each pcs_misc regs.
This change caused the malfunction of ipq8074 downstream since it still has the legacy pcs table where pcs_misc are not placed on a different table and instead put together assuming the offset of 0x400 for the related pcs_misc regs.
Split pcs_misc init cfg from the ipq8074 pcs init table to be handled correctly to prepare for actual support for gen3 pcie for ipq8074.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +9 -4
@@ -505,6 +505,13 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_FLL_CNTRL1 ,0x01 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_P2U3_WAKEUP_DLY_TIME_AUXCLK_H ,0x0 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_P2U3_WAKEUP_DLY_TIME_AUXCLK_L ,0x1 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_G12S1_TXDEEMPH_M3P5DB ,0x10 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_DCC_CAL_CONFIG ,0x01 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_SIGDET_LVL ,0xaa ), + QMP_PHY_INIT_CFG(QPHY_V4_PCS_REFGEN_REQ_CONFIG1, 0x0d), +}; + +static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_misc_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_ACTIONS ,0x0 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_L1P1_WAKEUP_DLY_TIME_AUXCLK_H ,0x00 ), QMP_PHY_INIT_CFG(QPHY_V4_PCS_PCIE_L1P1_WAKEUP_DLY_TIME_AUXCLK_L, 0x01),
@@ -517,11 +524,7 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG2 ,0x50 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG4 ,0x1a ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG5 ,0x6 ), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_G12S1_TXDEEMPH_M3P5DB ,0x10 ), QMP_PHY_INIT_CFG(QPHY_V4_PCS_PCIE_ENDPOINT_REFCLK_DRIVE, 0xc1), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_DCC_CAL_CONFIG ,0x01 ), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_SIGDET_LVL ,0xaa ), - QMP_PHY_INIT_CFG(QPHY_V4_PCS_REFGEN_REQ_CONFIG1, 0x0d), }; static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
@@ -1489,6 +1492,8 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = { .rx_num = ARRAY_SIZE(ipq8074_pcie_gen3_rx_tbl), .pcs = ipq8074_pcie_gen3_pcs_tbl, .pcs_num = ARRAY_SIZE(ipq8074_pcie_gen3_pcs_tbl), + .pcs_misc = ipq8074_pcie_gen3_pcs_misc_tbl, + .pcs_misc_num = ARRAY_SIZE(ipq8074_pcie_gen3_pcs_misc_tbl), }, .clk_list = ipq8074_pciephy_clk_l, .num_clks = ARRAY_SIZE(ipq8074_pciephy_clk_l),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 825/1146 phy: qcom-qmp-pcie: support separate tables for EP mode
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 11bf53a38c82baef349b4efc6a84f069dab7085a ]
The PCIe QMP PHY requires different programming sequences when being used for the RC (Root Complex) or for the EP (End Point) modes. Allow selecting the submode and thus selecting a set of PHY programming tables.
Since the RC and EP modes share common some common init sequence, the common sequence is kept in the main table and the sequence differences are pushed to the extra tables.
Stable-dep-of: 9ddcd920f8ed ("phy: qcom-qmp-pcie: Fix high latency with 4x2 PHY when ASPM is enabled")
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 46 ++++++++++++++++++++---- 1 file changed, 40 insertions(+), 6 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +40 -6
@@ -14,6 +14,7 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/of_address.h> +#include <linux/phy/pcie.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h>
@@ -1323,10 +1324,14 @@ struct qmp_phy_cfg {/* Main init sequence for PHY blocks - serdes, tx, rx, pcs */ const struct qmp_phy_cfg_tables tables;/* -* Additional init sequence for PHY blocks, providing additional -* register programming. Unless required it can be left omitted. +* Additional init sequences for PHY blocks, providing additional +* register programming. They are used for providing separate sequences +* for the Root Complex and End Point use cases. +* +* If EP mode is not supported, both tables can be left unset. */ const struct qmp_phy_cfg_tables *tables_rc; +const struct qmp_phy_cfg_tables *tables_ep;/* clock ids to be requested */ const char *const *clk_list;
@@ -1366,6 +1371,7 @@ struct qmp_phy_cfg {* @pcs_misc: iomapped memory space for lane's pcs_misc * @pipe_clk: pipe clock * @qmp: QMP phy to which this lane belongs +* @mode: currently selected PHY mode */ struct qmp_phy {struct phy *phy;
@@ -1379,6 +1385,7 @@ struct qmp_phy {void __iomem *pcs_misc;struct clk *pipe_clk;struct qcom_qmp *qmp; +int mode; };/**
@@ -1953,13 +1960,19 @@ static int qmp_pcie_power_on(struct phy *phy)struct qmp_phy *qphy =phy_get_drvdata (phy);struct qcom_qmp *qmp = qphy->qmp;const struct qmp_phy_cfg *cfg = qphy->cfg; +const struct qmp_phy_cfg_tables *mode_tables;void __iomem *pcs = qphy->pcs;void __iomem *status;unsigned int mask, val, ready;int ret; +if (qphy->mode ==PHY_MODE_PCIE_RC ) + mode_tables = cfg->tables_rc; +else + mode_tables = cfg->tables_ep; +qmp_pcie_serdes_init (qphy, &cfg->tables); -qmp_pcie_serdes_init (qphy, cfg->tables_rc); +qmp_pcie_serdes_init (qphy, mode_tables); ret =clk_prepare_enable (qphy->pipe_clk);if (ret) {
@@ -1969,10 +1982,10 @@ static int qmp_pcie_power_on(struct phy *phy)/* Tx, Rx, and PCS configurations */ qmp_pcie_lanes_init (qphy, &cfg->tables); -qmp_pcie_lanes_init (qphy, cfg->tables_rc); +qmp_pcie_lanes_init (qphy, mode_tables);qmp_pcie_pcs_init (qphy, &cfg->tables); -qmp_pcie_pcs_init (qphy, cfg->tables_rc); +qmp_pcie_pcs_init (qphy, mode_tables);/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );
@@ -2053,6 +2066,23 @@ static int qmp_pcie_disable(struct phy *phy)return qmp_pcie_exit (phy); } +static int qmp_pcie_set_mode (struct phy *phy,enum phy_mode mode,int submode) +{ +struct qmp_phy *qphy =phy_get_drvdata (phy); + +switch (submode) { +case PHY_MODE_PCIE_RC : +case PHY_MODE_PCIE_EP : + qphy->mode = submode; +break ; +default : +dev_err (&phy->dev,"Unsupported submode %d\n" , submode); +return -EINVAL ; + } + +return 0 ; +} +static int qmp_pcie_vreg_init (struct device *dev,const struct qmp_phy_cfg *cfg) {struct qcom_qmp *qmp =dev_get_drvdata (dev);
@@ -2176,6 +2206,7 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)static const struct phy_ops qmp_pcie_ops = { .power_on = qmp_pcie_enable, .power_off = qmp_pcie_disable, + .set_mode = qmp_pcie_set_mode, .owner =THIS_MODULE , };
@@ -2191,6 +2222,8 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id,if (!qphy)return -ENOMEM ; + qphy->mode =PHY_MODE_PCIE_RC ; + qphy->cfg = cfg; qphy->serdes = serdes;/*
@@ -2234,7 +2267,8 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id,if (IS_ERR (qphy->pcs_misc)) {if (cfg->tables.pcs_misc || - (cfg->tables_rc && cfg->tables_rc->pcs_misc)) + (cfg->tables_rc && cfg->tables_rc->pcs_misc) || + (cfg->tables_ep && cfg->tables_ep->pcs_misc))return PTR_ERR (qphy->pcs_misc); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 826/1146 phy: qcom-qmp-pcie: Support SM8450 PCIe1 PHY in EP mode
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit f5682f13b7ab0bbdffd11934afe4b5c011d5be74 ]
Add support for using PCIe1 (gen4x2) in EP mode on SM8450. The tables to program are mostly common with the RC mode tables, so only register difference are split into separate RC and EP tables.
Stable-dep-of: 9ddcd920f8ed ("phy: qcom-qmp-pcie: Fix high latency with 4x2 PHY when ASPM is enabled")
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 78 +++++++++++++++---- .../qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 1 + 2 files changed, 64 insertions(+), 15 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +63 -15
@@ -1188,15 +1188,29 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen3x1_pcie_pcs_misc_tbl[] = { };static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_serdes_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN ,0x14 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_IVCO ,0x0f ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP_EN ,0x46 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP_CFG ,0x04 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_VCO_TUNE_MAP ,0x02 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_HSCLK_SEL ,0x12 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_HSCLK_HS_SWITCH_SEL ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CORECLK_DIV_MODE0 ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CORECLK_DIV_MODE1 ,0x04 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_MISC1 ,0x88 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_CONFIG ,0x06 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_MODE ,0x14 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_VCO_DC_LEVEL_CTRL ,0x0f ), +}; + +static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_rc_serdes_tbl[] = {QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_PER1 ,0x31 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_PER2 ,0x01 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_STEP_SIZE1_MODE0 ,0xde ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_STEP_SIZE2_MODE0 ,0x07 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_STEP_SIZE1_MODE1 ,0x97 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SSC_STEP_SIZE2_MODE1 ,0x0c ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN ,0x14 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_CLK_ENABLE1 ,0x90 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_IVCO ,0x0f ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_CP_CTRL_MODE0 ,0x06 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_CP_CTRL_MODE1 ,0x06 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_RCTRL_MODE0 ,0x16 ),
@@ -1204,8 +1218,6 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_serdes_tbl[] = {QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_CCTRL_MODE0 ,0x36 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_CCTRL_MODE1 ,0x36 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_SYSCLK_EN_SEL ,0x08 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP_EN ,0x46 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP_CFG ,0x04 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP1_MODE0 ,0x0a ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP2_MODE0 ,0x1a ), QMP_PHY_INIT_CFG(QSERDES_V5_COM_LOCK_CMP1_MODE1, 0x14),
@@ -1218,17 +1230,8 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_serdes_tbl[] = {QMP_PHY_INIT_CFG (QSERDES_V5_COM_DIV_FRAC_START1_MODE1 ,0x55 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_DIV_FRAC_START2_MODE1 ,0x55 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_DIV_FRAC_START3_MODE1 ,0x05 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_VCO_TUNE_MAP ,0x02 ),QMP_PHY_INIT_CFG (QSERDES_V5_COM_CLK_SELECT ,0x34 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_HSCLK_SEL ,0x12 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_HSCLK_HS_SWITCH_SEL ,0x00 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_CORECLK_DIV_MODE0 ,0x0a ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_CORECLK_DIV_MODE1 ,0x04 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_MISC1 ,0x88 ), QMP_PHY_INIT_CFG(QSERDES_V5_COM_CORE_CLK_EN, 0x20), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_CONFIG ,0x06 ), -QMP_PHY_INIT_CFG (QSERDES_V5_COM_CMN_MODE ,0x14 ), - QMP_PHY_INIT_CFG(QSERDES_V5_COM_VCO_DC_LEVEL_CTRL, 0x0f), }; static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_tx_tbl[] = {
@@ -1296,14 +1299,44 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_tbl[] = { };static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = { -QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_ENDPOINT_REFCLK_DRIVE ,0xc1 ), -QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_OSC_DTCT_ACTIONS ,0x00 ),QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_G4_EQ_CONFIG5 ,0x02 ),QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_EQ_CONFIG1 ,0x16 ),QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_RX_MARGINING_CONFIG3 ,0x28 ),QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_G4_PRE_GAIN ,0x2e ), }; +static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_rc_pcs_misc_tbl[] = { +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_ENDPOINT_REFCLK_DRIVE ,0xc1 ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_OSC_DTCT_ACTIONS ,0x00 ), +}; + +static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_ep_serdes_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_V5_COM_BG_TIMER ,0x02 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_SYS_CLK_CTRL ,0x07 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CP_CTRL_MODE0 ,0x27 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CP_CTRL_MODE1 ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_RCTRL_MODE0 ,0x17 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_RCTRL_MODE1 ,0x19 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_CCTRL_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_PLL_CCTRL_MODE1 ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_SYSCLK_EN_SEL ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP1_MODE0 ,0xff ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP2_MODE0 ,0x04 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP1_MODE1 ,0xff ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_LOCK_CMP2_MODE1 ,0x09 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_DEC_START_MODE0 ,0x19 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_DEC_START_MODE1 ,0x28 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_INTEGLOOP_GAIN0_MODE0 ,0xfb ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_INTEGLOOP_GAIN1_MODE0 ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_INTEGLOOP_GAIN0_MODE1 ,0xfb ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_INTEGLOOP_GAIN1_MODE1 ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_V5_COM_CORE_CLK_EN ,0x60 ), +}; + +static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_ep_pcs_misc_tbl[] = { +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_OSC_DTCT_MODE2_CONFIG5 ,0x08 ), +}; +struct qmp_phy_cfg_tables {const struct qmp_phy_init_tbl *serdes;int serdes_num;
@@ -1802,6 +1835,21 @@ static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = { .pcs_misc = sm8450_qmp_gen4x2_pcie_pcs_misc_tbl, .pcs_misc_num = ARRAY_SIZE(sm8450_qmp_gen4x2_pcie_pcs_misc_tbl), }, + + .tables_rc = &(const struct qmp_phy_cfg_tables ) { + .serdes = sm8450_qmp_gen4x2_pcie_rc_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_rc_serdes_tbl), + .pcs_misc = sm8450_qmp_gen4x2_pcie_rc_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_rc_pcs_misc_tbl), + }, + + .tables_ep = &(const struct qmp_phy_cfg_tables ) { + .serdes = sm8450_qmp_gen4x2_pcie_ep_serdes_tbl, + .serdes_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_ep_serdes_tbl), + .pcs_misc = sm8450_qmp_gen4x2_pcie_ep_pcs_misc_tbl, + .pcs_misc_num =ARRAY_SIZE (sm8450_qmp_gen4x2_pcie_ep_pcs_misc_tbl), + }, + .clk_list = sdm845_pciephy_clk_l, .num_clks = ARRAY_SIZE(sdm845_pciephy_clk_l), .reset_list = sdm845_pciephy_reset_l,
drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h +1 -0
@@ -8,6 +8,7 @@/* Only for QMP V5_20 PHY - PCIe PCS registers */ #define QPHY_V5_20_PCS_PCIE_ENDPOINT_REFCLK_DRIVE 0x01c +#define QPHY_V5_20_PCS_PCIE_OSC_DTCT_MODE2_CONFIG5 0x084#define QPHY_V5_20_PCS_PCIE_OSC_DTCT_ACTIONS 0x090#define QPHY_V5_20_PCS_PCIE_EQ_CONFIG1 0x0a0#define QPHY_V5_20_PCS_PCIE_G4_EQ_CONFIG5 0x108
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 827/1146 phy: qcom-qmp-pcie: Fix high latency with 4x2 PHY when ASPM is enabled
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 9ddcd920f8edfe65c3670fbd0b49db00e1e562fe ]
The PCIe QMP 4x2 RC PHY generates high latency when ASPM is enabled. This seem to be fixed by clearing the QPHY_V5_20_PCS_PCIE_PRESET_P10_POST register of the pcs_misc register space.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 1 + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 1 + 2 files changed, 2 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +1 -0
@@ -1308,6 +1308,7 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = {static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_rc_pcs_misc_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_ENDPOINT_REFCLK_DRIVE ,0xc1 ),QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_OSC_DTCT_ACTIONS ,0x00 ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_PCIE_PRESET_P10_POST ,0x00 ), };static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_ep_serdes_tbl[] = {
drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h +1 -0
@@ -11,6 +11,7 @@#define QPHY_V5_20_PCS_PCIE_OSC_DTCT_MODE2_CONFIG5 0x084#define QPHY_V5_20_PCS_PCIE_OSC_DTCT_ACTIONS 0x090#define QPHY_V5_20_PCS_PCIE_EQ_CONFIG1 0x0a0 +#define QPHY_V5_20_PCS_PCIE_PRESET_P10_POST 0x0e0#define QPHY_V5_20_PCS_PCIE_G4_EQ_CONFIG5 0x108#define QPHY_V5_20_PCS_PCIE_G4_PRE_GAIN 0x15c#define QPHY_V5_20_PCS_PCIE_RX_MARGINING_CONFIG3 0x184
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 828/1146 phy: qcom-qmp-pcie: Fix sm8450_qmp_gen4x2_pcie_pcs_tbl[] register names
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 883aebf6e1ea88145d64dcf940dbcb5181313338 ]
sm8450_qmp_gen4x2_pcie_pcs_tbl[] contains the init sequence for PCS registers of QMP PHY v5.20. So use the v5.20 specific register names. Only major change is the rename of PCS_EQ_CONFIG{2/3} registers to PCS_EQ_CONFIG{4/5}.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 8 ++++---- drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 14 ++++++++++++++ drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +4 -4
@@ -1292,10 +1292,10 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_rx_tbl[] = { };static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_tbl[] = { -QMP_PHY_INIT_CFG (QPHY_V5_PCS_EQ_CONFIG2 ,0x16 ), -QMP_PHY_INIT_CFG (QPHY_V5_PCS_EQ_CONFIG3 ,0x22 ), -QMP_PHY_INIT_CFG (QPHY_V5_PCS_G3S2_PRE_GAIN ,0x2e ), -QMP_PHY_INIT_CFG (QPHY_V5_PCS_RX_SIGDET_LVL ,0x99 ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_EQ_CONFIG4 ,0x16 ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_EQ_CONFIG5 ,0x22 ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_G3S2_PRE_GAIN ,0x2e ), +QMP_PHY_INIT_CFG (QPHY_V5_20_PCS_RX_SIGDET_LVL ,0x99 ), };static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = {
drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2022, Linaro Ltd. +*/ + +#ifndef QCOM_PHY_QMP_PCS_V5_20_H_ +#define QCOM_PHY_QMP_PCS_V5_20_H_ + +#define QPHY_V5_20_PCS_G3S2_PRE_GAIN 0x170 +#define QPHY_V5_20_PCS_RX_SIGDET_LVL 0x188 +#define QPHY_V5_20_PCS_EQ_CONFIG4 0x1e0 +#define QPHY_V5_20_PCS_EQ_CONFIG5 0x1e4 + +#endif
drivers/phy/qualcomm/phy-qcom-qmp.h +1 -0
@@ -38,6 +38,7 @@#include "phy-qcom-qmp-pcs-pcie-v4_20.h" #include "phy-qcom-qmp-pcs-v5.h" +#include "phy-qcom-qmp-pcs-v5_20.h" #include "phy-qcom-qmp-pcs-pcie-v5.h" #include "phy-qcom-qmp-pcs-usb-v5.h" #include "phy-qcom-qmp-pcs-ufs-v5.h"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 829/1146 fs/ntfs3: Fix slab-out-of-bounds read in ntfs_trim_fs
In reply to Greg Kroah-HartmanFrom: Abdun Nihaal <[email protected]>
[ Upstream commit 557d19675a470bb0a98beccec38c5dc3735c20fa ]
Syzbot reports an out of bound access in ntfs_trim_fs.
The cause of this is using a loop termination condition that compares window index (iw) with wnd->nbits instead of wnd->nwnd, due to which the index used for wnd->free_bits exceeds the size of the array allocated.
Fix the loop condition.
--- fs/ntfs3/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/bitmap.c +1 -1
@@ -1424,7 +1424,7 @@ int ntfs_trim_fs(struct ntfs_sb_info *sbi, struct fstrim_range *range)down_read_nested (&wnd->rw_lock,BITMAP_MUTEX_CLUSTERS ); -for (; iw < wnd->nbits; iw++, wbit =0 ) { +for (; iw < wnd->nwnd; iw++, wbit =0 ) {CLST lcn_wnd = iw * wbits;struct buffer_head *bh;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 830/1146 dmaengine: idxd: Fix crc_val field for completion record
In reply to Greg Kroah-HartmanFrom: Fenghua Yu <[email protected]>
[ Upstream commit dc901d98b1fe6e52ab81cd3e0879379168e06daa ]
The crc_val in the completion record should be 64 bits and not 32 bits.
--- include/uapi/linux/idxd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/idxd.h +1 -1
@@ -295,7 +295,7 @@ struct dsa_completion_record { };uint32_t delta_rec_size; -uint32_t crc_val; +uint64_t crc_val;/* DIF check & strip */ struct {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 831/1146 rtc: rzn1: Check return value in rzn1_rtc_probe
In reply to Greg Kroah-HartmanFrom: Yushan Zhou <[email protected]>
[ Upstream commit 9800f24f7bd5b99fb4fc4ce981427102e2e15a1c ]
The rzn1_rtc_probe() function utilizes devm_pm_runtime_enable() but wasn't checking the return value. Fix it by adding missing check.
--- drivers/rtc/rtc-rzn1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rtc/rtc-rzn1.c +3 -1
@@ -355,7 +355,9 @@ static int rzn1_rtc_probe(struct platform_device *pdev)set_bit (RTC_FEATURE_ALARM_RES_MINUTE , rtc->rtcdev->features);clear_bit (RTC_FEATURE_UPDATE_INTERRUPT , rtc->rtcdev->features); -devm_pm_runtime_enable (&pdev->dev); + ret =devm_pm_runtime_enable (&pdev->dev); +if (ret <0 ) +return ret; ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 )return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 832/1146 rtc: class: Fix potential memleak in devm_rtc_allocate_device()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit 60da73808298ff2cfa9f165d55eb3d7aa7078601 ]
devm_rtc_allocate_device() will alloc a rtc_device first, and then run dev_set_name(). If dev_set_name() failed, the rtc_device will memleak. Move devm_add_action_or_reset() in front of dev_set_name() to prevent memleak.
unreferenced object 0xffff888110a53000 (size 2048):
comm "python3", pid 470, jiffies 4296078308 (age 58.882s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 08 30 a5 10 81 88 ff ff .........0......
08 30 a5 10 81 88 ff ff 00 00 00 00 00 00 00 00 .0..............
backtrace:
[<000000004aac0364>] kmalloc_trace+0x21/0x110
[<000000000ff02202>] devm_rtc_allocate_device+0xd4/0x400
[<000000001bdf5639>] devm_rtc_device_register+0x1a/0x80
[<00000000351bf81c>] rx4581_probe+0xdd/0x110 [rtc_rx4581]
[<00000000f0eba0ae>] spi_probe+0xde/0x130
[<00000000bff89ee8>] really_probe+0x175/0x3f0
[<00000000128e8d84>] __driver_probe_device+0xe6/0x170
[<00000000ee5bf913>] device_driver_attach+0x32/0x80
[<00000000f3f28f92>] bind_store+0x10b/0x1a0
[<000000009ff812d8>] drv_attr_store+0x49/0x70
[<000000008139c323>] sysfs_kf_write+0x8d/0xb0
[<00000000b6146e01>] kernfs_fop_write_iter+0x214/0x2d0
[<00000000ecbe3895>] vfs_write+0x61a/0x7d0
[<00000000aa2196ea>] ksys_write+0xc8/0x190
[<0000000046a600f5>] do_syscall_64+0x37/0x90
[<00000000541a336f>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- drivers/rtc/class.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/class.c +2 -2
@@ -374,11 +374,11 @@ struct rtc_device *devm_rtc_allocate_device(struct device *dev) rtc->id = id; rtc->dev.parent = dev; - err =dev_set_name (&rtc->dev,"rtc%d" , id); + err =devm_add_action_or_reset (dev, devm_rtc_release_device, rtc);if (err)return ERR_PTR (err); - err =devm_add_action_or_reset (dev, devm_rtc_release_device, rtc); + err =dev_set_name (&rtc->dev,"rtc%d" , id);if (err)return ERR_PTR (err);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 833/1146 rtc: pcf2127: Convert to .probe_new()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 5418e595f30bf4fde83ebb0121417c0c95cff98e ]
.probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work.
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
--- drivers/rtc/rtc-pcf2127.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/rtc/rtc-pcf2127.c +11 -11
@@ -885,9 +885,17 @@ static const struct regmap_bus pcf2127_i2c_regmap = {static struct i2c_driver pcf2127_i2c_driver; -static int pcf2127_i2c_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id pcf2127_i2c_id[] = { + {"pcf2127" ,1 }, + {"pcf2129" ,0 }, + {"pca2129" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, pcf2127_i2c_id); + +static int pcf2127_i2c_probe (struct i2c_client *client) { +const struct i2c_device_id *id =i2c_match_id (pcf2127_i2c_id, client);struct regmap *regmap;static const struct regmap_config config = { .reg_bits =8 ,
@@ -910,20 +918,12 @@ static int pcf2127_i2c_probe(struct i2c_client *client, pcf2127_i2c_driver.driver.name, id->driver_data); } -static const struct i2c_device_id pcf2127_i2c_id[] = { - {"pcf2127" ,1 }, - {"pcf2129" ,0 }, - {"pca2129" ,0 }, - { } -}; -MODULE_DEVICE_TABLE (i2c, pcf2127_i2c_id); -static struct i2c_driver pcf2127_i2c_driver = { .driver = { .name ="rtc-pcf2127-i2c" , .of_match_table =of_match_ptr (pcf2127_of_match), }, - .probe = pcf2127_i2c_probe, + .probe_new = pcf2127_i2c_probe, .id_table = pcf2127_i2c_id, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 834/1146 rtc: cmos: Call cmos_wake_setup() from cmos_do_probe()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 508ccdfb86b21da37ad091003a4d4567709d5dfb ]
Notice that cmos_wake_setup() is the only user of acpi_rtc_info and it can operate on the cmos_rtc variable directly, so it need not set the platform_data pointer before cmos_do_probe() is called. Instead, it can be called by cmos_do_probe() in the case when the platform_data pointer is not set to implement the default behavior (which is to use the FADT information as long as ACPI support is enabled).
Modify the code accordingly.
While at it, drop a comment that doesn't really match the code it is supposed to be describing.
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
--- drivers/rtc/rtc-cmos.c | 47 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-)
drivers/rtc/rtc-cmos.c +22 -25
@@ -744,6 +744,8 @@ static irqreturn_t cmos_interrupt(int irq, void *p)return IRQ_NONE ; } +static void cmos_wake_setup (struct device *dev); +#ifdef CONFIG_PNP #define INITSECTION
@@ -827,19 +829,27 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)if (info->address_space) address_space = info->address_space; -if (info->rtc_day_alarm && info->rtc_day_alarm <128 ) - cmos_rtc.day_alrm = info->rtc_day_alarm; -if (info->rtc_mon_alarm && info->rtc_mon_alarm <128 ) - cmos_rtc.mon_alrm = info->rtc_mon_alarm; -if (info->rtc_century && info->rtc_century <128 ) - cmos_rtc.century = info->rtc_century; + cmos_rtc.day_alrm = info->rtc_day_alarm; + cmos_rtc.mon_alrm = info->rtc_mon_alarm; + cmos_rtc.century = info->rtc_century;if (info->wake_on && info->wake_off) { cmos_rtc.wake_on = info->wake_on; cmos_rtc.wake_off = info->wake_off; } + }else { +cmos_wake_setup (dev); } +if (cmos_rtc.day_alrm >=128 ) + cmos_rtc.day_alrm =0 ; + +if (cmos_rtc.mon_alrm >=128 ) + cmos_rtc.mon_alrm =0 ; + +if (cmos_rtc.century >=128 ) + cmos_rtc.century =0 ; + cmos_rtc.dev = dev;dev_set_drvdata (dev, &cmos_rtc);
@@ -1275,13 +1285,6 @@ static void use_acpi_alarm_quirks(void)static inline void use_acpi_alarm_quirks (void ) { }#endif -/* Every ACPI platform has a mc146818 compatible "cmos rtc". Here we find -* its device node and pass extra config data. This helps its driver use -* capabilities that the now-obsolete mc146818 didn't have, and informs it -* that this board's RTC is wakeup-capable (per ACPI spec). -*/ -static struct cmos_rtc_board_info acpi_rtc_info; -static void cmos_wake_setup (struct device *dev) {if (acpi_disabled)
@@ -1289,26 +1292,23 @@ static void cmos_wake_setup(struct device *dev)use_acpi_alarm_quirks (); - acpi_rtc_info.wake_on = rtc_wake_on; - acpi_rtc_info.wake_off = rtc_wake_off; + cmos_rtc.wake_on = rtc_wake_on; + cmos_rtc.wake_off = rtc_wake_off; -/* workaround bug in some ACPI tables */ +/* ACPI tables bug workaround. */ if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) {dev_dbg (dev,"bogus FADT month_alarm (%d)\n" , acpi_gbl_FADT.month_alarm); acpi_gbl_FADT.month_alarm =0 ; } - acpi_rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm; - acpi_rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm; - acpi_rtc_info.rtc_century = acpi_gbl_FADT.century; + cmos_rtc.day_alrm = acpi_gbl_FADT.day_alarm; + cmos_rtc.mon_alrm = acpi_gbl_FADT.month_alarm; + cmos_rtc.century = acpi_gbl_FADT.century; -/* NOTE: S4_RTC_WAKE is NOT currently useful to Linux */ if (acpi_gbl_FADT.flags &ACPI_FADT_S4_RTC_WAKE )dev_info (dev,"RTC can wake from S4\n" ); - dev->platform_data = &acpi_rtc_info; -/* RTC always wakes from S1/S2/S3, and often S4/STD */ device_init_wakeup (dev,1 ); }
@@ -1359,8 +1359,6 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) {int irq, ret; -cmos_wake_setup (&pnp->dev); -if (pnp_port_start (pnp,0 ) ==0x70 && !pnp_irq_valid (pnp,0 )) { irq =0 ;#ifdef CONFIG_X86
@@ -1468,7 +1466,6 @@ static int __init cmos_platform_probe(struct platform_device *pdev)int irq, ret;cmos_of_init (pdev); -cmos_wake_setup (&pdev->dev);if (RTC_IOMAPPED ) resource =platform_get_resource (pdev,IORESOURCE_IO ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 835/1146 rtc: cmos: Call rtc_wake_setup() from cmos_do_probe()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 375bbba09692fe4c5218eddee8e312dd733fa846 ]
To reduce code duplication, move the invocation of rtc_wake_setup() into cmos_do_probe() and simplify the callers of the latter.
No intentional functional impact.
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
--- drivers/rtc/rtc-cmos.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/rtc/rtc-cmos.c +12 -16
@@ -744,6 +744,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p)return IRQ_NONE ; } +static inline void rtc_wake_setup (struct device *dev);static void cmos_wake_setup (struct device *dev);#ifdef CONFIG_PNP
@@ -938,6 +939,13 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) nvmem_cfg.size = address_space -NVRAM_OFFSET ;devm_rtc_nvmem_register (cmos_rtc.rtc, &nvmem_cfg); +/* +* Everything has gone well so far, so by default register a handler for +* the ACPI RTC fixed event. +*/ +if (!info) +rtc_wake_setup (dev); +dev_info (dev,"%s%s, %d bytes nvram%s\n" , !is_valid_irq (rtc_irq) ?"no alarms" : cmos_rtc.mon_alrm ? "alarms up to one year" :
@@ -1357,7 +1365,7 @@ static void rtc_wake_setup(struct device *dev)static int cmos_pnp_probe (struct pnp_dev *pnp,const struct pnp_device_id *id) { -int irq, ret; +int irq;if (pnp_port_start (pnp,0 ) ==0x70 && !pnp_irq_valid (pnp,0 )) { irq =0 ;
@@ -1373,13 +1381,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) irq =pnp_irq (pnp,0 ); } - ret =cmos_do_probe (&pnp->dev,pnp_get_resource (pnp,IORESOURCE_IO ,0 ), irq); -if (ret) -return ret; - -rtc_wake_setup (&pnp->dev); - -return 0 ; +return cmos_do_probe (&pnp->dev,pnp_get_resource (pnp,IORESOURCE_IO ,0 ), irq); }static void cmos_pnp_remove (struct pnp_dev *pnp)
@@ -1463,7 +1465,7 @@ static inline void cmos_of_init(struct platform_device *pdev) {}static int __init cmos_platform_probe (struct platform_device *pdev) {struct resource *resource; -int irq, ret; +int irq;cmos_of_init (pdev);
@@ -1475,13 +1477,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)if (irq <0 ) irq =-1 ; - ret =cmos_do_probe (&pdev->dev, resource, irq); -if (ret) -return ret; - -rtc_wake_setup (&pdev->dev); - -return 0 ; +return cmos_do_probe (&pdev->dev, resource, irq); }static int cmos_platform_remove (struct platform_device *pdev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 836/1146 rtc: cmos: Eliminate forward declarations of some functions
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit dca4d3b71c8a09a16951add656711fbd6f5bfbb0 ]
Reorder the ACPI-related code before cmos_do_probe() so as to eliminate excessive forward declarations of some functions.
While at it, for consistency, add the inline modifier to the definitions of empty stub static funtions and remove it from the corresponding definitions of functions with non-empty bodies.
No intentional functional impact.
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
--- drivers/rtc/rtc-cmos.c | 304 ++++++++++++++++++++--------------------- 1 file changed, 149 insertions(+), 155 deletions(-)
drivers/rtc/rtc-cmos.c +149 -155
@@ -744,8 +744,155 @@ static irqreturn_t cmos_interrupt(int irq, void *p)return IRQ_NONE ; } -static inline void rtc_wake_setup (struct device *dev); -static void cmos_wake_setup (struct device *dev); +#ifdef CONFIG_ACPI + +#include <linux/acpi.h> + +static u32 rtc_handler (void *context) +{ +struct device *dev = context; +struct cmos_rtc *cmos =dev_get_drvdata (dev); +unsigned char rtc_control =0 ; +unsigned char rtc_intr; +unsigned long flags; + + +/* +* Always update rtc irq when ACPI is used as RTC Alarm. +* Or else, ACPI SCI is enabled during suspend/resume only, +* update rtc irq in that case. +*/ +if (cmos_use_acpi_alarm ()) +cmos_interrupt (0 , (void *)cmos->rtc); +else { +/* Fix me: can we use cmos_interrupt() here as well? */ +spin_lock_irqsave (&rtc_lock, flags); +if (cmos_rtc.suspend_ctrl) + rtc_control =CMOS_READ (RTC_CONTROL ); +if (rtc_control &RTC_AIE ) { + cmos_rtc.suspend_ctrl &= ~RTC_AIE ; +CMOS_WRITE (rtc_control,RTC_CONTROL ); + rtc_intr =CMOS_READ (RTC_INTR_FLAGS ); +rtc_update_irq (cmos->rtc,1 , rtc_intr); + } +spin_unlock_irqrestore (&rtc_lock, flags); + } + +pm_wakeup_hard_event (dev); +acpi_clear_event (ACPI_EVENT_RTC ); +acpi_disable_event (ACPI_EVENT_RTC ,0 ); +return ACPI_INTERRUPT_HANDLED ; +} + +static void rtc_wake_setup (struct device *dev) +{ +if (acpi_disabled) +return ; + +acpi_install_fixed_event_handler (ACPI_EVENT_RTC , rtc_handler, dev); +/* +* After the RTC handler is installed, the Fixed_RTC event should +* be disabled. Only when the RTC alarm is set will it be enabled. +*/ +acpi_clear_event (ACPI_EVENT_RTC ); +acpi_disable_event (ACPI_EVENT_RTC ,0 ); +} + +static void rtc_wake_on (struct device *dev) +{ +acpi_clear_event (ACPI_EVENT_RTC ); +acpi_enable_event (ACPI_EVENT_RTC ,0 ); +} + +static void rtc_wake_off (struct device *dev) +{ +acpi_disable_event (ACPI_EVENT_RTC ,0 ); +} + +#ifdef CONFIG_X86 +/* Enable use_acpi_alarm mode for Intel platforms no earlier than 2015 */ +static void use_acpi_alarm_quirks (void ) +{ +if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) +return ; + +if (!is_hpet_enabled ()) +return ; + +if (dmi_get_bios_year () <2015 ) +return ; + + use_acpi_alarm = true; +} +#else +static inline void use_acpi_alarm_quirks (void ) { } +#endif + +static void cmos_wake_setup (struct device *dev) +{ +if (acpi_disabled) +return ; + +use_acpi_alarm_quirks (); + + cmos_rtc.wake_on = rtc_wake_on; + cmos_rtc.wake_off = rtc_wake_off; + +/* ACPI tables bug workaround. */ +if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) { +dev_dbg (dev,"bogus FADT month_alarm (%d)\n" , + acpi_gbl_FADT.month_alarm); + acpi_gbl_FADT.month_alarm =0 ; + } + + cmos_rtc.day_alrm = acpi_gbl_FADT.day_alarm; + cmos_rtc.mon_alrm = acpi_gbl_FADT.month_alarm; + cmos_rtc.century = acpi_gbl_FADT.century; + +if (acpi_gbl_FADT.flags &ACPI_FADT_S4_RTC_WAKE ) +dev_info (dev,"RTC can wake from S4\n" ); + +/* RTC always wakes from S1/S2/S3, and often S4/STD */ +device_init_wakeup (dev,1 ); +} + +static void cmos_check_acpi_rtc_status (struct device *dev, +unsigned char *rtc_control) +{ +struct cmos_rtc *cmos =dev_get_drvdata (dev); +acpi_event_status rtc_status; +acpi_status status; + +if (acpi_gbl_FADT.flags &ACPI_FADT_FIXED_RTC ) +return ; + + status =acpi_get_event_status (ACPI_EVENT_RTC , &rtc_status); +if (ACPI_FAILURE (status)) { +dev_err (dev,"Could not get RTC status\n" ); + }else if (rtc_status &ACPI_EVENT_FLAG_SET ) { +unsigned char mask; + *rtc_control &= ~RTC_AIE ; +CMOS_WRITE (*rtc_control,RTC_CONTROL ); + mask =CMOS_READ (RTC_INTR_FLAGS ); +rtc_update_irq (cmos->rtc,1 , mask); + } +} + +#else /* !CONFIG_ACPI */ + +static inline void rtc_wake_setup (struct device *dev) +{ +} + +static inline void cmos_wake_setup (struct device *dev) +{ +} + +static inline void cmos_check_acpi_rtc_status (struct device *dev, +unsigned char *rtc_control) +{ +} +#endif /* CONFIG_ACPI */ #ifdef CONFIG_PNP #define INITSECTION
@@ -1140,9 +1287,6 @@ static void cmos_check_wkalrm(struct device *dev) } } -static void cmos_check_acpi_rtc_status (struct device *dev, -unsigned char *rtc_control); -static int __maybe_unused cmos_resume (struct device *dev) {struct cmos_rtc *cmos =dev_get_drvdata (dev);
@@ -1209,156 +1353,6 @@ static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);* predate even PNPBIOS should set up platform_bus devices. */ -#ifdef CONFIG_ACPI - -#include <linux/acpi.h> - -static u32 rtc_handler (void *context) -{ -struct device *dev = context; -struct cmos_rtc *cmos =dev_get_drvdata (dev); -unsigned char rtc_control =0 ; -unsigned char rtc_intr; -unsigned long flags; - - -/* -* Always update rtc irq when ACPI is used as RTC Alarm. -* Or else, ACPI SCI is enabled during suspend/resume only, -* update rtc irq in that case. -*/ -if (cmos_use_acpi_alarm ()) -cmos_interrupt (0 , (void *)cmos->rtc); -else { -/* Fix me: can we use cmos_interrupt() here as well? */ -spin_lock_irqsave (&rtc_lock, flags); -if (cmos_rtc.suspend_ctrl) - rtc_control =CMOS_READ (RTC_CONTROL ); -if (rtc_control &RTC_AIE ) { - cmos_rtc.suspend_ctrl &= ~RTC_AIE ; -CMOS_WRITE (rtc_control,RTC_CONTROL ); - rtc_intr =CMOS_READ (RTC_INTR_FLAGS ); -rtc_update_irq (cmos->rtc,1 , rtc_intr); - } -spin_unlock_irqrestore (&rtc_lock, flags); - } - -pm_wakeup_hard_event (dev); -acpi_clear_event (ACPI_EVENT_RTC ); -acpi_disable_event (ACPI_EVENT_RTC ,0 ); -return ACPI_INTERRUPT_HANDLED ; -} - -static inline void rtc_wake_setup (struct device *dev) -{ -if (acpi_disabled) -return ; - -acpi_install_fixed_event_handler (ACPI_EVENT_RTC , rtc_handler, dev); -/* -* After the RTC handler is installed, the Fixed_RTC event should -* be disabled. Only when the RTC alarm is set will it be enabled. -*/ -acpi_clear_event (ACPI_EVENT_RTC ); -acpi_disable_event (ACPI_EVENT_RTC ,0 ); -} - -static void rtc_wake_on (struct device *dev) -{ -acpi_clear_event (ACPI_EVENT_RTC ); -acpi_enable_event (ACPI_EVENT_RTC ,0 ); -} - -static void rtc_wake_off (struct device *dev) -{ -acpi_disable_event (ACPI_EVENT_RTC ,0 ); -} - -#ifdef CONFIG_X86 -/* Enable use_acpi_alarm mode for Intel platforms no earlier than 2015 */ -static void use_acpi_alarm_quirks (void ) -{ -if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) -return ; - -if (!is_hpet_enabled ()) -return ; - -if (dmi_get_bios_year () <2015 ) -return ; - - use_acpi_alarm = true; -} -#else -static inline void use_acpi_alarm_quirks (void ) { } -#endif - -static void cmos_wake_setup (struct device *dev) -{ -if (acpi_disabled) -return ; - -use_acpi_alarm_quirks (); - - cmos_rtc.wake_on = rtc_wake_on; - cmos_rtc.wake_off = rtc_wake_off; - -/* ACPI tables bug workaround. */ -if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) { -dev_dbg (dev,"bogus FADT month_alarm (%d)\n" , - acpi_gbl_FADT.month_alarm); - acpi_gbl_FADT.month_alarm =0 ; - } - - cmos_rtc.day_alrm = acpi_gbl_FADT.day_alarm; - cmos_rtc.mon_alrm = acpi_gbl_FADT.month_alarm; - cmos_rtc.century = acpi_gbl_FADT.century; - -if (acpi_gbl_FADT.flags &ACPI_FADT_S4_RTC_WAKE ) -dev_info (dev,"RTC can wake from S4\n" ); - -/* RTC always wakes from S1/S2/S3, and often S4/STD */ -device_init_wakeup (dev,1 ); -} - -static void cmos_check_acpi_rtc_status (struct device *dev, -unsigned char *rtc_control) -{ -struct cmos_rtc *cmos =dev_get_drvdata (dev); -acpi_event_status rtc_status; -acpi_status status; - -if (acpi_gbl_FADT.flags &ACPI_FADT_FIXED_RTC ) -return ; - - status =acpi_get_event_status (ACPI_EVENT_RTC , &rtc_status); -if (ACPI_FAILURE (status)) { -dev_err (dev,"Could not get RTC status\n" ); - }else if (rtc_status &ACPI_EVENT_FLAG_SET ) { -unsigned char mask; - *rtc_control &= ~RTC_AIE ; -CMOS_WRITE (*rtc_control,RTC_CONTROL ); - mask =CMOS_READ (RTC_INTR_FLAGS ); -rtc_update_irq (cmos->rtc,1 , mask); - } -} - -#else - -static void cmos_wake_setup (struct device *dev) -{ -} - -static void cmos_check_acpi_rtc_status (struct device *dev, -unsigned char *rtc_control) -{ -} - -static void rtc_wake_setup (struct device *dev) -{ -} -#endif -#ifdef CONFIG_PNP #include <linux/pnp.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 837/1146 rtc: cmos: Rename ACPI-related functions
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit d13e9ad9f5146f066a5c5a1cc993d09e4fb21ead ]
The names of rtc_wake_setup() and cmos_wake_setup() don't indicate that these functions are ACPI-related, which is the case, and the former doesn't really reflect the role of the function.
Rename them to acpi_rtc_event_setup() and acpi_cmos_wake_setup(), respectively, to address this shortcoming.
No intentional functional impact.
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
--- drivers/rtc/rtc-cmos.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/rtc/rtc-cmos.c +6 -6
@@ -784,7 +784,7 @@ static u32 rtc_handler(void *context)return ACPI_INTERRUPT_HANDLED ; } -static void rtc_wake_setup (struct device *dev) +static void acpi_rtc_event_setup (struct device *dev) {if (acpi_disabled)return ;
@@ -828,7 +828,7 @@ static void use_acpi_alarm_quirks(void)static inline void use_acpi_alarm_quirks (void ) { }#endif -static void cmos_wake_setup (struct device *dev) +static void acpi_cmos_wake_setup (struct device *dev) {if (acpi_disabled)return ;
@@ -880,11 +880,11 @@ static void cmos_check_acpi_rtc_status(struct device *dev,#else /* !CONFIG_ACPI */ -static inline void rtc_wake_setup (struct device *dev) +static inline void acpi_rtc_event_setup (struct device *dev) { } -static inline void cmos_wake_setup (struct device *dev) +static inline void acpi_cmos_wake_setup (struct device *dev) { }
@@ -986,7 +986,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) cmos_rtc.wake_off = info->wake_off; } }else { -cmos_wake_setup (dev); +acpi_cmos_wake_setup (dev); }if (cmos_rtc.day_alrm >=128 )
@@ -1091,7 +1091,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)* the ACPI RTC fixed event. */ if (!info) -rtc_wake_setup (dev); +acpi_rtc_event_setup (dev); dev_info(dev, "%s%s, %d bytes nvram%s\n", !is_valid_irq(rtc_irq) ? "no alarms" :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 838/1146 rtc: cmos: Disable ACPI RTC event on removal
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 83ebb7b3036d151ee39a4a752018665648fc3bd4 ]
Make cmos_do_remove() drop the ACPI RTC fixed event handler so as to prevent it from operating on stale data in case the event triggers after driver removal.
--- drivers/rtc/rtc-cmos.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/rtc/rtc-cmos.c +15 -0
@@ -798,6 +798,14 @@ static void acpi_rtc_event_setup(struct device *dev)acpi_disable_event (ACPI_EVENT_RTC ,0 ); } +static void acpi_rtc_event_cleanup (void ) +{ +if (acpi_disabled) +return ; + +acpi_remove_fixed_event_handler (ACPI_EVENT_RTC , rtc_handler); +} +static void rtc_wake_on (struct device *dev) {acpi_clear_event (ACPI_EVENT_RTC );
@@ -884,6 +892,10 @@ static inline void acpi_rtc_event_setup(struct device *dev) { } +static inline void acpi_rtc_event_cleanup (void ) +{ +} +static inline void acpi_cmos_wake_setup (struct device *dev) { }
@@ -1138,6 +1150,9 @@ static void cmos_do_remove(struct device *dev)hpet_unregister_irq_handler (cmos_interrupt); } +if (!dev_get_platdata (dev)) +acpi_rtc_event_cleanup (); + cmos->rtc =NULL ; ports = cmos->iomem;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 839/1146 rtc: snvs: Allow a time difference on clock register read
In reply to Greg Kroah-HartmanFrom: Stefan Eichenberger <[email protected]>
[ Upstream commit 0462681e207ccc44778a77b3297af728b1cf5b9f ]
On an iMX6ULL the following message appears when a wakealarm is set:
echo 0 > /sys/class/rtc/rtc1/wakealarm
rtc rtc1: Timeout trying to get valid LPSRT Counter read
This does not always happen but is reproducible quite often (7 out of 10 times). The problem appears because the iMX6ULL is not able to read the registers within one 32kHz clock cycle which is the base clock of the RTC. Therefore, this patch allows a difference of up to 320 cycles (10ms). 10ms was chosen to be big enough even on systems with less cpu power (e.g. iMX6ULL). According to the reference manual a difference is fine:
- If the two consecutive reads are similar, the value is correct. The values have to be similar, not equal.
--- drivers/rtc/rtc-snvs.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/rtc/rtc-snvs.c +14 -2
@@ -32,6 +32,14 @@#define SNVS_LPPGDR_INIT 0x41736166#define CNTR_TO_SECS_SH 15 +/* The maximum RTC clock cycles that are allowed to pass between two +* consecutive clock counter register reads. If the values are corrupted a +* bigger difference is expected. The RTC frequency is 32kHz. With 320 cycles +* we end at 10ms which should be enough for most cases. If it once takes +* longer than expected we do a retry. +*/ +#define MAX_RTC_READ_DIFF_CYCLES 320 +struct snvs_rtc_data {struct rtc_device *rtc;struct regmap *regmap;
@@ -56,6 +64,7 @@ static u64 rtc_read_lpsrt(struct snvs_rtc_data *data)static u32 rtc_read_lp_counter (struct snvs_rtc_data *data) {u64 read1, read2; +s64 diff;unsigned int timeout =100 ;/* As expected, the registers might update between the read of the LSB
@@ -66,7 +75,8 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data)do { read2 = read1; read1 =rtc_read_lpsrt (data); - }while (read1 != read2 && --timeout); + diff = read1 - read2; + }while (((diff <0 ) || (diff >MAX_RTC_READ_DIFF_CYCLES )) && --timeout);if (!timeout)dev_err (&data->rtc->dev,"Timeout trying to get valid LPSRT Counter read\n" );
@@ -78,13 +88,15 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data)static int rtc_read_lp_counter_lsb (struct snvs_rtc_data *data,u32 *lsb) {u32 count1, count2; +s32 diff;unsigned int timeout =100 ;regmap_read (data->regmap, data->offset +SNVS_LPSRTCLR , &count1);do { count2 = count1;regmap_read (data->regmap, data->offset +SNVS_LPSRTCLR , &count1); - }while (count1 != count2 && --timeout); + diff = count1 - count2; + }while (((diff <0 ) || (diff >MAX_RTC_READ_DIFF_CYCLES )) && --timeout);if (!timeout) {dev_err (&data->rtc->dev,"Timeout trying to get valid LPSRT Counter read\n" );return -ETIMEDOUT ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 840/1146 rtc: pcf85063: Fix reading alarm
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit a6ceee26fd5ed9b5bd37322b1ca88e4548cee4a3 ]
If the alarms are disabled the topmost bit (AEN_*) is set in the alarm registers. This is also interpreted in BCD number leading to this warning:
rtc rtc0: invalid alarm value: 2022-09-21T80:80:80
Fix this by masking alarm enabling and reserved bits.
--- drivers/rtc/rtc-pcf85063.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/rtc/rtc-pcf85063.c +4 -4
@@ -169,10 +169,10 @@ static int pcf85063_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)if (ret)return ret; - alrm->time.tm_sec =bcd2bin (buf[0 ]); - alrm->time.tm_min =bcd2bin (buf[1 ]); - alrm->time.tm_hour =bcd2bin (buf[2 ]); - alrm->time.tm_mday =bcd2bin (buf[3 ]); + alrm->time.tm_sec =bcd2bin (buf[0 ] &0x7f ); + alrm->time.tm_min =bcd2bin (buf[1 ] &0x7f ); + alrm->time.tm_hour =bcd2bin (buf[2 ] &0x3f ); + alrm->time.tm_mday =bcd2bin (buf[3 ] &0x3f ); ret =regmap_read (pcf85063->regmap,PCF85063_REG_CTRL2 , &val);if (ret)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 841/1146 iommu/mediatek: Check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 73b6924cdebc899de9b719e1319aa86c6bed4acf ]
platform_get_resource() may return NULL pointer, we need check its return value to avoid null-ptr-deref in resource_size().
--- drivers/iommu/mtk_iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/mtk_iommu.c +2 -0
@@ -1173,6 +1173,8 @@ static int mtk_iommu_probe(struct platform_device *pdev) banks_num = data->plat_data->banks_num; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ;if (resource_size (res) < banks_num *MTK_IOMMU_BANK_SZ ) {dev_err (dev,"banknr %d. res %pR is not enough.\n" , banks_num, res);return -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 842/1146 iommu: Avoid races around device probe
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit 01657bc14a3990c665375f77978631fee77b1fce ]
We currently have 3 different ways that __iommu_probe_device() may be called, but no real guarantee that multiple callers can't tread on each other, especially once asynchronous driver probe gets involved. It would likely have taken a fair bit of luck to hit this previously, but commit 57365a04c921 ("iommu: Move bus setup to IOMMU device registration") ups the odds since now it's not just omap-iommu that may trigger multiple bus_iommu_probe() calls in parallel if probing asynchronously.
Add a lock to ensure we can't try to double-probe a device, and also close some possible race windows to make sure we're truly robust against trying to double-initialise a group via two different member devices.
--- drivers/iommu/iommu.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/iommu/iommu.c +22 -6
@@ -283,13 +283,23 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_listconst struct iommu_ops *ops = dev->bus->iommu_ops;struct iommu_device *iommu_dev;struct iommu_group *group; +static DEFINE_MUTEX (iommu_probe_device_lock);int ret;if (!ops)return -ENODEV ; - -if (!dev_iommu_get (dev)) -return -ENOMEM ; +/* +* Serialise to avoid races between IOMMU drivers registering in +* parallel and/or the "replay" calls from ACPI/OF code via client +* driver probe. Once the latter have been cleaned up we should +* probably be able to use device_lock() here to minimise the scope, +* but for now enforcing a simple global ordering is fine. +*/ +mutex_lock (&iommu_probe_device_lock); +if (!dev_iommu_get (dev)) { + ret = -ENOMEM ; + goto err_unlock; + }if (!try_module_get (ops->owner)) { ret = -EINVAL ;
@@ -309,11 +319,14 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list ret =PTR_ERR (group); goto out_release; } -iommu_group_put (group); +mutex_lock (&group->mutex);if (group_list && !group->default_domain &&list_empty (&group->entry))list_add_tail (&group->entry, group_list); +mutex_unlock (&group->mutex); +iommu_group_put (group); +mutex_unlock (&iommu_probe_device_lock);iommu_device_link (iommu_dev, dev);return 0 ;
@@ -328,6 +341,9 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list err_free:dev_iommu_free (dev); +err_unlock: +mutex_unlock (&iommu_probe_device_lock); +return ret; }
@@ -1799,11 +1815,11 @@ int bus_iommu_probe(struct bus_type *bus)return ret;list_for_each_entry_safe (group, next, &group_list, entry) { +mutex_lock (&group->mutex); +/* Remove item from the list */ list_del_init (&group->entry); -mutex_lock (&group->mutex); -/* Try to allocate default domain */ probe_alloc_default_domain (bus, group);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 843/1146 iommu/amd: Fix pci device refcount leak in ppr_notifier()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6cf0981c2233f97d56938d9d61845383d6eb227c ]
As comment of pci_get_domain_bus_and_slot() says, it returns a pci device with refcount increment, when finish using it, the caller must decrement the reference count by calling pci_dev_put(). So call it before returning from ppr_notifier() to avoid refcount leak.
--- drivers/iommu/amd/iommu_v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/amd/iommu_v2.c +1 -0
@@ -587,6 +587,7 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data)put_device_state (dev_state); out: +pci_dev_put (pdev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 844/1146 iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 73f5fc5f884ad0c5f7d57f66303af64f9f002526 ]
The fsl_pamu_probe() returns directly when create_csd() failed, leaving irq and memories unreleased.
Fix by jumping to error if create_csd() returns error.
--- drivers/iommu/fsl_pamu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/fsl_pamu.c +1 -1
@@ -868,7 +868,7 @@ static int fsl_pamu_probe(struct platform_device *pdev) ret =create_csd (ppaact_phys, mem_size, csd_port_id);if (ret) {dev_err (dev,"could not create coherence subdomain\n" ); -return ret; + goto error; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 845/1146 macintosh: fix possible memory leak in macio_add_one_device()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 5ca86eae55a2f006e6c1edd2029b2cacb6979515 ]
Afer commit 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array"), the name of device is allocated dynamically. It needs to be freed when of_device_register() fails. Call put_device() to give up the reference that's taken in device_initialize(), so that it can be freed in kobject_cleanup() when the refcount hits 0.
macio device is freed in macio_release_dev(), so the kfree() can be removed.
--- drivers/macintosh/macio_asic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/macintosh/macio_asic.c +1 -1
@@ -424,7 +424,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,if (of_device_register (&dev->ofdev) !=0 ) {printk (KERN_DEBUG "macio: device registration error for %s!\n" ,dev_name (&dev->ofdev.dev)); -kfree (dev); +put_device (&dev->ofdev.dev);return NULL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 846/1146 macintosh/macio-adb: check the return value of ioremap()
In reply to Greg Kroah-HartmanFrom: Xie Shaowen <[email protected]>
[ Upstream commit dbaa3105736d4d73063ea0a3b01cd7fafce924e6 ]
The function ioremap() in macio_init() can fail, so its return value should be checked.
--- drivers/macintosh/macio-adb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/macintosh/macio-adb.c +4 -0
@@ -108,6 +108,10 @@ int macio_init(void)return -ENXIO ; } adb =ioremap (r.start,sizeof (struct adb_regs )); +if (!adb) { +of_node_put (adbs); +return -ENOMEM ; + }out_8 (&adb->ctrl.r,0 );out_8 (&adb->intr.r,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 847/1146 powerpc/52xx: Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 5836947613ef33d311b4eff6a32d019580a214f5 ]
The error handling path of mpc52xx_lpbfifo_probe() has a request_irq() that is not balanced by a corresponding free_irq().
Add the missing call, as already done in the remove function.
--- arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +1 -0
@@ -531,6 +531,7 @@ static int mpc52xx_lpbfifo_probe(struct platform_device *op) err_bcom_rx_irq:bcom_gen_bd_rx_release (lpbfifo.bcom_rx_task); err_bcom_rx: +free_irq (lpbfifo.irq, &lpbfifo); err_irq:iounmap (lpbfifo.regs); lpbfifo.regs =NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 848/1146 cxl: Fix refcount leak in cxl_calc_capp_routing
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 1d09697ff22908ae487fc8c4fbde1811732be523 ]
of_get_next_parent() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. This function only calls of_node_put() in normal path, missing it in the error path.
Add missing of_node_put() to avoid refcount leak.
--- drivers/misc/cxl/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/misc/cxl/pci.c +1 -0
@@ -387,6 +387,7 @@ int cxl_calc_capp_routing(struct pci_dev *dev, u64 *chipid, rc =get_phb_index (np, phb_index);if (rc) {pr_err ("cxl: invalid phb index\n" ); +of_node_put (np);return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 849/1146 powerpc/xmon: Fix -Wswitch-unreachable warning in bpt_cmds
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 1c4a4a4c8410be4a231a58b23e7a30923ff954ac ]
When building with automatic stack variable initialization, GCC 12 complains about variables defined outside of switch case statements. Move the variable into the case that uses it, which silences the warning:
arch/powerpc/xmon/xmon.c: In function ‘bpt_cmds’:arch/powerpc/xmon/xmon.c:1529:13: warning: statement will never be executed [-Wswitch-unreachable]
1529 | int mode;
| ^~~~--- arch/powerpc/xmon/xmon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/powerpc/xmon/xmon.c +4 -3
@@ -1525,9 +1525,9 @@ bpt_cmds(void) cmd =inchar ();switch (cmd) { -static const char badaddr[] ="Only kernel addresses are permitted for breakpoints\n" ; -int mode; -case 'd' :/* bd - hardware data breakpoint */ +case 'd' : {/* bd - hardware data breakpoint */ +static const char badaddr[] ="Only kernel addresses are permitted for breakpoints\n" ; +int mode;if (xmon_is_ro) {printf (xmon_ro_msg);break ;
@@ -1560,6 +1560,7 @@ bpt_cmds(void)force_enable_xmon ();break ; + }case 'i' :/* bi - hardware instr breakpoint */ if (xmon_is_ro) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 850/1146 powerpc/xive: add missing iounmap() in error path in xive_spapr_populate_irq_data()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 8b49670f3bb3f10cd4d5a6dca17f5a31b173ecdc ]
If remapping 'data->trig_page' fails, the 'data->eoi_mmio' need be unmapped before returning from xive_spapr_populate_irq_data().
--- arch/powerpc/sysdev/xive/spapr.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/sysdev/xive/spapr.c +1 -0
@@ -439,6 +439,7 @@ static int xive_spapr_populate_irq_data(u32 hw_irq, struct xive_irq_data *data) data->trig_mmio =ioremap (data->trig_page,1u << data->esb_shift);if (!data->trig_mmio) { +iounmap (data->eoi_mmio);pr_err ("Failed to map trigger page for irq 0x%x\n" , hw_irq);return -ENOMEM ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 851/1146 powerpc/pseries: fix the object owners enum value in plpks driver
In reply to Greg Kroah-HartmanFrom: Nayna Jain <[email protected]>
[ Upstream commit 2330757e0be0acad88852e211dcd6106390a729b ]
OS_VAR_LINUX enum in PLPKS driver should be 0x02 instead of 0x01.
--- arch/powerpc/platforms/pseries/plpks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/plpks.h +1 -1
@@ -17,7 +17,7 @@#define WORLDREADABLE 0x08000000#define SIGNEDUPDATE 0x01000000 -#define PLPKS_VAR_LINUX 0x01 +#define PLPKS_VAR_LINUX 0x02#define PLPKS_VAR_COMMON 0x04struct plpks_var {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 852/1146 powerpc/pseries: Fix the H_CALL error code in PLPKS driver
In reply to Greg Kroah-HartmanFrom: Nayna Jain <[email protected]>
[ Upstream commit af223e1728c448073d1e12fe464bf344310edeba ]
PAPR Spec defines H_P1 actually as H_PARAMETER and maps H_ABORTED to a different numerical value.
Fix the error codes as per PAPR Specification.
--- arch/powerpc/include/asm/hvcall.h | 3 +-- arch/powerpc/platforms/pseries/plpks.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/hvcall.h +1 -2
@@ -79,7 +79,7 @@#define H_NOT_ENOUGH_RESOURCES -44#define H_R_STATE -45#define H_RESCINDED -46 -#define H_P1 -54 +#define H_ABORTED -54#define H_P2 -55#define H_P3 -56#define H_P4 -57
@@ -100,7 +100,6 @@#define H_COP_HW -74#define H_STATE -75#define H_IN_USE -77 -#define H_ABORTED -78#define H_UNSUPPORTED_FLAG_START -256#define H_UNSUPPORTED_FLAG_END -511#define H_MULTI_THREADS_ACTIVE -9005
arch/powerpc/platforms/pseries/plpks.c +1 -1
@@ -75,7 +75,7 @@ static int pseries_status_to_err(int rc)case H_FUNCTION : err = -ENXIO ;break ; -case H_P1 : +case H_PARAMETER :case H_P2 :case H_P3 :case H_P4 :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 853/1146 powerpc/pseries: Return -EIO instead of -EINTR for H_ABORTED error
In reply to Greg Kroah-HartmanFrom: Nayna Jain <[email protected]>
[ Upstream commit bb8e4c7cb759b90a04f2e94056b50288ff46a0ed ]
Some commands for eg. "cat" might continue to retry on encountering EINTR. This is not expected for original error code H_ABORTED.
Map H_ABORTED to more relevant Linux error code EIO.
--- arch/powerpc/platforms/pseries/plpks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/plpks.c +1 -1
@@ -111,7 +111,7 @@ static int pseries_status_to_err(int rc) err = -EEXIST ;break ;case H_ABORTED : - err = -EINTR ; + err = -EIO ;break ;default : err = -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 854/1146 powerpc/pseries: fix plpks_read_var() code for different consumers
In reply to Greg Kroah-HartmanFrom: Nayna Jain <[email protected]>
[ Upstream commit 1f622f3f80cbf8999ff5955a2fcfbd801a1f32e0 ]
Even though plpks_read_var() is currently called to read variables owned by different consumers, it internally supports only OS consumer.
Fix plpks_read_var() to handle different consumers correctly.
--- arch/powerpc/platforms/pseries/plpks.c | 28 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-)
arch/powerpc/platforms/pseries/plpks.c +18 -10
@@ -366,22 +366,24 @@ static int plpks_read_var(u8 consumer, struct plpks_var *var) {unsigned long retbuf[PLPAR_HCALL_BUFSIZE ] = {0 };struct plpks_auth *auth; -struct label *label; +struct label *label =NULL ;u8 *output;int rc;if (var->namelen >MAX_NAME_SIZE )return -EINVAL ; - auth =construct_auth (PKS_OS_OWNER ); + auth =construct_auth (consumer);if (IS_ERR (auth))return PTR_ERR (auth); - label =construct_label (var->component, var->os, var->name, - var->namelen); -if (IS_ERR (label)) { - rc =PTR_ERR (label); - goto out_free_auth; +if (consumer ==PKS_OS_OWNER ) { + label =construct_label (var->component, var->os, var->name, + var->namelen); +if (IS_ERR (label)) { + rc =PTR_ERR (label); + goto out_free_auth; + } } output =kzalloc (maxobjsize,GFP_KERNEL );
@@ -390,9 +392,15 @@ static int plpks_read_var(u8 consumer, struct plpks_var *var) goto out_free_label; } - rc =plpar_hcall (H_PKS_READ_OBJECT , retbuf,virt_to_phys (auth), -virt_to_phys (label), label->size,virt_to_phys (output), - maxobjsize); +if (consumer ==PKS_OS_OWNER ) + rc =plpar_hcall (H_PKS_READ_OBJECT , retbuf,virt_to_phys (auth), +virt_to_phys (label), label->size,virt_to_phys (output), + maxobjsize); +else + rc =plpar_hcall (H_PKS_READ_OBJECT , retbuf,virt_to_phys (auth), +virt_to_phys (var->name), var->namelen,virt_to_phys (output), + maxobjsize); +if (rc !=H_SUCCESS ) { pr_err("Failed to read variable %s for component %s with error %d\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 855/1146 kprobes: Fix check for probe enabled in kill_kprobe()
In reply to Greg Kroah-HartmanFrom: Li Huafei <[email protected]>
[ Upstream commit 0c76ef3f26d5ef2ac2c21b47e7620cff35809fbb ]
In kill_kprobe(), the check whether disarm_kprobe_ftrace() needs to be called always fails. This is because before that we set the KPROBE_FLAG_GONE flag for kprobe so that "!kprobe_disabled(p)" is always false.
The disarm_kprobe_ftrace() call introduced by commit:
0cb2f1372baa ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")
to fix the NULL pointer reference problem. When the probe is enabled, if we do not disarm it, this problem still exists.
Fix it by putting the probe enabled check before setting the KPROBE_FLAG_GONE flag.
--- kernel/kprobes.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
kernel/kprobes.c +8 -8
@@ -2364,6 +2364,14 @@ static void kill_kprobe(struct kprobe *p)lockdep_assert_held (&kprobe_mutex); +/* +* The module is going away. We should disarm the kprobe which +* is using ftrace, because ftrace framework is still available at +* 'MODULE_STATE_GOING' notification. +*/ +if (kprobe_ftrace (p) && !kprobe_disabled (p) && !kprobes_all_disarmed) +disarm_kprobe_ftrace (p); + p->flags |=KPROBE_FLAG_GONE ;if (kprobe_aggrprobe (p)) {/*
@@ -2380,14 +2388,6 @@ static void kill_kprobe(struct kprobe *p)* the original probed function (which will be freed soon) any more. */ arch_remove_kprobe (p); - -/* -* The module is going away. We should disarm the kprobe which -* is using ftrace, because ftrace framework is still available at -* 'MODULE_STATE_GOING' notification. -*/ -if (kprobe_ftrace (p) && !kprobe_disabled (p) && !kprobes_all_disarmed) -disarm_kprobe_ftrace (p); }/* Disable one kprobe */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 856/1146 powerpc: dts: turris1x.dts: Add channel labels for temperature sensor
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 67bbb62f61e810734da0a1577a9802ddaed24140 ]
Channel 0 of SA56004ED chip refers to internal SA56004ED chip sensor (chip itself is located on the board) and channel 1 of SA56004ED chip refers to external sensor which is connected to temperature diode of the P2020 CPU.
--- arch/powerpc/boot/dts/turris1x.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/powerpc/boot/dts/turris1x.dts +14 -0
@@ -69,6 +69,20 @@ temperature-sensor@4c { interrupt-parent = <&gpio>; interrupts = <12 IRQ_TYPE_LEVEL_LOW>, /* GPIO12 - ALERT pin */ <13 IRQ_TYPE_LEVEL_LOW>; /* GPIO13 - CRIT pin */ + #address-cells = <1>; + #size-cells = <0>; + + /* Local temperature sensor (SA56004ED internal) */ + channel@0 { + reg = <0>; + label = "board"; + }; + + /* Remote temperature sensor (D+/D- connected to P2020 CPU Temperature Diode) */ + channel@1 { + reg = <1>; + label = "cpu"; + }; }; /* DDR3 SPD/EEPROM */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 857/1146 powerpc/perf: callchain validate kernel stack pointer bounds
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 32c5209214bd8d4f8c4e9d9b630ef4c671f58e79 ]
The interrupt frame detection and loads from the hypothetical pt_regs are not bounds-checked. The next-frame validation only bounds-checks STACK_FRAME_OVERHEAD, which does not include the pt_regs. Add another test for this.
The user could set r1 to be equal to the address matching the first interrupt frame - STACK_INT_FRAME_SIZE, which is in the previous page due to the kernel redzone, and induce the kernel to load the marker from there. Possibly this could cause a crash at least. If the user could induce the previous page to contain a valid marker, then it might be able to direct perf to read specific memory addresses in a way that could be transmitted back to the user in the perf data.
--- arch/powerpc/perf/callchain.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/perf/callchain.c +1 -0
@@ -61,6 +61,7 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re next_sp = fp[0 ];if (next_sp == sp +STACK_INT_FRAME_SIZE && +validate_sp (sp, current,STACK_INT_FRAME_SIZE ) && fp[STACK_FRAME_MARKER ] ==STACK_FRAME_REGS_MARKER ) {/* * This looks like an interrupt frame for an
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 858/1146 powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4d0eea415216fe3791da2f65eb41399e70c7bedf ]
If platform_device_add() is not called or failed, it can not call platform_device_del() to clean up memory, it should call platform_device_put() in error case.
--- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/83xx/mpc832x_rdb.c +1 -1
@@ -107,7 +107,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, goto next; unreg: -platform_device_del (pdev); +platform_device_put (pdev); err:pr_err ("%pOF: registration failed\n" , np); next:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 859/1146 powerpc/hv-gpci: Fix hv_gpci event list
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit 03f7c1d2a49acd30e38789cd809d3300721e9b0e ]
Based on getPerfCountInfo v1.018 documentation, some of the hv_gpci events were deprecated for platform firmware that supports counter_info_version 0x8 or above.
Fix the hv_gpci event list by adding a new attribute group called "hv_gpci_event_attrs_v6" and a "ENABLE_EVENTS_COUNTERINFO_V6" macro to enable these events for platform firmware
that supports counter_info_version 0x6 or below. And assigning the hv_gpci event list based on output counter info version of underlying plaform.
--- arch/powerpc/perf/hv-gpci-requests.h | 4 ++++ arch/powerpc/perf/hv-gpci.c | 35 ++++++++++++++++++++++++++-- arch/powerpc/perf/hv-gpci.h | 1 + arch/powerpc/perf/req-gen/perf.h | 20 ++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-)
arch/powerpc/perf/hv-gpci-requests.h +4 -0
@@ -79,6 +79,7 @@ REQUEST(__field(0, 8, partition_id) )#include I (REQUEST_END ) +#ifdef ENABLE_EVENTS_COUNTERINFO_V6 /* * Not available for counter_info_version >= 0x8, use * run_instruction_cycles_by_partition(0x100) instead.
@@ -92,6 +93,7 @@ REQUEST(__field(0, 8, partition_id) __count(0x10, 8, cycles) )#include I (REQUEST_END ) +#endif #define REQUEST_NAME system_performance_capabilities#define REQUEST_NUM 0x40
@@ -103,6 +105,7 @@ REQUEST(__field(0, 1, perf_collect_privileged) )#include I (REQUEST_END ) +#ifdef ENABLE_EVENTS_COUNTERINFO_V6 #define REQUEST_NAME processor_bus_utilization_abc_links#define REQUEST_NUM 0x50#define REQUEST_IDX_KIND "hw_chip_id=?"
@@ -194,6 +197,7 @@ REQUEST(__field(0, 4, phys_processor_idx) __count(0x28, 8, instructions_completed) )#include I (REQUEST_END ) +#endif /* Processor_core_power_mode (0x95) skipped, no counters */ /* Affinity_domain_information_by_virtual_processor (0xA0) skipped,
arch/powerpc/perf/hv-gpci.c +33 -2
@@ -70,9 +70,9 @@ static const struct attribute_group format_group = { .attrs = format_attrs, }; -static const struct attribute_group event_group = { +static struct attribute_group event_group = { .name ="events" , - .attrs = hv_gpci_event_attrs, +/* .attrs is set in init */ };#define HV_CAPS_ATTR (_name, _format) \
@@ -330,6 +330,7 @@ static int hv_gpci_init(void)int r;unsigned long hret;struct hv_perf_caps caps; +struct hv_gpci_request_buffer *arg;hv_gpci_assert_offsets_correct ();
@@ -353,6 +354,36 @@ static int hv_gpci_init(void)/* sampling not supported */ h_gpci_pmu.capabilities |=PERF_PMU_CAP_NO_INTERRUPT ; + arg = (void *)get_cpu_var (hv_gpci_reqb); +memset (arg,0 ,HGPCI_REQ_BUFFER_SIZE ); + +/* +* hcall H_GET_PERF_COUNTER_INFO populates the output +* counter_info_version value based on the system hypervisor. +* Pass the counter request 0x10 corresponds to request type +* 'Dispatch_timebase_by_processor', to get the supported +* counter_info_version. +*/ + arg->params.counter_request =cpu_to_be32 (0x10 ); + + r =plpar_hcall_norets (H_GET_PERF_COUNTER_INFO , +virt_to_phys (arg),HGPCI_REQ_BUFFER_SIZE ); +if (r) { +pr_devel ("hcall failed, can't get supported counter_info_version: 0x%x\n" , r); + arg->params.counter_info_version_out =0x8 ; + } + +/* +* Use counter_info_version_out value to assign +* required hv-gpci event list. +*/ +if (arg->params.counter_info_version_out >=0x8 ) + event_group.attrs = hv_gpci_event_attrs; +else + event_group.attrs = hv_gpci_event_attrs_v6; + +put_cpu_var (hv_gpci_reqb); + r =perf_pmu_register (&h_gpci_pmu, h_gpci_pmu.name,-1 );if (r)return r;
arch/powerpc/perf/hv-gpci.h +1 -0
@@ -26,6 +26,7 @@ enum {#define REQUEST_FILE "../hv-gpci-requests.h"#define NAME_LOWER hv_gpci#define NAME_UPPER HV_GPCI +#define ENABLE_EVENTS_COUNTERINFO_V6 #include "req-gen/perf.h" #undef REQUEST_FILE#undef NAME_LOWER
arch/powerpc/perf/req-gen/perf.h +20 -0
@@ -139,6 +139,26 @@ PMU_EVENT_ATTR_STRING( \#define REQUEST_ (r_name, r_value, r_idx_1, r_fields) \ r_fields +/* Generate event list for platforms with counter_info_version 0x6 or below */ +static __maybe_unused struct attribute *hv_gpci_event_attrs_v6[] = { +#include REQUEST_FILE +NULL +}; + +/* +* Based on getPerfCountInfo v1.018 documentation, some of the hv-gpci +* events were deprecated for platform firmware that supports +* counter_info_version 0x8 or above. +* Those deprecated events are still part of platform firmware that +* support counter_info_version 0x6 and below. As per the getPerfCountInfo +* v1.018 documentation there is no counter_info_version 0x7. +* Undefining macro ENABLE_EVENTS_COUNTERINFO_V6, to disable the addition of +* deprecated events in "hv_gpci_event_attrs" attribute group, for platforms +* that supports counter_info_version 0x8 or above. +*/ +#undef ENABLE_EVENTS_COUNTERINFO_V6 + +/* Generate event list for platforms with counter_info_version 0x8 or above*/ static __maybe_unused struct attribute *hv_gpci_event_attrs[] = { #include REQUEST_FILE NULL
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 860/1146 selftests/powerpc: Fix resource leaks
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 8f4ab7da904ab7027ccd43ddb4f0094e932a5877 ]
In check_all_cpu_dscr_defaults, opendir() opens the directory stream. Add missing closedir() in the error path to release it.
In check_cpu_dscr_default, open() creates an open file descriptor. Add missing close() in the error path to release it.
--- tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c +4 -1
@@ -24,6 +24,7 @@ static int check_cpu_dscr_default(char *file, unsigned long val) rc =read (fd, buf,sizeof (buf));if (rc ==-1 ) {perror ("read() failed" ); +close (fd);return 1 ; }close (fd);
@@ -65,8 +66,10 @@ static int check_all_cpu_dscr_defaults(unsigned long val)if (access (file,F_OK ))continue ; -if (check_cpu_dscr_default (file, val)) +if (check_cpu_dscr_default (file, val)) { +closedir (sysfs);return 1 ; + } }closedir (sysfs);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 861/1146 iommu/mediatek: Add platform_device_put for recovering the device refcnt
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit dcb40e9fcce9bd251eaff19f3724131db522846c ]
Add platform_device_put to match with of_find_device_by_node.
Meanwhile, I add a new variable "pcommdev" which is for smi common device. Otherwise, "platform_device_put(plarbdev)" for smi-common dev may be not readable. And add a checking for whether pcommdev is NULL.
--- drivers/iommu/mtk_iommu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +8 -3
@@ -1044,7 +1044,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m struct mtk_iommu_data *data) {struct device_node *larbnode, *smicomm_node, *smi_subcomm_node; -struct platform_device *plarbdev; +struct platform_device *plarbdev, *pcommdev;struct device_link *link;int i, larb_nr, ret;
@@ -1075,12 +1075,14 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m }if (!plarbdev->dev.driver) {of_node_put (larbnode); +platform_device_put (plarbdev);return -EPROBE_DEFER ; } data->larb_imu[id].dev = &plarbdev->dev;component_match_add_release (dev, match, component_release_of, component_compare_of, larbnode); +platform_device_put (plarbdev); }/* Get smi-(sub)-common dev from the last larb. */
@@ -1098,12 +1100,15 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **melse smicomm_node = smi_subcomm_node; - plarbdev =of_find_device_by_node (smicomm_node); + pcommdev =of_find_device_by_node (smicomm_node);of_node_put (smicomm_node); - data->smicomm_dev = &plarbdev->dev; +if (!pcommdev) +return -ENODEV ; + data->smicomm_dev = &pcommdev->dev; link =device_link_add (data->smicomm_dev, dev,DL_FLAG_STATELESS |DL_FLAG_PM_RUNTIME ); +platform_device_put (pcommdev);if (!link) {dev_err (dev,"Unable to link %s.\n" ,dev_name (data->smicomm_dev));return -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 862/1146 iommu/mediatek: Use component_match_add
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 ]
In order to simplify the error patch(avoid call of_node_put), Use component_match_add instead component_match_add_release since we are only interested in the "device" here. Then we could always call of_node_put in normal path.
Strictly this is not a fixes patch, but it is a prepare for adding the error path, thus I add a Fixes tag too.
--- drivers/iommu/mtk_iommu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/iommu/mtk_iommu.c +4 -6
@@ -1069,19 +1069,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m id = i; plarbdev =of_find_device_by_node (larbnode); -if (!plarbdev) { -of_node_put (larbnode); +of_node_put (larbnode); +if (!plarbdev)return -ENODEV ; - } +if (!plarbdev->dev.driver) { -of_node_put (larbnode);platform_device_put (plarbdev);return -EPROBE_DEFER ; } data->larb_imu[id].dev = &plarbdev->dev; -component_match_add_release (dev, match, component_release_of, - component_compare_of, larbnode); +component_match_add (dev, match, component_compare_dev, &plarbdev->dev);platform_device_put (plarbdev); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 863/1146 iommu/mediatek: Add error path for loop of mm_dts_parse
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit 26593928564cf5b576ff05d3cbd958f57c9534bb ]
The mtk_iommu_mm_dts_parse will parse the smi larbs nodes. if the i+1 larb is parsed fail, we should put_device for the i..0 larbs.
There are two places need to comment:
1) The larbid may be not linear mapping, we should loop whole the array in the error path.
2) I move this line position: "data->larb_imu[id].dev = &plarbdev->dev;" before "if (!plarbdev->dev.driver)", That means set data->larb_imu[id].dev before the error path. then we don't need "platform_device_put(plarbdev)" again in probe_defer case. All depend on "put_device" of the error path in error cases.
--- drivers/iommu/mtk_iommu.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/iommu/mtk_iommu.c +20 -7
@@ -1056,8 +1056,10 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **mu32 id; larbnode =of_parse_phandle (dev->of_node,"mediatek,larbs" , i); -if (!larbnode) -return -EINVAL ; +if (!larbnode) { + ret = -EINVAL ; + goto err_larbdev_put; + }if (!of_device_is_available (larbnode)) {of_node_put (larbnode);
@@ -1070,14 +1072,16 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m plarbdev =of_find_device_by_node (larbnode);of_node_put (larbnode); -if (!plarbdev) -return -ENODEV ; +if (!plarbdev) { + ret = -ENODEV ; + goto err_larbdev_put; + } + data->larb_imu[id].dev = &plarbdev->dev;if (!plarbdev->dev.driver) { -platform_device_put (plarbdev); -return -EPROBE_DEFER ; + ret = -EPROBE_DEFER ; + goto err_larbdev_put; } - data->larb_imu[id].dev = &plarbdev->dev;component_match_add (dev, match, component_compare_dev, &plarbdev->dev);platform_device_put (plarbdev);
@@ -1112,6 +1116,15 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **mreturn -EINVAL ; }return 0 ; + +err_larbdev_put: +/* id may be not linear mapping, loop whole the array */ +for (i =MTK_LARB_NR_MAX -1 ; i >=0 ; i++) { +if (!data->larb_imu[i].dev) +continue ; +put_device (data->larb_imu[i].dev); + } +return ret; }static int mtk_iommu_probe (struct platform_device *pdev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 864/1146 iommu/mediatek: Validate number of phandles associated with "mediatek,larbs"
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit ef693a8440926884bfd9cc3d6d36f65719513350 ]
Fix the smatch warnings:drivers/iommu/mtk_iommu.c:878 mtk_iommu_mm_dts_parse() error: uninitialized symbol 'larbnode'.
If someone abuse the dtsi node(Don't follow the definition of dt-binding), for example "mediatek,larbs" is provided as boolean property, "larb_nr" will be zero and cause abnormal.
To fix this problem and improve the code safety, add some checking for the invalid input from dtsi, e.g. checking the larb_nr/larbid valid range, and avoid "mediatek,larb-id" property conflicts in the smi-larb nodes.
--- drivers/iommu/mtk_iommu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/iommu/mtk_iommu.c +12 -0
@@ -1051,6 +1051,8 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m larb_nr =of_count_phandle_with_args (dev->of_node,"mediatek,larbs" ,NULL );if (larb_nr <0 )return larb_nr; +if (larb_nr ==0 || larb_nr >MTK_LARB_NR_MAX ) +return -EINVAL ;for (i =0 ; i < larb_nr; i++) {u32 id;
@@ -1069,6 +1071,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m ret =of_property_read_u32 (larbnode,"mediatek,larb-id" , &id);if (ret)/* The id is consecutive if there is no this property */ id = i; +if (id >=MTK_LARB_NR_MAX ) { +of_node_put (larbnode); + ret = -EINVAL ; + goto err_larbdev_put; + } plarbdev =of_find_device_by_node (larbnode);of_node_put (larbnode);
@@ -1076,6 +1083,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m ret = -ENODEV ; goto err_larbdev_put; } +if (data->larb_imu[id].dev) { +platform_device_put (plarbdev); + ret = -EEXIST ; + goto err_larbdev_put; + } data->larb_imu[id].dev = &plarbdev->dev;if (!plarbdev->dev.driver) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 865/1146 iommu/sun50i: Remove IOMMU_DOMAIN_IDENTITY
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit ef5bb8e7a7127218f826b9ccdf7508e7a339f4c2 ]
This driver treats IOMMU_DOMAIN_IDENTITY the same as UNMANAGED, which cannot possibly be correct.
UNMANAGED domains are required to start out blocking all DMAs. This seems to be what this driver does as it allocates a first level 'dt' for the IO page table that is 0 filled.
Thus UNMANAGED looks like a working IO page table, and so IDENTITY must be a mistake. Remove it.
--- drivers/iommu/sun50i-iommu.c | 1 - 1 file changed, 1 deletion(-)
drivers/iommu/sun50i-iommu.c +0 -1
@@ -672,7 +672,6 @@ static struct iommu_domain *sun50i_iommu_domain_alloc(unsigned type)struct sun50i_iommu_domain *sun50i_domain;if (type !=IOMMU_DOMAIN_DMA && - type !=IOMMU_DOMAIN_IDENTITY && type !=IOMMU_DOMAIN_UNMANAGED )return NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 866/1146 pwm: sifive: Call pwm_sifive_update_clock() while mutex is held
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 45558b3abb87eeb2cedb8a59cb2699c120b5102a ]
As was documented in commit 0f02f491b786 ("pwm: sifive: Reduce time the controller lock is held") a caller of pwm_sifive_update_clock() must hold the mutex. So fix pwm_sifive_clock_notifier() to grab the lock.
While this necessity was only documented later, the race exists since the driver was introduced.
--- drivers/pwm/pwm-sifive.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pwm/pwm-sifive.c +4 -1
@@ -204,8 +204,11 @@ static int pwm_sifive_clock_notifier(struct notifier_block *nb,struct pwm_sifive_ddata *ddata = container_of(nb, struct pwm_sifive_ddata, notifier); -if (event ==POST_RATE_CHANGE ) +if (event ==POST_RATE_CHANGE ) { +mutex_lock (&ddata->lock);pwm_sifive_update_clock (ddata, ndata->new_rate); +mutex_unlock (&ddata->lock); + }return NOTIFY_OK ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 867/1146 pwm: mtk-disp: Fix the parameters calculated by the enabled flag of disp_pwm
In reply to Greg Kroah-HartmanFrom: xinlei lee <[email protected]>
[ Upstream commit 0b5ef3429d8f78427558ab0dcbfd862098ba2a63 ]
In the original mtk_disp_pwm_get_state() function wrongly uses bit 0 of CON0 to judge if the PWM is enabled.
However that is indicated by a bit (at a machine dependent position) in the DISP_PWM_EN register. Fix this accordingly.
--- drivers/pwm/pwm-mtk-disp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pwm/pwm-mtk-disp.c +3 -2
@@ -178,7 +178,7 @@ static void mtk_disp_pwm_get_state(struct pwm_chip *chip, {struct mtk_disp_pwm *mdp =to_mtk_disp_pwm (chip);u64 rate, period, high_width; -u32 clk_div, con0, con1; +u32 clk_div, pwm_en, con0, con1;int err; err =clk_prepare_enable (mdp->clk_main);
@@ -197,7 +197,8 @@ static void mtk_disp_pwm_get_state(struct pwm_chip *chip, rate =clk_get_rate (mdp->clk_main); con0 =readl (mdp->base + mdp->data->con0); con1 =readl (mdp->base + mdp->data->con1); - state->enabled = !!(con0 &BIT (0 )); + pwm_en =readl (mdp->base +DISP_PWM_EN ); + state->enabled = !!(pwm_en & mdp->data->enable_mask); clk_div =FIELD_GET (PWM_CLKDIV_MASK , con0); period =FIELD_GET (PWM_PERIOD_MASK , con1);/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 868/1146 pwm: mediatek: always use bus clock for PWM on MT7622
In reply to Greg Kroah-HartmanFrom: Daniel Golle <[email protected]>
[ Upstream commit aa3c668f2f98856af96e13f44da6ca4f26f0b98c ]
According to MT7622 Reference Manual for Development Board v1.0 the PWM unit found in the MT7622 SoC also comes with the PWM_CK_26M_SEL register at offset 0x210 just like other modern MediaTek ARM64 SoCs. And also MT7622 sets that register to 0x00000001 on reset which is described as 'Select 26M fix CLK as BCLK' in the datasheet. Hence set has_ck_26m_sel to true also for MT7622 which results in the driver writing 0 to the PWM_CK_26M_SEL register which is described as 'Select bus CLK as BCLK'.
--- drivers/pwm/pwm-mediatek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-mediatek.c +1 -1
@@ -296,7 +296,7 @@ static const struct pwm_mediatek_of_data mt6795_pwm_data = {static const struct pwm_mediatek_of_data mt7622_pwm_data = { .num_pwms =6 , .pwm45_fixup = false, - .has_ck_26m_sel = false, + .has_ck_26m_sel = true, };static const struct pwm_mediatek_of_data mt7623_pwm_data = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 869/1146 RISC-V: KVM: Fix reg_val check in kvm_riscv_vcpu_set_reg_config()
In reply to Greg Kroah-HartmanFrom: Anup Patel <[email protected]>
[ Upstream commit e482d9e33d5b0f222cbef7341dcd52cead6b9edc ]
The reg_val check in kvm_riscv_vcpu_set_reg_config() should only be done for isa config register.
--- arch/riscv/kvm/vcpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/riscv/kvm/vcpu.c +7 -4
@@ -296,12 +296,15 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu,if (copy_from_user (®_val, uaddr,KVM_REG_SIZE (reg->id)))return -EFAULT ; -/* This ONE REG interface is only defined for single letter extensions */ -if (fls (reg_val) >=RISCV_ISA_EXT_BASE ) -return -EINVAL ; -switch (reg_num) {case KVM_REG_RISCV_CONFIG_REG (isa): +/* +* This ONE REG interface is only defined for +* single letter extensions. +*/ +if (fls (reg_val) >=RISCV_ISA_EXT_BASE ) +return -EINVAL ; +if (!vcpu->arch.ran_atleast_once) {/* Ignore the enable/disable request for certain extensions */ for (i =0 ; i <RISCV_ISA_EXT_BASE ; i++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 870/1146 remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit e01ce676aaef3b13d02343d7e70f9637d93a3367 ]
The kfree() should be called when of_irq_get_byname() fails or devm_request_threaded_irq() fails in qcom_add_sysmon_subdev(), otherwise there will be a memory leak, so add kfree() to fix it.
--- drivers/remoteproc/qcom_sysmon.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/remoteproc/qcom_sysmon.c +4 -1
@@ -652,7 +652,9 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,if (sysmon->shutdown_irq != -ENODATA ) {dev_err (sysmon->dev,"failed to retrieve shutdown-ack IRQ\n" ); -return ERR_PTR (sysmon->shutdown_irq); + ret = sysmon->shutdown_irq; +kfree (sysmon); +return ERR_PTR (ret); } }else { ret = devm_request_threaded_irq(sysmon->dev,
@@ -663,6 +665,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,if (ret) {dev_err (sysmon->dev,"failed to acquire shutdown-ack IRQ\n" ); +kfree (sysmon);return ERR_PTR (ret); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 871/1146 remoteproc: qcom: q6v5: Fix potential null-ptr-deref in q6v5_wcss_init_mmio()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit f360e2b275efbb745ba0af8b47d9ef44221be586 ]
q6v5_wcss_init_mmio() will call platform_get_resource_byname() that may fail and return NULL. devm_ioremap() will use res->start as input, which may causes null-ptr-deref. Check the ret value of platform_get_resource_byname() to avoid the null-ptr-deref.
--- drivers/remoteproc/qcom_q6v5_wcss.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/remoteproc/qcom_q6v5_wcss.c +3 -0
@@ -827,6 +827,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,int ret; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"qdsp6" ); +if (!res) +return -EINVAL ; + wcss->reg_base =devm_ioremap (&pdev->dev, res->start,resource_size (res));if (!wcss->reg_base)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 872/1146 remoteproc: qcom_q6v5_pas: disable wakeup on probe fail or remove
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 9a70551996e699fda262e8d54bbd41739d7aad6d ]
Leaving wakeup enabled during probe fail (-EPROBE_DEFER) or remove makes the subsequent probe fail.
[ 3.749454] remoteproc remoteproc0: releasing 3000000.remoteproc [ 3.752949] qcom_q6v5_pas: probe of 3000000.remoteproc failed with error -17 [ 3.878935] remoteproc remoteproc0: releasing 4080000.remoteproc [ 3.887602] qcom_q6v5_pas: probe of 4080000.remoteproc failed with error -17 [ 4.319552] remoteproc remoteproc0: releasing 8300000.remoteproc [ 4.332716] qcom_q6v5_pas: probe of 8300000.remoteproc failed with error -17
Fix this by disabling wakeup in both cases so the driver can properly probe on the next try.
--- drivers/remoteproc/qcom_q6v5_pas.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/remoteproc/qcom_q6v5_pas.c +2 -0
@@ -556,6 +556,7 @@ static int adsp_probe(struct platform_device *pdev) detach_proxy_pds:adsp_pds_detach (adsp, adsp->proxy_pds, adsp->proxy_pd_count); free_rproc: +device_init_wakeup (adsp->dev, false);rproc_free (rproc);return ret;
@@ -572,6 +573,7 @@ static int adsp_remove(struct platform_device *pdev)qcom_remove_sysmon_subdev (adsp->sysmon);qcom_remove_smd_subdev (adsp->rproc, &adsp->smd_subdev);qcom_remove_ssr_subdev (adsp->rproc, &adsp->ssr_subdev); +device_init_wakeup (adsp->dev, false);rproc_free (adsp->rproc);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 873/1146 remoteproc: qcom_q6v5_pas: detach power domains on remove
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 34d01df00b84127be04c914fc9f8e8be1fcdf851 ]
We need to detach from the power domains also on remove, not just on probe fail so a subsequent probe works as expected.
Otherwise the following error appears on re-probe:
[ 29.452005] sysfs: cannot create duplicate filename '/devices/genpd:0:3000000.remoteproc' [ 29.477121] CPU: 1 PID: 483 Comm: sh Tainted: G W 6.1.0-rc4-00075-g71a113770bda #78 [ 29.510319] Hardware name: Fairphone 4 (DT) [ 29.538335] Call trace: [ 29.564470] dump_backtrace.part.0+0xe0/0xf0 [ 29.592602] show_stack+0x18/0x30 [ 29.619616] dump_stack_lvl+0x64/0x80 [ 29.646834] dump_stack+0x18/0x34 [ 29.673541] sysfs_warn_dup+0x60/0x7c [ 29.700592] sysfs_create_dir_ns+0xec/0x110 [ 29.728057] kobject_add_internal+0xb8/0x374 [ 29.755530] kobject_add+0x9c/0x104 [ 29.782072] device_add+0xbc/0x8a0 [ 29.808445] device_register+0x20/0x30 [ 29.835175] genpd_dev_pm_attach_by_id+0xa4/0x190 [ 29.862851] genpd_dev_pm_attach_by_name+0x3c/0xb0 [ 29.890472] dev_pm_domain_attach_by_name+0x20/0x30 [ 29.918212] adsp_probe+0x278/0x580 [ 29.944384] platform_probe+0x68/0xc0 [ 29.970603] really_probe+0xbc/0x2dc [ 29.996662] __driver_probe_device+0x78/0xe0 [ 30.023491] device_driver_attach+0x48/0xac [ 30.050215] bind_store+0xb8/0x114 [ 30.075957] drv_attr_store+0x24/0x3c [ 30.101874] sysfs_kf_write+0x44/0x54 [ 30.127751] kernfs_fop_write_iter+0x120/0x1f0 [ 30.154448] vfs_write+0x1ac/0x380 [ 30.179937] ksys_write+0x70/0x104 [ 30.205274] __arm64_sys_write+0x1c/0x2c [ 30.231060] invoke_syscall+0x48/0x114 [ 30.256594] el0_svc_common.constprop.0+0x44/0xec [ 30.283183] do_el0_svc+0x2c/0xd0 [ 30.308320] el0_svc+0x2c/0x84 [ 30.333059] el0t_64_sync_handler+0xf4/0x120 [ 30.359001] el0t_64_sync+0x18c/0x190 [ 30.384385] kobject_add_internal failed for genpd:0:3000000.remoteproc with -EEXIST, don't try to register things with the same name in the same directory. [ 30.406029] remoteproc remoteproc0: releasing 3000000.remoteproc [ 30.416064] qcom_q6v5_pas: probe of 3000000.remoteproc failed with error -17
--- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_pas.c +1 -0
@@ -573,6 +573,7 @@ static int adsp_remove(struct platform_device *pdev)qcom_remove_sysmon_subdev (adsp->sysmon);qcom_remove_smd_subdev (adsp->rproc, &adsp->smd_subdev);qcom_remove_ssr_subdev (adsp->rproc, &adsp->ssr_subdev); +adsp_pds_detach (adsp, adsp->proxy_pds, adsp->proxy_pd_count);device_init_wakeup (adsp->dev, false);rproc_free (adsp->rproc);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 874/1146 remoteproc: qcom_q6v5_pas: Fix missing of_node_put() in adsp_alloc_memory_region()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 38e7d9c19276832ebb0277f415b9214bf7baeb37 ]
The pointer node is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_pas.c +1 -0
@@ -449,6 +449,7 @@ static int adsp_alloc_memory_region(struct qcom_adsp *adsp) } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret)return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 875/1146 remoteproc: qcom: q6v5: Fix missing clk_disable_unprepare() in q6v5_wcss_qcs404_power_on()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit 7ff5d60f18bba5cbaf17b2926aa9da44d5beca01 ]
q6v5_wcss_qcs404_power_on() have no fail path for readl_poll_timeout(). Add fail path for readl_poll_timeout().
--- drivers/remoteproc/qcom_q6v5_wcss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/remoteproc/qcom_q6v5_wcss.c +2 -1
@@ -351,7 +351,7 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)if (ret) {dev_err (wcss->dev,"xo cbcr enabling timed out (rc:%d)\n" , ret); -return ret; + goto disable_xo_cbcr_clk; }writel (0 , wcss->reg_base +Q6SS_CGC_OVERRIDE );
@@ -417,6 +417,7 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss) val =readl (wcss->reg_base +Q6SS_SLEEP_CBCR ); val &= ~Q6SS_CLK_ENABLE ;writel (val, wcss->reg_base +Q6SS_SLEEP_CBCR ); +disable_xo_cbcr_clk: val =readl (wcss->reg_base +Q6SS_XO_CBCR ); val &= ~Q6SS_CLK_ENABLE ;writel (val, wcss->reg_base +Q6SS_XO_CBCR );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 876/1146 powerpc/pseries/eeh: use correct API for error log size
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 9aafbfa5f57a4b75bafd3bed0191e8429c5fa618 ]
rtas-error-log-max is not the name of an RTAS function, so rtas_token() is not the appropriate API for retrieving its value. We already have rtas_get_error_log_max() which returns a sensible value if the property is absent for any reason, so use that instead.
--- arch/powerpc/platforms/pseries/eeh_pseries.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
arch/powerpc/platforms/pseries/eeh_pseries.c +1 -10
@@ -848,16 +848,7 @@ static int __init eeh_pseries_init(void) }/* Initialize error log size */ - eeh_error_buf_size =rtas_token ("rtas-error-log-max" ); -if (eeh_error_buf_size ==RTAS_UNKNOWN_SERVICE ) { -pr_info ("%s: unknown EEH error log size\n" , - __func__); - eeh_error_buf_size =1024 ; - }else if (eeh_error_buf_size >RTAS_ERROR_LOG_MAX ) { -pr_info ("%s: EEH error log size %d exceeds the maximal %d\n" , - __func__, eeh_error_buf_size,RTAS_ERROR_LOG_MAX ); - eeh_error_buf_size =RTAS_ERROR_LOG_MAX ; - } + eeh_error_buf_size =rtas_get_error_log_max ();/* Set EEH probe mode */ eeh_add_flag (EEH_PROBE_MODE_DEVTREE |EEH_ENABLE_IO_FOR_LOG );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 877/1146 dt-bindings: mfd: qcom,spmi-pmic: Drop PWM reg dependency
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 763ab98687404d924b6612f7c9c8430333d31229 ]
The PWM node is not a separate device and is expected to be part of parent SPMI PMIC node, thus it obtains the address space from the parent. One IO address in "reg" is also not correct description because LPG block maps to several regions.
--- Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +4 -4
@@ -98,6 +98,10 @@ properties: type: object $ref: /schemas/regulator/qcom,spmi-regulator.yaml# + pwm: + type: object + $ref: /schemas/leds/leds-qcom-lpg.yaml# + patternProperties: "^adc@[0-9a-f]+$": type: object
@@ -123,10 +127,6 @@ patternProperties: type: object $ref: /schemas/power/reset/qcom,pon.yaml# - "pwm@[0-9a-f]+$": - type: object - $ref: /schemas/leds/leds-qcom-lpg.yaml# - "^rtc@[0-9a-f]+$": type: object $ref: /schemas/rtc/qcom-pm8xxx-rtc.yaml#
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 878/1146 mfd: axp20x: Do not sleep in the power off handler
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 3f37d4f695cff180033254b9ed5adc8ab927cba9 ]
Since commit 856c288b0039 ("ARM: Use do_kernel_power_off()"), the function axp20x_power_off() now runs inside a RCU read-side critical section, so it is not allowed to call msleep(). Use mdelay() instead.
--- drivers/mfd/axp20x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/axp20x.c +1 -1
@@ -842,7 +842,7 @@ static void axp20x_power_off(void) AXP20X_OFF);/* Give capacitors etc. time to drain to avoid kernel panic msg. */ -msleep (500 ); +mdelay (500 ); }int axp20x_match_device (struct axp20x_dev *axp20x)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 879/1146 mfd: bd957x: Fix Kconfig dependency on REGMAP_IRQ
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
[ Upstream commit 85842c46fd47fa6bd78681c154223bed27d5fd19 ]
The BD957x driver uses REGMAP_IRQ but does not 'select' to depend on it. This can cause build failures. Select REGMAP_IRQ for BD957X.
--- drivers/mfd/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/Kconfig +1 -0
@@ -2027,6 +2027,7 @@ config MFD_ROHM_BD957XMUF depends on I2C=y depends on OF select REGMAP_I2C + select REGMAP_IRQ select MFD_CORE help Select this option to get support for the ROHM BD9576MUF and
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 880/1146 mfd: qcom_rpm: Fix an error handling path in qcom_rpm_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 36579aca877a62f67ecd77eb3edefc4c86292406 ]
If an error occurs after the clk_prepare_enable() call, a corresponding clk_disable_unprepare() should be called.
Simplify code and switch to devm_clk_get_enabled() to fix it.
--- drivers/mfd/qcom_rpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mfd/qcom_rpm.c +1 -3
@@ -547,7 +547,7 @@ static int qcom_rpm_probe(struct platform_device *pdev)init_completion (&rpm->ack);/* Enable message RAM clock */ - rpm->ramclk =devm_clk_get (&pdev->dev,"ram" ); + rpm->ramclk =devm_clk_get_enabled (&pdev->dev,"ram" );if (IS_ERR (rpm->ramclk)) { ret =PTR_ERR (rpm->ramclk);if (ret == -EPROBE_DEFER )
@@ -558,7 +558,6 @@ static int qcom_rpm_probe(struct platform_device *pdev)*/ rpm->ramclk =NULL ; } -clk_prepare_enable (rpm->ramclk);/* Accepts NULL */ irq_ack =platform_get_irq_byname (pdev,"ack" );if (irq_ack <0 )
@@ -681,7 +680,6 @@ static int qcom_rpm_remove(struct platform_device *pdev)struct qcom_rpm *rpm =dev_get_drvdata (&pdev->dev);of_platform_depopulate (&pdev->dev); -clk_disable_unprepare (rpm->ramclk);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 881/1146 mfd: pm8008: Fix return value check in pm8008_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 14f8c55d48e02157519fbcb3a5de557abd8a06e2 ]
In case of error, the function devm_regmap_init_i2c() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().
--- drivers/mfd/qcom-pm8008.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/qcom-pm8008.c +2 -2
@@ -215,8 +215,8 @@ static int pm8008_probe(struct i2c_client *client) dev = &client->dev; regmap =devm_regmap_init_i2c (client, &qcom_mfd_regmap_cfg); -if (!regmap) -return -ENODEV ; +if (IS_ERR (regmap)) +return PTR_ERR (regmap);i2c_set_clientdata (client, regmap);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 882/1146 netfilter: flowtable: really fix NAT IPv6 offload
In reply to Greg Kroah-HartmanFrom: Qingfang DENG <[email protected]>
[ Upstream commit 5fb45f95eec682621748b7cb012c6a8f0f981e6a ]
The for-loop was broken from the start. It translates to:
for (i = 0; i < 4; i += 4)
which means the loop statement is run only once, so only the highest 32-bit of the IPv6 address gets mangled.
Fix the loop increment.
--- net/netfilter/nf_flow_table_offload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_flow_table_offload.c +3 -3
@@ -383,12 +383,12 @@ static void flow_offload_ipv6_mangle(struct nf_flow_rule *flow_rule, const __be32 *addr, const __be32 *mask) { struct flow_action_entry *entry; -int i, j; +int i; -for (i =0 , j =0 ; i <sizeof (struct in6_addr ) /sizeof (u32); i +=sizeof (u32), j++) { +for (i =0 ; i <sizeof (struct in6_addr ) /sizeof (u32); i++) { entry =flow_action_entry_next (flow_rule);flow_offload_mangle (entry,FLOW_ACT_MANGLE_HDR_TYPE_IP6 , - offset + i, &addr[j], mask); + offset + i *sizeof (u32), &addr[i], mask); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 883/1146 rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 5fb733d7bd6949e90028efdce8bd528c6ab7cf1e ]
The clk_disable_unprepare() should be called in the error handling of clk_get_rate(), fix it.
--- drivers/rtc/rtc-st-lpc.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-st-lpc.c +1 -0
@@ -238,6 +238,7 @@ static int st_rtc_probe(struct platform_device *pdev) rtc->clkrate =clk_get_rate (rtc->clk);if (!rtc->clkrate) { +clk_disable_unprepare (rtc->clk);dev_err (&pdev->dev,"Unable to fetch clock rate\n" );return -EINVAL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 884/1146 rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 90cd5c88830140c9fade92a8027e0fb2c6e4cc49 ]
The pic32_rtc_enable(pdata, 0) and clk_disable_unprepare(pdata->clk) should be called in the error handling of devm_rtc_allocate_device(), so we should move devm_rtc_allocate_device earlier in pic32_rtc_probe() to fix it.
--- drivers/rtc/rtc-pic32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/rtc/rtc-pic32.c +4 -4
@@ -324,16 +324,16 @@ static int pic32_rtc_probe(struct platform_device *pdev)spin_lock_init (&pdata->alarm_lock); + pdata->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (pdata->rtc)) +return PTR_ERR (pdata->rtc); +clk_prepare_enable (pdata->clk);pic32_rtc_enable (pdata,1 );device_init_wakeup (&pdev->dev,1 ); - pdata->rtc =devm_rtc_allocate_device (&pdev->dev); -if (IS_ERR (pdata->rtc)) -return PTR_ERR (pdata->rtc); - pdata->rtc->ops = &pic32_rtcops; pdata->rtc->range_min =RTC_TIMESTAMP_BEGIN_2000 ; pdata->rtc->range_max =RTC_TIMESTAMP_END_2099 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 885/1146 rtc: pcf85063: fix pcf85063_clkout_control
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit c2d12e85336f6d4172fb2bab5935027c446d7343 ]
pcf85063_clkout_control reads the wrong register but then update the correct one.
--- drivers/rtc/rtc-pcf85063.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-pcf85063.c +1 -1
@@ -424,7 +424,7 @@ static int pcf85063_clkout_control(struct clk_hw *hw, bool enable)unsigned int buf;int ret; - ret =regmap_read (pcf85063->regmap,PCF85063_REG_OFFSET , &buf); + ret =regmap_read (pcf85063->regmap,PCF85063_REG_CTRL2 , &buf);if (ret <0 )return ret; buf &=PCF85063_REG_CLKO_F_MASK ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 886/1146 iommu/mediatek: Fix forever loop in error handling
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 462e768b55a2331324ff72e74706261134369826 ]
There is a typo so this loop does i++ where i-- was intended. It will result in looping until the kernel crashes.
--- drivers/iommu/mtk_iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +1 -2
@@ -1130,8 +1130,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **mreturn 0 ; err_larbdev_put: -/* id may be not linear mapping, loop whole the array */ -for (i =MTK_LARB_NR_MAX -1 ; i >=0 ; i++) { +for (i =MTK_LARB_NR_MAX -1 ; i >=0 ; i--) {if (!data->larb_imu[i].dev)continue ;put_device (data->larb_imu[i].dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 887/1146 nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure
In reply to Greg Kroah-HartmanFrom: Dan Aloni <[email protected]>
[ Upstream commit 3bc8edc98bd43540dbe648e4ef91f443d6d20a24 ]
On error situation clp->cl_cb_conn.cb_xprt should not be given a reference to the xprt otherwise both client cleanup and the error handling path of the caller call to put it. Better to delay handing over the reference to a later branch.
[ 72.530665] refcount_t: underflow; use-after-free. [ 72.531933] WARNING: CPU: 0 PID: 173 at lib/refcount.c:28 refcount_warn_saturate+0xcf/0x120 [ 72.533075] Modules linked in: nfsd(OE) nfsv4(OE) nfsv3(OE) nfs(OE) lockd(OE) compat_nfs_ssc(OE) nfs_acl(OE) rpcsec_gss_krb5(OE) auth_rpcgss(OE) rpcrdma(OE) dns_resolver fscache netfs grace rdma_cm iw_cm ib_cm sunrpc(OE) mlx5_ib mlx5_core mlxfw pci_hyperv_intf ib_uverbs ib_core xt_MASQUERADE nf_conntrack_netlink nft_counter xt_addrtype nft_compat br_netfilter bridge stp llc nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip_set overlay nf_tables nfnetlink crct10dif_pclmul crc32_pclmul ghash_clmulni_intel xfs serio_raw virtio_net virtio_blk net_failover failover fuse [last unloaded: sunrpc] [ 72.540389] CPU: 0 PID: 173 Comm: kworker/u16:5 Tainted: G OE 5.15.82-dan #1 [ 72.541511] Hardware name: Red Hat KVM/RHEL-AV, BIOS 1.16.0-3.module+el8.7.0+1084+97b81f61 04/01/2014 [ 72.542717] Workqueue: nfsd4_callbacks nfsd4_run_cb_work [nfsd] [ 72.543575] RIP: 0010:refcount_warn_saturate+0xcf/0x120 [ 72.544299] Code: 55 00 0f 0b 5d e9 01 50 98 00 80 3d 75 9e 39 08 00 0f 85 74 ff ff ff 48 c7 c7 e8 d1 60 8e c6 05 61 9e 39 08 01 e8 f6 51 55 00 <0f> 0b 5d e9 d9 4f 98 00 80 3d 4b 9e 39 08 00 0f 85 4c ff ff ff 48 [ 72.546666] RSP: 0018:ffffb3f841157cf0 EFLAGS: 00010286 [ 72.547393] RAX: 0000000000000026 RBX: ffff89ac6231d478 RCX: 0000000000000000 [ 72.548324] RDX: ffff89adb7c2c2c0 RSI: ffff89adb7c205c0 RDI: ffff89adb7c205c0 [ 72.549271] RBP: ffffb3f841157cf0 R08: 0000000000000000 R09: c0000000ffefffff [ 72.550209] R10: 0000000000000001 R11: ffffb3f841157ad0 R12: ffff89ac6231d180 [ 72.551142] R13: ffff89ac6231d478 R14: ffff89ac40c06180 R15: ffff89ac6231d4b0 [ 72.552089] FS: 0000000000000000(0000) GS:ffff89adb7c00000(0000) knlGS:0000000000000000 [ 72.553175] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 72.553934] CR2: 0000563a310506a8 CR3: 0000000109a66000 CR4: 0000000000350ef0 [ 72.554874] Call Trace: [ 72.555278] <TASK> [ 72.555614] svc_xprt_put+0xaf/0xe0 [sunrpc] [ 72.556276] nfsd4_process_cb_update.isra.11+0xb7/0x410 [nfsd] [ 72.557087] ? update_load_avg+0x82/0x610 [ 72.557652] ? cpuacct_charge+0x60/0x70 [ 72.558212] ? dequeue_entity+0xdb/0x3e0 [ 72.558765] ? queued_spin_unlock+0x9/0x20 [ 72.559358] nfsd4_run_cb_work+0xfc/0x270 [nfsd] [ 72.560031] process_one_work+0x1df/0x390 [ 72.560600] worker_thread+0x37/0x3b0 [ 72.561644] ? process_one_work+0x390/0x390 [ 72.562247] kthread+0x12f/0x150 [ 72.562710] ? set_kthread_struct+0x50/0x50 [ 72.563309] ret_from_fork+0x22/0x30 [ 72.563818] </TASK> [ 72.564189] ---[ end trace 031117b1c72ec616 ]--- [ 72.566019] list_add corruption. next->prev should be prev (ffff89ac4977e538), but was ffff89ac4763e018. (next=ffff89ac4763e018). [ 72.567647] ------------[ cut here ]------------
--- fs/nfsd/nfs4callback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfsd/nfs4callback.c +3 -1
@@ -916,7 +916,6 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c }else {if (!conn->cb_xprt)return -EINVAL ; - clp->cl_cb_conn.cb_xprt = conn->cb_xprt; clp->cl_cb_session = ses; args.bc_xprt = conn->cb_xprt; args.prognumber = clp->cl_cb_session->se_cb_prog;
@@ -936,6 +935,9 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *crpc_shutdown_client (client);return -ENOMEM ; } + +if (clp->cl_minorversion !=0 ) + clp->cl_cb_conn.cb_xprt = conn->cb_xprt; clp->cl_cb_client = client; clp->cl_cb_cred = cred;rcu_read_lock ();
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 888/1146 net: macsec: fix net device access prior to holding a lock
In reply to Greg Kroah-HartmanFrom: Emeel Hakim <[email protected]>
[ Upstream commit f3b4a00f0f62da252c598310698dfc82ef2f2e2e ]
Currently macsec offload selection update routine accesses the net device prior to holding the relevant lock. Fix by holding the lock prior to the device access.
--- drivers/net/macsec.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/net/macsec.c +21 -13
@@ -2593,7 +2593,7 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)const struct macsec_ops *ops;struct macsec_context ctx;struct macsec_dev *macsec; -int ret; +int ret =0 ;if (!attrs[MACSEC_ATTR_IFINDEX ])return -EINVAL ;
@@ -2606,28 +2606,36 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info) macsec_genl_offload_policy, NULL))return -EINVAL ; +rtnl_lock (); + dev =get_dev_from_nl (genl_info_net (info), attrs); -if (IS_ERR (dev)) -return PTR_ERR (dev); +if (IS_ERR (dev)) { + ret =PTR_ERR (dev); + goto out; + } macsec =macsec_priv (dev); -if (!tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]) -return -EINVAL ; +if (!tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]) { + ret = -EINVAL ; + goto out; + } offload =nla_get_u8 (tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]);if (macsec->offload == offload) -return 0 ; + goto out;/* Check if the offloading mode is supported by the underlying layers */ if (offload !=MACSEC_OFFLOAD_OFF && - !macsec_check_offload (offload, macsec)) -return -EOPNOTSUPP ; + !macsec_check_offload (offload, macsec)) { + ret = -EOPNOTSUPP ; + goto out; + }/* Check if the net device is busy. */ -if (netif_running (dev)) -return -EBUSY ; - -rtnl_lock (); +if (netif_running (dev)) { + ret = -EBUSY ; + goto out; + } prev_offload = macsec->offload; macsec->offload = offload;
@@ -2662,7 +2670,7 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info) rollback: macsec->offload = prev_offload; - +out:rtnl_unlock ();return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 889/1146 bonding: add missed __rcu annotation for curr_active_slave
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 3d0b738fc5adf9f380702ac1424672e4b32c3781 ]
There is one direct accesses to bond->curr_active_slave in bond_miimon_commit(). Protected it by rcu_access_pointer() since the later of this function also use this one.
Stable-dep-of: e95cc44763a4 ("bonding: do failover when high prio link up")
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -2698,7 +2698,7 @@ static void bond_miimon_commit(struct bonding *bond)bond_miimon_link_change (bond, slave,BOND_LINK_UP ); -if (!bond->curr_active_slave || slave == primary) +if (!rcu_access_pointer (bond->curr_active_slave) || slave == primary) goto do_failover;continue ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 890/1146 bonding: do failover when high prio link up
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit e95cc44763a41d5c715ef16742bcb1d8e6524a62 ]
Currently, when a high prio link enslaved, or when current link down, the high prio port could be selected. But when high prio link up, the new active slave reselection is not triggered. Fix it by checking link's prio when getting up. Making the do_failover after looping all slaves as there may be multi high prio slaves up.
--- drivers/net/bonding/bond_main.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/net/bonding/bond_main.c +15 -9
@@ -2653,8 +2653,9 @@ static void bond_miimon_link_change(struct bonding *bond,static void bond_miimon_commit (struct bonding *bond) { -struct list_head *iter;struct slave *slave, *primary; +bool do_failover = false; +struct list_head *iter;bond_for_each_slave (bond, slave, iter) {switch (slave->link_new_state) {
@@ -2698,8 +2699,9 @@ static void bond_miimon_commit(struct bonding *bond)bond_miimon_link_change (bond, slave,BOND_LINK_UP ); -if (!rcu_access_pointer (bond->curr_active_slave) || slave == primary) - goto do_failover; +if (!rcu_access_pointer (bond->curr_active_slave) || slave == primary || + slave->prio >rcu_dereference (bond->curr_active_slave)->prio) + do_failover = true;continue ;
@@ -2720,7 +2722,7 @@ static void bond_miimon_commit(struct bonding *bond)bond_miimon_link_change (bond, slave,BOND_LINK_DOWN );if (slave ==rcu_access_pointer (bond->curr_active_slave)) - goto do_failover; + do_failover = true;continue ;
@@ -2731,8 +2733,9 @@ static void bond_miimon_commit(struct bonding *bond)continue ; } + } -do_failover: +if (do_failover) {block_netpoll_tx ();bond_select_active_slave (bond);unblock_netpoll_tx ();
@@ -3530,6 +3533,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)*/ static void bond_ab_arp_commit (struct bonding *bond) { +bool do_failover = false;struct list_head *iter;unsigned long last_tx;struct slave *slave;
@@ -3559,8 +3563,9 @@ static void bond_ab_arp_commit(struct bonding *bond)slave_info (bond->dev, slave->dev,"link status definitely up\n" );if (!rtnl_dereference (bond->curr_active_slave) || - slave ==rtnl_dereference (bond->primary_slave)) - goto do_failover; + slave ==rtnl_dereference (bond->primary_slave) || + slave->prio >rtnl_dereference (bond->curr_active_slave)->prio) + do_failover = true; }
@@ -3579,7 +3584,7 @@ static void bond_ab_arp_commit(struct bonding *bond)if (slave ==rtnl_dereference (bond->curr_active_slave)) {RCU_INIT_POINTER (bond->current_arp_slave,NULL ); - goto do_failover; + do_failover = true; }continue ;
@@ -3603,8 +3608,9 @@ static void bond_ab_arp_commit(struct bonding *bond) slave->link_new_state);continue ; } + } -do_failover: +if (do_failover) {block_netpoll_tx ();bond_select_active_slave (bond);unblock_netpoll_tx ();
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 891/1146 mISDN: hfcsusb: dont call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ddc9648db162eee556edd5222d2808fe33730203 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
skb_queue_purge() is called under spin_lock_irqsave() in hfcusb_l2l1D(), kfree_skb() is called in it, to fix this, use skb_queue_splice_init() to move the dch->squeue to a free queue, also enqueue the tx_skb and rx_skb, at last calling __skb_queue_purge() to free the SKBs afer unlock.
In tx_iso_complete(), dev_kfree_skb() is called to consume the transmitted SKB, so replace it with dev_consume_skb_irq().
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/isdn/hardware/mISDN/hfcsusb.c +8 -4
@@ -326,20 +326,24 @@ hfcusb_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb)test_and_clear_bit (FLG_L2_ACTIVATED , &dch->Flags);if (hw->protocol ==ISDN_P_NT_S0 ) { +struct sk_buff_head free_queue; + +__skb_queue_head_init (&free_queue);hfcsusb_ph_command (hw,HFC_L1_DEACTIVATE_NT );spin_lock_irqsave (&hw->lock, flags); -skb_queue_purge (&dch->squeue); +skb_queue_splice_init (&dch->squeue, &free_queue);if (dch->tx_skb) { -dev_kfree_skb (dch->tx_skb); +__skb_queue_tail (&free_queue, dch->tx_skb); dch->tx_skb =NULL ; } dch->tx_idx =0 ;if (dch->rx_skb) { -dev_kfree_skb (dch->rx_skb); +__skb_queue_tail (&free_queue, dch->rx_skb); dch->rx_skb =NULL ; }test_and_clear_bit (FLG_TX_BUSY , &dch->Flags);spin_unlock_irqrestore (&hw->lock, flags); +__skb_queue_purge (&free_queue);#ifdef FIXME if (test_and_clear_bit (FLG_L1_BUSY , &dch->Flags))dchannel_sched_event (&hc->dch,D_CLEARBUSY );
@@ -1330,7 +1334,7 @@ tx_iso_complete(struct urb *urb)printk ("\n" ); } -dev_kfree_skb (tx_skb); +dev_consume_skb_irq (tx_skb); tx_skb =NULL ;if (fifo->dch &&get_next_dframe (fifo->dch)) tx_skb = fifo->dch->tx_skb;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 892/1146 mISDN: hfcpci: dont call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f0f596bd75a9d573ca9b587abb39cee0b916bb82 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
skb_queue_purge() is called under spin_lock_irqsave() in hfcpci_l2l1D(), kfree_skb() is called in it, to fix this, use skb_queue_splice_init() to move the dch->squeue to a free queue, also enqueue the tx_skb and rx_skb, at last calling __skb_queue_purge() to free the SKBs afer unlock.
--- drivers/isdn/hardware/mISDN/hfcpci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/isdn/hardware/mISDN/hfcpci.c +9 -4
@@ -1617,16 +1617,19 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb)test_and_clear_bit (FLG_L2_ACTIVATED , &dch->Flags);spin_lock_irqsave (&hc->lock, flags);if (hc->hw.protocol ==ISDN_P_NT_S0 ) { +struct sk_buff_head free_queue; + +__skb_queue_head_init (&free_queue);/* prepare deactivation */ Write_hfc (hc,HFCPCI_STATES ,0x40 ); -skb_queue_purge (&dch->squeue); +skb_queue_splice_init (&dch->squeue, &free_queue);if (dch->tx_skb) { -dev_kfree_skb (dch->tx_skb); +__skb_queue_tail (&free_queue, dch->tx_skb); dch->tx_skb =NULL ; } dch->tx_idx =0 ;if (dch->rx_skb) { -dev_kfree_skb (dch->rx_skb); +__skb_queue_tail (&free_queue, dch->rx_skb); dch->rx_skb =NULL ; }test_and_clear_bit (FLG_TX_BUSY , &dch->Flags);
@@ -1639,10 +1642,12 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb) hc->hw.mst_m &= ~HFCPCI_MASTER ;Write_hfc (hc,HFCPCI_MST_MODE , hc->hw.mst_m); ret =0 ; +spin_unlock_irqrestore (&hc->lock, flags); +__skb_queue_purge (&free_queue); }else { ret =l1_event (dch->l1, hh->prim); +spin_unlock_irqrestore (&hc->lock, flags); } -spin_unlock_irqrestore (&hc->lock, flags);break ; }if (!ret)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 893/1146 mISDN: hfcmulti: dont call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 1232946cf522b8de9e398828bde325d7c41f29dd ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
skb_queue_purge() is called under spin_lock_irqsave() in handle_dmsg() and hfcm_l1callback(), kfree_skb() is called in them, to fix this, use skb_queue_splice_init() to move the dch->squeue to a free queue, also enqueue the tx_skb and rx_skb, at last calling __skb_queue_purge() to free the SKBs afer unlock.
--- drivers/isdn/hardware/mISDN/hfcmulti.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/isdn/hardware/mISDN/hfcmulti.c +13 -6
@@ -3217,6 +3217,7 @@ static int hfcm_l1callback(struct dchannel *dch, u_int cmd) {struct hfc_multi *hc = dch->hw; +struct sk_buff_head free_queue;u_long flags;switch (cmd) {
@@ -3245,6 +3246,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)l1_event (dch->l1,HW_POWERUP_IND );break ;case HW_DEACT_REQ : +__skb_queue_head_init (&free_queue);/* start deactivation */ spin_lock_irqsave (&hc->lock, flags);if (hc->ctype ==HFC_TYPE_E1 ) {
@@ -3264,20 +3266,21 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)plxsd_checksync (hc,0 ); } } -skb_queue_purge (&dch->squeue); +skb_queue_splice_init (&dch->squeue, &free_queue);if (dch->tx_skb) { -dev_kfree_skb (dch->tx_skb); +__skb_queue_tail (&free_queue, dch->tx_skb); dch->tx_skb =NULL ; } dch->tx_idx =0 ;if (dch->rx_skb) { -dev_kfree_skb (dch->rx_skb); +__skb_queue_tail (&free_queue, dch->rx_skb); dch->rx_skb =NULL ; }test_and_clear_bit (FLG_TX_BUSY , &dch->Flags);if (test_and_clear_bit (FLG_BUSY_TIMER , &dch->Flags))del_timer (&dch->timer);spin_unlock_irqrestore (&hc->lock, flags); +__skb_queue_purge (&free_queue);break ;case HW_POWERUP_REQ :spin_lock_irqsave (&hc->lock, flags);
@@ -3384,6 +3387,9 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)case PH_DEACTIVATE_REQ :test_and_clear_bit (FLG_L2_ACTIVATED , &dch->Flags);if (dch->dev.D.protocol !=ISDN_P_TE_S0 ) { +struct sk_buff_head free_queue; + +__skb_queue_head_init (&free_queue);spin_lock_irqsave (&hc->lock, flags);if (debug &DEBUG_HFCMULTI_MSG ) printk(KERN_DEBUG
@@ -3405,14 +3411,14 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)/* deactivate */ dch->state =1 ; } -skb_queue_purge (&dch->squeue); +skb_queue_splice_init (&dch->squeue, &free_queue);if (dch->tx_skb) { -dev_kfree_skb (dch->tx_skb); +__skb_queue_tail (&free_queue, dch->tx_skb); dch->tx_skb =NULL ; } dch->tx_idx =0 ;if (dch->rx_skb) { -dev_kfree_skb (dch->rx_skb); +__skb_queue_tail (&free_queue, dch->rx_skb); dch->rx_skb =NULL ; }test_and_clear_bit (FLG_TX_BUSY , &dch->Flags);
@@ -3424,6 +3430,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)#endif ret =0 ;spin_unlock_irqrestore (&hc->lock, flags); +__skb_queue_purge (&free_queue); }else ret =l1_event (dch->l1, hh->prim);break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 894/1146 block, bfq: fix possible uaf for bfqq->bic
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 64dc8c732f5c2b406cc752e6aaa1bd5471159cab ]
Our test report a uaf for 'bfqq->bic' in 5.10:
==================================================================
BUG: KASAN: use-after-free in bfq_select_queue+0x378/0xa30 CPU: 6 PID: 2318352 Comm: fsstress Kdump: loaded Not tainted 5.10.0-60.18.0.50.h602.kasan.eulerosv2r11.x86_64 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58-20220320_160524-szxrtosci10000 04/01/2014 Call Trace: bfq_select_queue+0x378/0xa30 bfq_dispatch_request+0xe8/0x130 blk_mq_do_dispatch_sched+0x62/0xb0 __blk_mq_sched_dispatch_requests+0x215/0x2a0 blk_mq_sched_dispatch_requests+0x8f/0xd0 __blk_mq_run_hw_queue+0x98/0x180 __blk_mq_delay_run_hw_queue+0x22b/0x240 blk_mq_run_hw_queue+0xe3/0x190 blk_mq_sched_insert_requests+0x107/0x200 blk_mq_flush_plug_list+0x26e/0x3c0 blk_finish_plug+0x63/0x90 __iomap_dio_rw+0x7b5/0x910 iomap_dio_rw+0x36/0x80 ext4_dio_read_iter+0x146/0x190 [ext4] ext4_file_read_iter+0x1e2/0x230 [ext4] new_sync_read+0x29f/0x400 vfs_read+0x24e/0x2d0 ksys_read+0xd5/0x1b0 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x61/0xc6
Commit 3bc5e683c67d ("bfq: Split shared queues on move between cgroups") changes that move process to a new cgroup will allocate a new bfqq to use, however, the old bfqq and new bfqq can point to the same bic:
1) Initial state, two process with io in the same cgroup.
Process 1 Process 2
(BIC1) (BIC2)
| Λ | Λ | | | | V | V | bfqq1 bfqq2
2) bfqq1 is merged to bfqq2.
Process 1 Process 2
(BIC1) (BIC2)
| | \-------------\|
V
bfqq1 bfqq2(coop)
3) Process 1 exit, then issue new io(denoce IOA) from Process 2.
(BIC2)
| Λ | | V |
bfqq2(coop)
4) Before IOA is completed, move Process 2 to another cgroup and issue io.
Process 2
(BIC2)
Λ
|\--------------\
| V
bfqq2 bfqq3
Now that BIC2 points to bfqq3, while bfqq2 and bfqq3 both point to BIC2. If all the requests are completed, and Process 2 exit, BIC2 will be freed while there is no guarantee that bfqq2 will be freed before BIC2.
Fix the problem by clearing bfqq->bic while bfqq is detached from bic.
--- block/bfq-iosched.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
block/bfq-iosched.c +6 -1
@@ -386,6 +386,12 @@ static void bfq_put_stable_ref(struct bfq_queue *bfqq);void bic_set_bfqq (struct bfq_io_cq *bic,struct bfq_queue *bfqq,bool is_sync) { +struct bfq_queue *old_bfqq = bic->bfqq[is_sync]; + +/* Clear bic pointer if bfqq is detached from this bic */ +if (old_bfqq && old_bfqq->bic == bic) + old_bfqq->bic =NULL ; +/* * If bfqq != NULL, then a non-stable queue merge between * bic->bfqq and bfqq is happening here. This causes troubles
@@ -5377,7 +5383,6 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync)unsigned long flags;spin_lock_irqsave (&bfqd->lock, flags); - bfqq->bic =NULL ;bfq_exit_bfqq (bfqd, bfqq);bic_set_bfqq (bic,NULL , is_sync);spin_unlock_irqrestore (&bfqd->lock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 895/1146 selftests/bpf: Select CONFIG_FUNCTION_ERROR_INJECTION
In reply to Greg Kroah-HartmanFrom: Song Liu <[email protected]>
[ Upstream commit a8dfde09c90109e3a98af54847e91bde7dc2d5c2 ]
BPF selftests require CONFIG_FUNCTION_ERROR_INJECTION to work. However, CONFIG_FUNCTION_ERROR_INJECTION is no longer 'y' by default after recent changes. As a result, we are seeing errors like the following from BPF CI:
bpf_testmod_test_read() is not modifiable
__x64_sys_setdomainname is not sleepable
__x64_sys_getpgid is not sleepable
Fix this by explicitly selecting CONFIG_FUNCTION_ERROR_INJECTION in the selftest config.
--- tools/testing/selftests/bpf/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/config +1 -0
@@ -13,6 +13,7 @@ CONFIG_CRYPTO_USER_API_HASH=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FPROBE=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_FUNCTION_TRACER=y CONFIG_GENEVE=y CONFIG_IKCONFIG=y
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 896/1146 bpf: prevent leak of lsm program after failed attach
In reply to Greg Kroah-HartmanFrom: Milan Landaverde <[email protected]>
[ Upstream commit e89f3edffb860a0f54a9ed16deadb7a4a1fa3862 ]
In [0], we added the ability to bpf_prog_attach LSM programs to cgroups, but in our validation to make sure the prog is meant to be attached to BPF_LSM_CGROUP, we return too early if the check fails. This results in lack of decrementing prog's refcnt (through bpf_prog_put) leaving the LSM program alive past the point of the expected lifecycle. This fix allows for the decrement to take place.
[0] https://lore.kernel.org/all/[email protected]/
--- kernel/bpf/syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/syscall.c +3 -3
@@ -3504,9 +3504,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)case BPF_PROG_TYPE_LSM :if (ptype ==BPF_PROG_TYPE_LSM && prog->expected_attach_type !=BPF_LSM_CGROUP ) -return -EINVAL ; - - ret =cgroup_bpf_prog_attach (attr, ptype, prog); + ret = -EINVAL ; +else + ret =cgroup_bpf_prog_attach (attr, ptype, prog);break ;default : ret = -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 897/1146 media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 73278d483378cf850ade923a1107a70297b2602a ]
The patch adding support for dynamically allocated arrays accidentally dropped the line setting ctrl->is_new to 1, thus new string values were always ignored.
--- drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/v4l2-core/v4l2-ctrls-api.c +1 -0
@@ -150,6 +150,7 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)* then return an error. */ if (strlen (ctrl->p_new.p_char) == ctrl->maximum && last) + ctrl->is_new =1 ;return -ERANGE ; }return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 898/1146 net: enetc: avoid buffer leaks on xdp_do_redirect() failure
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 628050ec952d2e2e46ec9fb6aa07e41139e030c8 ]
Before enetc_clean_rx_ring_xdp() calls xdp_do_redirect(), each software BD in the RX ring between index orig_i and i can have one of 2 refcount values on its page.
We are the owner of the current buffer that is being processed, so the refcount will be at least 1.
If the current owner of the buffer at the diametrically opposed index in the RX ring (i.o.w, the other half of this page) has not yet called kfree(), this page's refcount could even be 2.
enetc_page_reusable() in enetc_flip_rx_buff() tests for the page refcount against 1, and [ if it's 2 ] does not attempt to reuse it.
But if enetc_flip_rx_buff() is put after the xdp_do_redirect() call, the page refcount can have one of 3 values. It can also be 0, if there is no owner of the other page half, and xdp_do_redirect() for this buffer ran so far that it triggered a flush of the devmap/cpumap bulk queue, and the consumers of those bulk queues also freed the buffer, all by the time xdp_do_redirect() returns the execution back to enetc.
This is the reason why enetc_flip_rx_buff() is called before xdp_do_redirect(), but there is a big flaw with that reasoning:enetc_flip_rx_buff() will set rx_swbd->page = NULL on both sides of the enetc_page_reusable() branch, and if xdp_do_redirect() returns an error, we call enetc_xdp_free(), which does not deal gracefully with that.
In fact, what happens is quite special. The page refcounts start as 1. enetc_flip_rx_buff() figures they're reusable, transfers these rx_swbd->page pointers to a different rx_swbd in enetc_reuse_page(), and bumps the refcount to 2. When xdp_do_redirect() later returns an error, we call the no-op enetc_xdp_free(), but we still haven't lost the reference to that page. A copy of it is still at rx_ring->next_to_alloc, but that has refcount 2 (and there are no concurrent owners of it in flight, to drop the refcount). What really kills the system is when we'll flip the rx_swbd->page the second time around. With an updated refcount of 2, the page will not be reusable and we'll really leak it. Then enetc_new_page() will have to allocate more pages, which will then eventually leak again on further errors from xdp_do_redirect().
The problem, summarized, is that we zeroize rx_swbd->page before we're completely done with it, and this makes it impossible for the error path to do something with it.
Since the packet is potentially multi-buffer and therefore the rx_swbd->page is potentially an array, manual passing of the old pointers between enetc_flip_rx_buff() and enetc_xdp_free() is a bit difficult.
For the sake of going with a simple solution, we accept the possibility of racing with xdp_do_redirect(), and we move the flip procedure to execute only on the redirect success path. By racing, I mean that the page may be deemed as not reusable by enetc (having a refcount of 0), but there will be no leak in that case, either.
Once we accept that, we have something better to do with buffers on XDP_REDIRECT failure. Since we haven't performed half-page flipping yet, we won't, either (and this way, we can avoid enetc_xdp_free() completely, which gives the entire page to the slab allocator). Instead, we'll call enetc_xdp_drop(), which will recycle this half of the buffer back to the RX ring.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 35 +++++--------------- 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +8 -27
@@ -1489,23 +1489,6 @@ static void enetc_xdp_drop(struct enetc_bdr *rx_ring, int rx_ring_first, rx_ring->stats.xdp_drops++; } -static void enetc_xdp_free (struct enetc_bdr *rx_ring,int rx_ring_first, -int rx_ring_last) -{ -while (rx_ring_first != rx_ring_last) { -struct enetc_rx_swbd *rx_swbd = &rx_ring->rx_swbd[rx_ring_first]; - -if (rx_swbd->page) { -dma_unmap_page (rx_ring->dev, rx_swbd->dma,PAGE_SIZE , - rx_swbd->dir); -__free_page (rx_swbd->page); - rx_swbd->page =NULL ; - } -enetc_bdr_idx_inc (rx_ring, &rx_ring_first); - } - rx_ring->stats.xdp_redirect_failures++; -} -static int enetc_clean_rx_ring_xdp (struct enetc_bdr *rx_ring,struct napi_struct *napi,int work_limit,struct bpf_prog *prog)
@@ -1527,8 +1510,8 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,int orig_i, orig_cleaned_cnt;struct xdp_buff xdp_buff;struct sk_buff *skb; -int tmp_orig_i, err;u32 bd_status; +int err; rxbd =enetc_rxbd (rx_ring, i); bd_status =le32_to_cpu (rxbd->r.lstatus);
@@ -1615,18 +1598,16 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,break ; } - tmp_orig_i = orig_i; - -while (orig_i != i) { -enetc_flip_rx_buff (rx_ring, - &rx_ring->rx_swbd[orig_i]); -enetc_bdr_idx_inc (rx_ring, &orig_i); - } - err =xdp_do_redirect (rx_ring->ndev, &xdp_buff, prog);if (unlikely (err)) { -enetc_xdp_free (rx_ring, tmp_orig_i, i); +enetc_xdp_drop (rx_ring, orig_i, i); + rx_ring->stats.xdp_redirect_failures++; }else { +while (orig_i != i) { +enetc_flip_rx_buff (rx_ring, + &rx_ring->rx_swbd[orig_i]); +enetc_bdr_idx_inc (rx_ring, &orig_i); + } xdp_redirect_frm_cnt++; rx_ring->stats.xdp_redirect++; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 899/1146 nfc: pn533: Clear nfc_target before being used
In reply to Greg Kroah-HartmanFrom: Minsuk Kang <[email protected]>
[ Upstream commit 9f28157778ede0d4f183f7ab3b46995bb400abbe ]
Fix a slab-out-of-bounds read that occurs in nla_put() called from nfc_genl_send_target() when target->sensb_res_len, which is duplicated from an nfc_target in pn533, is too large as the nfc_target is not properly initialized and retains garbage values. Clear nfc_targets with memset() before they are used.
Found by a modified version of syzkaller.
BUG: KASAN: slab-out-of-bounds in nla_put Call Trace: memcpy nla_put nfc_genl_dump_targets genl_lock_dumpit netlink_dump __netlink_dump_start genl_family_rcv_msg_dumpit genl_rcv_msg netlink_rcv_skb genl_rcv netlink_unicast netlink_sendmsg sock_sendmsg ____sys_sendmsg ___sys_sendmsg __sys_sendmsg do_syscall_64
--- drivers/nfc/pn533/pn533.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/nfc/pn533/pn533.c +4 -0
@@ -1295,6 +1295,8 @@ static int pn533_poll_dep_complete(struct pn533 *dev, void *arg,if (IS_ERR (resp))return PTR_ERR (resp); +memset (&nfc_target,0 ,sizeof (struct nfc_target )); + rsp = (struct pn533_cmd_jump_dep_response *)resp->data; rc = rsp->status &PN533_CMD_RET_MASK ;
@@ -1926,6 +1928,8 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,dev_dbg (dev->dev,"Creating new target\n" ); +memset (&nfc_target,0 ,sizeof (struct nfc_target )); + nfc_target.supported_protocols =NFC_PROTO_NFC_DEP_MASK ; nfc_target.nfcid1_len =10 ;memcpy (nfc_target.nfcid1, rsp->nfcid3t, nfc_target.nfcid1_len);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 900/1146 unix: Fix race in SOCK_SEQPACKETs unix_dgram_sendmsg()
In reply to Greg Kroah-HartmanFrom: Kirill Tkhai <[email protected]>
[ Upstream commit 3ff8bff704f4de125dca2262e5b5b963a3da1d87 ]
There is a race resulting in alive SOCK_SEQPACKET socket may change its state from TCP_ESTABLISHED to TCP_CLOSE:
unix_release_sock(peer) unix_dgram_sendmsg(sk)
sock_orphan(peer)
sock_set_flag(peer, SOCK_DEAD)
sock_alloc_send_pskb()
if !(sk->sk_shutdown & SEND_SHUTDOWN)
OK
if sock_flag(peer, SOCK_DEAD)
sk->sk_state = TCP_CLOSE sk->sk_shutdown = SHUTDOWN_MASK
After that socket sk remains almost normal: it is able to connect, listen, accept and recvmsg, while it can't sendmsg.
Since this is the only possibility for alive SOCK_SEQPACKET to change the state in such way, we should better fix this strange and potentially danger corner case.
Note, that we will return EPIPE here like this is normally done in sock_alloc_send_pskb(). Originally used ECONNREFUSED looks strange, since it's strange to return
a specific retval in dependence of race in kernel, when user can't affect on this.
Also, move TCP_CLOSE assignment for SOCK_DGRAM sockets under state lock to fix race with unix_dgram_connect():
unix_dgram_connect(other) unix_dgram_sendmsg(sk)
unix_peer(sk) = NULL unix_state_unlock(sk)
unix_state_double_lock(sk, other)
sk->sk_state = TCP_ESTABLISHED
unix_peer(sk) = other unix_state_double_unlock(sk, other)
sk->sk_state = TCP_CLOSED
This patch fixes both of these races.
--- net/unix/af_unix.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/unix/af_unix.c +9 -2
@@ -1999,13 +1999,20 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg,unix_state_lock (sk); err =0 ; -if (unix_peer (sk) == other) { +if (sk->sk_type ==SOCK_SEQPACKET ) { +/* We are here only when racing with unix_release_sock() +* is clearing @other. Never change state to TCP_CLOSE +* unlike SOCK_DGRAM wants. +*/ +unix_state_unlock (sk); + err = -EPIPE ; + }else if (unix_peer (sk) == other) {unix_peer (sk) =NULL ;unix_dgram_peer_wake_disconnect_wakeup (sk, other); + sk->sk_state =TCP_CLOSE ;unix_state_unlock (sk); - sk->sk_state =TCP_CLOSE ;unix_dgram_disconnected (sk, other);sock_put (other); err = -ECONNREFUSED ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 901/1146 r6040: Fix kmemleak in probe and remove
In reply to Greg Kroah-HartmanFrom: Li Zetao <[email protected]>
[ Upstream commit 7e43039a49c2da45edc1d9d7c9ede4003ab45a5f ]
There is a memory leaks reported by kmemleak:
unreferenced object 0xffff888116111000 (size 2048):
comm "modprobe", pid 817, jiffies 4294759745 (age 76.502s)
hex dump (first 32 bytes):
00 c4 0a 04 81 88 ff ff 08 10 11 16 81 88 ff ff ................
08 10 11 16 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff815bcd82>] kmalloc_trace+0x22/0x60
[<ffffffff827e20ee>] phy_device_create+0x4e/0x90
[<ffffffff827e6072>] get_phy_device+0xd2/0x220
[<ffffffff827e7844>] mdiobus_scan+0xa4/0x2e0
[<ffffffff827e8be2>] __mdiobus_register+0x482/0x8b0
[<ffffffffa01f5d24>] r6040_init_one+0x714/0xd2c [r6040]
...The problem occurs in probe process as follows:
r6040_init_one:
mdiobus_register
mdiobus_scan <- alloc and register phy_device,
the reference count of phy_device is 3
r6040_mii_probe
phy_connect <- connect to the first phy_device,
so the reference count of the first phy_device is 4, others are 3
register_netdev <- fault inject succeeded, goto error handling path
// error handling path
err_out_mdio_unregister:
mdiobus_unregister(lp->mii_bus);
err_out_mdio:
mdiobus_free(lp->mii_bus); <- the reference count of the first
phy_device is 1, it is not released and other phy_devices are released
// similarly, the remove process also has the same problem
The root cause is traced to the phy_device is not disconnected when removes one r6040 device in r6040_remove_one() or on error handling path after r6040_mii probed successfully. In r6040_mii_probe(), a net ethernet device is connected to the first PHY device of mii_bus, in order to notify the connected driver when the link status changes, which is the default behavior of the PHY infrastructure to handle everything. Therefore the phy_device should be disconnected when removes one r6040 device or on error handling path.
Fix it by adding phy_disconnect() when removes one r6040 device or on error handling path after r6040_mii probed successfully.
--- drivers/net/ethernet/rdc/r6040.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/rdc/r6040.c +4 -1
@@ -1159,10 +1159,12 @@ static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) err =register_netdev (dev);if (err) {dev_err (&pdev->dev,"Failed to register net device\n" ); - goto err_out_mdio_unregister; + goto err_out_phy_disconnect; }return 0 ; +err_out_phy_disconnect: +phy_disconnect (dev->phydev); err_out_mdio_unregister:mdiobus_unregister (lp->mii_bus); err_out_mdio:
@@ -1186,6 +1188,7 @@ static void r6040_remove_one(struct pci_dev *pdev)struct r6040_private *lp =netdev_priv (dev);unregister_netdev (dev); +phy_disconnect (dev->phydev);mdiobus_unregister (lp->mii_bus);mdiobus_free (lp->mii_bus);netif_napi_del (&lp->napi);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 902/1146 blk-mq: move the srcu_struct used for quiescing to the tagset
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 80bd4a7aab4c9ce59bf5e35fdf52aa23d8a3c9f5 ]
All I/O submissions have fairly similar latencies, and a tagset-wide quiesce is a fairly common operation.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-core.c | 27 +++++---------------------- block/blk-mq.c | 33 +++++++++++++++++++++++++-------- block/blk-mq.h | 14 +++++++------- block/blk-sysfs.c | 9 ++------- block/blk.h | 9 +-------- block/genhd.c | 2 +- include/linux/blk-mq.h | 4 ++++ include/linux/blkdev.h | 9 --------- 8 files changed, 45 insertions(+), 62 deletions(-)
block/blk-core.c +5 -22
@@ -65,7 +65,6 @@ DEFINE_IDA(blk_queue_ida);* For queue allocation */ struct kmem_cache *blk_requestq_cachep; -struct kmem_cache *blk_requestq_srcu_cachep;/* * Controlling structure to kblockd
@@ -373,26 +372,20 @@ static void blk_timeout_work(struct work_struct *work) { } -struct request_queue *blk_alloc_queue (int node_id,bool alloc_srcu) +struct request_queue *blk_alloc_queue (int node_id) {struct request_queue *q; - q =kmem_cache_alloc_node (blk_get_queue_kmem_cache (alloc_srcu), -GFP_KERNEL | __GFP_ZERO, node_id); + q =kmem_cache_alloc_node (blk_requestq_cachep,GFP_KERNEL | __GFP_ZERO, + node_id);if (!q)return NULL ; -if (alloc_srcu) { -blk_queue_flag_set (QUEUE_FLAG_HAS_SRCU , q); -if (init_srcu_struct (q->srcu) !=0 ) - goto fail_q; - } - q->last_merge =NULL ; q->id =ida_alloc (&blk_queue_ida,GFP_KERNEL );if (q->id <0 ) - goto fail_srcu; + goto fail_q; q->stats =blk_alloc_queue_stats ();if (!q->stats)
@@ -434,11 +427,8 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu)blk_free_queue_stats (q->stats); fail_id:ida_free (&blk_queue_ida, q->id); -fail_srcu: -if (alloc_srcu) -cleanup_srcu_struct (q->srcu); fail_q: -kmem_cache_free (blk_get_queue_kmem_cache (alloc_srcu), q); +kmem_cache_free (blk_requestq_cachep, q);return NULL ; }
@@ -1183,9 +1173,6 @@ int __init blk_dev_init(void) sizeof_field(struct request, cmd_flags));BUILD_BUG_ON (REQ_OP_BITS +REQ_FLAG_BITS >8 * sizeof_field(struct bio, bi_opf)); -BUILD_BUG_ON (ALIGN (offsetof(struct request_queue , srcu), - __alignof__(struct request_queue )) != -sizeof (struct request_queue ));/* used for unplugging and affects IO latency/throughput - HIGHPRI */ kblockd_workqueue = alloc_workqueue("kblockd",
@@ -1196,10 +1183,6 @@ int __init blk_dev_init(void) blk_requestq_cachep =kmem_cache_create ("request_queue" ,sizeof (struct request_queue ),0 ,SLAB_PANIC ,NULL ); - blk_requestq_srcu_cachep =kmem_cache_create ("request_queue_srcu" , -sizeof (struct request_queue ) + -sizeof (struct srcu_struct ),0 ,SLAB_PANIC ,NULL ); - blk_debugfs_root =debugfs_create_dir ("block" ,NULL );return 0 ;
block/blk-mq.c +25 -8
@@ -261,8 +261,8 @@ EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue_nowait);*/ void blk_mq_wait_quiesce_done (struct request_queue *q) { -if (blk_queue_has_srcu (q)) -synchronize_srcu (q->srcu); +if (q->tag_set->flags &BLK_MQ_F_BLOCKING ) +synchronize_srcu (q->tag_set->srcu);else synchronize_rcu (); }
@@ -3975,7 +3975,7 @@ static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set,struct request_queue *q;int ret; - q =blk_alloc_queue (set->numa_node, set->flags &BLK_MQ_F_BLOCKING ); + q =blk_alloc_queue (set->numa_node);if (!q)return ERR_PTR (-ENOMEM ); q->queuedata = queuedata;
@@ -4147,9 +4147,6 @@ static void blk_mq_update_poll_flag(struct request_queue *q)int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set,struct request_queue *q) { -WARN_ON_ONCE (blk_queue_has_srcu (q) != - !!(set->flags &BLK_MQ_F_BLOCKING )); -/* mark the queue as mq asap */ q->mq_ops = set->ops;
@@ -4406,8 +4403,18 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)if (set->nr_maps ==1 && set->nr_hw_queues > nr_cpu_ids) set->nr_hw_queues = nr_cpu_ids; -if (blk_mq_alloc_tag_set_tags (set, set->nr_hw_queues) <0 ) -return -ENOMEM ; +if (set->flags &BLK_MQ_F_BLOCKING ) { + set->srcu =kmalloc (sizeof (*set->srcu),GFP_KERNEL ); +if (!set->srcu) +return -ENOMEM ; + ret =init_srcu_struct (set->srcu); +if (ret) + goto out_free_srcu; + } + + ret =blk_mq_alloc_tag_set_tags (set, set->nr_hw_queues); +if (ret) + goto out_cleanup_srcu; ret = -ENOMEM ;for (i =0 ; i < set->nr_maps; i++) {
@@ -4437,6 +4444,12 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) }kfree (set->tags); set->tags =NULL ; +out_cleanup_srcu: +if (set->flags &BLK_MQ_F_BLOCKING ) +cleanup_srcu_struct (set->srcu); +out_free_srcu: +if (set->flags &BLK_MQ_F_BLOCKING ) +kfree (set->srcu);return ret; }EXPORT_SYMBOL (blk_mq_alloc_tag_set);
@@ -4476,6 +4489,10 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)kfree (set->tags); set->tags =NULL ; +if (set->flags &BLK_MQ_F_BLOCKING ) { +cleanup_srcu_struct (set->srcu); +kfree (set->srcu); + } }EXPORT_SYMBOL (blk_mq_free_tag_set);
block/blk-mq.h +7 -7
@@ -377,17 +377,17 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,/* run the code block in @dispatch_ops with rcu/srcu read lock held */ #define __blk_mq_run_dispatch_ops (q, check_sleep, dispatch_ops) \ do { \ - if (!blk_queue_has_srcu(q)) { \ - rcu_read_lock(); \ - (dispatch_ops); \ - rcu_read_unlock(); \ - } else { \ + if ((q)->tag_set->flags & BLK_MQ_F_BLOCKING) { \ int srcu_idx; \ \ might_sleep_if(check_sleep); \ - srcu_idx = srcu_read_lock((q)->srcu); \ + srcu_idx = srcu_read_lock((q)->tag_set->srcu); \ (dispatch_ops); \ - srcu_read_unlock((q)->srcu, srcu_idx); \ + srcu_read_unlock((q)->tag_set->srcu, srcu_idx); \ + } else { \ + rcu_read_lock(); \ + (dispatch_ops); \ + rcu_read_unlock(); \ } \ } while (0)
block/blk-sysfs.c +2 -7
@@ -739,10 +739,8 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,static void blk_free_queue_rcu (struct rcu_head *rcu_head) { - struct request_queue *q = container_of(rcu_head, struct request_queue, - rcu_head); - -kmem_cache_free (blk_get_queue_kmem_cache (blk_queue_has_srcu (q)), q); +kmem_cache_free (blk_requestq_cachep, + container_of(rcu_head, struct request_queue, rcu_head)); }/**
@@ -779,9 +777,6 @@ static void blk_release_queue(struct kobject *kobj)if (queue_is_mq (q))blk_mq_release (q); -if (blk_queue_has_srcu (q)) -cleanup_srcu_struct (q->srcu); -ida_free (&blk_queue_ida, q->id);call_rcu (&q->rcu_head, blk_free_queue_rcu); }
block/blk.h +1 -8
@@ -27,7 +27,6 @@ struct blk_flush_queue { };extern struct kmem_cache *blk_requestq_cachep; -extern struct kmem_cache *blk_requestq_srcu_cachep;extern struct kobj_type blk_queue_ktype;extern struct ida blk_queue_ida;
@@ -428,13 +427,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct page *page, unsigned int len, unsigned int offset, unsigned int max_sectors, bool *same_page); -static inline struct kmem_cache *blk_get_queue_kmem_cache (bool srcu) -{ -if (srcu) -return blk_requestq_srcu_cachep; -return blk_requestq_cachep; -} -struct request_queue *blk_alloc_queue (int node_id,bool alloc_srcu); +struct request_queue *blk_alloc_queue (int node_id);int disk_scan_partitions (struct gendisk *disk,fmode_t mode);
block/genhd.c +1 -1
@@ -1414,7 +1414,7 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)struct request_queue *q;struct gendisk *disk; - q =blk_alloc_queue (node, false); + q =blk_alloc_queue (node);if (!q)return NULL ;
include/linux/blk-mq.h +4 -0
@@ -7,6 +7,7 @@#include <linux/lockdep.h> #include <linux/scatterlist.h> #include <linux/prefetch.h> +#include <linux/srcu.h> struct blk_mq_tags ;struct blk_flush_queue ;
@@ -501,6 +502,8 @@ enum hctx_type {* @tag_list_lock: Serializes tag_list accesses. * @tag_list: List of the request queues that use this tag set. See also * request_queue.tag_set_list. +* @srcu: Use as lock when type of the request queue is blocking +* (BLK_MQ_F_BLOCKING). */ struct blk_mq_tag_set {struct blk_mq_queue_map map[HCTX_MAX_TYPES ];
@@ -521,6 +524,7 @@ struct blk_mq_tag_set {struct mutex tag_list_lock;struct list_head tag_list; +struct srcu_struct *srcu; };/**
include/linux/blkdev.h +0 -9
@@ -22,7 +22,6 @@#include <linux/blkzoned.h> #include <linux/sched.h> #include <linux/sbitmap.h> -#include <linux/srcu.h> #include <linux/uuid.h> #include <linux/xarray.h>
@@ -544,18 +543,11 @@ struct request_queue {struct mutex debugfs_mutex;bool mq_sysfs_init_done; - -/** -* @srcu: Sleepable RCU. Use as lock when type of the request queue -* is blocking (BLK_MQ_F_BLOCKING). Must be the last member -*/ -struct srcu_struct srcu[]; };/* Keep blk_queue_flag_name[] in sync with the definitions below */ #define QUEUE_FLAG_STOPPED 0/* queue is stopped */ #define QUEUE_FLAG_DYING 1/* queue being torn down */ -#define QUEUE_FLAG_HAS_SRCU 2/* SRCU is allocated */ #define QUEUE_FLAG_NOMERGES 3/* disable merge attempts */ #define QUEUE_FLAG_SAME_COMP 4/* complete on same CPU-group */ #define QUEUE_FLAG_FAIL_IO 5/* fake timeout */
@@ -591,7 +583,6 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);#define blk_queue_stopped (q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)#define blk_queue_dying (q) test_bit(QUEUE_FLAG_DYING, &(q)->queue_flags) -#define blk_queue_has_srcu (q) test_bit(QUEUE_FLAG_HAS_SRCU, &(q)->queue_flags)#define blk_queue_init_done (q) test_bit(QUEUE_FLAG_INIT_DONE, &(q)->queue_flags)#define blk_queue_nomerges (q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)#define blk_queue_noxmerges (q) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 903/1146 blk-crypto: pass a gendisk to blk_crypto_sysfs_{,un}register
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 450deb93df7d457cdd93594a1987f9650c749b96 ]
Prepare for changes to the block layer sysfs handling by passing the readily available gendisk to blk_crypto_sysfs_{,un}register.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-crypto-internal.h | 10 ++++++---- block/blk-crypto-sysfs.c | 7 ++++--- block/blk-sysfs.c | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-)
block/blk-crypto-internal.h +6 -4
@@ -21,9 +21,9 @@ extern const struct blk_crypto_mode blk_crypto_modes[];#ifdef CONFIG_BLK_INLINE_ENCRYPTION -int blk_crypto_sysfs_register (struct request_queue *q); +int blk_crypto_sysfs_register (struct gendisk *disk); -void blk_crypto_sysfs_unregister (struct request_queue *q); +void blk_crypto_sysfs_unregister (struct gendisk *disk);void bio_crypt_dun_increment (u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE ],unsigned int inc);
@@ -67,12 +67,14 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq)#else /* CONFIG_BLK_INLINE_ENCRYPTION */ -static inline int blk_crypto_sysfs_register (struct request_queue *q) +static inline int blk_crypto_sysfs_register (struct gendisk *disk) {return 0 ; } -static inline void blk_crypto_sysfs_unregister (struct request_queue *q) { } +static inline void blk_crypto_sysfs_unregister (struct gendisk *disk) +{ +}static inline bool bio_crypt_rq_ctx_compatible (struct request *rq,struct bio *bio)
block/blk-crypto-sysfs.c +4 -3
@@ -126,8 +126,9 @@ static struct kobj_type blk_crypto_ktype = {* If the request_queue has a blk_crypto_profile, create the "crypto" * subdirectory in sysfs (/sys/block/$disk/queue/crypto/). */ -int blk_crypto_sysfs_register (struct request_queue *q) +int blk_crypto_sysfs_register (struct gendisk *disk) { +struct request_queue *q = disk->queue;struct blk_crypto_kobj *obj;int err;
@@ -149,9 +150,9 @@ int blk_crypto_sysfs_register(struct request_queue *q)return 0 ; } -void blk_crypto_sysfs_unregister (struct request_queue *q) +void blk_crypto_sysfs_unregister (struct gendisk *disk) { -kobject_put (q->crypto_kobject); +kobject_put (disk->queue->crypto_kobject); }static int __init blk_crypto_sysfs_init (void )
block/blk-sysfs.c +2 -2
@@ -833,7 +833,7 @@ int blk_register_queue(struct gendisk *disk) goto put_dev; } - ret =blk_crypto_sysfs_register (q); + ret =blk_crypto_sysfs_register (disk);if (ret) goto put_dev;
@@ -910,7 +910,7 @@ void blk_unregister_queue(struct gendisk *disk)*/ if (queue_is_mq (q))blk_mq_sysfs_unregister (disk); -blk_crypto_sysfs_unregister (q); +blk_crypto_sysfs_unregister (disk);mutex_lock (&q->sysfs_lock);elv_unregister_queue (q);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 904/1146 block: factor out a blk_debugfs_remove helper
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6fc75f309d291d328b4ea2f91bef0ff56e4bc7c2 ]
Split the debugfs removal from blk_unregister_queue into a helper so that the it can be reused for blk_register_queue error handling.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-sysfs.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
block/blk-sysfs.c +14 -7
@@ -797,6 +797,19 @@ struct kobj_type blk_queue_ktype = { .release = blk_release_queue, }; +static void blk_debugfs_remove (struct gendisk *disk) +{ +struct request_queue *q = disk->queue; + +mutex_lock (&q->debugfs_mutex); +blk_trace_shutdown (q); +debugfs_remove_recursive (q->debugfs_dir); + q->debugfs_dir =NULL ; + q->sched_debugfs_dir =NULL ; + q->rqos_debugfs_dir =NULL ; +mutex_unlock (&q->debugfs_mutex); +} +/** * blk_register_queue - register a block layer queue with sysfs * @disk: Disk of which the request queue should be registered with sysfs.
@@ -922,11 +935,5 @@ void blk_unregister_queue(struct gendisk *disk)kobject_del (&q->kobj);mutex_unlock (&q->sysfs_dir_lock); -mutex_lock (&q->debugfs_mutex); -blk_trace_shutdown (q); -debugfs_remove_recursive (q->debugfs_dir); - q->debugfs_dir =NULL ; - q->sched_debugfs_dir =NULL ; - q->rqos_debugfs_dir =NULL ; -mutex_unlock (&q->debugfs_mutex); +blk_debugfs_remove (disk); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 905/1146 block: fix error unwinding in blk_register_queue
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 40602997be26887bdfa3d58659c3acb4579099e9 ]
blk_register_queue fails to handle errors from blk_mq_sysfs_register, leaks various resources on errors and accidentally sets queue refs percpu refcount to percpu mode on kobject_add failure. Fix all that by properly unwinding on errors.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-sysfs.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
block/blk-sysfs.c +16 -12
@@ -820,13 +820,15 @@ int blk_register_queue(struct gendisk *disk)int ret;mutex_lock (&q->sysfs_dir_lock); - ret =kobject_add (&q->kobj, &disk_to_dev (disk)->kobj,"queue" );if (ret <0 ) - goto unlock; + goto out_unlock_dir; -if (queue_is_mq (q)) -blk_mq_sysfs_register (disk); +if (queue_is_mq (q)) { + ret =blk_mq_sysfs_register (disk); +if (ret) + goto out_del_queue_kobj; + }mutex_lock (&q->sysfs_lock);mutex_lock (&q->debugfs_mutex);
@@ -838,17 +840,17 @@ int blk_register_queue(struct gendisk *disk) ret =disk_register_independent_access_ranges (disk);if (ret) - goto put_dev; + goto out_debugfs_remove;if (q->elevator) { ret =elv_register_queue (q, false);if (ret) - goto put_dev; + goto out_unregister_ia_ranges; } ret =blk_crypto_sysfs_register (disk);if (ret) - goto put_dev; + goto out_elv_unregister;blk_queue_flag_set (QUEUE_FLAG_REGISTERED , q);wbt_enable_default (q);
@@ -859,8 +861,6 @@ int blk_register_queue(struct gendisk *disk)if (q->elevator)kobject_uevent (&q->elevator->kobj,KOBJ_ADD );mutex_unlock (&q->sysfs_lock); - -unlock:mutex_unlock (&q->sysfs_dir_lock);/*
@@ -879,13 +879,17 @@ int blk_register_queue(struct gendisk *disk)return ret; -put_dev: +out_elv_unregister:elv_unregister_queue (q); +out_unregister_ia_ranges:disk_unregister_independent_access_ranges (disk); +out_debugfs_remove: +blk_debugfs_remove (disk);mutex_unlock (&q->sysfs_lock); -mutex_unlock (&q->sysfs_dir_lock); +out_del_queue_kobj:kobject_del (&q->kobj); - +out_unlock_dir: +mutex_unlock (&q->sysfs_dir_lock);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 906/1146 block: untangle request_queue refcounting from sysfs
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 2bd85221a625b316114bafaab527770b607095d3 ]
The kobject embedded into the request_queue is used for the queue directory in sysfs, but that is a child of the gendisks directory and is intimately tied to it. Move this kobject to the gendisk and use a refcount_t in the request_queue for the actual request_queue refcounting that is completely unrelated to the device model.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-core.c | 42 ++++++++++++++++---- block/blk-crypto-sysfs.c | 4 +- block/blk-ia-ranges.c | 3 +- block/blk-sysfs.c | 86 +++++++++++----------------------------- block/blk.h | 4 -- block/bsg.c | 11 +++-- block/elevator.c | 2 +- include/linux/blkdev.h | 6 +-- 8 files changed, 71 insertions(+), 87 deletions(-)
block/blk-core.c +34 -8
@@ -59,12 +59,12 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_split);EXPORT_TRACEPOINT_SYMBOL_GPL (block_unplug);EXPORT_TRACEPOINT_SYMBOL_GPL (block_rq_insert); -DEFINE_IDA (blk_queue_ida); +static DEFINE_IDA (blk_queue_ida);/* * For queue allocation */ -struct kmem_cache *blk_requestq_cachep; +static struct kmem_cache *blk_requestq_cachep;/* * Controlling structure to kblockd
@@ -252,19 +252,46 @@ void blk_clear_pm_only(struct request_queue *q) }EXPORT_SYMBOL_GPL (blk_clear_pm_only); +static void blk_free_queue_rcu (struct rcu_head *rcu_head) +{ +kmem_cache_free (blk_requestq_cachep, + container_of(rcu_head, struct request_queue, rcu_head)); +} + +static void blk_free_queue (struct request_queue *q) +{ +might_sleep (); + +percpu_ref_exit (&q->q_usage_counter); + +if (q->poll_stat) +blk_stat_remove_callback (q, q->poll_cb); +blk_stat_free_callback (q->poll_cb); + +blk_free_queue_stats (q->stats); +kfree (q->poll_stat); + +if (queue_is_mq (q)) +blk_mq_release (q); + +ida_free (&blk_queue_ida, q->id); +call_rcu (&q->rcu_head, blk_free_queue_rcu); +} +/** * blk_put_queue - decrement the request_queue refcount * @q: the request_queue structure to decrement the refcount for * -* Decrements the refcount of the request_queue kobject. When this reaches 0 -* we'll have blk_release_queue() called. +* Decrements the refcount of the request_queue and free it when the refcount +* reaches 0. * * Context: Any context, but the last reference must not be dropped from * atomic context. */ void blk_put_queue (struct request_queue *q) { -kobject_put (&q->kobj); +if (refcount_dec_and_test (&q->refs)) +blk_free_queue (q); }EXPORT_SYMBOL (blk_put_queue);
@@ -399,8 +426,7 @@ struct request_queue *blk_alloc_queue(int node_id)INIT_WORK (&q->timeout_work, blk_timeout_work);INIT_LIST_HEAD (&q->icq_list); -kobject_init (&q->kobj, &blk_queue_ktype); - +refcount_set (&q->refs,1 );mutex_init (&q->debugfs_mutex);mutex_init (&q->sysfs_lock);mutex_init (&q->sysfs_dir_lock);
@@ -444,7 +470,7 @@ bool blk_get_queue(struct request_queue *q) {if (unlikely (blk_queue_dying (q)))return false; -kobject_get (&q->kobj); +refcount_inc (&q->refs);return true; }EXPORT_SYMBOL (blk_get_queue);
block/blk-crypto-sysfs.c +2 -2
@@ -140,8 +140,8 @@ int blk_crypto_sysfs_register(struct gendisk *disk)return -ENOMEM ; obj->profile = q->crypto_profile; - err =kobject_init_and_add (&obj->kobj, &blk_crypto_ktype, &q->kobj, -"crypto" ); + err =kobject_init_and_add (&obj->kobj, &blk_crypto_ktype, + &disk->queue_kobj,"crypto" );if (err) {kobject_put (&obj->kobj);return err;
block/blk-ia-ranges.c +2 -1
@@ -123,7 +123,8 @@ int disk_register_independent_access_ranges(struct gendisk *disk)*/ WARN_ON (iars->sysfs_registered); ret =kobject_init_and_add (&iars->kobj, &blk_ia_ranges_ktype, - &q->kobj,"%s" ,"independent_access_ranges" ); + &disk->queue_kobj,"%s" , +"independent_access_ranges" );if (ret) { disk->ia_ranges =NULL ;kobject_put (&iars->kobj);
block/blk-sysfs.c +23 -63
156 lines not on this page · raw message
block/blk.h +0 -4
@@ -26,10 +26,6 @@ struct blk_flush_queue {spinlock_t mq_flush_lock; }; -extern struct kmem_cache *blk_requestq_cachep; -extern struct kobj_type blk_queue_ktype; -extern struct ida blk_queue_ida; -bool is_flush_rq (struct request *req); struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,
block/bsg.c +7 -4
@@ -175,8 +175,10 @@ static void bsg_device_release(struct device *dev)void bsg_unregister_queue (struct bsg_device *bd) { -if (bd->queue->kobj.sd) -sysfs_remove_link (&bd->queue->kobj,"bsg" ); +struct gendisk *disk = bd->queue->disk; + +if (disk && disk->queue_kobj.sd) +sysfs_remove_link (&disk->queue_kobj,"bsg" );cdev_device_del (&bd->cdev, &bd->device);put_device (&bd->device); }
@@ -216,8 +218,9 @@ struct bsg_device *bsg_register_queue(struct request_queue *q,if (ret) goto out_put_device; -if (q->kobj.sd) { - ret =sysfs_create_link (&q->kobj, &bd->device.kobj,"bsg" ); +if (q->disk && q->disk->queue_kobj.sd) { + ret =sysfs_create_link (&q->disk->queue_kobj, &bd->device.kobj, +"bsg" );if (ret) goto out_device_del; }
block/elevator.c +1 -1
@@ -499,7 +499,7 @@ int elv_register_queue(struct request_queue *q, bool uevent)lockdep_assert_held (&q->sysfs_lock); - error =kobject_add (&e->kobj, &q->kobj,"%s" ,"iosched" ); + error =kobject_add (&e->kobj, &q->disk->queue_kobj,"iosched" );if (!error) {struct elv_fs_entry *attr = e->type->elevator_attrs;if (attr) {
include/linux/blkdev.h +2 -4
@@ -155,6 +155,7 @@ struct gendisk {unsigned open_partitions;/* number of open partitions */ struct backing_dev_info *bdi; +struct kobject queue_kobj;/* the queue/ directory */ struct kobject *slave_dir;#ifdef CONFIG_BLOCK_HOLDER_DEPRECATED struct list_head slave_bdevs;
@@ -437,10 +438,7 @@ struct request_queue {struct gendisk *disk; -/* -* queue kobject -*/ -struct kobject kobj; +refcount_t refs;/* * mq queue kobject
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 907/1146 block: mark blk_put_queue as potentially blocking
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 63f93fd6fa5717769a78d6d7bea6f7f9a1ccca8e ]
We can't just say that the last reference release may block, as any reference dropped could be the last one. So move the might_sleep() from blk_free_queue to blk_put_queue and update the documentation.
Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter")
--- block/blk-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
block/blk-core.c +2 -4
@@ -260,8 +260,6 @@ static void blk_free_queue_rcu(struct rcu_head *rcu_head)static void blk_free_queue (struct request_queue *q) { -might_sleep (); -percpu_ref_exit (&q->q_usage_counter);if (q->poll_stat)
@@ -285,11 +283,11 @@ static void blk_free_queue(struct request_queue *q)* Decrements the refcount of the request_queue and free it when the refcount * reaches 0. * -* Context: Any context, but the last reference must not be dropped from -* atomic context. +* Context: Can sleep. */ void blk_put_queue (struct request_queue *q) { +might_sleep ();if (refcount_dec_and_test (&q->refs))blk_free_queue (q); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 908/1146 block: fix use-after-free of q->q_usage_counter
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit d36a9ea5e7766961e753ee38d4c331bbe6ef659b ]
For blk-mq, queue release handler is usually called after blk_mq_freeze_queue_wait() returns. However, the q_usage_counter->release() handler may not be run yet at that time, so this can cause a use-after-free.
Fix the issue by moving percpu_ref_exit() into blk_free_queue_rcu(). Since ->release() is called with rcu read lock held, it is agreed that the race should be covered in caller per discussion from the two links.
--- block/blk-core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/blk-core.c +5 -4
@@ -254,14 +254,15 @@ EXPORT_SYMBOL_GPL(blk_clear_pm_only);static void blk_free_queue_rcu (struct rcu_head *rcu_head) { -kmem_cache_free (blk_requestq_cachep, - container_of(rcu_head, struct request_queue, rcu_head)); +struct request_queue *q =container_of (rcu_head, + struct request_queue, rcu_head); + +percpu_ref_exit (&q->q_usage_counter); +kmem_cache_free (blk_requestq_cachep, q); }static void blk_free_queue (struct request_queue *q) { -percpu_ref_exit (&q->q_usage_counter); -if (q->poll_stat)blk_stat_remove_callback (q, q->poll_cb);blk_stat_free_callback (q->poll_cb);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 909/1146 net: dsa: mv88e6xxx: avoid reg_lock deadlock in mv88e6xxx_setup_port()
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit a7d82367daa6baa5e8399e6327e7f2f463534505 ]
In the blamed commit, it was not noticed that one implementation of chip->info->ops->phylink_get_caps(), called by mv88e6xxx_get_caps(), may access hardware registers, and in doing so, it takes the mv88e6xxx_reg_lock(). Namely, this is mv88e6352_phylink_get_caps().
This is a problem because mv88e6xxx_get_caps(), apart from being a top-level function (method invoked by dsa_switch_ops), is now also directly called from mv88e6xxx_setup_port(), which runs under the mv88e6xxx_reg_lock() taken by mv88e6xxx_setup(). Therefore, when running on mv88e6352, the reg_lock would be acquired a second time and the system would deadlock on driver probe.
The things that mv88e6xxx_setup() can compete with in terms of register access with are the IRQ handlers and MDIO bus operations registered by mv88e6xxx_probe(). So there is a real need to acquire the register lock.
The register lock can, in principle, be dropped and re-acquired pretty much at will within the driver, as long as no operations that involve waiting for indirect access to complete (essentially, callers of mv88e6xxx_smi_direct_wait() and mv88e6xxx_wait_mask()) are interrupted with the lock released. However, I would guess that in mv88e6xxx_setup(), the critical section is kept open for such a long time just in order to optimize away multiple lock/unlock operations on the registers.
We could, in principle, drop the reg_lock right before the mv88e6xxx_setup_port() -> mv88e6xxx_get_caps() call, and re-acquire it immediately afterwards. But this would look ugly, because mv88e6xxx_setup_port() would release a lock which it didn't acquire, but the caller did.
A cleaner solution to this issue comes from the observation that struct mv88e6xxxx_ops methods generally assume they are called with the reg_lock already acquired. Whereas mv88e6352_phylink_get_caps() is more the exception rather than the norm, in that it acquires the lock itself.
Let's enforce the same locking pattern/convention for chip->info->ops->phylink_get_caps() as well, and make mv88e6xxx_get_caps(), the top-level function, acquire the register lock explicitly, for this one implementation that will access registers for port 4 to work properly.
This means that mv88e6xxx_setup_port() will no longer call the top-level function, but the low-level mv88e6xxx_ops method which expects the correct calling context (register lock held).
Compared to chip->info->ops->phylink_get_caps(), mv88e6xxx_get_caps() also fixes up the supported_interfaces bitmap for internal ports, since that can be done generically and does not require per-switch knowledge. That's code which will no longer execute, however mv88e6xxx_setup_port() doesn't need that. It just needs to look at the mac_capabilities bitmap.
--- drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +4 -5
@@ -689,13 +689,12 @@ static void mv88e6352_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,/* Port 4 supports automedia if the serdes is associated with it. */ if (port ==4 ) { -mv88e6xxx_reg_lock (chip); err =mv88e6352_g2_scratch_port_has_serdes (chip, port);if (err <0 )dev_err (chip->dev,"p%d: failed to read scratch\n" , port);if (err <=0 ) - goto unlock; +return ; cmode =mv88e6352_get_port4_serdes_cmode (chip);if (cmode <0 )
@@ -703,8 +702,6 @@ static void mv88e6352_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, port); elsemv88e6xxx_translate_cmode (cmode ,supported ); -unlock: -mv88e6xxx_reg_unlock (chip); } }
@@ -831,7 +828,9 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, {struct mv88e6xxx_chip *chip = ds->priv; +mv88e6xxx_reg_lock (chip); chip->info->ops->phylink_get_caps (chip, port, config); +mv88e6xxx_reg_unlock (chip);if (mv88e6xxx_phy_is_internal (ds, port)) { __set_bit(PHY_INTERFACE_MODE_INTERNAL,
@@ -3307,7 +3306,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)struct phylink_config pl_config = {};unsigned long caps; -mv88e6xxx_get_caps (ds, port, &pl_config); + chip->info->ops->phylink_get_caps (chip, port, &pl_config); caps = pl_config.mac_capabilities;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 910/1146 igc: Enhance Qbv scheduling by using first flag bit
In reply to Greg Kroah-HartmanFrom: Vinicius Costa Gomes <[email protected]>
[ Upstream commit db0b124f02ba68de6517ac303d431af220ccfe9f ]
The I225 hardware has a limitation that packets can only be scheduled in the [0, cycle-time] interval. So, scheduling a packet to the start of the next cycle doesn't usually work.
To overcome this, we use the Transmit Descriptor first flag to indicates that a packet should be the first packet (from a queue) in a cycle according to the section 7.5.2.9.3.4 The First Packet on Each QBV Cycle in Intel Discrete I225/6 User Manual.
But this only works if there was any packet from that queue during the current cycle, to avoid this issue, we issue an empty packet if that's not the case. Also require one more descriptor to be available, to take into account the empty packet that might be issued.
Test Setup:
Talker: Use l2_tai to generate the launchtime into packet load.
Listener: Use timedump.c to compute the delta between packet arrival and LaunchTime packet payload.
Test Result:
Before:
1666000610127300000,1666000610127300096,96,621273 1666000610127400000,1666000610127400192,192,621274 1666000610127500000,1666000610127500032,32,621275 1666000610127600000,1666000610127600128,128,621276 1666000610127700000,1666000610127700224,224,621277 1666000610127800000,1666000610127800064,64,621278 1666000610127900000,1666000610127900160,160,621279 1666000610128000000,1666000610128000000,0,621280 1666000610128100000,1666000610128100096,96,621281 1666000610128200000,1666000610128200192,192,621282 1666000610128300000,1666000610128300032,32,621283 1666000610128400000,1666000610128301056,-98944,621284 1666000610128500000,1666000610128302080,-197920,621285 1666000610128600000,1666000610128302848,-297152,621286 1666000610128700000,1666000610128303872,-396128,621287 1666000610128800000,1666000610128304896,-495104,621288 1666000610128900000,1666000610128305664,-594336,621289 1666000610129000000,1666000610128306688,-693312,621290 1666000610129100000,1666000610128307712,-792288,621291 1666000610129200000,1666000610128308480,-891520,621292 1666000610129300000,1666000610128309504,-990496,621293 1666000610129400000,1666000610128310528,-1089472,621294 1666000610129500000,1666000610128311296,-1188704,621295 1666000610129600000,1666000610128312320,-1287680,621296 1666000610129700000,1666000610128313344,-1386656,621297 1666000610129800000,1666000610128314112,-1485888,621298 1666000610129900000,1666000610128315136,-1584864,621299 1666000610130000000,1666000610128316160,-1683840,621300 1666000610130100000,1666000610128316928,-1783072,621301 1666000610130200000,1666000610128317952,-1882048,621302 1666000610130300000,1666000610128318976,-1981024,621303 1666000610130400000,1666000610128319744,-2080256,621304 1666000610130500000,1666000610128320768,-2179232,621305 1666000610130600000,1666000610128321792,-2278208,621306 1666000610130700000,1666000610128322816,-2377184,621307 1666000610130800000,1666000610128323584,-2476416,621308 1666000610130900000,1666000610128324608,-2575392,621309 1666000610131000000,1666000610128325632,-2674368,621310 1666000610131100000,1666000610128326400,-2773600,621311 1666000610131200000,1666000610128327424,-2872576,621312 1666000610131300000,1666000610128328448,-2971552,621313 1666000610131400000,1666000610128329216,-3070784,621314 1666000610131500000,1666000610131500032,32,621315 1666000610131600000,1666000610131600128,128,621316 1666000610131700000,1666000610131700224,224,621317
After:
1666073510646200000,1666073510646200064,64,2676462 1666073510646300000,1666073510646300160,160,2676463 1666073510646400000,1666073510646400256,256,2676464 1666073510646500000,1666073510646500096,96,2676465 1666073510646600000,1666073510646600192,192,2676466 1666073510646700000,1666073510646700032,32,2676467 1666073510646800000,1666073510646800128,128,2676468 1666073510646900000,1666073510646900224,224,2676469 1666073510647000000,1666073510647000064,64,2676470 1666073510647100000,1666073510647100160,160,2676471 1666073510647200000,1666073510647200256,256,2676472 1666073510647300000,1666073510647300096,96,2676473 1666073510647400000,1666073510647400192,192,2676474 1666073510647500000,1666073510647500032,32,2676475 1666073510647600000,1666073510647600128,128,2676476 1666073510647700000,1666073510647700224,224,2676477 1666073510647800000,1666073510647800064,64,2676478 1666073510647900000,1666073510647900160,160,2676479 1666073510648000000,1666073510648000000,0,2676480 1666073510648100000,1666073510648100096,96,2676481 1666073510648200000,1666073510648200192,192,2676482 1666073510648300000,1666073510648300032,32,2676483 1666073510648400000,1666073510648400128,128,2676484 1666073510648500000,1666073510648500224,224,2676485 1666073510648600000,1666073510648600064,64,2676486 1666073510648700000,1666073510648700160,160,2676487 1666073510648800000,1666073510648800000,0,2676488 1666073510648900000,1666073510648900096,96,2676489 1666073510649000000,1666073510649000192,192,2676490 1666073510649100000,1666073510649100032,32,2676491 1666073510649200000,1666073510649200128,128,2676492 1666073510649300000,1666073510649300224,224,2676493 1666073510649400000,1666073510649400064,64,2676494 1666073510649500000,1666073510649500160,160,2676495 1666073510649600000,1666073510649600000,0,2676496 1666073510649700000,1666073510649700096,96,2676497 1666073510649800000,1666073510649800192,192,2676498 1666073510649900000,1666073510649900032,32,2676499 1666073510650000000,1666073510650000128,128,2676500
--- drivers/net/ethernet/intel/igc/igc.h | 2 + drivers/net/ethernet/intel/igc/igc_defines.h | 2 + drivers/net/ethernet/intel/igc/igc_main.c | 176 ++++++++++++++++--- 3 files changed, 151 insertions(+), 29 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +2 -0
@@ -94,6 +94,8 @@ struct igc_ring {u8 queue_index;/* logical index of the ring*/ u8 reg_idx;/* physical index of the ring */ bool launchtime_enable;/* true if LaunchTime is enabled */ +ktime_t last_tx_cycle;/* end of the cycle with a launchtime transmission */ +ktime_t last_ff_cycle;/* Last cycle with an active first flag */ u32 start_time;u32 end_time;
drivers/net/ethernet/intel/igc/igc_defines.h +2 -0
@@ -321,6 +321,8 @@#define IGC_ADVTXD_L4LEN_SHIFT 8/* Adv ctxt L4LEN shift */ #define IGC_ADVTXD_MSS_SHIFT 16/* Adv ctxt MSS shift */ +#define IGC_ADVTXD_TSN_CNTX_FIRST 0x00000080 +/* Transmit Control */ #define IGC_TCTL_EN 0x00000002/* enable Tx */ #define IGC_TCTL_PSP 0x00000008/* pad short packets */
drivers/net/ethernet/intel/igc/igc_main.c +147 -29
252 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 911/1146 igc: Use strict cycles for Qbv scheduling
In reply to Greg Kroah-HartmanFrom: Vinicius Costa Gomes <[email protected]>
[ Upstream commit d8f45be01dd9381065a3778a579385249ed011dc ]
Configuring strict cycle mode in the controller forces more well behaved transmissions when taprio is offloaded.
When set this strict_cycle and strict_end, transmission is not enabled if the whole packet cannot be completed before end of the Qbv cycle.
--- drivers/net/ethernet/intel/igc/igc_tsn.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/igc/igc_tsn.c +2 -9
@@ -110,15 +110,8 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter)wr32 (IGC_STQT (i), ring->start_time);wr32 (IGC_ENDQT (i), ring->end_time); -if (adapter->base_time) { -/* If we have a base_time we are in "taprio" -* mode and we need to be strict about the -* cycles: only transmit a packet if it can be -* completed during that cycle. -*/ - txqctl |=IGC_TXQCTL_STRICT_CYCLE | -IGC_TXQCTL_STRICT_END ; - } + txqctl |=IGC_TXQCTL_STRICT_CYCLE | +IGC_TXQCTL_STRICT_END ;if (ring->launchtime_enable) txqctl |=IGC_TXQCTL_QUEUE_MODE_LAUNCHT ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 912/1146 igc: Add checking for basetime less than zero
In reply to Greg Kroah-HartmanFrom: Muhammad Husaini Zulkifli <[email protected]>
[ Upstream commit 3b61764fb49a6e147ac90d71dccdddc9d5508ba1 ]
Using the tc qdisc command, the user can set basetime to any value. Checking should be done on the driver's side to prevent registering basetime values that are less than zero.
--- drivers/net/ethernet/intel/igc/igc_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/igc/igc_main.c +3 -0
@@ -6040,6 +6040,9 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,if (!qopt->enable)return igc_tsn_clear_schedule (adapter); +if (qopt->base_time <0 ) +return -ERANGE ; +if (adapter->base_time)return -EALREADY ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 913/1146 igc: allow BaseTime 0 enrollment for Qbv
In reply to Greg Kroah-HartmanFrom: Tan Tee Min <[email protected]>
[ Upstream commit e17090eb24944fbbe1f24d9f336d7bad4fbe47e8 ]
Introduce qbv_enable flag in igc_adapter struct to store the Qbv on/off. So this allow the BaseTime to enroll with zero value.
--- drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 2 ++ drivers/net/ethernet/intel/igc/igc_tsn.c | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc.h +1 -0
@@ -184,6 +184,7 @@ struct igc_adapter {ktime_t base_time;ktime_t cycle_time; +bool qbv_enable;/* OS defined structs */ struct pci_dev *pdev;
drivers/net/ethernet/intel/igc/igc_main.c +2 -0
@@ -6037,6 +6037,8 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,u32 start_time =0 , end_time =0 ;size_t n; + adapter->qbv_enable = qopt->enable; +if (!qopt->enable)return igc_tsn_clear_schedule (adapter);
drivers/net/ethernet/intel/igc/igc_tsn.c +1 -1
@@ -36,7 +36,7 @@ static unsigned int igc_tsn_new_flags(struct igc_adapter *adapter) {unsigned int new_flags = adapter->flags & ~IGC_FLAG_TSN_ANY_ENABLED ; -if (adapter->base_time) +if (adapter->qbv_enable) new_flags |=IGC_FLAG_TSN_QBV_ENABLED ;if (is_any_launchtime (adapter))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 914/1146 igc: recalculate Qbv end_time by considering cycle time
In reply to Greg Kroah-HartmanFrom: Tan Tee Min <[email protected]>
[ Upstream commit 6d05251d537a4d3835959a8cdd8cbbbdcdc0c904 ]
Qbv users can specify a cycle time that is not equal to the total GCL intervals. Hence, recalculation is necessary here to exclude the time interval that exceeds the cycle time. As those GCL which exceeds the cycle time will be truncated.
According to IEEE Std. 802.1Q-2018 section 8.6.9.2, once the end of the list is reached, it will switch to the END_OF_CYCLE state and leave the gates in the same state until the next cycle is started.
--- drivers/net/ethernet/intel/igc/igc_main.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/ethernet/intel/igc/igc_main.c +15 -0
@@ -6060,6 +6060,21 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter, end_time += e->interval; +/* If any of the conditions below are true, we need to manually +* control the end time of the cycle. +* 1. Qbv users can specify a cycle time that is not equal +* to the total GCL intervals. Hence, recalculation is +* necessary here to exclude the time interval that +* exceeds the cycle time. +* 2. According to IEEE Std. 802.1Q-2018 section 8.6.9.2, +* once the end of the list is reached, it will switch +* to the END_OF_CYCLE state and leave the gates in the +* same state until the next cycle is started. +*/ +if (end_time > adapter->cycle_time || + n +1 == qopt->num_entries) + end_time = adapter->cycle_time; +for (i =0 ; i < adapter->num_tx_queues; i++) {struct igc_ring *ring = adapter->tx_ring[i];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 915/1146 igc: Set Qbv start_time and end_time to end_time if not being configured in GCL
In reply to Greg Kroah-HartmanFrom: Tan Tee Min <[email protected]>
[ Upstream commit 72abeedd83982c1bc6023f631e412db78374d9b4 ]
The default setting of end_time minus start_time is whole 1 second. Thus, if it's not being configured in any GCL entry then it will be staying at original 1 second.
This patch is changing the start_time and end_time to be end_time as if setting zero will be having weird HW behavior where the gate will not be fully closed.
--- drivers/net/ethernet/intel/igc/igc_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_main.c +13 -1
@@ -6036,6 +6036,7 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,bool queue_configured[IGC_MAX_TX_QUEUES ] = { };u32 start_time =0 , end_time =0 ;size_t n; +int i; adapter->qbv_enable = qopt->enable;
@@ -6056,7 +6057,6 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,for (n =0 ; n < qopt->num_entries; n++) {struct tc_taprio_sched_entry *e = &qopt->entries[n]; -int i; end_time += e->interval;
@@ -6095,6 +6095,18 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter, start_time += e->interval; } +/* Check whether a queue gets configured. +* If not, set the start and end time to be end time. +*/ +for (i =0 ; i < adapter->num_tx_queues; i++) { +if (!queue_configured[i]) { +struct igc_ring *ring = adapter->tx_ring[i]; + + ring->start_time = end_time; + ring->end_time = end_time; + } + } +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 916/1146 rtc: mxc_v2: Add missing clk_disable_unprepare()
In reply to Greg Kroah-HartmanFrom: GUO Zihua <[email protected]>
[ Upstream commit 55d5a86618d3b1a768bce01882b74cbbd2651975 ]
The call to clk_disable_unprepare() is left out in the error handling of devm_rtc_allocate_device. Add it back.
--- drivers/rtc/rtc-mxc_v2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rtc/rtc-mxc_v2.c +3 -1
@@ -336,8 +336,10 @@ static int mxc_rtc_probe(struct platform_device *pdev) } pdata->rtc =devm_rtc_allocate_device (&pdev->dev); -if (IS_ERR (pdata->rtc)) +if (IS_ERR (pdata->rtc)) { +clk_disable_unprepare (pdata->clk);return PTR_ERR (pdata->rtc); + } pdata->rtc->ops = &mxc_rtc_ops; pdata->rtc->range_max =U32_MAX ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 917/1146 devlink: hold region lock when flushing snapshots
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit b4cafb3d2c740f8d1b1234b43ac4a60e5291c960 ]
Netdevsim triggers a splat on reload, when it destroys regions with snapshots pending:
WARNING: CPU: 1 PID: 787 at net/core/devlink.c:6291 devlink_region_snapshot_del+0x12e/0x140 CPU: 1 PID: 787 Comm: devlink Not tainted 6.1.0-07460-g7ae9888d6e1c #580 RIP: 0010:devlink_region_snapshot_del+0x12e/0x140 Call Trace: <TASK> devl_region_destroy+0x70/0x140 nsim_dev_reload_down+0x2f/0x60 [netdevsim] devlink_reload+0x1f7/0x360 devlink_nl_cmd_reload+0x6ce/0x860 genl_family_rcv_msg_doit.isra.0+0x145/0x1c0
This is the locking assert in devlink_region_snapshot_del(), we're supposed to be holding the region->snapshot_lock here.
--- net/core/devlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/devlink.c +2 -0
@@ -11435,8 +11435,10 @@ void devl_region_destroy(struct devlink_region *region)devl_assert_locked (devlink);/* Free all snapshots of region */ +mutex_lock (®ion->snapshot_lock);list_for_each_entry_safe (snapshot, ts, ®ion->snapshot_list, list)devlink_region_snapshot_del (region, snapshot); +mutex_unlock (®ion->snapshot_lock);list_del (®ion->list);mutex_destroy (®ion->snapshot_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 918/1146 selftests: devlink: fix the fd redirect in dummy_reporter_test
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 2fc60e2ff972d3dca836bff0b08cbe503c4ca1ce ]
$number + > bash means redirect FD $number, e.g. commonly used 2> redirects stderr (fd 2). The test uses 8192> to write the number 8192 to a file, this results in:
./devlink.sh: line 499: 8192: Bad file descriptor
Oddly the test also papers over this issue by checking for failure (expecting an error rather than success) so it passes, anyway.
--- tools/testing/selftests/drivers/net/netdevsim/devlink.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/drivers/net/netdevsim/devlink.sh +2 -2
@@ -496,8 +496,8 @@ dummy_reporter_test() check_reporter_info dummy healthy 3 3 10 true - echo 8192> $DEBUGFS_DIR/health/binary_len - check_fail $? "Failed set dummy reporter binary len to 8192" + echo 8192 > $DEBUGFS_DIR/health/binary_len + check_err $? "Failed set dummy reporter binary len to 8192" local dump=$(devlink health dump show $DL_HANDLE reporter dummy -j) check_err $? "Failed show dump of dummy reporter"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 919/1146 openvswitch: Fix flow lookup to use unmasked key
In reply to Greg Kroah-HartmanFrom: Eelco Chaudron <[email protected]>
[ Upstream commit 68bb10101e6b0a6bb44e9c908ef795fc4af99eae ]
The commit mentioned below causes the ovs_flow_tbl_lookup() function to be called with the masked key. However, it's supposed to be called with the unmasked key. This due to the fact that the datapath supports installing wider flows, and OVS relies on this behavior. For example if ipv4(src=1.1.1.1/192.0.0.0, dst=1.1.1.2/192.0.0.0) exists, a wider flow (smaller mask) of ipv4(src=192.1.1.1/128.0.0.0,dst=192.1.1.2/ 128.0.0.0) is allowed to be added.
However, if we try to add a wildcard rule, the installation fails:
$ ovs-appctl dpctl/add-flow system@myDP "in_port(1),eth_type(0x0800), \ ipv4(src=1.1.1.1/192.0.0.0,dst=1.1.1.2/192.0.0.0,frag=no)" 2 $ ovs-appctl dpctl/add-flow system@myDP "in_port(1),eth_type(0x0800), \ ipv4(src=192.1.1.1/0.0.0.0,dst=49.1.1.2/0.0.0.0,frag=no)" 2 ovs-vswitchd: updating flow table (File exists)
The reason is that the key used to determine if the flow is already present in the system uses the original key ANDed with the mask. This results in the IP address not being part of the (miniflow) key, i.e., being substituted with an all-zero value. When doing the actual lookup, this results in the key wrongfully matching the first flow, and therefore the flow does not get installed.
This change reverses the commit below, but rather than having the key on the stack, it's allocated.
--- net/openvswitch/datapath.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
net/openvswitch/datapath.c +16 -9
@@ -948,6 +948,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)struct sw_flow_mask mask;struct sk_buff *reply;struct datapath *dp; +struct sw_flow_key *key;struct sw_flow_actions *acts;struct sw_flow_match match;u32 ufid_flags =ovs_nla_get_ufid_flags (a[OVS_FLOW_ATTR_UFID_FLAGS ]);
@@ -975,24 +976,26 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) }/* Extract key. */ -ovs_match_init (&match, &new_flow->key, false, &mask); + key =kzalloc (sizeof (*key),GFP_KERNEL ); +if (!key) { + error = -ENOMEM ; + goto err_kfree_key; + } + +ovs_match_init (&match, key, false, &mask); error =ovs_nla_get_match (net, &match, a[OVS_FLOW_ATTR_KEY ], a[OVS_FLOW_ATTR_MASK ], log);if (error) goto err_kfree_flow; +ovs_flow_mask_key (&new_flow->key, key, true, &mask); +/* Extract flow identifier. */ error =ovs_nla_get_identifier (&new_flow->id, a[OVS_FLOW_ATTR_UFID ], - &new_flow->key, log); + key, log);if (error) goto err_kfree_flow; -/* unmasked key is needed to match when ufid is not used. */ -if (ovs_identifier_is_key (&new_flow->id)) - match.key = new_flow->id.unmasked_key; - -ovs_flow_mask_key (&new_flow->key, &new_flow->key, true, &mask); -/* Validate actions. */ error =ovs_nla_copy_actions (net, a[OVS_FLOW_ATTR_ACTIONS ], &new_flow->key, &acts, log);
@@ -1019,7 +1022,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)if (ovs_identifier_is_ufid (&new_flow->id)) flow =ovs_flow_tbl_lookup_ufid (&dp->table, &new_flow->id);if (!flow) - flow =ovs_flow_tbl_lookup (&dp->table, &new_flow->key); + flow =ovs_flow_tbl_lookup (&dp->table, key);if (likely (!flow)) {rcu_assign_pointer (new_flow->sf_acts, acts);
@@ -1089,6 +1092,8 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)if (reply)ovs_notify (&dp_flow_genl_family, reply, info); + +kfree (key);return 0 ; err_unlock_ovs:
@@ -1098,6 +1103,8 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)ovs_nla_free_flow_actions (acts); err_kfree_flow:ovs_flow_free (new_flow, false); +err_kfree_key: +kfree (key); error:return error; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 920/1146 soc: mediatek: pm-domains: Fix the power glitch issue
In reply to Greg Kroah-HartmanFrom: Chun-Jie Chen <[email protected]>
[ Upstream commit dba8eb83af9dd757ef645b52200775e86883d858 ]
Power reset maybe generate unexpected signal. In order to avoid the glitch issue, we need to enable isolation first to guarantee the stable signal when power reset is triggered.
--- drivers/soc/mediatek/mtk-pm-domains.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/mediatek/mtk-pm-domains.c +1 -1
@@ -275,9 +275,9 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)clk_bulk_disable_unprepare (pd->num_subsys_clks, pd->subsys_clks);/* subsys power off */ -regmap_clear_bits (scpsys->base, pd->data->ctl_offs,PWR_RST_B_BIT );regmap_set_bits (scpsys->base, pd->data->ctl_offs,PWR_ISO_BIT );regmap_set_bits (scpsys->base, pd->data->ctl_offs,PWR_CLK_DIS_BIT ); +regmap_clear_bits (scpsys->base, pd->data->ctl_offs,PWR_RST_B_BIT );regmap_clear_bits (scpsys->base, pd->data->ctl_offs,PWR_ON_2ND_BIT );regmap_clear_bits (scpsys->base, pd->data->ctl_offs,PWR_ON_BIT );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 921/1146 arm64: dts: mt8183: Fix Mali GPU clock
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit ad2631b5645a1d0ca9bf6fecf71f77e3b0071ee5 ]
The actual clock feeding into the Mali GPU on the MT8183 is from the clock gate in the MFGCFG block, not CLK_TOP_MFGPLL_CK from the TOPCKGEN block, which itself is simply a pass-through placeholder for the MFGPLL in the APMIXEDSYS block.
Fix the hardware description with the correct clock reference.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +1 -1
@@ -1678,7 +1678,7 @@ gpu: gpu@13040000 { <GIC_SPI 278 IRQ_TYPE_LEVEL_LOW>; interrupt-names = "job", "mmu", "gpu"; - clocks = <&topckgen CLK_TOP_MFGPLL_CK>; + clocks = <&mfgcfg CLK_MFG_BG3D>; power-domains = <&spm MT8183_POWER_DOMAIN_MFG_CORE0>,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 922/1146 devlink: protect devlink dump by the instance lock
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 214964a13ab56a9757d146b79b468a7ca190fbfb ]
Take the instance lock around devlink_nl_fill() when dumping, doit takes it already.
We are only dumping basic info so in the worst case we were risking data races around the reload statistics. Until the big devlink mutex was removed all relevant code was protected by it, so the missing instance lock was not exposed.
--- net/core/devlink.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/devlink.c +3 -0
@@ -1505,10 +1505,13 @@ static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg,continue ; } +devl_lock (devlink); err =devlink_nl_fill (msg, devlink,DEVLINK_CMD_NEW ,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq,NLM_F_MULTI ); +devl_unlock (devlink);devlink_put (devlink); +if (err) goto out; idx++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 923/1146 skbuff: Account for tail adjustment during pull operations
In reply to Greg Kroah-HartmanFrom: Subash Abhinov Kasiviswanathan <[email protected]>
[ Upstream commit 2d7afdcbc9d32423f177ee12b7c93783aea338fb ]
Extending the tail can have some unexpected side effects if a program uses a helper like BPF_FUNC_skb_pull_data to read partial content beyond the head skb headlen when all the skbs in the gso frag_list are linear with no head_frag -
kernel BUG at net/core/skbuff.c:4219!
pc : skb_segment+0xcf4/0xd2c lr : skb_segment+0x63c/0xd2c Call trace: skb_segment+0xcf4/0xd2c __udp_gso_segment+0xa4/0x544 udp4_ufo_fragment+0x184/0x1c0 inet_gso_segment+0x16c/0x3a4 skb_mac_gso_segment+0xd4/0x1b0 __skb_gso_segment+0xcc/0x12c udp_rcv_segment+0x54/0x16c udp_queue_rcv_skb+0x78/0x144 udp_unicast_rcv_skb+0x8c/0xa4 __udp4_lib_rcv+0x490/0x68c udp_rcv+0x20/0x30 ip_protocol_deliver_rcu+0x1b0/0x33c ip_local_deliver+0xd8/0x1f0 ip_rcv+0x98/0x1a4 deliver_ptype_list_skb+0x98/0x1ec __netif_receive_skb_core+0x978/0xc60
Fix this by marking these skbs as GSO_DODGY so segmentation can handle the tail updates accordingly.
--- net/core/skbuff.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/skbuff.c +3 -0
@@ -2416,6 +2416,9 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta) insp = list; }else {/* Eaten partially. */ +if (skb_is_gso (skb) && !list->head_frag && +skb_headlen (list)) +skb_shinfo (skb)->gso_type |=SKB_GSO_DODGY ;if (skb_shared (list)) {/* Sucks! We need to fork list. :-( */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 924/1146 mailbox: mpfs: read the system controllers status
In reply to Greg Kroah-HartmanFrom: Conor Dooley <[email protected]>
[ Upstream commit ab47d0bfdf88faac0eb02749e5bfaa306e004300 ]
Some services explicitly return an error code in their response, but others rely on the system controller to set a status in its status register. The meaning of the bits varies based on what service is requested, so pass it back up to the driver that requested the service in the first place. The field in the message struct already existed, but was unused until now.
If the system controller is busy, in which case we should never actually be in the interrupt handler, or if the service fails the mailbox itself should not be read. Callers should check the status before operating on the response.
There's an existing, but unused, #define for the mailbox mask - but it was incorrect. It was doing a GENMASK_ULL(32, 16) which should've just been a GENMASK(31, 16), so fix that up and start using it.
--- drivers/mailbox/mailbox-mpfs.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)
drivers/mailbox/mailbox-mpfs.c +28 -3
@@ -2,7 +2,7 @@/* * Microchip PolarFire SoC (MPFS) system controller/mailbox controller driver * -* Copyright (c) 2020 Microchip Corporation. All rights reserved. +* Copyright (c) 2020-2022 Microchip Corporation. All rights reserved. * * Author: Conor Dooley <[email protected]> *
@@ -56,7 +56,7 @@#define SCB_STATUS_NOTIFY_MASK BIT(SCB_STATUS_NOTIFY)#define SCB_STATUS_POS (16) -#define SCB_STATUS_MASK GENMASK_ULL(SCB_STATUS_POS + SCB_MASK_WIDTH, SCB_STATUS_POS) +#define SCB_STATUS_MASK GENMASK(SCB_STATUS_POS + SCB_MASK_WIDTH - 1, SCB_STATUS_POS)struct mpfs_mbox {struct mbox_controller controller;
@@ -130,13 +130,38 @@ static void mpfs_mbox_rx_data(struct mbox_chan *chan)struct mpfs_mbox *mbox = (struct mpfs_mbox *)chan->con_priv;struct mpfs_mss_response *response = mbox->response;u16 num_words =ALIGN ((response->resp_size), (4 )) /4U ; -u32 i; +u32 i, status;if (!response->resp_msg) {dev_err (mbox->dev,"failed to assign memory for response %d\n" , -ENOMEM );return ; } +/* +* The status is stored in bits 31:16 of the SERVICES_SR register. +* It is only valid when BUSY == 0. +* We should *never* get an interrupt while the controller is +* still in the busy state. If we do, something has gone badly +* wrong & the content of the mailbox would not be valid. +*/ +if (mpfs_mbox_busy (mbox)) { +dev_err (mbox->dev,"got an interrupt but system controller is busy\n" ); + response->resp_status =0xDEAD ; +return ; + } + + status =readl_relaxed (mbox->ctrl_base +SERVICES_SR_OFFSET ); + +/* +* If the status of the individual servers is non-zero, the service has +* failed. The contents of the mailbox at this point are not be valid, +* so don't bother reading them. Set the status so that the driver +* implementing the service can handle the result. +*/ + response->resp_status = (status &SCB_STATUS_MASK ) >>SCB_STATUS_POS ; +if (response->resp_status) +return ; +if (!mpfs_mbox_busy (mbox)) {for (i =0 ; i < num_words; i++) { response->resp_msg[i] =
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 925/1146 mailbox: arm_mhuv2: Fix return value check in mhuv2_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 165b7643f2df890066b1b4e8a387888a600ca9bf ]
If devm_of_iomap() fails, it returns ERR_PTR() and never return NULL, so replace NULL pointer check with IS_ERR() to fix this problem.
--- drivers/mailbox/arm_mhuv2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/arm_mhuv2.c +2 -2
@@ -1062,8 +1062,8 @@ static int mhuv2_probe(struct amba_device *adev, const struct amba_id *id)int ret = -EINVAL ; reg =devm_of_iomap (dev, dev->of_node,0 ,NULL ); -if (!reg) -return -ENOMEM ; +if (IS_ERR (reg)) +return PTR_ERR (reg); mhu =devm_kzalloc (dev,sizeof (*mhu),GFP_KERNEL );if (!mhu)
Signature · 15 lines
2.35.1
)
state = ret ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE;
if (!IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch) ||
- ctx->current_codec == V4L2_PIX_FMT_VP8_FRAME || ret) {
+ ctx->current_codec == V4L2_PIX_FMT_VP8_FRAME) {
v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx, state);
if (src_buf_req)
v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
--
2.35.1Greg Kroah-Hartman
maintainerPATCH 926/1146 mailbox: zynq-ipi: fix error handling while device_register() fails
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit a6792a0cdef0b1c2d77920246283a72537e60e94 ]
If device_register() fails, it has two issues:
1. The name allocated by dev_set_name() is leaked.
2. The parent of device is not NULL, device_unregister() is called in zynqmp_ipi_free_mboxes(), it will lead a kernel crash because of removing not added device.
Call put_device() to give up the reference, so the name is freed in kobject_cleanup(). Add device registered check in zynqmp_ipi_free_mboxes() to avoid null-ptr-deref.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +3 -1
@@ -493,6 +493,7 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, ret =device_register (&ipi_mbox->dev);if (ret) {dev_err (dev,"Failed to register ipi mbox dev.\n" ); +put_device (&ipi_mbox->dev);return ret; } mdev = &ipi_mbox->dev;
@@ -619,7 +620,8 @@ static void zynqmp_ipi_free_mboxes(struct zynqmp_ipi_pdata *pdata) ipi_mbox = &pdata->ipi_mboxes[i];if (ipi_mbox->dev.parent) {mbox_controller_unregister (&ipi_mbox->mbox); -device_unregister (&ipi_mbox->dev); +if (device_is_registered (&ipi_mbox->dev)) +device_unregister (&ipi_mbox->dev); } } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 927/1146 net_sched: reject TCF_EM_SIMPLE case for complex ematch module
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 9cd3fd2054c3b3055163accbf2f31a4426f10317 ]
When TCF_EM_SIMPLE was introduced, it is supposed to be convenient for ematch implementation:
https://lore.kernel.org/all/[email protected]/
"You don't have to, providing a 32bit data chunk without TCF_EM_SIMPLE set will simply result in allocating & copy. It's an optimization, nothing more."
So if an ematch module provides ops->datalen that means it wants a complex data structure (saved in its em->data) instead of a simple u32 value. We should simply reject such a combination, otherwise this u32 could be misinterpreted as a pointer.
--- net/sched/ematch.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/ematch.c +2 -0
@@ -255,6 +255,8 @@ static int tcf_em_validate(struct tcf_proto *tp,* the value carried. */ if (em_hdr->flags &TCF_EM_SIMPLE ) { +if (em->ops->datalen >0 ) + goto errout;if (data_len <sizeof (u32)) goto errout; em->data = *(u32 *) data;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 928/1146 rxrpc: Fix missing unlock in rxrpc_do_sendmsg()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 4feb2c44629e6f9b459b41a5a60491069d346a95 ]
One of the error paths in rxrpc_do_sendmsg() doesn't unlock the call mutex before returning. Fix it to do this.
Note that this still doesn't get rid of the checker warning:
../net/rxrpc/sendmsg.c:617:5: warning: context imbalance in 'rxrpc_do_sendmsg' - wrong count at exit
I think the interplay between the socket lock and the call's user_mutex may be too complicated for checker to analyse, especially as rxrpc_new_client_call_for_sendmsg(), which it calls, returns with the call's user_mutex if successful but unconditionally drops the socket lock.
--- net/rxrpc/sendmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/sendmsg.c +1 -1
@@ -716,7 +716,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len)if (call->tx_total_len !=-1 || call->tx_pending || call->tx_top !=0 ) - goto error_put; + goto out_put_unlock; call->tx_total_len = p.call.tx_total_len; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 929/1146 myri10ge: Fix an error handling path in myri10ge_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit d83b950d44d2982c0e62e3d81b0f35ab09431008 ]
Some memory allocated in myri10ge_probe_slices() is not released in the error handling path of myri10ge_probe().
Add the corresponding kfree(), as already done in the remove function.
--- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -0
@@ -3913,6 +3913,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)myri10ge_free_slices (mgp); abort_with_firmware: +kfree (mgp->msix_vectors);myri10ge_dummy_rdma (mgp,0 ); abort_with_ioremap:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 930/1146 net: stream: purge sk_error_queue in sk_stream_kill_queues()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit e0c8bccd40fc1c19e1d246c39bcf79e357e1ada3 ]
Changheon Lee reported TCP socket leaks, with a nice repro.
It seems we leak TCP sockets with the following sequence:
1) SOF_TIMESTAMPING_TX_ACK is enabled on the socket.
Each ACK will cook an skb put in error queue, from __skb_tstamp_tx(). __skb_tstamp_tx() is using skb_clone(), unless SOF_TIMESTAMPING_OPT_TSONLY was also requested.
2) If the application is also using MSG_ZEROCOPY, then we put in the error queue cloned skbs that had a struct ubuf_info attached to them.
Whenever an struct ubuf_info is allocated, sock_zerocopy_alloc() does a sock_hold().
As long as the cloned skbs are still in sk_error_queue, socket refcount is kept elevated.
3) Application closes the socket, while error queue is not empty.
Since tcp_close() no longer purges the socket error queue, we might end up with a TCP socket with at least one skb in error queue keeping the socket alive forever.
This bug can be (ab)used to consume all kernel memory and freeze the host.
We need to purge the error queue, with proper synchronization against concurrent writers.
--- net/core/stream.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/stream.c +6 -0
@@ -196,6 +196,12 @@ void sk_stream_kill_queues(struct sock *sk)/* First the read buffer. */ __skb_queue_purge (&sk->sk_receive_queue); +/* Next, the error queue. +* We need to use queue lock, because other threads might +* add packets to the queue without socket lock being held. +*/ +skb_queue_purge (&sk->sk_error_queue); +/* Next, the write queue. */ WARN_ON_ONCE (!skb_queue_empty (&sk->sk_write_queue));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 931/1146 mctp: serial: Fix starting value for frame check sequence
In reply to Greg Kroah-HartmanFrom: Jeremy Kerr <[email protected]>
[ Upstream commit 2856a62762c8409e360d4fd452194c8e57ba1058 ]
RFC1662 defines the start state for the crc16 FCS to be 0xffff, but we're currently starting at zero.
This change uses the correct start state. We're only early in the adoption for the serial binding, so there aren't yet any other users to interface to.
--- drivers/net/mctp/mctp-serial.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/mctp/mctp-serial.c +4 -2
@@ -35,6 +35,8 @@#define BYTE_FRAME 0x7e#define BYTE_ESC 0x7d +#define FCS_INIT 0xffff +static DEFINE_IDA (mctp_serial_ida);enum mctp_serial_state {
@@ -123,7 +125,7 @@ static void mctp_serial_tx_work(struct work_struct *work) buf[2 ] = dev->txlen;if (!dev->txpos) - dev->txfcs =crc_ccitt (0 , buf +1 ,2 ); + dev->txfcs =crc_ccitt (FCS_INIT , buf +1 ,2 ); txlen =write_chunk (dev, buf + dev->txpos,3 - dev->txpos);if (txlen <=0 ) {
@@ -303,7 +305,7 @@ static void mctp_serial_push_header(struct mctp_serial *dev, unsigned char c)case 1 :if (c ==MCTP_SERIAL_VERSION ) { dev->rxpos++; - dev->rxfcs =crc_ccitt_byte (0 , c); + dev->rxfcs =crc_ccitt_byte (FCS_INIT , c); }else { dev->rxstate =STATE_ERR ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 932/1146 cifs: dont leak -ENOMEM in smb2_open_file()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
[ Upstream commit f60ffa662d1427cfd31fe9d895c3566ac50bfe52 ]
A NULL error response might be a valid case where smb2_reconnect() failed to reconnect the session and tcon due to a disconnected server prior to issuing the I/O operation, so don't leak -ENOMEM to userspace on such occasions.
--- fs/cifs/smb2file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/smb2file.c +2 -2
@@ -122,8 +122,8 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, __u32struct smb2_hdr *hdr = err_iov.iov_base;if (unlikely (!err_iov.iov_base || err_buftype ==CIFS_NO_BUFFER )) - rc = -ENOMEM ; -else if (hdr->Status ==STATUS_STOPPED_ON_SYMLINK ) { + goto out; +if (hdr->Status ==STATUS_STOPPED_ON_SYMLINK ) { rc =smb2_parse_symlink_response (oparms->cifs_sb, &err_iov, &data->symlink_target);if (!rc) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 933/1146 net: dsa: microchip: remove IRQF_TRIGGER_FALLING in request_threaded_irq
In reply to Greg Kroah-HartmanFrom: Arun Ramadoss <[email protected]>
[ Upstream commit 62e027fb0e5293d95e8d36655757ef4687c8795d ]
KSZ swithes used interrupts for detecting the phy link up and down. During registering the interrupt handler, it used IRQF_TRIGGER_FALLING flag. But this flag has to be retrieved from device tree instead of hard coding in the driver, so removing the flag.
--- drivers/net/dsa/microchip/ksz_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +1 -2
@@ -1883,8 +1883,7 @@ static int ksz_irq_common_setup(struct ksz_device *dev, struct ksz_irq *kirq)irq_create_mapping (kirq->domain, n); ret =request_threaded_irq (kirq->irq_num,NULL , ksz_irq_thread_fn, -IRQF_ONESHOT |IRQF_TRIGGER_FALLING , - kirq->name, kirq); +IRQF_ONESHOT , kirq->name, kirq);if (ret) goto out;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 934/1146 mctp: Remove device type check at unregister
In reply to Greg Kroah-HartmanFrom: Matt Johnston <[email protected]>
[ Upstream commit b389a902dd5be4ece505a2e0463b9b034de04bf5 ]
The unregister check could be incorrectly triggered if a netdev changes its type after register. That is possible for a tun device using TUNSETLINK ioctl, resulting in mctp unregister failing and the netdev unregister waiting forever.
This was encountered by https://github.com/openthread/openthread/issues/8523
Neither check at register or unregister is required. They were added in an attempt to track down mctp_ptr being set unexpectedly, which should not happen in normal operation.
--- net/mctp/device.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
net/mctp/device.c +1 -13
@@ -429,12 +429,6 @@ static void mctp_unregister(struct net_device *dev)struct mctp_dev *mdev; mdev =mctp_dev_get_rtnl (dev); -if (mdev && !mctp_known (dev)) { -// Sanity check, should match what was set in mctp_register -netdev_warn (dev,"%s: BUG mctp_ptr set for unknown type %d" , - __func__, dev->type); -return ; - }if (!mdev)return ;
@@ -451,14 +445,8 @@ static int mctp_register(struct net_device *dev)struct mctp_dev *mdev;/* Already registered? */ - mdev =rtnl_dereference (dev->mctp_ptr); - -if (mdev) { -if (!mctp_known (dev)) -netdev_warn (dev,"%s: BUG mctp_ptr set for unknown type %d" , - __func__, dev->type); +if (rtnl_dereference (dev->mctp_ptr))return 0 ; - }/* only register specific types */ if (!mctp_known (dev))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 935/1146 HID: amd_sfh: Add missing check for dma_alloc_coherent
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 53ffa6a9f83b2170c60591da1ead8791d5a42e81 ]
Add check for the return value of the dma_alloc_coherent since it may return NULL pointer if allocation fails.
--- drivers/hid/amd-sfh-hid/amd_sfh_client.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hid/amd-sfh-hid/amd_sfh_client.c +4 -0
@@ -237,6 +237,10 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) in_data->sensor_virt_addr[i] =dma_alloc_coherent (dev,sizeof (int ) *8 , &cl_data->sensor_dma_addr[i],GFP_KERNEL ); +if (!in_data->sensor_virt_addr[i]) { + rc = -ENOMEM ; + goto cleanup; + } cl_data->sensor_sts[i] =SENSOR_DISABLED ; cl_data->sensor_requested_cnt[i] =0 ; cl_data->cur_hid_dev = i;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 936/1146 net: fec: check the return value of build_skb()
In reply to Greg Kroah-HartmanFrom: Wei Fang <[email protected]>
[ Upstream commit 19e72b064fc32cd58f6fc0b1eb64ac2e4f770e76 ]
The build_skb might return a null pointer but there is no check on the return value in the fec_enet_rx_queue(). So a null pointer dereference might occur. To avoid this, we check the return value of build_skb. If the return value is a null pointer, the driver will recycle the page and update the statistic of ndev. Then jump to rx_processing_done to clear the status flags of the BD so that the hardware can recycle the BD.
--- drivers/net/ethernet/freescale/fec_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +8 -0
@@ -1642,6 +1642,14 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id)* bridging applications. */ skb =build_skb (page_address (page),PAGE_SIZE ); +if (unlikely (!skb)) { +page_pool_recycle_direct (rxq->page_pool, page); + ndev->stats.rx_dropped++; + +netdev_err_once (ndev,"build_skb failed!\n" ); + goto rx_processing_done; + } +skb_reserve (skb,FEC_ENET_XDP_HEADROOM );skb_put (skb, pkt_len -4 );skb_mark_for_recycle (skb);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 937/1146 rcu: Fix __this_cpu_read() lockdep warning in rcu_force_quiescent_state()
In reply to Greg Kroah-HartmanFrom: Zqiang <[email protected]>
[ Upstream commit ceb1c8c9b8aa9199da46a0f29d2d5f08d9b44c15 ]
Running rcutorture with non-zero fqs_duration module parameter in a kernel built with CONFIG_PREEMPTION=y results in the following splat:
BUG: using __this_cpu_read() in preemptible [00000000] code: rcu_torture_fqs/398 caller is __this_cpu_preempt_check+0x13/0x20 CPU: 3 PID: 398 Comm: rcu_torture_fqs Not tainted 6.0.0-rc1-yoctodev-standard+ Call Trace: <TASK> dump_stack_lvl+0x5b/0x86 dump_stack+0x10/0x16 check_preemption_disabled+0xe5/0xf0 __this_cpu_preempt_check+0x13/0x20 rcu_force_quiescent_state.part.0+0x1c/0x170 rcu_force_quiescent_state+0x1e/0x30 rcu_torture_fqs+0xca/0x160 ? rcu_torture_boost+0x430/0x430 kthread+0x192/0x1d0 ? kthread_complete_and_exit+0x30/0x30 ret_from_fork+0x22/0x30 </TASK>
The problem is that rcu_force_quiescent_state() uses __this_cpu_read() in preemptible code instead of the proper raw_cpu_read(). This commit therefore changes __this_cpu_read() to raw_cpu_read().
--- kernel/rcu/tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tree.c +1 -1
@@ -2418,7 +2418,7 @@ void rcu_force_quiescent_state(void)struct rcu_node *rnp_old =NULL ;/* Funnel through hierarchy to reduce memory contention. */ - rnp =__this_cpu_read (rcu_data.mynode); + rnp =raw_cpu_read (rcu_data.mynode);for (; rnp !=NULL ; rnp = rnp->parent) { ret = (READ_ONCE (rcu_state.gp_flags) &RCU_GP_FLAG_FQS ) || !raw_spin_trylock (&rnp->fqslock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 938/1146 arm64: make is_ttbrX_addr() noinstr-safe
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit d8c1d798a2e5091128c391c6dadcc9be334af3f5 ]
We use is_ttbr0_addr() in noinstr code, but as it's only marked as inline, it's theoretically possible for the compiler to place it out-of-line and instrument it, which would be problematic.
Mark is_ttbr0_addr() as __always_inline such that that can safely be used from noinstr code. For consistency, do the same to is_ttbr1_addr(). Note that while is_ttbr1_addr() calls arch_kasan_reset_tag(), this is a macro (and its callees are either macros or __always_inline), so there is not a risk of transient instrumentation.
--- arch/arm64/include/asm/processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/processor.h +2 -2
@@ -308,13 +308,13 @@ static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, }#endif -static inline bool is_ttbr0_addr (unsigned long addr) +static __always_inline bool is_ttbr0_addr(unsigned long addr) {/* entry assembly clears tags for TTBR0 addrs */ return addr <TASK_SIZE ; } -static inline bool is_ttbr1_addr (unsigned long addr) +static __always_inline bool is_ttbr1_addr(unsigned long addr) {/* TTBR1 addresses may have a tag if KASAN_SW_TAGS is in use */ return arch_kasan_reset_tag (addr) >=PAGE_OFFSET ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 939/1146 ARM: dts: aspeed: rainier,everest: Move reserved memory regions
In reply to Greg Kroah-HartmanFrom: Adriana Kobylak <[email protected]>
[ Upstream commit e184d42a6e085f95f5c4f1a4fbabebab2984cb68 ]
Move the reserved regions to account for a decrease in DRAM when ECC is enabled. ECC takes 1/9th of memory.
Running on HW with ECC off, u-boot prints:
DRAM: already initialized, 1008 MiB (capacity:1024 MiB, VGA:16 MiB, ECC:off)
And with ECC on, u-boot prints:
DRAM: already initialized, 896 MiB (capacity:1024 MiB, VGA:16 MiB, ECC:on, ECC size:896 MiB)
This implies that MCR54 is configured for ECC to be bounded at the bottom of a 16MiB VGA memory region:
1024MiB - 16MiB (VGA) = 1008MiB
1008MiB / 9 (for ECC) = 112MiB
1008MiB - 112MiB = 896MiB (available DRAM)
The flash_memory region currently starts at offset 896MiB:0xb8000000 (flash_memory offset) - 0x80000000 (base memory address) = 0x38000000 = 896MiB
This is the end of the available DRAM with ECC enabled and therefore it needs to be moved.
Since the flash_memory is 64MiB in size and needs to be 64MiB aligned, it can just be moved up by 64MiB and would sit right at the end of the available DRAM buffer.
The ramoops region currently follows the flash_memory, but it can be moved to sit above flash_memory which would minimize the address-space fragmentation.
--- arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 17 ++++++++--------- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 16 +++++++++------- 2 files changed, 17 insertions(+), 16 deletions(-)
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts +8 -9
@@ -162,16 +162,9 @@ reserved-memory { #size-cells = <1>; ranges; - /* LPC FW cycle bridge region requires natural alignment */ - flash_memory: region@b8000000 { - no-map; - reg = <0xb8000000 0x04000000>; /* 64M */ - }; - - /* 48MB region from the end of flash to start of vga memory */ - ramoops@bc000000 { + ramoops@b3e00000 { compatible = "ramoops"; - reg = <0xbc000000 0x200000>; /* 16 * (4 * 0x8000) */ + reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */ record-size = <0x8000>; console-size = <0x8000>; ftrace-size = <0x8000>;
@@ -179,6 +172,12 @@ ramoops@bc000000 { max-reason = <3>; /* KMSG_DUMP_EMERG */ }; + /* LPC FW cycle bridge region requires natural alignment */ + flash_memory: region@b4000000 { + no-map; + reg = <0xb4000000 0x04000000>; /* 64M */ + }; + /* VGA region is dictated by hardware strapping */ vga_memory: region@bf000000 { no-map;
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +9 -7
@@ -95,14 +95,9 @@ reserved-memory { #size-cells = <1>; ranges; - flash_memory: region@b8000000 { - no-map; - reg = <0xb8000000 0x04000000>; /* 64M */ - }; - - ramoops@bc000000 { + ramoops@b3e00000 { compatible = "ramoops"; - reg = <0xbc000000 0x200000>; /* 16 * (4 * 0x8000) */ + reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */ record-size = <0x8000>; console-size = <0x8000>; ftrace-size = <0x8000>;
@@ -110,6 +105,13 @@ ramoops@bc000000 { max-reason = <3>; /* KMSG_DUMP_EMERG */ }; + /* LPC FW cycle bridge region requires natural alignment */ + flash_memory: region@b4000000 { + no-map; + reg = <0xb4000000 0x04000000>; /* 64M */ + }; + + /* VGA region is dictated by hardware strapping */ vga_memory: region@bf000000 { no-map; compatible = "shared-dma-pool";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 940/1146 video: hyperv_fb: Avoid taking busy spinlock on panic path
In reply to Greg Kroah-HartmanFrom: Guilherme G. Piccoli <[email protected]>
[ Upstream commit 1d044ca035dc22df0d3b39e56f2881071d9118bd ]
The Hyper-V framebuffer code registers a panic notifier in order to try updating its fbdev if the kernel crashed. The notifier callback is straightforward, but it calls the vmbus_sendpacket() routine eventually, and such function takes a spinlock for the ring buffer operations.
Panic path runs in atomic context, with local interrupts and preemption disabled, and all secondary CPUs shutdown. That said, taking a spinlock might cause a lockup if a secondary CPU was disabled with such lock taken. Fix it here by checking if the ring buffer spinlock is busy on Hyper-V framebuffer panic notifier; if so, bail-out avoiding the potential lockup scenario.
--- drivers/hv/ring_buffer.c | 13 +++++++++++++ drivers/video/fbdev/hyperv_fb.c | 8 +++++++- include/linux/hyperv.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-)
drivers/hv/ring_buffer.c +13 -0
@@ -280,6 +280,19 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) ring_info->pkt_buffer_size =0 ; } +/* +* Check if the ring buffer spinlock is available to take or not; used on +* atomic contexts, like panic path (see the Hyper-V framebuffer driver). +*/ + +bool hv_ringbuffer_spinlock_busy (struct vmbus_channel *channel) +{ +struct hv_ring_buffer_info *rinfo = &channel->outbound; + +return spin_is_locked (&rinfo->ring_lock); +} +EXPORT_SYMBOL_GPL (hv_ringbuffer_spinlock_busy); +/* Write to the ring buffer. */ int hv_ringbuffer_write(struct vmbus_channel *channel, const struct kvec *kv_list, u32 kv_count,
drivers/video/fbdev/hyperv_fb.c +7 -1
@@ -780,12 +780,18 @@ static void hvfb_ondemand_refresh_throttle(struct hvfb_par *par,static int hvfb_on_panic (struct notifier_block *nb,unsigned long e,void *p) { +struct hv_device *hdev;struct hvfb_par *par;struct fb_info *info; par = container_of(nb, struct hvfb_par, hvfb_panic_nb); - par->synchronous_fb = true; info = par->info; + hdev =device_to_hv_device (info->device); + +if (hv_ringbuffer_spinlock_busy (hdev->channel)) +return NOTIFY_DONE ; + + par->synchronous_fb = true;if (par->need_docopy)hvfb_docopy (par,0 , dio_fb_size);synthvid_update (info,0 ,0 ,INT_MAX ,INT_MAX );
include/linux/hyperv.h +2 -0
@@ -1341,6 +1341,8 @@ struct hv_ring_buffer_debug_info {int hv_ringbuffer_get_debuginfo (struct hv_ring_buffer_info *ring_info,struct hv_ring_buffer_debug_info *debug_info); +bool hv_ringbuffer_spinlock_busy (struct vmbus_channel *channel); +/* Vmbus interface */ #define vmbus_driver_register (driver) \ __vmbus_driver_register(driver, THIS_MODULE, KBUILD_MODNAME)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 941/1146 x86/hyperv: Remove unregister syscore call from Hyper-V cleanup
In reply to Greg Kroah-HartmanFrom: Gaurav Kohli <[email protected]>
[ Upstream commit 32c97d980e2eef25465d453f2956a9ca68926a3c ]
Hyper-V cleanup code comes under panic path where preemption and irq is already disabled. So calling of unregister_syscore_ops might schedule out the thread even for the case where mutex lock is free. hyperv_cleanup
unregister_syscore_ops
mutex_lock(&syscore_ops_lock)
might_sleep
Here might_sleep might schedule out this thread, where voluntary preemption config is on and this thread will never comes back. And also this was added earlier to maintain the symmetry which is not required as this can comes during crash shutdown path only.
To prevent the same, removing unregister_syscore_ops function call.
--- arch/x86/hyperv/hv_init.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/hyperv/hv_init.c +0 -2
@@ -535,8 +535,6 @@ void hyperv_cleanup(void)union hv_x64_msr_hypercall_contents hypercall_msr;union hv_reference_tsc_msr tsc_msr; -unregister_syscore_ops (&hv_syscore_ops); -/* Reset our OS id */ wrmsrl (HV_X64_MSR_GUEST_OS_ID ,0 );hv_ghcb_msr_write (HV_X64_MSR_GUEST_OS_ID ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 942/1146 binfmt_misc: fix shift-out-of-bounds in check_special_flags
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 6a46bf558803dd2b959ca7435a5c143efe837217 ]
UBSAN reported a shift-out-of-bounds warning:
left shift of 1 by 31 places cannot be represented in type 'int'
Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x8d/0xcf lib/dump_stack.c:106 ubsan_epilogue+0xa/0x44 lib/ubsan.c:151 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 lib/ubsan.c:322 check_special_flags fs/binfmt_misc.c:241 [inline] create_entry fs/binfmt_misc.c:456 [inline] bm_register_write+0x9d3/0xa20 fs/binfmt_misc.c:654 vfs_write+0x11e/0x580 fs/read_write.c:582 ksys_write+0xcf/0x120 fs/read_write.c:637 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x34/0x80 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x4194e1
Since the type of Node's flags is unsigned long, we should define these macros with same type too.
--- fs/binfmt_misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/binfmt_misc.c +4 -4
@@ -44,10 +44,10 @@ static LIST_HEAD(entries);static int enabled =1 ;enum {Enabled, Magic}; -#define MISC_FMT_PRESERVE_ARGV0 (1 << 31) -#define MISC_FMT_OPEN_BINARY (1 << 30) -#define MISC_FMT_CREDENTIALS (1 << 29) -#define MISC_FMT_OPEN_FILE (1 << 28) +#define MISC_FMT_PRESERVE_ARGV0 (1UL << 31) +#define MISC_FMT_OPEN_BINARY (1UL << 30) +#define MISC_FMT_CREDENTIALS (1UL << 29) +#define MISC_FMT_OPEN_FILE (1UL << 28) typedef struct { struct list_head list;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 943/1146 arm64: dts: qcom: sm8450: disable SDHCI SDR104/SDR50 on all boards
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 9d561dc4e5cc31e757f91eb7bb709d2e2a8c9ce0 ]
SDHCI on SM8450 HDK also has problems with SDR104/SDR50:
mmc0: card never left busy state
mmc0: error -110 whilst initialising SD card
so I think it is safe to assume this issue affects all SM8450 boards. Move the quirk disallowing these modes to the SoC DTSI, to spare people working on other boards the misery of debugging this issue.
--- arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 2 -- arch/arm64/boot/dts/qcom/sm8450.dtsi | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts +0 -2
@@ -556,8 +556,6 @@ &sdhc_2 { pinctrl-1 = <&sdc2_sleep_state &sdc2_card_det_n>; vmmc-supply = <&pm8350c_l9>; vqmmc-supply = <&pm8350c_l6>; - /* Forbid SDR104/SDR50 - broken hw! */ - sdhci-caps-mask = <0x3 0x0>; no-sdio; no-mmc; status = "okay";
arch/arm64/boot/dts/qcom/sm8450.dtsi +3 -0
@@ -3192,6 +3192,9 @@ sdhc_2: sdhci@8804000 { bus-width = <4>; dma-coherent; + /* Forbid SDR104/SDR50 - broken hw! */ + sdhci-caps-mask = <0x3 0x0>; + status = "disabled"; sdhc2_opp_table: opp-table {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 944/1146 arm64: dts: qcom: sm6350: Add apps_smmu with streamID to SDHCI 1/2 nodes
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 7372b944a6ba5ac86628eaacc89ed4f103435cb9 ]
When enabling the APPS SMMU the mainline driver reconfigures the SMMU from its bootloader configuration, losing the stream mapping for (among which) the SDHCI hardware and breaking its ADMA feature. This feature can be disabled with:
sdhci.debug_quirks=0x40
But it is of course desired to have this feature enabled and working through the SMMU.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm6350.dtsi +2 -0
@@ -485,6 +485,7 @@ sdhc_1: mmc@7c4000 { interrupts = <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 644 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; + iommus = <&apps_smmu 0x60 0x0>; clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>,
@@ -1063,6 +1064,7 @@ sdhc_2: mmc@8804000 { interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; + iommus = <&apps_smmu 0x560 0x0>; clocks = <&gcc GCC_SDCC2_AHB_CLK>, <&gcc GCC_SDCC2_APPS_CLK>,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 945/1146 fs: jfs: fix shift-out-of-bounds in dbAllocAG
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 898f706695682b9954f280d95e49fa86ffa55d08 ]
Syzbot found a crash : UBSAN: shift-out-of-bounds in dbAllocAG. The underlying bug is the missing check of bmp->db_agl2size. The field can be greater than 64 and trigger the shift-out-of-bounds.
Fix this bug by adding a check of bmp->db_agl2size in dbMount since this field is used in many following functions. The upper bound for this field is L2MAXL2SIZE - L2MAXAG, thanks for the help of Dave Kleikamp. Note that, for maintenance, I reorganized error handling code of dbMount.
--- fs/jfs/jfs_dmap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
fs/jfs/jfs_dmap.c +16 -6
@@ -155,7 +155,7 @@ int dbMount(struct inode *ipbmap)struct bmap *bmp;struct dbmap_disk *dbmp_le;struct metapage *mp; -int i; +int i, err;/* * allocate/initialize the in-memory bmap descriptor
@@ -170,8 +170,8 @@ int dbMount(struct inode *ipbmap)BMAPBLKNO <<JFS_SBI (ipbmap->i_sb)->l2nbperpage, PSIZE, 0);if (mp ==NULL ) { -kfree (bmp); -return -EIO ; + err = -EIO ; + goto err_kfree_bmp; }/* copy the on-disk bmap descriptor to its in-memory version. */
@@ -181,9 +181,8 @@ int dbMount(struct inode *ipbmap) bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag);if (!bmp->db_numag) { -release_metapage (mp); -kfree (bmp); -return -EINVAL ; + err = -EINVAL ; + goto err_release_metapage; } bmp->db_maxlevel =le32_to_cpu (dbmp_le->dn_maxlevel);
@@ -194,6 +193,11 @@ int dbMount(struct inode *ipbmap) bmp->db_agwidth =le32_to_cpu (dbmp_le->dn_agwidth); bmp->db_agstart =le32_to_cpu (dbmp_le->dn_agstart); bmp->db_agl2size =le32_to_cpu (dbmp_le->dn_agl2size); +if (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG ) { + err = -EINVAL ; + goto err_release_metapage; + } +for (i =0 ; i <MAXAG ; i++) bmp->db_agfree[i] =le64_to_cpu (dbmp_le->dn_agfree[i]); bmp->db_agsize =le64_to_cpu (dbmp_le->dn_agsize);
@@ -214,6 +218,12 @@ int dbMount(struct inode *ipbmap)BMAP_LOCK_INIT (bmp);return (0 ); + +err_release_metapage: +release_metapage (mp); +err_kfree_bmp: +kfree (bmp); +return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 946/1146 udf: Avoid double brelse() in udf_rename()
In reply to Greg Kroah-HartmanFrom: Shigeru Yoshida <[email protected]>
[ Upstream commit c791730f2554a9ebb8f18df9368dc27d4ebc38c2 ]
syzbot reported a warning like below [1]:
VFS: brelse: Trying to free free buffer
WARNING: CPU: 2 PID: 7301 at fs/buffer.c:1145 __brelse+0x67/0xa0 ... Call Trace: <TASK> invalidate_bh_lru+0x99/0x150 smp_call_function_many_cond+0xe2a/0x10c0 ? generic_remap_file_range_prep+0x50/0x50 ? __brelse+0xa0/0xa0 ? __mutex_lock+0x21c/0x12d0 ? smp_call_on_cpu+0x250/0x250 ? rcu_read_lock_sched_held+0xb/0x60 ? lock_release+0x587/0x810 ? __brelse+0xa0/0xa0 ? generic_remap_file_range_prep+0x50/0x50 on_each_cpu_cond_mask+0x3c/0x80 blkdev_flush_mapping+0x13a/0x2f0 blkdev_put_whole+0xd3/0xf0 blkdev_put+0x222/0x760 deactivate_locked_super+0x96/0x160 deactivate_super+0xda/0x100 cleanup_mnt+0x222/0x3d0 task_work_run+0x149/0x240 ? task_work_cancel+0x30/0x30 do_exit+0xb29/0x2a40 ? reacquire_held_locks+0x4a0/0x4a0 ? do_raw_spin_lock+0x12a/0x2b0 ? mm_update_next_owner+0x7c0/0x7c0 ? rwlock_bug.part.0+0x90/0x90 ? zap_other_threads+0x234/0x2d0 do_group_exit+0xd0/0x2a0 __x64_sys_exit_group+0x3a/0x50 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd
The cause of the issue is that brelse() is called on both ofibh.sbh and ofibh.ebh by udf_find_entry() when it returns NULL. However, brelse() is called by udf_rename(), too. So, b_count on buffer_head becomes unbalanced.
This patch fixes the issue by not calling brelse() by udf_rename() when udf_find_entry() returns NULL.
--- fs/udf/namei.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/udf/namei.c +4 -4
@@ -1091,8 +1091,9 @@ static int udf_rename(struct user_namespace *mnt_userns, struct inode *old_dir,return -EINVAL ; ofi =udf_find_entry (old_dir, &old_dentry->d_name, &ofibh, &ocfi); -if (IS_ERR (ofi)) { - retval =PTR_ERR (ofi); +if (!ofi ||IS_ERR (ofi)) { +if (IS_ERR (ofi)) + retval =PTR_ERR (ofi); goto end_rename; }
@@ -1101,8 +1102,7 @@ static int udf_rename(struct user_namespace *mnt_userns, struct inode *old_dir,brelse (ofibh.sbh); tloc =lelb_to_cpu (ocfi.icb.extLocation); -if (!ofi ||udf_get_lb_pblock (old_dir->i_sb, &tloc,0 ) - != old_inode->i_ino) +if (udf_get_lb_pblock (old_dir->i_sb, &tloc,0 ) != old_inode->i_ino) goto end_rename; nfi =udf_find_entry (new_dir, &new_dentry->d_name, &nfibh, &ncfi);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 947/1146 jfs: Fix fortify moan in symlink
In reply to Greg Kroah-HartmanFrom: Dr. David Alan Gilbert <[email protected]>
[ Upstream commit ebe060369f8d6e4588b115f252bebf5ba4d64350 ]
JFS has in jfs_incore.h:
/* _inline may overflow into _inline_ea when needed */
/* _inline_ea may overlay the last part of
* file._xtroot if maxentry = XTROOTINITSLOT
*/
union {
struct {
/* 128: inline symlink */
unchar _inline[128];
/* 128: inline extended attr */
unchar _inline_ea[128];
};
unchar _inline_all[256];and currently the symlink code copies into _inline;
if this is larger than 128 bytes it triggers a fortify warning of the form:
memcpy: detected field-spanning write (size 132) of single field
"ip->i_link" at fs/jfs/namei.c:950 (size 18446744073709551615)
when it's actually OK.
Copy it into _inline_all instead.
--- fs/jfs/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jfs/namei.c +1 -1
@@ -946,7 +946,7 @@ static int jfs_symlink(struct user_namespace *mnt_userns, struct inode *dip,if (ssize <=IDATASIZE ) { ip->i_op = &jfs_fast_symlink_inode_operations; - ip->i_link =JFS_IP (ip)->i_inline; + ip->i_link =JFS_IP (ip)->i_inline_all;memcpy (ip->i_link, name, ssize); ip->i_size = ssize -1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 948/1146 fs: jfs: fix shift-out-of-bounds in dbDiscardAG
In reply to Greg Kroah-HartmanFrom: Hoi Pok Wu <[email protected]>
[ Upstream commit 25e70c6162f207828dd405b432d8f2a98dbf7082 ]
This should be applied to most URSAN bugs found recently by syzbot, by guarding the dbMount. As syzbot feeding rubbish into the bmap descriptor.
--- fs/jfs/jfs_dmap.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/jfs/jfs_dmap.c +5 -0
@@ -198,6 +198,11 @@ int dbMount(struct inode *ipbmap) goto err_release_metapage; } +if (((bmp->db_mapsize -1 ) >> bmp->db_agl2size) >MAXAG ) { + err = -EINVAL ; + goto err_release_metapage; + } +for (i =0 ; i <MAXAG ; i++) bmp->db_agfree[i] =le64_to_cpu (dbmp_le->dn_agfree[i]); bmp->db_agsize =le64_to_cpu (dbmp_le->dn_agsize);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 949/1146 ACPI: processor: idle: Check acpi_fetch_acpi_dev() return value
In reply to Greg Kroah-HartmanFrom: Li Zhong <[email protected]>
[ Upstream commit 2437513a814b3e93bd02879740a8a06e52e2cf7d ]
The return value of acpi_fetch_acpi_dev() could be NULL, which would cause a NULL pointer dereference to occur in acpi_device_hid().
--- drivers/acpi/processor_idle.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/acpi/processor_idle.c +3 -0
@@ -1134,6 +1134,9 @@ static int acpi_processor_get_lpi_info(struct acpi_processor *pr) status =acpi_get_parent (handle, &pr_ahandle);while (ACPI_SUCCESS (status)) { d =acpi_fetch_acpi_dev (pr_ahandle); +if (!d) +break ; + handle = pr_ahandle;if (strcmp (acpi_device_hid (d),ACPI_PROCESSOR_CONTAINER_HID ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 950/1146 ACPI: EC: Add quirk for the HP Pavilion Gaming 15-cx0041ur
In reply to Greg Kroah-HartmanFrom: Mia Kanashi <[email protected]>
[ Upstream commit b423f240a66ad928c4cb5ec6055dfc90ce8d894e ]
Added GPE quirk entry for the HP Pavilion Gaming 15-cx0041ur. There is a quirk entry for the 15-cx0xxx laptops, but this one has different DMI_PRODUCT_NAME.
Notably backlight keys and other ACPI events now function correctly.
--- drivers/acpi/ec.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/acpi/ec.c +10 -0
@@ -1875,6 +1875,16 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-cx0xxx"), }, }, + { +/* +* HP Pavilion Gaming Laptop 15-cx0041ur +*/ + .callback = ec_honor_dsdt_gpe, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP 15-cx0041ur"), + }, + }, {/* * Samsung hardware
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 951/1146 ACPICA: Fix error code path in acpi_ds_call_control_method()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 404ec60438add1afadaffaed34bb5fe4ddcadd40 ]
A use-after-free in acpi_ps_parse_aml() after a failing invocaion of acpi_ds_call_control_method() is reported by KASAN [1] and code inspection reveals that next_walk_state pushed to the thread by acpi_ds_create_walk_state() is freed on errors, but it is not popped from the thread beforehand. Thus acpi_ds_get_current_walk_state() called by acpi_ps_parse_aml() subsequently returns it as the new walk state which is incorrect.
To address this, make acpi_ds_call_control_method() call acpi_ds_pop_walk_state() to pop next_walk_state from the thread before returning an error.
--- drivers/acpi/acpica/dsmethod.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/acpi/acpica/dsmethod.c +8 -2
@@ -517,7 +517,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, info =ACPI_ALLOCATE_ZEROED (sizeof (struct acpi_evaluate_info ));if (!info) { status =AE_NO_MEMORY ; - goto cleanup; + goto pop_walk_state; } info->parameters = &this_walk_state->operands[0 ];
@@ -529,7 +529,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,ACPI_FREE (info);if (ACPI_FAILURE (status)) { - goto cleanup; + goto pop_walk_state; } next_walk_state->method_nesting_depth =
@@ -575,6 +575,12 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,return_ACPI_STATUS (status); +pop_walk_state: + +/* On error, pop the walk state to be deleted from thread */ + +acpi_ds_pop_walk_state (thread); + cleanup:/* On error, we must terminate the method properly */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 952/1146 thermal/core: Ensure that thermal device is registered in thermal_zone_get_temp
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 1c6b30060777352e7881383bab726046d8c3c610 ]
Calls to thermal_zone_get_temp() are not protected against thermal zone device removal. As result, it is possible that the thermal zone operations callbacks are no longer valid when thermal_zone_get_temp() is called. This may result in crashes such as
BUG: unable to handle page fault for address: ffffffffc04ef420 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 5d60e067 P4D 5d60e067 PUD 5d610067 PMD 110197067 PTE 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 1 PID: 3209 Comm: cat Tainted: G W 5.10.136-19389-g615abc6eb807 #1 02df41ac0b12f3a64f4b34245188d8875bb3bce1 Hardware name: Google Coral/Coral, BIOS Google_Coral.10068.92.0 11/27/2018 RIP: 0010:thermal_zone_get_temp+0x26/0x73 Code: 89 c3 eb d3 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 53 48 85 ff 74 50 48 89 fb 48 81 ff 00 f0 ff ff 77 44 48 8b 83 98 03 00 00 <48> 83 78 10 00 74 36 49 89 f6 4c 8d bb d8 03 00 00 4c 89 ff e8 9f RSP: 0018:ffffb3758138fd38 EFLAGS: 00010287 RAX: ffffffffc04ef410 RBX: ffff98f14d7fb000 RCX: 0000000000000000 RDX: ffff98f17cf90000 RSI: ffffb3758138fd64 RDI: ffff98f14d7fb000 RBP: ffffb3758138fd50 R08: 0000000000001000 R09: ffff98f17cf90000 R10: 0000000000000000 R11: ffffffff8dacad28 R12: 0000000000001000 R13: ffff98f1793a7d80 R14: ffff98f143231708 R15: ffff98f14d7fb018 FS: 00007ec166097800(0000) GS:ffff98f1bbd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffc04ef420 CR3: 000000010ee9a000 CR4: 00000000003506e0 Call Trace: temp_show+0x31/0x68 dev_attr_show+0x1d/0x4f sysfs_kf_seq_show+0x92/0x107 seq_read_iter+0xf5/0x3f2 vfs_read+0x205/0x379 __x64_sys_read+0x7c/0xe2 do_syscall_64+0x43/0x55 entry_SYSCALL_64_after_hwframe+0x61/0xc6
if a thermal device is removed while accesses to its device attributes are ongoing.
The problem is exposed by code in iwl_op_mode_mvm_start(), which registers a thermal zone device only to unregister it shortly afterwards if an unrelated failure is encountered while accessing the hardware.
Check if the thermal zone device is registered after acquiring the thermal zone device mutex to ensure this does not happen.
The code was tested by triggering the failure in iwl_op_mode_mvm_start() on purpose. Without this patch, the kernel crashes reliably. The crash is no longer observed after applying this and the preceding patches.
--- drivers/thermal/thermal_helpers.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/thermal/thermal_helpers.c +6 -1
@@ -115,7 +115,12 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)int ret;mutex_lock (&tz->lock); - ret =__thermal_zone_get_temp (tz, temp); + +if (device_is_registered (&tz->device)) + ret =__thermal_zone_get_temp (tz, temp); +else + ret = -ENODEV ; +mutex_unlock (&tz->lock);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 953/1146 ACPI: video: Change GIGABYTE GB-BXBT-2807 quirk to force_none
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 9f7dd272ff9338f1f43c7a837d5a7ee67811d552 ]
The GIGABYTE GB-BXBT-2807 DMI quirk was added by commit 25417185e9b5 ("ACPI: video: Add DMI quirk for GIGABYTE GB-BXBT-2807") which says the following in its commit message:
"The GIGABYTE GB-BXBT-2807 is a mini-PC which uses off the shelf components, like an Intel GPU which is meant for mobile systems. As such, it, by default, has a backlight controller exposed.
Unfortunately, the backlight controller only confuses userspace, which sees the existence of a backlight device node and has the unrealistic belief that there is actually a backlight there!
Add a DMI quirk to force the backlight off on this system."
So in essence this quirk was using a video_detect_force_vendor quirk to disable backlight control. Now a days we have a specific "none" backlight type for this. Change the quirk to video_detect_force_none and group it together with the other force_none quirks.
--- drivers/acpi/video_detect.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/acpi/video_detect.c +8 -8
@@ -197,14 +197,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "1015CX"), }, }, - { - .callback = video_detect_force_vendor, -/* GIGABYTE GB-BXBT-2807 */ - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), - DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"), - }, - }, { .callback = video_detect_force_vendor,/* Samsung N150/N210/N220 */
@@ -671,6 +663,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"), }, }, + { + .callback = video_detect_force_none, +/* GIGABYTE GB-BXBT-2807 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"), + }, + }, { .callback = video_detect_force_none,/* MSI MS-7721 */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 954/1146 ACPI: video: Change Sony Vaio VPCEH3U1E quirk to force_native
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 84d56f326a8ef0071df8c0c3b983b9e2c3b73006 ]
According to: https://bugzilla.kernel.org/show_bug.cgi?id=202401
the Sony Vaio VPCEH3U1E quirk was added to disable the acpi_video0 backlight interface because that was not working, so that userspace will pick the actually working native nv_backlight interface instead.
With the new kernel behavior of hiding native interfaces unless acpi_video_get_backlight_type() returns native, the current video_detect_force_vendor quirk will cause the working nv_backlight interface will be disabled too.
Change the quirk to video_detect_force_native to get the desired result of only registering the nv_backlight interface.
After this all currently remaining force_vendor quirks in video_detect_dmi_table[] are there to prefer a vendor interface over a non working ACPI video interface, add a comment to document this.
--- drivers/acpi/video_detect.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/acpi/video_detect.c +13 -8
@@ -132,6 +132,10 @@ static int video_detect_force_none(const struct dmi_system_id *d) }static const struct dmi_system_id video_detect_dmi_table[] = { +/* +* Models which should use the vendor backlight interface, +* because of broken ACPI video backlight control. +*/ {/* https://bugzilla.redhat.com/show_bug.cgi?id=1128309 */ .callback = video_detect_force_vendor,
@@ -224,14 +228,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "NC210/NC110"), }, }, - { - .callback = video_detect_force_vendor, -/* Sony VPCEH3U1E */ - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), - DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"), - }, - }, { .callback = video_detect_force_vendor,/* Xiaomi Mi Pad 2 */
@@ -601,6 +597,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "N250P"), }, }, + { + /* https://bugzilla.kernel.org/show_bug.cgi?id=202401 */ + .callback = video_detect_force_native, + /* Sony Vaio VPCEH3U1E */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"), + }, + },/* * These Toshibas have a broken acpi-video interface for brightness
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 955/1146 ACPI: video: Add force_vendor quirk for Sony Vaio PCG-FRV35
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 23735543eb228c604e59f99f2f5d13aa507e5db2 ]
The Sony Vaio PCG-FRV35 advertises both native and vendor backlight control interfaces. With the upcoming changes to prefer native over vendor acpi_video_get_backlight_type() will start returning native on these laptops.
But the native radeon_bl0 interface does not work, where as the sony vendor interface does work. Add a quirk to force use of the vendor interface.
--- drivers/acpi/video_detect.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/acpi/video_detect.c +13 -0
@@ -237,6 +237,19 @@ static const struct dmi_system_id video_detect_dmi_table[] = { }, }, +/* +* Models which should use the vendor backlight interface, +* because of broken native backlight control. +*/ + { + .callback = video_detect_force_vendor, + /* Sony Vaio PCG-FRV35 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PCG-FRV35"), + }, + }, + /* * Toshiba models with Transflective display, these need to use * the toshiba_acpi vendor driver for proper Transflective handling.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 956/1146 ACPI: video: Add force_native quirk for Sony Vaio VPCY11S1E
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit f5a6ff923d4a1d639da36228d00e95ff67d417f0 ]
The Sony Vaio VPCY11S1E advertises both native and ACPI video backlight control interfaces, but only the native interface works and the default heuristics end up picking ACPI video on this model.
Add a video_detect_force_native DMI quirk for this.
--- drivers/acpi/video_detect.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/video_detect.c +8 -0
@@ -619,6 +619,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"), }, }, + { + .callback = video_detect_force_native, + /* Sony Vaio VPCY11S1E */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCY11S1E"), + }, + },/* * These Toshibas have a broken acpi-video interface for brightness
Signature · 1 line
2.35.1