5.9.2-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 136/757 media: omap3isp: Fix memleak in isp_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit d8fc21c17099635e8ebd986d042be65a6c6b5bd0 ]
When devm_ioremap_resource() fails, isp should be
freed just like other error paths in isp_probe.
--- drivers/media/platform/omap3isp/isp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/omap3isp/isp.c +4 -2
@@ -2328,8 +2328,10 @@ static int isp_probe(struct platform_device *pdev) mem =platform_get_resource (pdev,IORESOURCE_MEM , i); isp->mmio_base[map_idx] =devm_ioremap_resource (isp->dev, mem); -if (IS_ERR (isp->mmio_base[map_idx])) -return PTR_ERR (isp->mmio_base[map_idx]); +if (IS_ERR (isp->mmio_base[map_idx])) { + ret =PTR_ERR (isp->mmio_base[map_idx]); + goto error; + } } ret =isp_get_clocks (isp);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 137/757 media: i2c: ov5640: Remain in power down for DVP mode unless streaming
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 3b987d70e903962eb8c5961ba166c345a49d1a0b ]
Keep the sensor in software power down mode and wake up only in ov5640_set_stream_dvp() callback.
--- drivers/media/i2c/ov5640.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/media/i2c/ov5640.c +16 -3
@@ -34,6 +34,8 @@#define OV5640_REG_SYS_RESET02 0x3002#define OV5640_REG_SYS_CLOCK_ENABLE02 0x3006#define OV5640_REG_SYS_CTRL0 0x3008 +#define OV5640_REG_SYS_CTRL0_SW_PWDN 0x42 +#define OV5640_REG_SYS_CTRL0_SW_PWUP 0x02#define OV5640_REG_CHIP_ID 0x300a#define OV5640_REG_IO_MIPI_CTRL00 0x300e#define OV5640_REG_PAD_OUTPUT_ENABLE01 0x3017
@@ -1120,6 +1122,12 @@ static int ov5640_load_regs(struct ov5640_dev *sensor, val = regs->val; mask = regs->mask; +/* remain in power down mode for DVP */ +if (regs->reg_addr ==OV5640_REG_SYS_CTRL0 && + val ==OV5640_REG_SYS_CTRL0_SW_PWUP && + sensor->ep.bus_type !=V4L2_MBUS_CSI2_DPHY ) +continue ; +if (mask) ret =ov5640_mod_reg (sensor, reg_addr, mask, val);else
@@ -1297,9 +1305,14 @@ static int ov5640_set_stream_dvp(struct ov5640_dev *sensor, bool on)* PAD OUTPUT ENABLE 02 * - [7:2]: D[5:0] output enable */ -return ov5640_write_reg (sensor, -OV5640_REG_PAD_OUTPUT_ENABLE02 , - on ?0xfc :0 ); + ret =ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE02 , + on ?0xfc :0 ); +if (ret) +return ret; + +return ov5640_write_reg (sensor,OV5640_REG_SYS_CTRL0 , on ? +OV5640_REG_SYS_CTRL0_SW_PWUP : +OV5640_REG_SYS_CTRL0_SW_PWDN ); }static int ov5640_set_stream_mipi (struct ov5640_dev *sensor,bool on)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 138/757 media: i2c: ov5640: Separate out mipi configuration from s_power
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit b1751ae652fb95919c08df5bdd739ccf9886158a ]
In preparation for adding DVP configuration in s_power callback move mipi configuration into separate function
--- drivers/media/i2c/ov5640.c | 116 +++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 56 deletions(-)
drivers/media/i2c/ov5640.c +60 -56
@@ -2014,6 +2014,61 @@ static void ov5640_set_power_off(struct ov5640_dev *sensor)clk_disable_unprepare (sensor->xclk); } +static int ov5640_set_power_mipi (struct ov5640_dev *sensor,bool on) +{ +int ret; + +if (!on) { +/* Reset MIPI bus settings to their default values. */ +ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x58 ); +ov5640_write_reg (sensor,OV5640_REG_MIPI_CTRL00 ,0x04 ); +ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT00 ,0x00 ); +return 0 ; + } + +/* +* Power up MIPI HS Tx and LS Rx; 2 data lanes mode +* +* 0x300e = 0x40 +* [7:5] = 010 : 2 data lanes mode (see FIXME note in +* "ov5640_set_stream_mipi()") +* [4] = 0 : Power up MIPI HS Tx +* [3] = 0 : Power up MIPI LS Rx +* [2] = 0 : MIPI interface disabled +*/ + ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x40 ); +if (ret) +return ret; + +/* +* Gate clock and set LP11 in 'no packets mode' (idle) +* +* 0x4800 = 0x24 +* [5] = 1 : Gate clock when 'no packets' +* [2] = 1 : MIPI bus in LP11 when 'no packets' +*/ + ret =ov5640_write_reg (sensor,OV5640_REG_MIPI_CTRL00 ,0x24 ); +if (ret) +return ret; + +/* +* Set data lanes and clock in LP11 when 'sleeping' +* +* 0x3019 = 0x70 +* [6] = 1 : MIPI data lane 2 in LP11 when 'sleeping' +* [5] = 1 : MIPI data lane 1 in LP11 when 'sleeping' +* [4] = 1 : MIPI clock lane in LP11 when 'sleeping' +*/ + ret =ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT00 ,0x70 ); +if (ret) +return ret; + +/* Give lanes some time to coax into LP11 state. */ +usleep_range (500 ,1000 ); + +return 0 ; +} +static int ov5640_set_power (struct ov5640_dev *sensor,bool on) {int ret =0 ;
@@ -2026,67 +2081,16 @@ static int ov5640_set_power(struct ov5640_dev *sensor, bool on) ret =ov5640_restore_mode (sensor);if (ret) goto power_off; + } -/* We're done here for DVP bus, while CSI-2 needs setup. */ -if (sensor->ep.bus_type !=V4L2_MBUS_CSI2_DPHY ) -return 0 ; - -/* -* Power up MIPI HS Tx and LS Rx; 2 data lanes mode -* -* 0x300e = 0x40 -* [7:5] = 010 : 2 data lanes mode (see FIXME note in -* "ov5640_set_stream_mipi()") -* [4] = 0 : Power up MIPI HS Tx -* [3] = 0 : Power up MIPI LS Rx -* [2] = 0 : MIPI interface disabled -*/ - ret =ov5640_write_reg (sensor, -OV5640_REG_IO_MIPI_CTRL00 ,0x40 ); -if (ret) - goto power_off; - -/* -* Gate clock and set LP11 in 'no packets mode' (idle) -* -* 0x4800 = 0x24 -* [5] = 1 : Gate clock when 'no packets' -* [2] = 1 : MIPI bus in LP11 when 'no packets' -*/ - ret =ov5640_write_reg (sensor, -OV5640_REG_MIPI_CTRL00 ,0x24 ); -if (ret) - goto power_off; - -/* -* Set data lanes and clock in LP11 when 'sleeping' -* -* 0x3019 = 0x70 -* [6] = 1 : MIPI data lane 2 in LP11 when 'sleeping' -* [5] = 1 : MIPI data lane 1 in LP11 when 'sleeping' -* [4] = 1 : MIPI clock lane in LP11 when 'sleeping' -*/ - ret =ov5640_write_reg (sensor, -OV5640_REG_PAD_OUTPUT00 ,0x70 ); +if (sensor->ep.bus_type ==V4L2_MBUS_CSI2_DPHY ) { + ret =ov5640_set_power_mipi (sensor, on);if (ret) goto power_off; + } -/* Give lanes some time to coax into LP11 state. */ -usleep_range (500 ,1000 ); - - }else { -if (sensor->ep.bus_type ==V4L2_MBUS_CSI2_DPHY ) { -/* Reset MIPI bus settings to their default values. */ -ov5640_write_reg (sensor, -OV5640_REG_IO_MIPI_CTRL00 ,0x58 ); -ov5640_write_reg (sensor, -OV5640_REG_MIPI_CTRL00 ,0x04 ); -ov5640_write_reg (sensor, -OV5640_REG_PAD_OUTPUT00 ,0x00 ); - } - +if (!on)ov5640_set_power_off (sensor); - }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 139/757 media: i2c: ov5640: Enable data pins on poweron for DVP mode
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 576f5d4ba8f672953513280510abf9a736b015cc ]
During testing this sensor on iW-RainboW-G21D-Qseven platform in 8-bit DVP mode with rcar-vin bridge noticed the capture worked fine for the first run (with yavta), but for subsequent runs the bridge driver waited for the frame to be captured. Debugging further noticed the data lines were enabled/disabled in stream on/off callback and dumping the register contents 0x3017/0x3018 in ov5640_set_stream_dvp() reported the correct values, but yet frame capturing failed.
To get around this issue data lines are enabled in s_power callback. (Also the sensor remains in power down mode if not streaming so power consumption shouldn't be affected)
--- drivers/media/i2c/ov5640.c | 73 +++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 33 deletions(-)
drivers/media/i2c/ov5640.c +40 -33
@@ -276,8 +276,7 @@ static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)/* YUV422 UYVY VGA@30fps */ static const struct reg_value ov5640_init_setting_30fps_VGA[] = { {0x3103 ,0x11 ,0 ,0 }, {0x3008 ,0x82 ,0 ,5 }, {0x3008 ,0x42 ,0 ,0 }, - {0x3103 ,0x03 ,0 ,0 }, {0x3017 ,0x00 ,0 ,0 }, {0x3018 ,0x00 ,0 ,0 }, - {0x3630 ,0x36 ,0 ,0 }, + {0x3103 ,0x03 ,0 ,0 }, {0x3630 ,0x36 ,0 ,0 }, {0x3631 ,0x0e ,0 ,0 }, {0x3632 ,0xe2 ,0 ,0 }, {0x3633 ,0x12 ,0 ,0 }, {0x3621 ,0xe0 ,0 ,0 }, {0x3704 ,0xa0 ,0 ,0 }, {0x3703 ,0x5a ,0 ,0 }, {0x3715 ,0x78 ,0 ,0 }, {0x3717 ,0x01 ,0 ,0 }, {0x370b ,0x60 ,0 ,0 },
@@ -1283,33 +1282,6 @@ static int ov5640_set_stream_dvp(struct ov5640_dev *sensor, bool on)if (ret)return ret; -/* -* enable VSYNC/HREF/PCLK DVP control lines -* & D[9:6] DVP data lines -* -* PAD OUTPUT ENABLE 01 -* - 6: VSYNC output enable -* - 5: HREF output enable -* - 4: PCLK output enable -* - [3:0]: D[9:6] output enable -*/ - ret =ov5640_write_reg (sensor, -OV5640_REG_PAD_OUTPUT_ENABLE01 , - on ?0x7f :0 ); -if (ret) -return ret; - -/* -* enable D[5:0] DVP data lines -* -* PAD OUTPUT ENABLE 02 -* - [7:2]: D[5:0] output enable -*/ - ret =ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE02 , - on ?0xfc :0 ); -if (ret) -return ret; -return ov5640_write_reg (sensor,OV5640_REG_SYS_CTRL0 , on ?OV5640_REG_SYS_CTRL0_SW_PWUP :OV5640_REG_SYS_CTRL0_SW_PWDN );
@@ -2069,6 +2041,40 @@ static int ov5640_set_power_mipi(struct ov5640_dev *sensor, bool on)return 0 ; } +static int ov5640_set_power_dvp (struct ov5640_dev *sensor,bool on) +{ +int ret; + +if (!on) { +/* Reset settings to their default values. */ +ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE01 ,0x00 ); +ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE02 ,0x00 ); +return 0 ; + } + +/* +* enable VSYNC/HREF/PCLK DVP control lines +* & D[9:6] DVP data lines +* +* PAD OUTPUT ENABLE 01 +* - 6: VSYNC output enable +* - 5: HREF output enable +* - 4: PCLK output enable +* - [3:0]: D[9:6] output enable +*/ + ret =ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE01 ,0x7f ); +if (ret) +return ret; + +/* +* enable D[5:0] DVP data lines +* +* PAD OUTPUT ENABLE 02 +* - [7:2]: D[5:0] output enable +*/ +return ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE02 ,0xfc ); +} +static int ov5640_set_power (struct ov5640_dev *sensor,bool on) {int ret =0 ;
@@ -2083,11 +2089,12 @@ static int ov5640_set_power(struct ov5640_dev *sensor, bool on) goto power_off; } -if (sensor->ep.bus_type ==V4L2_MBUS_CSI2_DPHY ) { +if (sensor->ep.bus_type ==V4L2_MBUS_CSI2_DPHY ) ret =ov5640_set_power_mipi (sensor, on); -if (ret) - goto power_off; - } +else + ret =ov5640_set_power_dvp (sensor, on); +if (ret) + goto power_off;if (!on)ov5640_set_power_off (sensor);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 140/757 media: rcar_drif: Fix fwnode reference leak when parsing DT
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit cdd4f7824994c9254acc6e415750529ea2d2cfe0 ]
The fwnode reference corresponding to the endpoint is leaked in an error path of the rcar_drif_parse_subdevs() function. Fix it, and reorganize fwnode reference handling in the function to release references early, simplifying error paths.
--- drivers/media/platform/rcar_drif.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/media/platform/rcar_drif.c +5 -11
@@ -1227,28 +1227,22 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)if (!ep)return 0 ; +/* Get the endpoint properties */ +rcar_drif_get_ep_properties (sdr, ep); + fwnode =fwnode_graph_get_remote_port_parent (ep); +fwnode_handle_put (ep);if (!fwnode) {dev_warn (sdr->dev,"bad remote port parent\n" ); -fwnode_handle_put (ep);return -EINVAL ; } sdr->ep.asd.match.fwnode = fwnode; sdr->ep.asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; ret =v4l2_async_notifier_add_subdev (notifier, &sdr->ep.asd); -if (ret) { -fwnode_handle_put (fwnode); -return ret; - } - -/* Get the endpoint properties */ -rcar_drif_get_ep_properties (sdr, ep); -fwnode_handle_put (fwnode); -fwnode_handle_put (ep); -return 0 ; +return ret; }/* Check if the given device is the primary bond */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 141/757 media: rcar_drif: Allocate v4l2_async_subdev dynamically
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 468e986dac0e94194334ca6d0abf3af8c250792e ]
v4l2_async_notifier_add_subdev() requires the asd to be allocated dynamically, but the rcar-drif driver embeds it in the rcar_drif_graph_ep structure. This causes memory corruption when the notifier is destroyed at remove time with v4l2_async_notifier_cleanup().
Fix this issue by registering the asd with v4l2_async_notifier_add_fwnode_subdev(), which allocates it dynamically internally.
--- drivers/media/platform/rcar_drif.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/media/platform/rcar_drif.c +6 -12
@@ -185,7 +185,6 @@ struct rcar_drif_frame_buf {/* OF graph endpoint's V4L2 async data */ struct rcar_drif_graph_ep {struct v4l2_subdev *subdev;/* Async matched subdev */ -struct v4l2_async_subdev asd;/* Async sub-device descriptor */ };/* DMA buffer */
@@ -1109,12 +1108,6 @@ static int rcar_drif_notify_bound(struct v4l2_async_notifier *notifier,struct rcar_drif_sdr *sdr = container_of(notifier, struct rcar_drif_sdr, notifier); -if (sdr->ep.asd.match.fwnode != -of_fwnode_handle (subdev->dev->of_node)) { -rdrif_err (sdr,"subdev %s cannot bind\n" , subdev->name); -return -EINVAL ; - } -v4l2_set_subdev_hostdata (subdev, sdr); sdr->ep.subdev = subdev;rdrif_dbg (sdr,"bound asd %s\n" , subdev->name);
@@ -1218,7 +1211,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr) {struct v4l2_async_notifier *notifier = &sdr->notifier;struct fwnode_handle *fwnode, *ep; -int ret; +struct v4l2_async_subdev *asd;v4l2_async_notifier_init (notifier);
@@ -1237,12 +1230,13 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)return -EINVAL ; } - sdr->ep.asd.match.fwnode = fwnode; - sdr->ep.asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - ret =v4l2_async_notifier_add_subdev (notifier, &sdr->ep.asd); + asd =v4l2_async_notifier_add_fwnode_subdev (notifier, fwnode, +sizeof (*asd));fwnode_handle_put (fwnode); +if (IS_ERR (asd)) +return PTR_ERR (asd); -return ret; +return 0 ; }/* Check if the given device is the primary bond */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 142/757 media: rcar-csi2: Allocate v4l2_async_subdev dynamically
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 2cac7cbfb4099980e78244359ab9c6f056d6a7ec ]
v4l2_async_notifier_add_subdev() requires the asd to be allocated dynamically, but the rcar-csi2 driver embeds it in the rcar_csi2 structure. This causes memory corruption when the notifier is destroyed at remove time with v4l2_async_notifier_cleanup().
Fix this issue by registering the asd with v4l2_async_notifier_add_fwnode_subdev(), which allocates it dynamically internally.
--- drivers/media/platform/rcar-vin/rcar-csi2.c | 24 +++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/media/platform/rcar-vin/rcar-csi2.c +10 -14
@@ -362,7 +362,6 @@ struct rcar_csi2 {struct media_pad pads[NR_OF_RCAR_CSI2_PAD ];struct v4l2_async_notifier notifier; -struct v4l2_async_subdev asd;struct v4l2_subdev *remote;struct v4l2_mbus_framefmt mf;
@@ -811,6 +810,8 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv,static int rcsi2_parse_dt (struct rcar_csi2 *priv) { +struct v4l2_async_subdev *asd; +struct fwnode_handle *fwnode;struct device_node *ep;struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 };int ret;
@@ -834,24 +835,19 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)return ret; } - priv->asd.match.fwnode = -fwnode_graph_get_remote_endpoint (of_fwnode_handle (ep)); - priv->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - + fwnode =fwnode_graph_get_remote_endpoint (of_fwnode_handle (ep));of_node_put (ep); -v4l2_async_notifier_init (&priv->notifier); - - ret =v4l2_async_notifier_add_subdev (&priv->notifier, &priv->asd); -if (ret) { -fwnode_handle_put (priv->asd.match.fwnode); -return ret; - } +dev_dbg (priv->dev,"Found '%pOF'\n" ,to_of_node (fwnode)); +v4l2_async_notifier_init (&priv->notifier); priv->notifier.ops = &rcar_csi2_notify_ops; -dev_dbg (priv->dev,"Found '%pOF'\n" , -to_of_node (priv->asd.match.fwnode)); + asd =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, fwnode, +sizeof (*asd)); +fwnode_handle_put (fwnode); +if (IS_ERR (asd)) +return PTR_ERR (asd); ret =v4l2_async_subdev_notifier_register (&priv->subdev, &priv->notifier);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 143/757 media: i2c: max9286: Allocate v4l2_async_subdev dynamically
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 86d37bf31af647760f1f17e7c1afa1bdba075198 ]
v4l2_async_notifier_add_subdev() requires the asd to be allocated dynamically, but the max9286 driver embeds it in the max9286_source structure. This causes memory corruption when the notifier is destroyed at remove time with v4l2_async_notifier_cleanup().
Fix this issue by registering the asd with v4l2_async_notifier_add_fwnode_subdev(), which allocates it dynamically internally. A new max9286_asd structure is introduced, to store a pointer to the corresonding max9286_source that needs to be accessed from bound and unbind callbacks. There's no need to take an extra explicit reference to the fwnode anymore as v4l2_async_notifier_add_fwnode_subdev() does so internally.
While at it, use %u instead of %d to print the unsigned index in the error message from the v4l2_async_notifier_add_fwnode_subdev() error path.
--- drivers/media/i2c/max9286.c | 40 +++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-)
drivers/media/i2c/max9286.c +21 -19
@@ -135,13 +135,19 @@#define MAX9286_SRC_PAD 4struct max9286_source { -struct v4l2_async_subdev asd;struct v4l2_subdev *sd;struct fwnode_handle *fwnode; }; -#define asd_to_max9286_source (_asd) \ - container_of(_asd, struct max9286_source, asd) +struct max9286_asd { +struct v4l2_async_subdev base; +struct max9286_source *source; +}; + +static inline struct max9286_asd *to_max9286_asd (struct v4l2_async_subdev *asd) +{ + return container_of(asd, struct max9286_asd, base); +}struct max9286_priv {struct i2c_client *client;
@@ -481,7 +487,7 @@ static int max9286_notify_bound(struct v4l2_async_notifier *notifier, struct v4l2_async_subdev *asd) {struct max9286_priv *priv =sd_to_max9286 (notifier->sd); -struct max9286_source *source =asd_to_max9286_source (asd); +struct max9286_source *source =to_max9286_asd (asd)->source;unsigned int index =to_index (priv, source);unsigned int src_pad;int ret;
@@ -545,7 +551,7 @@ static void max9286_notify_unbind(struct v4l2_async_notifier *notifier, struct v4l2_async_subdev *asd) {struct max9286_priv *priv =sd_to_max9286 (notifier->sd); -struct max9286_source *source =asd_to_max9286_source (asd); +struct max9286_source *source =to_max9286_asd (asd)->source;unsigned int index =to_index (priv, source); source->sd =NULL ;
@@ -570,23 +576,19 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)for_each_source (priv, source) {unsigned int i =to_index (priv, source); - - source->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - source->asd.match.fwnode = source->fwnode; - - ret =v4l2_async_notifier_add_subdev (&priv->notifier, - &source->asd); -if (ret) { -dev_err (dev,"Failed to add subdev for source %d" , i); +struct v4l2_async_subdev *asd; + + asd =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, + source->fwnode, +sizeof (*asd)); +if (IS_ERR (asd)) { +dev_err (dev,"Failed to add subdev for source %u: %ld" , + i,PTR_ERR (asd));v4l2_async_notifier_cleanup (&priv->notifier); -return ret; +return PTR_ERR (asd); } -/* -* Balance the reference counting handled through -* v4l2_async_notifier_cleanup() -*/ -fwnode_handle_get (source->fwnode); +to_max9286_asd (asd)->source = source; } priv->notifier.ops = &max9286_notify_ops;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 144/757 crypto: sa2ul - fix compiler warning produced by clang
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit 17bce37e1b5eca95f9da783a07930b6d608c1389 ]
Clang detects a warning for an assignment that doesn't really do anything. Fix this by removing the offending piece of code.
--- drivers/crypto/sa2ul.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/crypto/sa2ul.c +2 -4
@@ -1148,12 +1148,10 @@ static int sa_run(struct sa_req *req) ret =sg_split (req->dst, mapped_dst_nents,0 ,1 , &split_size, &dst, &dst_nents, gfp_flags); -if (ret) { - dst_nents = dst_nents; +if (ret) dst = req->dst; - }else { +else rxd->split_dst_sg = dst; - } } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 145/757 spi: fsi: Handle 9 to 15 byte transfers lengths
In reply to Greg Kroah-HartmanFrom: Brad Bishop <[email protected]>
[ Upstream commit 2b3cef0fc757bd06ed9b83bd4c436bfa55f47370 ]
The trailing <len> - 8 bytes of transfer data in this size range is no longer ignored.
--- drivers/spi/spi-fsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/spi/spi-fsi.c +3 -3
@@ -258,15 +258,15 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx,if (loops >1 ) {fsi_spi_sequence_add (seq,SPI_FSI_SEQUENCE_BRANCH (idx)); -if (rem) -fsi_spi_sequence_add (seq, rem); - rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG ,SPI_FSI_COUNTER_CFG_LOOPS (loops -1 ));if (rc)return rc; } +if (rem) +fsi_spi_sequence_add (seq, rem); +return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 146/757 spi: fsi: Fix use of the bneq+ sequencer instruction
In reply to Greg Kroah-HartmanFrom: Brad Bishop <[email protected]>
[ Upstream commit 7909eebb2bea7fdbb2de0aa794cf29843761ed5b ]
All of the switches in N2_count_control in the counter configuration are required to make the branch if not equal and increment command work. Set them when using bneq+.
A side effect of this mode requires a dummy write to TDR when both transmitting and receiving otherwise the controller won't start shifting receive data.
It is likely not possible to avoid TDR underrun errors in this mode and they are harmless, so do not check for them.
--- drivers/spi/spi-fsi.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/spi/spi-fsi.c +25 -3
@@ -29,6 +29,10 @@#define SPI_FSI_ERROR 0x0#define SPI_FSI_COUNTER_CFG 0x1#define SPI_FSI_COUNTER_CFG_LOOPS (x) (((u64)(x) & 0xffULL) << 32) +#define SPI_FSI_COUNTER_CFG_N2_RX BIT_ULL(8) +#define SPI_FSI_COUNTER_CFG_N2_TX BIT_ULL(9) +#define SPI_FSI_COUNTER_CFG_N2_IMPLICIT BIT_ULL(10) +#define SPI_FSI_COUNTER_CFG_N2_RELOAD BIT_ULL(11)#define SPI_FSI_CFG1 0x2#define SPI_FSI_CLOCK_CFG 0x3#define SPI_FSI_CLOCK_CFG_MM_ENABLE BIT_ULL(32)
@@ -61,7 +65,7 @@#define SPI_FSI_STATUS_RDR_OVERRUN BIT_ULL(62)#define SPI_FSI_STATUS_RDR_FULL BIT_ULL(63)#define SPI_FSI_STATUS_ANY_ERROR \ - (SPI_FSI_STATUS_ERROR | SPI_FSI_STATUS_TDR_UNDERRUN | \ + (SPI_FSI_STATUS_ERROR | \ SPI_FSI_STATUS_TDR_OVERRUN | SPI_FSI_STATUS_RDR_UNDERRUN | \ SPI_FSI_STATUS_RDR_OVERRUN)#define SPI_FSI_PORT_CTRL 0x9
@@ -238,6 +242,7 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx,int rc;u8 len =min (transfer->len,8U );u8 rem = transfer->len % len; +u64 cfg =0ULL ; loops = transfer->len / len;
@@ -258,8 +263,14 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx,if (loops >1 ) {fsi_spi_sequence_add (seq,SPI_FSI_SEQUENCE_BRANCH (idx)); - rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG , -SPI_FSI_COUNTER_CFG_LOOPS (loops -1 )); + cfg =SPI_FSI_COUNTER_CFG_LOOPS (loops -1 ); +if (transfer->rx_buf) + cfg |=SPI_FSI_COUNTER_CFG_N2_RX | +SPI_FSI_COUNTER_CFG_N2_TX | +SPI_FSI_COUNTER_CFG_N2_IMPLICIT | +SPI_FSI_COUNTER_CFG_N2_RELOAD ; + + rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG , cfg);if (rc)return rc; }
@@ -275,6 +286,7 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx, {int rc =0 ;u64 status =0ULL ; +u64 cfg =0ULL ;if (transfer->tx_buf) {int nb;
@@ -312,6 +324,16 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,u64 in =0ULL ;u8 *rx = transfer->rx_buf; + rc =fsi_spi_read_reg (ctx,SPI_FSI_COUNTER_CFG , &cfg); +if (rc) +return rc; + +if (cfg &SPI_FSI_COUNTER_CFG_N2_IMPLICIT ) { + rc =fsi_spi_write_reg (ctx,SPI_FSI_DATA_TX ,0 ); +if (rc) +return rc; + } + while (transfer->len > recv) { do { rc = fsi_spi_read_reg(ctx, SPI_FSI_STATUS,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 147/757 spi: fsi: Implement restricted size for certain controllers
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
[ Upstream commit 49c9fc1d7c101eceaddb655e4f0e062b0c8f403b ]
Some of the FSI-attached SPI controllers cannot use the loop command in programming the sequencer due to security requirements. Check the devicetree compatibility that indicates this condition and restrict the size for these controllers. Also, add more transfers directly in the sequence up to the length of the sequence register.
--- drivers/spi/spi-fsi.c | 65 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-)
drivers/spi/spi-fsi.c +53 -12
@@ -24,7 +24,8 @@#define SPI_FSI_BASE 0x70000#define SPI_FSI_INIT_TIMEOUT_MS 1000 -#define SPI_FSI_MAX_TRANSFER_SIZE 2048 +#define SPI_FSI_MAX_XFR_SIZE 2048 +#define SPI_FSI_MAX_XFR_SIZE_RESTRICTED 32#define SPI_FSI_ERROR 0x0#define SPI_FSI_COUNTER_CFG 0x1
@@ -74,6 +75,8 @@ struct fsi_spi {struct device *dev;/* SPI controller device */ struct fsi_device *fsi;/* FSI2SPI CFAM engine device */ u32 base; +size_t max_xfr_size; +bool restricted; };struct fsi_spi_sequence {
@@ -209,8 +212,12 @@ static int fsi_spi_reset(struct fsi_spi *ctx)if (rc)return rc; -return fsi_spi_write_reg (ctx,SPI_FSI_CLOCK_CFG , -SPI_FSI_CLOCK_CFG_RESET2 ); + rc =fsi_spi_write_reg (ctx,SPI_FSI_CLOCK_CFG , +SPI_FSI_CLOCK_CFG_RESET2 ); +if (rc) +return rc; + +return fsi_spi_write_reg (ctx,SPI_FSI_STATUS ,0ULL ); }static int fsi_spi_sequence_add (struct fsi_spi_sequence *seq,u8 val)
@@ -218,8 +225,8 @@ static int fsi_spi_sequence_add(struct fsi_spi_sequence *seq, u8 val)/* * Add the next byte of instruction to the 8-byte sequence register. * Then decrement the counter so that the next instruction will go in -* the right place. Return the number of "slots" left in the sequence -* register. +* the right place. Return the index of the slot we just filled in the +* sequence register. */ seq->data |= (u64 )val << seq->bit; seq->bit -=8 ;
@@ -237,9 +244,11 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx,struct fsi_spi_sequence *seq, struct spi_transfer *transfer) { + bool docfg = false;int loops;int idx;int rc; +u8 val =0 ;u8 len =min (transfer->len,8U );u8 rem = transfer->len % len;u64 cfg =0ULL ;
@@ -247,22 +256,42 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx, loops = transfer->len / len;if (transfer->tx_buf) { - idx =fsi_spi_sequence_add (seq, -SPI_FSI_SEQUENCE_SHIFT_OUT (len)); + val =SPI_FSI_SEQUENCE_SHIFT_OUT (len); + idx =fsi_spi_sequence_add (seq, val); +if (rem) rem =SPI_FSI_SEQUENCE_SHIFT_OUT (rem); }else if (transfer->rx_buf) { - idx =fsi_spi_sequence_add (seq, -SPI_FSI_SEQUENCE_SHIFT_IN (len)); + val =SPI_FSI_SEQUENCE_SHIFT_IN (len); + idx =fsi_spi_sequence_add (seq, val); +if (rem) rem =SPI_FSI_SEQUENCE_SHIFT_IN (rem); }else {return -EINVAL ; } +if (ctx->restricted) { +const int eidx = rem ?5 :6 ; + +while (loops >1 && idx <= eidx) { + idx =fsi_spi_sequence_add (seq, val); + loops--; + docfg = true; + } + +if (loops >1 ) { +dev_warn (ctx->dev,"No sequencer slots; aborting.\n" ); +return -EINVAL ; + } + } +if (loops >1 ) {fsi_spi_sequence_add (seq,SPI_FSI_SEQUENCE_BRANCH (idx)); + docfg = true; + } +if (docfg) { cfg =SPI_FSI_COUNTER_CFG_LOOPS (loops -1 );if (transfer->rx_buf) cfg |= SPI_FSI_COUNTER_CFG_N2_RX |
@@ -273,6 +302,8 @@ static int fsi_spi_sequence_transfer(struct fsi_spi *ctx, rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG , cfg);if (rc)return rc; + }else { +fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG ,0ULL ); }if (rem)
@@ -429,7 +460,7 @@ static int fsi_spi_transfer_one_message(struct spi_controller *ctlr,/* Sequencer must do shift out (tx) first. */ if (!transfer->tx_buf || - transfer->len >SPI_FSI_MAX_TRANSFER_SIZE ) { + transfer->len > (ctx->max_xfr_size +8 )) { rc = -EINVAL ; goto error; }
@@ -453,7 +484,7 @@ static int fsi_spi_transfer_one_message(struct spi_controller *ctlr,/* Sequencer can only do shift in (rx) after tx. */ if (next->rx_buf) { -if (next->len >SPI_FSI_MAX_TRANSFER_SIZE ) { +if (next->len > ctx->max_xfr_size) { rc = -EINVAL ; goto error; }
@@ -498,7 +529,9 @@ static int fsi_spi_transfer_one_message(struct spi_controller *ctlr,static size_t fsi_spi_max_transfer_size (struct spi_device *spi) { -return SPI_FSI_MAX_TRANSFER_SIZE ; +struct fsi_spi *ctx =spi_controller_get_devdata (spi->controller); + +return ctx->max_xfr_size; }static int fsi_spi_probe (struct device *dev)
@@ -546,6 +579,14 @@ static int fsi_spi_probe(struct device *dev) ctx->fsi = fsi; ctx->base = base +SPI_FSI_BASE ; +if (of_device_is_compatible (np,"ibm,fsi2spi-restricted" )) { + ctx->restricted = true; + ctx->max_xfr_size =SPI_FSI_MAX_XFR_SIZE_RESTRICTED ; + }else { + ctx->restricted = false; + ctx->max_xfr_size =SPI_FSI_MAX_XFR_SIZE ; + } + rc =devm_spi_register_controller (dev, ctlr);if (rc)spi_controller_put (ctlr);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 148/757 spi: dw-pci: free previously allocated IRQs if desc->setup() fails
In reply to Greg Kroah-HartmanFrom: Jay Fang <[email protected]>
[ Upstream commit 9599f341889c87e56bb944659c32490d05e2532f ]
Free previously allocated IRQs when return an error code of desc->setup() which is not always successful. And simplify the code by adding a goto label.
--- drivers/spi/spi-dw-pci.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/spi/spi-dw-pci.c +9 -7
@@ -127,18 +127,16 @@ static int spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (desc->setup) { ret = desc->setup (dws);if (ret) -return ret; + goto err_free_irq_vectors; } }else { -pci_free_irq_vectors (pdev); -return -ENODEV ; + ret = -ENODEV ; + goto err_free_irq_vectors; } ret =dw_spi_add_host (&pdev->dev, dws); -if (ret) { -pci_free_irq_vectors (pdev); -return ret; - } +if (ret) + goto err_free_irq_vectors;/* PCI hook and SPI hook use the same drv data */ pci_set_drvdata (pdev, dws);
@@ -152,6 +150,10 @@ static int spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pm_runtime_allow (&pdev->dev);return 0 ; + +err_free_irq_vectors: +pci_free_irq_vectors (pdev); +return ret; }static void spi_pci_remove (struct pci_dev *pdev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 149/757 crypto: sa2ul - Select CRYPTO_AUTHENC
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 61f033ba18c37e6b9ddfc4ee6dffe049d981fe7e ]
The sa2ul driver uses crypto_authenc_extractkeys and therefore must select CRYPTO_AUTHENC.
--- drivers/crypto/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/Kconfig +1 -0
@@ -876,6 +876,7 @@ config CRYPTO_DEV_SA2UL select CRYPTO_SHA1 select CRYPTO_SHA256 select CRYPTO_SHA512 + select CRYPTO_AUTHENC select HW_RANDOM select SG_SPLIT help
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 150/757 crypto: omap-sham - fix digcnt register handling with export/import
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit 3faf757bad75f3fc1b2736f0431e295a073a7423 ]
Running export/import for hashes in peculiar order (mostly done by openssl) can mess up the internal book keeping of the OMAP SHA core. Fix by forcibly writing the correct DIGCNT back to hardware. This issue was noticed while transitioning to openssl 1.1 support.
--- drivers/crypto/omap-sham.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/crypto/omap-sham.c +3 -0
@@ -456,6 +456,9 @@ static void omap_sham_write_ctrl_omap4(struct omap_sham_dev *dd, size_t length,struct omap_sham_reqctx *ctx =ahash_request_ctx (dd->req);u32 val, mask; +if (likely (ctx->digcnt)) +omap_sham_write (dd,SHA_REG_DIGCNT (dd), ctx->digcnt); +/* * Setting ALGO_CONST only for the first iteration and * CLOSE_HASH only for the last one. Note that flags mode bits
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 151/757 crypto: sa2ul - Fix pm_runtime_get_sync() error checking
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 2baace5feb86c6916221911f391f11fcd8e1a259 ]
The pm_runtime_get_sync() function returns either 0 or 1 on success but this code treats a return of 1 as a failure.
--- drivers/crypto/sa2ul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/sa2ul.c +1 -1
@@ -2331,7 +2331,7 @@ static int sa_ul_probe(struct platform_device *pdev)pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev); -if (ret) { +if (ret <0 ) {dev_err (&pdev->dev,"%s: failed to get sync: %d\n" , __func__, ret);return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 152/757 selftests/seccomp: Use __NR_mknodat instead of __NR_mknod
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 05b52c6625278cc6ed1245a569167f86a971ff86 ]
The __NR_mknod syscall doesn't exist on arm64 (only __NR_mknodat). Switch to the modern syscall.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +1 -1
@@ -3715,7 +3715,7 @@ TEST(user_notification_filter_empty)if (pid ==0 ) {int listener; - listener =user_notif_syscall (__NR_mknod,SECCOMP_FILTER_FLAG_NEW_LISTENER ); + listener =user_notif_syscall (__NR_mknodat,SECCOMP_FILTER_FLAG_NEW_LISTENER );if (listener <0 )_exit (EXIT_FAILURE );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 153/757 selftests/seccomp: Refactor arch register macros to avoid xtensa special case
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit a6a4d78419a04095221ec2b518edefb080218d55 ]
To avoid an xtensa special-case, refactor all arch register macros to take the register variable instead of depending on the macro expanding as a struct member name.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +47 -50
@@ -1667,64 +1667,64 @@ TEST_F(TRACE_poke, getpid_runs_normally) }#if defined(__x86_64__) -# define ARCH_REGS struct user_regs_struct -# define SYSCALL_NUM orig_rax -# define SYSCALL_RET rax +# define ARCH_REGS struct user_regs_struct +# define SYSCALL_NUM (_regs) (_regs).orig_rax +# define SYSCALL_RET (_regs) (_regs).rax#elif defined(__i386__) -# define ARCH_REGS struct user_regs_struct -# define SYSCALL_NUM orig_eax -# define SYSCALL_RET eax +# define ARCH_REGS struct user_regs_struct +# define SYSCALL_NUM (_regs) (_regs).orig_eax +# define SYSCALL_RET (_regs) (_regs).eax#elif defined(__arm__) -# define ARCH_REGS struct pt_regs -# define SYSCALL_NUM ARM_r7 -# define SYSCALL_RET ARM_r0 +# define ARCH_REGS struct pt_regs +# define SYSCALL_NUM (_regs) (_regs).ARM_r7 +# define SYSCALL_RET (_regs) (_regs).ARM_r0#elif defined(__aarch64__) -# define ARCH_REGS struct user_pt_regs -# define SYSCALL_NUM regs[8] -# define SYSCALL_RET regs[0] +# define ARCH_REGS struct user_pt_regs +# define SYSCALL_NUM (_regs) (_regs).regs[8] +# define SYSCALL_RET (_regs) (_regs).regs[0]#elif defined(__riscv) && __riscv_xlen ==64 -# define ARCH_REGS struct user_regs_struct -# define SYSCALL_NUM a7 -# define SYSCALL_RET a0 +# define ARCH_REGS struct user_regs_struct +# define SYSCALL_NUM (_regs) (_regs).a7 +# define SYSCALL_RET (_regs) (_regs).a0#elif defined(__csky__) -# define ARCH_REGS struct pt_regs -#if defined(__CSKYABIV2__) -# define SYSCALL_NUM regs[3] -#else -# define SYSCALL_NUM regs[9] -#endif -# define SYSCALL_RET a0 +# define ARCH_REGS struct pt_regs +# if defined(__CSKYABIV2__) +# define SYSCALL_NUM (_regs) (_regs).regs[3] +# else +# define SYSCALL_NUM (_regs) (_regs).regs[9] +# endif +# define SYSCALL_RET (_regs) (_regs).a0#elif defined(__hppa__) -# define ARCH_REGS struct user_regs_struct -# define SYSCALL_NUM gr[20] -# define SYSCALL_RET gr[28] +# define ARCH_REGS struct user_regs_struct +# define SYSCALL_NUM (_regs) (_regs).gr[20] +# define SYSCALL_RET (_regs) (_regs).gr[28]#elif defined(__powerpc__) -# define ARCH_REGS struct pt_regs -# define SYSCALL_NUM gpr[0] -# define SYSCALL_RET gpr[3] +# define ARCH_REGS struct pt_regs +# define SYSCALL_NUM (_regs) (_regs).gpr[0] +# define SYSCALL_RET (_regs) (_regs).gpr[3]#elif defined(__s390__) -# define ARCH_REGS s390_regs -# define SYSCALL_NUM gprs[2] -# define SYSCALL_RET gprs[2] +# define ARCH_REGS s390_regs +# define SYSCALL_NUM (_regs) (_regs).gprs[2] +# define SYSCALL_RET (_regs) (_regs).gprs[2]# define SYSCALL_NUM_RET_SHARE_REG #elif defined(__mips__) -# define ARCH_REGS struct pt_regs -# define SYSCALL_NUM regs[2] -# define SYSCALL_SYSCALL_NUM regs[4] -# define SYSCALL_RET regs[2] +# define ARCH_REGS struct pt_regs +# define SYSCALL_NUM (_regs) (_regs).regs[2] +# define SYSCALL_SYSCALL_NUM regs[4] +# define SYSCALL_RET (_regs) (_regs).regs[2]# define SYSCALL_NUM_RET_SHARE_REG #elif defined(__xtensa__) -# define ARCH_REGS struct user_pt_regs -# define SYSCALL_NUM syscall +# define ARCH_REGS struct user_pt_regs +# define SYSCALL_NUM (_regs) (_regs).syscall/* * On xtensa syscall return value is in the register * a2 of the current window which is not fixed. */ -#define SYSCALL_RET (reg) a[(reg).windowbase * 4 + 2] +#define SYSCALL_RET (_regs) (_regs).a[(_regs).windowbase * 4 + 2]#elif defined(__sh__) -# define ARCH_REGS struct pt_regs -# define SYSCALL_NUM gpr[3] -# define SYSCALL_RET gpr[0] +# define ARCH_REGS struct pt_regs +# define SYSCALL_NUM (_regs) (_regs).gpr[3] +# define SYSCALL_RET (_regs) (_regs).gpr[0]#else # error "Do not know how to find your architecture's registers and syscalls"#endif
@@ -1773,10 +1773,10 @@ int get_syscall(struct __test_metadata *_metadata, pid_t tracee)#endif #if defined(__mips__) -if (regs.SYSCALL_NUM == __NR_O32_Linux) +if (SYSCALL_NUM (regs) == __NR_O32_Linux)return regs.SYSCALL_SYSCALL_NUM;#endif -return regs.SYSCALL_NUM; +return SYSCALL_NUM (regs); }/* Architecture-specific syscall changing routine. */
@@ -1799,14 +1799,14 @@ void change_syscall(struct __test_metadata *_metadata,defined (__s390__) ||defined (__hppa__) ||defined (__riscv) || \ defined(__xtensa__) || defined(__csky__) || defined(__sh__) { - regs.SYSCALL_NUM = syscall; +SYSCALL_NUM (regs) = syscall; }#elif defined(__mips__) { -if (regs.SYSCALL_NUM == __NR_O32_Linux) +if (SYSCALL_NUM (regs) == __NR_O32_Linux) regs.SYSCALL_SYSCALL_NUM = syscall;else - regs.SYSCALL_NUM = syscall; +SYSCALL_NUM (regs) = syscall; }#elif defined(__arm__)
@@ -1840,11 +1840,8 @@ void change_syscall(struct __test_metadata *_metadata, if (syscall == -1)#ifdef SYSCALL_NUM_RET_SHARE_REG TH_LOG ("Can't modify syscall return on this architecture" ); - -#elif defined(__xtensa__) - regs.SYSCALL_RET (regs) = result;#else - regs.SYSCALL_RET = result; +SYSCALL_RET (regs) = result;#endif #ifdef HAVE_GETREGS
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 154/757 selftests/seccomp: powerpc: Fix seccomp return value testing
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 46138329faeac3598f5a4dc991a174386b6de833 ]
On powerpc, the errno is not inverted, and depends on ccr.so being set. Add this to a powerpc definition of SYSCALL_RET_SET().
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tools/testing/selftests/seccomp/seccomp_bpf.c +15 -0
@@ -1702,6 +1702,21 @@ TEST_F(TRACE_poke, getpid_runs_normally)# define ARCH_REGS struct pt_regs# define SYSCALL_NUM (_regs) (_regs).gpr[0]# define SYSCALL_RET (_regs) (_regs).gpr[3] +# define SYSCALL_RET_SET(_regs, _val) \ + do { \ + typeof(_val) _result = (_val); \ + /* \ +* A syscall error is signaled by CR0 SO bit \ +* and the code is stored as a positive value. \ +*/ \ + if (_result < 0) { \ + SYSCALL_RET(_regs) = -result; \ + (_regs).ccr |= 0x10000000; \ + } else { \ + SYSCALL_RET(_regs) = result; \ + (_regs).ccr &= ~0x10000000; \ + } \ + } while (0)#elif defined(__s390__)# define ARCH_REGS s390_regs# define SYSCALL_NUM (_regs) (_regs).gprs[2]
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 155/757 regmap: debugfs: Fix more error path regressions
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit 1d512ee861b80da63cbc501b973c53131aa22f29 ]
Many error paths in __regmap_init rely on ret being pre-initialised to -EINVAL, add an extra initialisation in after the new call to regmap_set_name.
--- drivers/base/regmap/regmap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/regmap/regmap.c +2 -0
@@ -711,6 +711,8 @@ struct regmap *__regmap_init(struct device *dev,if (ret) goto err_map; + ret = -EINVAL ;/* Later error paths rely on this */ +if (config->disable_locking) { map->lock = map->unlock = regmap_lock_unlock_none;regmap_debugfs_disable (map);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 156/757 hwmon: (pmbus/max34440) Fix status register reads for MAX344{51,60,61}
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 6c094b31ea2ad773824362ba0fccb88d36f8d32d ]
Starting with MAX34451, the chips of this series support STATUS_IOUT and STATUS_TEMPERATURE commands, and no longer report over-current and over-temperature status with STATUS_MFR_SPECIFIC.
--- drivers/hwmon/pmbus/max34440.c | 3 --- 1 file changed, 3 deletions(-)
drivers/hwmon/pmbus/max34440.c +0 -3
@@ -388,7 +388,6 @@ static struct pmbus_driver_info max34440_info[] = { .func[18] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[19] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[20] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, - .read_byte_data = max34440_read_byte_data, .read_word_data = max34440_read_word_data, .write_word_data = max34440_write_word_data, },
@@ -419,7 +418,6 @@ static struct pmbus_driver_info max34440_info[] = { .func[15] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[16] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[17] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, - .read_byte_data = max34440_read_byte_data, .read_word_data = max34440_read_word_data, .write_word_data = max34440_write_word_data, },
@@ -455,7 +453,6 @@ static struct pmbus_driver_info max34440_info[] = { .func[19] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[20] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, .func[21] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, - .read_byte_data = max34440_read_byte_data, .read_word_data = max34440_read_word_data, .write_word_data = max34440_write_word_data, },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 157/757 hwmon: (w83627ehf) Fix a resource leak in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 18360b33a071e5883250fd1e04bfdeff8c3887a3 ]
Smatch has a new check for resource leaks which found a bug in probe:
drivers/hwmon/w83627ehf.c:2417 w83627ehf_probe()
warn: 'res->start' not released on lines: 2412.We need to clean up if devm_hwmon_device_register_with_info() fails.
--- drivers/hwmon/w83627ehf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/hwmon/w83627ehf.c +5 -1
@@ -1951,8 +1951,12 @@ static int w83627ehf_probe(struct platform_device *pdev) data, &w83627ehf_chip_info, w83627ehf_groups); +if (IS_ERR (hwmon_dev)) { + err =PTR_ERR (hwmon_dev); + goto exit_release; + } -return PTR_ERR_OR_ZERO (hwmon_dev); +return 0 ; exit_release:release_region (res->start,IOREGION_LENGTH );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 158/757 cypto: mediatek - fix leaks in mtk_desc_ring_alloc
In reply to Greg Kroah-HartmanFrom: Xiaoliang Pang <[email protected]>
[ Upstream commit 228d284aac61283cde508a925d666f854b57af63 ]
In the init loop, if an error occurs in function 'dma_alloc_coherent', then goto the err_cleanup section, after run i--,
in the array ring, the struct mtk_ring with index i will not be released, causing memory leaks
--- drivers/crypto/mediatek/mtk-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/mediatek/mtk-platform.c +2 -2
@@ -469,13 +469,13 @@ static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)return 0 ; err_cleanup: -for (; i--; ) { +do {dma_free_coherent (cryp->dev,MTK_DESC_RING_SZ , ring[i]->res_base, ring[i]->res_dma);dma_free_coherent (cryp->dev,MTK_DESC_RING_SZ , ring[i]->cmd_base, ring[i]->cmd_dma);kfree (ring[i]); - } + }while (i--);return -ENOMEM ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/757 crypto: stm32/crc32 - Avoid lock if hardware is already used
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit bbf2cb1ea1e1428589d7f4d652bed15b265ce92d ]
If STM32 CRC device is already in use, calculate CRC by software.
This will release CPU constraint for a concurrent access to the hardware, and avoid masking irqs during the whole block processing.
--- drivers/crypto/stm32/Kconfig | 1 + drivers/crypto/stm32/stm32-crc32.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)
drivers/crypto/stm32/Kconfig +1 -0
@@ -3,6 +3,7 @@ config CRYPTO_DEV_STM32_CRC tristate "Support for STM32 crc accelerators" depends on ARCH_STM32 select CRYPTO_HASH + select CRC32 help This enables support for the CRC32 hw accelerator which can be found on STMicroelectronics STM32 SOC.
drivers/crypto/stm32/stm32-crc32.c +12 -3
@@ -6,6 +6,7 @@#include <linux/bitrev.h> #include <linux/clk.h> +#include <linux/crc32.h> #include <linux/crc32poly.h> #include <linux/module.h> #include <linux/mod_devicetable.h>
@@ -147,7 +148,6 @@ static int burst_update(struct shash_desc *desc, const u8 *d8,struct stm32_crc_desc_ctx *ctx =shash_desc_ctx (desc);struct stm32_crc_ctx *mctx =crypto_shash_ctx (desc->tfm);struct stm32_crc *crc; -unsigned long flags; crc =stm32_crc_get_next_crc ();if (!crc)
@@ -155,7 +155,15 @@ static int burst_update(struct shash_desc *desc, const u8 *d8,pm_runtime_get_sync (crc->dev); -spin_lock_irqsave (&crc->lock, flags); +if (!spin_trylock (&crc->lock)) { +/* Hardware is busy, calculate crc32 by software */ +if (mctx->poly ==CRC32_POLY_LE ) + ctx->partial =crc32_le (ctx->partial, d8, length); +else + ctx->partial =__crc32c_le (ctx->partial, d8, length); + + goto pm_out; + }/* * Restore previously calculated CRC for this context as init value
@@ -195,8 +203,9 @@ static int burst_update(struct shash_desc *desc, const u8 *d8,/* Store partial result */ ctx->partial =readl_relaxed (crc->regs +CRC_DR ); -spin_unlock_irqrestore (&crc->lock, flags); +spin_unlock (&crc->lock); +pm_out:pm_runtime_mark_last_busy (crc->dev);pm_runtime_put_autosuspend (crc->dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/757 crypto: sun8i-ce - handle endianness of t_common_ctl
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 87f34260f5e09a4578132ad1c05aef2d707dd4bf ]
t_common_ctl is LE32 so we need to convert its value before using it. This value is only used on H6 (ignored on other SoCs) and not handling the endianness cause failure on xRNG/hashes operations on H6 when running BE.
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +4 -1
@@ -120,7 +120,10 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name)/* Be sure all data is written before enabling the task */ wmb (); - v =1 | (ce->chanlist[flow].tl->t_common_ctl &0x7F ) <<8 ; +/* Only H6 needs to write a part of t_common_ctl along with "1", but since it is ignored +* on older SoCs, we have no reason to complicate things. +*/ + v =1 | ((le32_to_cpu (ce->chanlist[flow].tl->t_common_ctl) &0x7F ) <<8 );writel (v, ce->base +CE_TLR );mutex_unlock (&ce->mlock);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 161/757 media: mx2_emmaprp: Fix memleak in emmaprp_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 21d387b8d372f859d9e87fdcc7c3b4a432737f4d ]
When platform_get_irq() fails, we should release
vfd and unregister pcdev->v4l2_dev just like the
subsequent error paths.
--- drivers/media/platform/mx2_emmaprp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/mx2_emmaprp.c +5 -2
@@ -852,8 +852,11 @@ static int emmaprp_probe(struct platform_device *pdev)platform_set_drvdata (pdev, pcdev); irq =platform_get_irq (pdev,0 ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto rel_vdev; + } + ret =devm_request_irq (&pdev->dev, irq, emmaprp_irq,0 ,dev_name (&pdev->dev), pcdev);if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/757 media: mtk-mdp: Fix Null pointer dereference when calling list_add
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit 0ca9454740b05eec199c5ffdb23a79eb44437917 ]
In list_add, the first variable is the new node and the second is the list head. The function is called with a wrong order causing NULL dereference:
[ 15.527030] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008 [ 15.542317] Mem abort info: [ 15.545152] ESR = 0x96000044 [ 15.548248] EC = 0x25: DABT (current EL), IL = 32 bits [ 15.553624] SET = 0, FnV = 0 [ 15.556715] EA = 0, S1PTW = 0 [ 15.559892] Data abort info: [ 15.562799] ISV = 0, ISS = 0x00000044 [ 15.566678] CM = 0, WnR = 1 [ 15.569683] user pgtable: 4k pages, 48-bit VAs, pgdp=00000001373f0000 [ 15.576196] [0000000000000008] pgd=0000000000000000, p4d=0000000000000000 [ 15.583101] Internal error: Oops: 96000044 [#1] PREEMPT SMP [ 15.588747] Modules linked in: mtk_mdp(+) cfg80211 v4l2_mem2mem videobuf2_vmalloc videobuf2_dma_contig videobuf2_memops videobuf2_v4l2 videobuf2_common vide odev mt8173_rt5650 smsc95xx usbnet ecdh_generic ecc snd_soc_rt5645 mc mt8173_afe_pcm rfkill cros_ec_sensors snd_soc_mtk_common elan_i2c crct10dif_ce cros_ec_se nsors_core snd_soc_rl6231 elants_i2c industrialio_triggered_buffer kfifo_buf mtk_vpu cros_ec_chardev cros_usbpd_charger cros_usbpd_logger sbs_battery display_c onnector pwm_bl ip_tables x_tables ipv6 [ 15.634295] CPU: 0 PID: 188 Comm: systemd-udevd Not tainted 5.9.0-rc2+ #69 [ 15.641242] Hardware name: Google Elm (DT) [ 15.645381] pstate: 20000005 (nzCv daif -PAN -UAO BTYPE=--) [ 15.651022] pc : mtk_mdp_probe+0x134/0x3a8 [mtk_mdp] [ 15.656041] lr : mtk_mdp_probe+0x128/0x3a8 [mtk_mdp] [ 15.661055] sp : ffff80001255b910 [ 15.669548] x29: ffff80001255b910 x28: 0000000000000000 [ 15.679973] x27: ffff800009089bf8 x26: ffff0000fafde800 [ 15.690347] x25: ffff0000ff7d2768 x24: ffff800009089010 [ 15.700670] x23: ffff0000f01a7cd8 x22: ffff0000fafde810 [ 15.710940] x21: ffff0000f01a7c80 x20: ffff0000f0c3c180 [ 15.721148] x19: ffff0000ff7f1618 x18: 0000000000000010 [ 15.731289] x17: 0000000000000000 x16: 0000000000000000 [ 15.741375] x15: 0000000000aaaaaa x14: 0000000000000020 [ 15.751399] x13: 00000000ffffffff x12: 0000000000000020 [ 15.761363] x11: 0000000000000028 x10: 0101010101010101 [ 15.771279] x9 : 0000000000000004 x8 : 7f7f7f7f7f7f7f7f [ 15.781148] x7 : 646bff6171606b2b x6 : 0000000000806d65 [ 15.790981] x5 : ffff0000ff7f8360 x4 : 0000000000000000 [ 15.800767] x3 : 0000000000000004 x2 : 0000000000000001 [ 15.810501] x1 : 0000000000000005 x0 : 0000000000000000 [ 15.820171] Call trace: [ 15.826944] mtk_mdp_probe+0x134/0x3a8 [mtk_mdp] [ 15.835908] platform_drv_probe+0x54/0xa8 [ 15.844247] really_probe+0xe4/0x3b0 [ 15.852104] driver_probe_device+0x58/0xb8 [ 15.860457] device_driver_attach+0x74/0x80 [ 15.868854] __driver_attach+0x58/0xe0 [ 15.876770] bus_for_each_dev+0x70/0xc0 [ 15.884726] driver_attach+0x24/0x30 [ 15.892374] bus_add_driver+0x14c/0x1f0 [ 15.900295] driver_register+0x64/0x120 [ 15.908168] __platform_driver_register+0x48/0x58 [ 15.916864] mtk_mdp_driver_init+0x20/0x1000 [mtk_mdp] [ 15.925943] do_one_initcall+0x54/0x1b4 [ 15.933662] do_init_module+0x54/0x200 [ 15.941246] load_module+0x1cf8/0x22d0 [ 15.948798] __do_sys_finit_module+0xd8/0xf0 [ 15.956829] __arm64_sys_finit_module+0x20/0x30 [ 15.965082] el0_svc_common.constprop.0+0x6c/0x168 [ 15.973527] do_el0_svc+0x24/0x90 [ 15.980403] el0_sync_handler+0x90/0x198 [ 15.987867] el0_sync+0x158/0x180 [ 15.994653] Code: 9400014b 2a0003fc 35000920 f9400280 (f9000417) [ 16.004299] ---[ end trace 76fee0203f9898e5 ]---
--- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/mtk-mdp/mtk_mdp_core.c +1 -1
@@ -94,7 +94,7 @@ static void mtk_mdp_reset_handler(void *priv)void mtk_mdp_register_component (struct mtk_mdp_dev *mdp,struct mtk_mdp_comp *comp) { -list_add (&mdp->comp_list, &comp->node); +list_add (&comp->node, &mdp->comp_list); } void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 163/757 media: tc358743: initialize variable
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 274cf92d5dff5c2fec1a518078542ffe70d07646 ]
clang static analysis flags this error
tc358743.c:1468:9: warning: Branch condition evaluates
to a garbage value
return handled ? IRQ_HANDLED : IRQ_NONE;
^~~~~~~handled should be initialized to false.
--- drivers/media/i2c/tc358743.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/tc358743.c +1 -1
@@ -1461,7 +1461,7 @@ static int tc358743_isr(struct v4l2_subdev *sd, u32 status, bool *handled)static irqreturn_t tc358743_irq_handler (int irq,void *dev_id) {struct tc358743_state *state = dev_id; -bool handled; +bool handled = false;tc358743_isr (&state->sd,0 , &handled);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 164/757 media: tc358743: cleanup tc358743_cec_isr
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 877cb8a444dad2304e891294afb0915fe3c278d6 ]
tc358743_cec_isr is misnammed, it is not the main isr. So rename it to be consistent with its siblings, tc358743_cec_handler.
It also does not check if its input parameter 'handled' is is non NULL like its siblings, so add a check.
--- drivers/media/i2c/tc358743.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/media/i2c/tc358743.c +7 -5
@@ -919,8 +919,8 @@ static const struct cec_adap_ops tc358743_cec_adap_ops = { .adap_monitor_all_enable = tc358743_cec_adap_monitor_all_enable, }; -static void tc358743_cec_isr (struct v4l2_subdev *sd,u16 intstatus, -bool *handled) +static void tc358743_cec_handler (struct v4l2_subdev *sd,u16 intstatus, +bool *handled) {struct tc358743_state *state =to_state (sd);unsigned int cec_rxint, cec_txint;
@@ -953,7 +953,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus,cec_transmit_attempt_done (state->cec_adap,CEC_TX_STATUS_ERROR ); } - *handled = true; +if (handled) + *handled = true; }if ((intstatus &MASK_CEC_RINT ) && (cec_rxint &MASK_CECRIEND )) {
@@ -968,7 +969,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, msg.msg[i] = v &0xff ; }cec_received_msg (state->cec_adap, &msg); - *handled = true; +if (handled) + *handled = true; }i2c_wr16 (sd,INTSTATUS , intstatus & (MASK_CEC_RINT |MASK_CEC_TINT ));
@@ -1432,7 +1434,7 @@ static int tc358743_isr(struct v4l2_subdev *sd, u32 status, bool *handled)#ifdef CONFIG_VIDEO_TC358743_CEC if (intstatus & (MASK_CEC_RINT |MASK_CEC_TINT )) { -tc358743_cec_isr (sd, intstatus, handled); +tc358743_cec_handler (sd, intstatus, handled);i2c_wr16 (sd,INTSTATUS , intstatus & (MASK_CEC_RINT |MASK_CEC_TINT )); intstatus &= ~(MASK_CEC_RINT |MASK_CEC_TINT );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 165/757 nvme: fix error handling in nvme_ns_report_zones
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 936fab503ff4af94f5f9c0b549f3ab4d435500ec ]
nvme_submit_sync_cmd can return positive NVMe error codes in addition to the negative Linux error code, which are currently ignored. Fix this by removing __nvme_ns_report_zones and handling the errors from nvme_submit_sync_cmd in the caller instead of multiplexing the return value and the number of zones reported into a single return value.
--- drivers/nvme/host/zns.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-)
drivers/nvme/host/zns.c +16 -25
@@ -133,28 +133,6 @@ static void *nvme_zns_alloc_report_buffer(struct nvme_ns *ns,return NULL ; } -static int __nvme_ns_report_zones (struct nvme_ns *ns,sector_t sector, -struct nvme_zone_report *report, -size_t buflen) -{ -struct nvme_command c = { }; -int ret; - - c.zmr.opcode = nvme_cmd_zone_mgmt_recv; - c.zmr.nsid =cpu_to_le32 (ns->head->ns_id); - c.zmr.slba =cpu_to_le64 (nvme_sect_to_lba (ns, sector)); - c.zmr.numd =cpu_to_le32 (nvme_bytes_to_numd (buflen)); - c.zmr.zra =NVME_ZRA_ZONE_REPORT ; - c.zmr.zrasf =NVME_ZRASF_ZONE_REPORT_ALL ; - c.zmr.pr =NVME_REPORT_ZONE_PARTIAL ; - - ret =nvme_submit_sync_cmd (ns->queue, &c, report, buflen); -if (ret) -return ret; - -return le64_to_cpu (report->nr_zones); -} - static int nvme_zone_parse_entry(struct nvme_ns *ns, struct nvme_zone_descriptor *entry, unsigned int idx, report_zones_cb cb,
@@ -182,6 +160,7 @@ static int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data) { struct nvme_zone_report *report; +struct nvme_command c = { };int ret, zone_idx =0 ;unsigned int nz, i;size_t buflen;
@@ -190,14 +169,26 @@ static int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector,if (!report)return -ENOMEM ; + c.zmr.opcode = nvme_cmd_zone_mgmt_recv; + c.zmr.nsid =cpu_to_le32 (ns->head->ns_id); + c.zmr.numd =cpu_to_le32 (nvme_bytes_to_numd (buflen)); + c.zmr.zra =NVME_ZRA_ZONE_REPORT ; + c.zmr.zrasf =NVME_ZRASF_ZONE_REPORT_ALL ; + c.zmr.pr =NVME_REPORT_ZONE_PARTIAL ; + sector &= ~(ns->zsze -1 );while (zone_idx < nr_zones && sector <get_capacity (ns->disk)) {memset (report,0 , buflen); - ret =__nvme_ns_report_zones (ns, sector, report, buflen); -if (ret <0 ) + + c.zmr.slba =cpu_to_le64 (nvme_sect_to_lba (ns, sector)); + ret =nvme_submit_sync_cmd (ns->queue, &c, report, buflen); +if (ret) { +if (ret >0 ) + ret = -EIO ; goto out_free; + } - nz = min_t(unsigned int, ret, nr_zones); + nz =min ((unsigned int )le64_to_cpu (report->nr_zones), nr_zones);if (!nz)break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 166/757 media: rcar-vin: Fix a reference count leak.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit aaffa0126a111d65f4028c503c76192d4cc93277 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- drivers/media/platform/rcar-vin/rcar-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/rcar-vin/rcar-dma.c +3 -1
@@ -1409,8 +1409,10 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)int ret; ret =pm_runtime_get_sync (vin->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (vin->dev);return ret; + }/* Make register writes take effect immediately. */ vnmc =rvin_read (vin,VNMC_REG );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 167/757 media: rockchip/rga: Fix a reference count leak.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 884d638e0853c4b5f01eb6d048fc3b6239012404 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- drivers/media/platform/rockchip/rga/rga-buf.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/rockchip/rga/rga-buf.c +1 -0
@@ -81,6 +81,7 @@ static int rga_buf_start_streaming(struct vb2_queue *q, unsigned int count) ret =pm_runtime_get_sync (rga->dev);if (ret <0 ) { +pm_runtime_put_noidle (rga->dev);rga_buf_return_buffers (q,VB2_BUF_STATE_QUEUED );return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 168/757 media: platform: fcp: Fix a reference count leak.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 63e36a381d92a9cded97e90d481ee22566557dd1 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- drivers/media/platform/rcar-fcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/rcar-fcp.c +3 -1
@@ -103,8 +103,10 @@ int rcar_fcp_enable(struct rcar_fcp_device *fcp)return 0 ; ret =pm_runtime_get_sync (fcp->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (fcp->dev);return ret; + }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 169/757 media: camss: Fix a reference count leak.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit d0675b67b42eb4f1a840d1513b5b00f78312f833 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if PM runtime put is not called in error handling paths. Thus call pm_runtime_put_sync() if pm_runtime_get_sync() fails.
--- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-csiphy.c +3 -1
@@ -176,8 +176,10 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_sync (dev);return ret; + } ret =csiphy_set_clock_rates (csiphy);if (ret <0 ) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 170/757 media: s5p-mfc: Fix a reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 78741ce98c2e36188e2343434406b0e0bc50b0e7 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +3 -1
@@ -79,8 +79,10 @@ int s5p_mfc_power_on(void)int i, ret =0 ; ret =pm_runtime_get_sync (pm->device); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (pm->device);return ret; + }/* clock control */ for (i =0 ; i < pm->num_clocks; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 171/757 media: stm32-dcmi: Fix a reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 88f50a05f907d96a27a9ce3cc9e8cbb91a6f0f22 ]
Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put is not called in error handling paths. Thus replace the jump target "err_release_buffers" by "err_pm_putw".
--- drivers/media/platform/stm32/stm32-dcmi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/platform/stm32/stm32-dcmi.c +1 -3
@@ -733,7 +733,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)if (ret <0 ) {dev_err (dcmi->dev,"%s: Failed to start streaming, cannot get sync (%d)\n" , __func__, ret); - goto err_release_buffers; + goto err_pm_put; } ret =media_pipeline_start (&dcmi->vdev->entity, &dcmi->pipeline);
@@ -837,8 +837,6 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) err_pm_put:pm_runtime_put (dcmi->dev); - -err_release_buffers:spin_lock_irq (&dcmi->irqlock);/* * Return all buffers to vb2 in QUEUED state.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 172/757 media: ti-vpe: Fix a missing check and reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 7dae2aaaf432767ca7aa11fa84643a7c2600dbdd ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. And also, when the call of function vpe_runtime_get() failed, we won't call vpe_runtime_put().
Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails inside vpe_runtime_get().
--- drivers/media/platform/ti-vpe/vpe.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/ti-vpe/vpe.c +2 -0
@@ -2475,6 +2475,8 @@ static int vpe_runtime_get(struct platform_device *pdev) r =pm_runtime_get_sync (&pdev->dev);WARN_ON (r <0 ); +if (r) +pm_runtime_put_noidle (&pdev->dev);return r <0 ? r :0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 173/757 regulator: resolve supply after creating regulator
In reply to Greg Kroah-HartmanFrom: Michał Mirosław <[email protected]>
[ Upstream commit aea6cb99703e17019e025aa71643b4d3e0a24413 ]
When creating a new regulator its supply cannot create the sysfs link because the device is not yet published. Remove early supply resolving since it will be done later anyway. This makes the following error disappear and the symlinks get created instead.
DCDC_REG1: supplied by VSYS
VSYS: could not add device link regulator.3 err -2
Note: It doesn't fix the problem for bypassed regulators, though.
--- drivers/regulator/core.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/regulator/core.c +13 -8
@@ -5256,15 +5256,20 @@ regulator_register(const struct regulator_desc *regulator_desc,else if (regulator_desc->supply_name) rdev->supply_name = regulator_desc->supply_name; -/* -* Attempt to resolve the regulator supply, if specified, -* but don't return an error if we fail because we will try -* to resolve it again later as more regulators are added. -*/ -if (regulator_resolve_supply (rdev)) -rdev_dbg (rdev,"unable to resolve supply\n" ); - ret =set_machine_constraints (rdev, constraints); +if (ret == -EPROBE_DEFER ) { +/* Regulator might be in bypass mode and so needs its supply +* to set the constraints */ +/* FIXME: this currently triggers a chicken-and-egg problem +* when creating -SUPPLY symlink in sysfs to a regulator +* that is just being created */ + ret =regulator_resolve_supply (rdev); +if (!ret) + ret =set_machine_constraints (rdev, constraints); +else +rdev_dbg (rdev,"unable to resolve supply early: %pe\n" , +ERR_PTR (ret)); + }if (ret <0 ) goto wash;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 174/757 pinctrl: bcm: fix kconfig dependency warning when !GPIOLIB
In reply to Greg Kroah-HartmanFrom: Necip Fazil Yildiran <[email protected]>
[ Upstream commit 513034d8b089b9a49dab57845aee70e830fe7334 ]
When PINCTRL_BCM2835 is enabled and GPIOLIB is disabled, it results in the following Kbuild warning:
WARNING: unmet direct dependencies detected for GPIOLIB_IRQCHIP
Depends on [n]: GPIOLIB [=n]
Selected by [y]:
- PINCTRL_BCM2835 [=y] && PINCTRL [=y] && OF [=y] && (ARCH_BCM2835 [=n] || ARCH_BRCMSTB [=n] || COMPILE_TEST [=y])
The reason is that PINCTRL_BCM2835 selects GPIOLIB_IRQCHIP without depending on or selecting GPIOLIB while GPIOLIB_IRQCHIP is subordinate to GPIOLIB.
Honor the kconfig menu hierarchy to remove kconfig dependency warnings.
--- drivers/pinctrl/bcm/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/bcm/Kconfig +1 -0
@@ -23,6 +23,7 @@ config PINCTRL_BCM2835 select PINMUX select PINCONF select GENERIC_PINCONF + select GPIOLIB select GPIOLIB_IRQCHIP default ARCH_BCM2835 || ARCH_BRCMSTB help
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 175/757 spi: spi-s3c64xx: swap s3c64xx_spi_set_cs() and s3c64xx_enable_datapath()
In reply to Greg Kroah-HartmanFrom: Łukasz Stelmach <[email protected]>
[ Upstream commit 581e2b41977dfc2d4c26c8e976f89c43bb92f9bf ]
Fix issues with DMA transfers bigger than 512 bytes on Exynos3250. Without the patches such transfers fail to complete. This solution to the problem is found in the vendor kernel for ARTIK5 boards based on Exynos3250.
--- drivers/spi/spi-s3c64xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-s3c64xx.c +2 -2
@@ -685,11 +685,11 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, sdd->state &= ~RXBUSY ; sdd->state &= ~TXBUSY ; -s3c64xx_enable_datapath (sdd, xfer, use_dma); -/* Start the signals */ s3c64xx_spi_set_cs (spi, true); +s3c64xx_enable_datapath (sdd, xfer, use_dma); +spin_unlock_irqrestore (&sdd->lock, flags);if (use_dma)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 176/757 spi: spi-s3c64xx: Check return values
In reply to Greg Kroah-HartmanFrom: Łukasz Stelmach <[email protected]>
[ Upstream commit 2f4db6f705c5cba85d23836c19b44d9687dc1334 ]
Check return values in prepare_dma() and s3c64xx_spi_config() and propagate errors upwards.
--- drivers/spi/spi-s3c64xx.c | 50 ++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 9 deletions(-)
drivers/spi/spi-s3c64xx.c +41 -9
@@ -122,6 +122,7 @@struct s3c64xx_spi_dma_data {struct dma_chan *ch; +dma_cookie_t cookie;enum dma_transfer_direction direction; };
@@ -271,12 +272,13 @@ static void s3c64xx_spi_dmacb(void *data)spin_unlock_irqrestore (&sdd->lock, flags); } -static void prepare_dma (struct s3c64xx_spi_dma_data *dma, +static int prepare_dma (struct s3c64xx_spi_dma_data *dma,struct sg_table *sgt) {struct s3c64xx_spi_driver_data *sdd;struct dma_slave_config config;struct dma_async_tx_descriptor *desc; +int ret;memset (&config,0 ,sizeof (config));
@@ -300,12 +302,24 @@ static void prepare_dma(struct s3c64xx_spi_dma_data *dma, desc =dmaengine_prep_slave_sg (dma->ch, sgt->sgl, sgt->nents, dma->direction,DMA_PREP_INTERRUPT ); +if (!desc) { +dev_err (&sdd->pdev->dev,"unable to prepare %s scatterlist" , + dma->direction ==DMA_DEV_TO_MEM ?"rx" :"tx" ); +return -ENOMEM ; + } desc->callback = s3c64xx_spi_dmacb; desc->callback_param = dma; -dmaengine_submit (desc); + dma->cookie =dmaengine_submit (desc); + ret =dma_submit_error (dma->cookie); +if (ret) { +dev_err (&sdd->pdev->dev,"DMA submission failed" ); +return -EIO ; + } +dma_async_issue_pending (dma->ch); +return 0 ; }static void s3c64xx_spi_set_cs (struct spi_device *spi,bool enable)
@@ -355,11 +369,12 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master,return xfer->len > (FIFO_LVL_MASK (sdd) >>1 ) +1 ; } -static void s3c64xx_enable_datapath (struct s3c64xx_spi_driver_data *sdd, +static int s3c64xx_enable_datapath (struct s3c64xx_spi_driver_data *sdd,struct spi_transfer *xfer,int dma_mode) {void __iomem *regs = sdd->regs;u32 modecfg, chcfg; +int ret =0 ; modecfg =readl (regs +S3C64XX_SPI_MODE_CFG ); modecfg &= ~(S3C64XX_SPI_MODE_TXDMA_ON |S3C64XX_SPI_MODE_RXDMA_ON );
@@ -385,7 +400,7 @@ static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, chcfg |=S3C64XX_SPI_CH_TXCH_ON ;if (dma_mode) { modecfg |=S3C64XX_SPI_MODE_TXDMA_ON ; -prepare_dma (&sdd->tx_dma, &xfer->tx_sg); + ret =prepare_dma (&sdd->tx_dma, &xfer->tx_sg); }else {switch (sdd->cur_bpw) {case 32 :
@@ -417,12 +432,17 @@ static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd,writel (((xfer->len *8 / sdd->cur_bpw) &0xffff ) |S3C64XX_SPI_PACKET_CNT_EN , regs +S3C64XX_SPI_PACKET_CNT ); -prepare_dma (&sdd->rx_dma, &xfer->rx_sg); + ret =prepare_dma (&sdd->rx_dma, &xfer->rx_sg); } } +if (ret) +return ret; +writel (modecfg, regs +S3C64XX_SPI_MODE_CFG );writel (chcfg, regs +S3C64XX_SPI_CH_CFG ); + +return 0 ; } static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
@@ -555,9 +575,10 @@ static int s3c64xx_wait_for_pio(struct s3c64xx_spi_driver_data *sdd,return 0 ; } -static void s3c64xx_spi_config (struct s3c64xx_spi_driver_data *sdd) +static int s3c64xx_spi_config (struct s3c64xx_spi_driver_data *sdd) {void __iomem *regs = sdd->regs; +int ret;u32 val;/* Disable Clock */
@@ -605,7 +626,9 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)if (sdd->port_conf->clk_from_cmu) {/* The src_clk clock is divided internally by 2 */ -clk_set_rate (sdd->src_clk, sdd->cur_speed *2 ); + ret =clk_set_rate (sdd->src_clk, sdd->cur_speed *2 ); +if (ret) +return ret; }else {/* Configure Clock */ val =readl (regs +S3C64XX_SPI_CLK_CFG );
@@ -619,6 +642,8 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) val |=S3C64XX_SPI_ENCLK_ENABLE ;writel (val, regs +S3C64XX_SPI_CLK_CFG ); } + +return 0 ; }#define XFER_DMAADDR_INVALID DMA_BIT_MASK(32)
@@ -661,7 +686,9 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, sdd->cur_bpw = bpw; sdd->cur_speed = speed; sdd->cur_mode = spi->mode; -s3c64xx_spi_config (sdd); + status =s3c64xx_spi_config (sdd); +if (status) +return status; } if (!is_polling(sdd) && (xfer->len > fifo_len) &&
@@ -688,10 +715,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,/* Start the signals */ s3c64xx_spi_set_cs (spi, true); -s3c64xx_enable_datapath (sdd, xfer, use_dma); + status =s3c64xx_enable_datapath (sdd, xfer, use_dma);spin_unlock_irqrestore (&sdd->lock, flags); +if (status) { +dev_err (&spi->dev,"failed to enable data path for transfer: %d\n" , status); +break ; + } +if (use_dma) status =s3c64xx_wait_for_dma (sdd, xfer);else
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 177/757 hwmon: (bt1-pvt) Test sensor power supply on probe
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit a6db1561291fc0f2f9aa23bf38f381adc63e7b14 ]
Baikal-T1 PVT sensor has got a dedicated power supply domain (feed up by the external GPVT/VPVT_18 pins). In case if it isn't powered up, the registers will be accessible, but the sensor conversion just won't happen. Due to that an attempt to read data from any PVT sensor will cause the task hanging up. For instance that will happen if XP11 jumper isn't installed on the Baikal-T1-based BFK3.1 board. Let's at least test whether the conversion work on the device probe procedure. By doing so will make sure that the PVT sensor is powered up at least at boot time.
--- drivers/hwmon/bt1-pvt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/hwmon/bt1-pvt.c +40 -0
@@ -13,6 +13,7 @@#include <linux/bitops.h> #include <linux/clk.h> #include <linux/completion.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/hwmon-sysfs.h> #include <linux/hwmon.h>
@@ -982,6 +983,41 @@ static int pvt_request_clks(struct pvt_hwmon *pvt)return 0 ; } +static int pvt_check_pwr (struct pvt_hwmon *pvt) +{ +unsigned long tout; +int ret =0 ; +u32 data; + +/* +* Test out the sensor conversion functionality. If it is not done on +* time then the domain must have been unpowered and we won't be able +* to use the device later in this driver. +* Note If the power source is lost during the normal driver work the +* data read procedure will either return -ETIMEDOUT (for the +* alarm-less driver configuration) or just stop the repeated +* conversion. In the later case alas we won't be able to detect the +* problem. +*/ +pvt_update (pvt->regs +PVT_INTR_MASK ,PVT_INTR_ALL ,PVT_INTR_ALL ); +pvt_update (pvt->regs +PVT_CTRL ,PVT_CTRL_EN ,PVT_CTRL_EN ); +pvt_set_tout (pvt,0 ); +readl (pvt->regs +PVT_DATA ); + + tout =PVT_TOUT_MIN /NSEC_PER_USEC ; +usleep_range (tout,2 * tout); + + data =readl (pvt->regs +PVT_DATA ); +if (!(data &PVT_DATA_VALID )) { + ret = -ENODEV ; +dev_err (pvt->dev,"Sensor is powered down\n" ); + } + +pvt_update (pvt->regs +PVT_CTRL ,PVT_CTRL_EN ,0 ); + +return ret; +} +static void pvt_init_iface (struct pvt_hwmon *pvt) {u32 trim, temp;
@@ -1109,6 +1145,10 @@ static int pvt_probe(struct platform_device *pdev)if (ret)return ret; + ret =pvt_check_pwr (pvt); +if (ret) +return ret; +pvt_init_iface (pvt); ret =pvt_request_irq (pvt);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 178/757 hwmon: (bt1-pvt) Cache current update timeout
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit 0015503e5f6357f286bef34d039e43359fa4efd4 ]
Instead of converting the update timeout data to the milliseconds each time on the read procedure let's preserve the currently set timeout in the dedicated driver private data cache. The cached value will be then used in the timeout read method and in the alarm-less data conversion to prevent the caller task hanging up in case if the PVT sensor is suddenly powered down.
--- drivers/hwmon/bt1-pvt.c | 85 ++++++++++++++++++++++------------------- drivers/hwmon/bt1-pvt.h | 3 ++ 2 files changed, 49 insertions(+), 39 deletions(-)
drivers/hwmon/bt1-pvt.c +46 -39
@@ -655,44 +655,16 @@ static int pvt_write_trim(struct pvt_hwmon *pvt, long val)static int pvt_read_timeout (struct pvt_hwmon *pvt,long *val) { -unsigned long rate; -ktime_t kt; -u32 data; - - rate =clk_get_rate (pvt->clks[PVT_CLOCK_REF ].clk); -if (!rate) -return -ENODEV ; - -/* -* Don't bother with mutex here, since we just read data from MMIO. -* We also have to scale the ticks timeout up to compensate the -* ms-ns-data translations. -*/ - data =readl (pvt->regs +PVT_TTIMEOUT ) +1 ; +int ret; -/* -* Calculate ref-clock based delay (Ttotal) between two consecutive -* data samples of the same sensor. So we first must calculate the -* delay introduced by the internal ref-clock timer (Tref * Fclk). -* Then add the constant timeout cuased by each conversion latency -* (Tmin). The basic formulae for each conversion is following: -* Ttotal = Tref * Fclk + Tmin -* Note if alarms are enabled the sensors are polled one after -* another, so in order to have the delay being applicable for each -* sensor the requested value must be equally redistirbuted. -*/ -#if defined(CONFIG_SENSORS_BT1_PVT_ALARMS ) - kt =ktime_set (PVT_SENSORS_NUM * (u64 )data,0 ); - kt =ktime_divns (kt, rate); - kt =ktime_add_ns (kt,PVT_SENSORS_NUM *PVT_TOUT_MIN ); -#else - kt =ktime_set (data,0 ); - kt =ktime_divns (kt, rate); - kt =ktime_add_ns (kt,PVT_TOUT_MIN ); -#endif + ret =mutex_lock_interruptible (&pvt->iface_mtx); +if (ret) +return ret;/* Return the result in msec as hwmon sysfs interface requires. */ - *val =ktime_to_ms (kt); + *val =ktime_to_ms (pvt->timeout); + +mutex_unlock (&pvt->iface_mtx);return 0 ; }
@@ -700,7 +672,7 @@ static int pvt_read_timeout(struct pvt_hwmon *pvt, long *val)static int pvt_write_timeout (struct pvt_hwmon *pvt,long val) {unsigned long rate; -ktime_t kt; +ktime_t kt, cache;u32 data;int ret;
@@ -713,7 +685,7 @@ static int pvt_write_timeout(struct pvt_hwmon *pvt, long val)* between all available sensors to have the requested delay * applicable to each individual sensor. */ - kt =ms_to_ktime (val); + cache = kt =ms_to_ktime (val);#if defined(CONFIG_SENSORS_BT1_PVT_ALARMS ) kt =ktime_divns (kt,PVT_SENSORS_NUM );#endif
@@ -742,6 +714,7 @@ static int pvt_write_timeout(struct pvt_hwmon *pvt, long val)return ret;pvt_set_tout (pvt, data); + pvt->timeout = cache;mutex_unlock (&pvt->iface_mtx);
@@ -1018,10 +991,17 @@ static int pvt_check_pwr(struct pvt_hwmon *pvt)return ret; } -static void pvt_init_iface (struct pvt_hwmon *pvt) +static int pvt_init_iface (struct pvt_hwmon *pvt) { +unsigned long rate;u32 trim, temp; + rate =clk_get_rate (pvt->clks[PVT_CLOCK_REF ].clk); +if (!rate) { +dev_err (pvt->dev,"Invalid reference clock rate\n" ); +return -ENODEV ; + } +/* * Make sure all interrupts and controller are disabled so not to * accidentally have ISR executed before the driver data is fully
@@ -1036,12 +1016,37 @@ static void pvt_init_iface(struct pvt_hwmon *pvt)pvt_set_mode (pvt, pvt_info[pvt->sensor].mode);pvt_set_tout (pvt,PVT_TOUT_DEF ); +/* +* Preserve the current ref-clock based delay (Ttotal) between the +* sensors data samples in the driver data so not to recalculate it +* each time on the data requests and timeout reads. It consists of the +* delay introduced by the internal ref-clock timer (N / Fclk) and the +* constant timeout caused by each conversion latency (Tmin): +* Ttotal = N / Fclk + Tmin +* If alarms are enabled the sensors are polled one after another and +* in order to get the next measurement of a particular sensor the +* caller will have to wait for at most until all the others are +* polled. In that case the formulae will look a bit different: +* Ttotal = 5 * (N / Fclk + Tmin) +*/ +#if defined(CONFIG_SENSORS_BT1_PVT_ALARMS ) + pvt->timeout =ktime_set (PVT_SENSORS_NUM *PVT_TOUT_DEF ,0 ); + pvt->timeout =ktime_divns (pvt->timeout, rate); + pvt->timeout =ktime_add_ns (pvt->timeout,PVT_SENSORS_NUM *PVT_TOUT_MIN ); +#else + pvt->timeout =ktime_set (PVT_TOUT_DEF ,0 ); + pvt->timeout =ktime_divns (pvt->timeout, rate); + pvt->timeout =ktime_add_ns (pvt->timeout,PVT_TOUT_MIN ); +#endif + trim =PVT_TRIM_DEF ;if (!of_property_read_u32 (pvt->dev->of_node,"baikal,pvt-temp-offset-millicelsius" , &temp)) trim =pvt_calc_trim (temp);pvt_set_trim (pvt, trim); + +return 0 ; }static int pvt_request_irq (struct pvt_hwmon *pvt)
@@ -1149,7 +1154,9 @@ static int pvt_probe(struct platform_device *pdev)if (ret)return ret; -pvt_init_iface (pvt); + ret =pvt_init_iface (pvt); +if (ret) +return ret; ret =pvt_request_irq (pvt);if (ret)
drivers/hwmon/bt1-pvt.h +3 -0
@@ -10,6 +10,7 @@#include <linux/completion.h> #include <linux/hwmon.h> #include <linux/kernel.h> +#include <linux/ktime.h> #include <linux/mutex.h> #include <linux/seqlock.h>
@@ -201,6 +202,7 @@ struct pvt_cache {* if alarms are disabled). * @sensor: current PVT sensor the data conversion is being performed for. * @cache: data cache descriptor. +* @timeout: conversion timeout cache. */ struct pvt_hwmon {struct device *dev;
@@ -214,6 +216,7 @@ struct pvt_hwmon {struct mutex iface_mtx;enum pvt_sensor_type sensor;struct pvt_cache cache[PVT_SENSORS_NUM ]; +ktime_t timeout; };/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 179/757 hwmon: (bt1-pvt) Wait for the completion with timeout
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit 0ffd21d5985506d164ada9e8fff6daae8ef469a1 ]
If the PVT sensor is suddenly powered down while a caller is waiting for the conversion completion, the request won't be finished and the task will hang up on this procedure until the power is back up again. Let's call the wait_for_completion_timeout() method instead to prevent that. The cached timeout is exactly what we need to predict for how long conversion could normally last.
--- drivers/hwmon/bt1-pvt.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/hwmon/bt1-pvt.c +12 -1
@@ -477,6 +477,7 @@ static int pvt_read_data(struct pvt_hwmon *pvt, enum pvt_sensor_type type, long *val) {struct pvt_cache *cache = &pvt->cache[type]; +unsigned long timeout;u32 data;int ret;
@@ -500,7 +501,14 @@ static int pvt_read_data(struct pvt_hwmon *pvt, enum pvt_sensor_type type,pvt_update (pvt->regs +PVT_INTR_MASK ,PVT_INTR_DVALID ,0 );pvt_update (pvt->regs +PVT_CTRL ,PVT_CTRL_EN ,PVT_CTRL_EN ); -wait_for_completion (&cache->conversion); +/* +* Wait with timeout since in case if the sensor is suddenly powered +* down the request won't be completed and the caller will hang up on +* this procedure until the power is back up again. Multiply the +* timeout by the factor of two to prevent a false timeout. +*/ + timeout =2 *usecs_to_jiffies (ktime_to_us (pvt->timeout)); + ret =wait_for_completion_timeout (&cache->conversion, timeout);pvt_update (pvt->regs +PVT_CTRL ,PVT_CTRL_EN ,0 ); pvt_update(pvt->regs + PVT_INTR_MASK, PVT_INTR_DVALID,
@@ -510,6 +518,9 @@ static int pvt_read_data(struct pvt_hwmon *pvt, enum pvt_sensor_type type,mutex_unlock (&pvt->iface_mtx); +if (!ret) +return -ETIMEDOUT ; +if (type ==PVT_TEMP ) *val =pvt_calc_poly (&poly_N_to_temp, data);else
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 180/757 spi: imx: Fix freeing of DMA channels if spi_bitbang_start() fails
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 45f0bbdafd26d6d772172563b30bff561cec9133 ]
If the SPI controller has has_dmamode = true and spi_bitbang_start() fails in spi_imx_probe(), then the driver must release the DMA channels acquired in spi_imx_sdma_init() by calling spi_imx_sdma_exit() in the fail path.
--- drivers/spi/spi-imx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-imx.c +4 -1
@@ -1707,7 +1707,7 @@ static int spi_imx_probe(struct platform_device *pdev) ret =spi_bitbang_start (&spi_imx->bitbang);if (ret) {dev_err (&pdev->dev,"bitbang start failed with %d\n" , ret); - goto out_runtime_pm_put; + goto out_bitbang_start; }dev_info (&pdev->dev,"probed\n" );
@@ -1717,6 +1717,9 @@ static int spi_imx_probe(struct platform_device *pdev)return ret; +out_bitbang_start: +if (spi_imx->devtype_data->has_dmamode) +spi_imx_sdma_exit (spi_imx); out_runtime_pm_put:pm_runtime_dont_use_autosuspend (spi_imx->dev);pm_runtime_put_sync (spi_imx->dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/757 btrfs: add owner and fs_info to alloc_state io_tree
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit 154f7cb86809a3a796bffbc7a5a7ce0dee585eaa ]
Commit 1c11b63eff2a ("btrfs: replace pending/pinned chunks lists with io tree") introduced btrfs_device::alloc_state extent io tree, but it doesn't initialize the fs_info and owner member.
This means the following features are not properly supported:
- Fs owner report for insert_state() error
Without fs_info initialized, although btrfs_err() won't panic, it won't output which fs is causing the error.
- Wrong owner for trace events
alloc_state will get the owner as pinned extents.
Fix this by assiging proper fs_info and owner forbtrfs_device::alloc_state.
--- fs/btrfs/extent-io-tree.h | 1 + fs/btrfs/volumes.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/btrfs/extent-io-tree.h +1 -0
@@ -48,6 +48,7 @@ enum {IO_TREE_INODE_FILE_EXTENT ,IO_TREE_LOG_CSUM_RANGE ,IO_TREE_SELFTEST , + IO_TREE_DEVICE_ALLOC_STATE, }; struct extent_io_tree {
fs/btrfs/volumes.c +4 -3
@@ -406,7 +406,7 @@ void __exit btrfs_cleanup_fs_uuids(void)* Returned struct is not linked onto any lists and must be destroyed using * btrfs_free_device. */ -static struct btrfs_device *__alloc_device (void ) +static struct btrfs_device *__alloc_device (struct btrfs_fs_info *fs_info) {struct btrfs_device *dev;
@@ -433,7 +433,8 @@ static struct btrfs_device *__alloc_device(void)btrfs_device_data_ordered_init (dev);INIT_RADIX_TREE (&dev->reada_zones,GFP_NOFS & ~__GFP_DIRECT_RECLAIM);INIT_RADIX_TREE (&dev->reada_extents,GFP_NOFS & ~__GFP_DIRECT_RECLAIM); -extent_io_tree_init (NULL , &dev->alloc_state,0 ,NULL ); +extent_io_tree_init (fs_info, &dev->alloc_state, +IO_TREE_DEVICE_ALLOC_STATE ,NULL );return dev; }
@@ -6529,7 +6530,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,if (WARN_ON (!devid && !fs_info))return ERR_PTR (-EINVAL ); - dev =__alloc_device (); + dev =__alloc_device (fs_info);if (IS_ERR (dev))return dev;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 182/757 blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
In reply to Greg Kroah-HartmanFrom: Yang Yang <[email protected]>
[ Upstream commit 47ce030b7ac5a5259a9a5919f230b52497afc31a ]
blk_exit_queue will free elevator_data, while blk_mq_run_work_fn will access it. Move cancel of hctx->run_work to the front of blk_exit_queue to avoid use-after-free.
--- block/blk-mq-sysfs.c | 2 -- block/blk-sysfs.c | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-)
block/blk-mq-sysfs.c +0 -2
@@ -36,8 +36,6 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj) struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx, kobj); -cancel_delayed_work_sync (&hctx->run_work); -if (hctx->flags &BLK_MQ_F_BLOCKING )cleanup_srcu_struct (hctx->srcu);blk_free_flush_queue (hctx->fq);
block/blk-sysfs.c +8 -1
@@ -934,9 +934,16 @@ static void blk_release_queue(struct kobject *kobj)blk_free_queue_stats (q->stats); -if (queue_is_mq (q)) +if (queue_is_mq (q)) { +struct blk_mq_hw_ctx *hctx; +int i; +cancel_delayed_work_sync (&q->requeue_work); +queue_for_each_hw_ctx (q, hctx, i) +cancel_delayed_work_sync (&hctx->run_work); + } +blk_exit_queue (q);blk_queue_free_zone_bitmaps (q);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 183/757 ath10k: provide survey info as accumulated data
In reply to Greg Kroah-HartmanFrom: Venkateswara Naralasetty <[email protected]>
[ Upstream commit 720e5c03e5cb26d33d97f55192b791bb48478aa5 ]
It is expected that the returned counters by .get_survey are monotonic increasing. But the data from ath10k gets reset to zero regularly. Channel active/busy time are then showing incorrect values (less than previous or sometimes zero) for the currently active channel during successive survey dump commands.
example:
$ iw dev wlan0 survey dump Survey data from wlan0 frequency: 5180 MHz [in use] channel active time: 54995 ms channel busy time: 432 ms channel receive time: 0 ms channel transmit time: 59 ms ...
$ iw dev wlan0 survey dump Survey data from wlan0 frequency: 5180 MHz [in use] channel active time: 32592 ms channel busy time: 254 ms channel receive time: 0 ms channel transmit time: 0 ms ...
The correct way to handle this is to use the non-clearing WMI_BSS_SURVEY_REQ_TYPE_READ wmi_bss_survey_req_type. The firmware will then accumulate the survey data and handle wrap arounds.
Tested-on: QCA9984 hw1.0 10.4-3.5.3-00057
Tested-on: QCA988X hw2.0 10.2.4-1.0-00047
Tested-on: QCA9888 hw2.0 10.4-3.9.0.2-00024
Tested-on: QCA4019 hw1.0 10.4-3.6-00140
--- drivers/net/wireless/ath/ath10k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/mac.c +1 -1
@@ -7278,7 +7278,7 @@ ath10k_mac_update_bss_chan_survey(struct ath10k *ar, struct ieee80211_channel *channel) {int ret; -enum wmi_bss_survey_req_type type =WMI_BSS_SURVEY_REQ_TYPE_READ_CLEAR ; +enum wmi_bss_survey_req_type type =WMI_BSS_SURVEY_REQ_TYPE_READ ;lockdep_assert_held (&ar->conf_mutex);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 184/757 drm/vkms: fix xrgb on compute crc
In reply to Greg Kroah-HartmanFrom: Melissa Wen <[email protected]>
[ Upstream commit 0986191186128b10b6bbfa5220fc587ed5725e49 ]
The previous memset operation was not correctly zeroing the alpha channel to compute the crc, and as a result, the IGT subtest kms_cursor_crc/pipe-A-cursor-alpha-transparent fails.
--- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_composer.c +1 -1
@@ -33,7 +33,7 @@ static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer) + (i * composer->pitch) + (j * composer->cpp);/* XRGB format ignores Alpha channel */ -memset (vaddr_out + src_offset +24 ,0 ,8 ); +bitmap_clear (vaddr_out + src_offset,24 ,8 ); crc =crc32_le (crc, vaddr_out + src_offset,sizeof (u32)); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 185/757 Bluetooth: hci_uart: Cancel init work before unregistering
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 3b799254cf6f481460719023d7a18f46651e5e7f ]
If hci_uart_tty_close() or hci_uart_unregister_device() is called while hu->init_ready is scheduled, hci_register_dev() could be called after the hci_uart is torn down. Avoid this by ensuring the work is complete or canceled before checking the HCI_UART_REGISTERED flag.
--- drivers/bluetooth/hci_ldisc.c | 1 + drivers/bluetooth/hci_serdev.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/bluetooth/hci_ldisc.c +1 -0
@@ -538,6 +538,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)clear_bit (HCI_UART_PROTO_READY , &hu->flags);percpu_up_write (&hu->proto_lock); +cancel_work_sync (&hu->init_ready);cancel_work_sync (&hu->write_work);if (hdev) {
drivers/bluetooth/hci_serdev.c +2 -0
@@ -355,6 +355,8 @@ void hci_uart_unregister_device(struct hci_uart *hu)struct hci_dev *hdev = hu->hdev;clear_bit (HCI_UART_PROTO_READY , &hu->flags); + +cancel_work_sync (&hu->init_ready);if (test_bit (HCI_UART_REGISTERED , &hu->flags))hci_unregister_dev (hdev);hci_free_dev (hdev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 186/757 drm/amd/display: Fix wrong return value in dm_update_plane_state()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit c35376137e940c3389df2726a92649c01a9844b4 ]
On an error exit path, a negative error code should be returned instead of a positive return value.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -2
@@ -8217,8 +8217,7 @@ static int dm_update_plane_state(struct dc *dc, dm_old_plane_state->dc_state, dm_state->context)) { - ret =EINVAL ; -return ret; +return -EINVAL ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 187/757 drm/vgem: add missing platform_device_unregister() in vgem_init()
In reply to Greg Kroah-HartmanFrom: Qinglang Miao <[email protected]>
[ Upstream commit 57fb54082d5d14512dfd21bc39d91945d3ad1ee9 ]
When vgem_init() get into out_put, the unregister call of vgem_device->platform is missing. So add it before return.
--- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vgem/vgem_drv.c +1 -1
@@ -471,8 +471,8 @@ static int __init vgem_init(void) out_put:drm_dev_put (&vgem_device->drm); +platform_device_unregister (vgem_device->platform);return ret; - out_unregister:platform_device_unregister (vgem_device->platform); out_free:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 188/757 drm/vkms: add missing platform_device_unregister() in vkms_init()
In reply to Greg Kroah-HartmanFrom: Qinglang Miao <[email protected]>
[ Upstream commit 7995bd13296111d672d8c5959f5e81dbbbda5286 ]
When vkms_init() get into out_put, the unregister call of vkms_device->platform is missing. So add it before return.
--- drivers/gpu/drm/vkms/vkms_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_drv.c +1 -1
@@ -190,8 +190,8 @@ static int __init vkms_init(void) out_put:drm_dev_put (&vkms_device->drm); +platform_device_unregister (vkms_device->platform);return ret; - out_unregister:platform_device_unregister (vkms_device->platform); out_free:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 189/757 drm: panel: Fix bus format for OrtusTech COM43H4M85ULC panel
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit f098f168e91ca915c6cf8aa316136af647792f2f ]
The OrtusTech COM43H4M85ULC panel is a 18-bit RGB panel, set the bus format to MEDIA_BUS_FMT_RGB666_1X18.
--- drivers/gpu/drm/panel/panel-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-simple.c +1 -1
@@ -2946,7 +2946,7 @@ static const struct panel_desc ortustech_com43h4m85ulc = { .width = 56, .height = 93, }, - .bus_format = MEDIA_BUS_FMT_RGB888_1X24, + .bus_format = MEDIA_BUS_FMT_RGB666_1X18, .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE, .connector_type = DRM_MODE_CONNECTOR_DPI, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 190/757 ath6kl: prevent potential array overflow in ath6kl_add_new_sta()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 54f9ab7b870934b70e5a21786d951fbcf663970f ]
The value for "aid" comes from skb->data so Smatch marks it as untrusted. If it's invalid then it can result in an out of bounds array access in ath6kl_add_new_sta().
--- drivers/net/wireless/ath/ath6kl/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath6kl/main.c +3 -0
@@ -430,6 +430,9 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,ath6kl_dbg (ATH6KL_DBG_TRC ,"new station %pM aid=%d\n" , mac_addr, aid); +if (aid <1 || aid >AP_MAX_NUM_STA ) +return ; +if (assoc_req_len >sizeof (struct ieee80211_hdr_3addr )) {struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) assoc_info;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 191/757 ath9k: Fix potential out of bounds in ath9k_htc_txcompletion_cb()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 2705cd7558e718a7240c64eb0afb2edad5f8c190 ]
The value of "htc_hdr->endpoint_id" comes from skb->data so Smatch marks it as untrusted so we have to check it before using it as an array offset.
This is similar to a bug that syzkaller found in commit e4ff08a4d727 ("ath9k: Fix use-after-free Write in ath9k_htc_rx_msg") so it is probably a real issue.
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath9k/htc_hst.c +2 -0
@@ -339,6 +339,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle,if (skb) { htc_hdr = (struct htc_frame_hdr *) skb->data; +if (htc_hdr->endpoint_id >=ARRAY_SIZE (htc_handle->endpoint)) + goto ret; endpoint = &htc_handle->endpoint[htc_hdr->endpoint_id];skb_pull (skb,sizeof (struct htc_frame_hdr ));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 192/757 ath10k: Fix the size used in a dma_free_coherent() call in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 454530a9950b5a26d4998908249564cedfc4babc ]
Update the size used in 'dma_free_coherent()' in order to match the one used in the corresponding 'dma_alloc_coherent()'.
--- drivers/net/wireless/ath/ath10k/ce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/ce.c +1 -1
@@ -1555,7 +1555,7 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, ret =ath10k_ce_alloc_shadow_base (ar, src_ring, nentries);if (ret) {dma_free_coherent (ar->dev, - (nentries *sizeof (struct ce_desc_64 ) + + (nentries *sizeof (struct ce_desc ) +CE_DESC_RING_ALIGN ), src_ring->base_addr_owner_space_unaligned, base_addr);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 193/757 wcn36xx: Fix reported 802.11n rx_highest rate wcn3660/wcn3680
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 3b9fb6791e7113679b1eb472e6ce1659e80f5797 ]
Qualcomm's document "80-WL007-1 Rev. J" states that the highest rx rate for the WCN3660 and WCN3680 on MCS 7 is 150 Mbps not the 72 Mbps stated here.
This patch fixes the data-rate declared in the 5GHz table.
hardware")
--- drivers/net/wireless/ath/wcn36xx/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/main.c +1 -1
@@ -163,7 +163,7 @@ static struct ieee80211_supported_band wcn_band_5ghz = { .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, .mcs = { .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, - .rx_highest =cpu_to_le16 (72 ), + .rx_highest =cpu_to_le16 (150 ), .tx_params = IEEE80211_HT_MCS_TX_DEFINED, } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 194/757 ASoC: qcom: lpass-platform: fix memory leak
In reply to Greg Kroah-HartmanFrom: Rohit kumar <[email protected]>
[ Upstream commit 5fd188215d4eb52703600d8986b22311099a5940 ]
lpass_pcm_data is never freed. Free it in close
ops to avoid memory leak.
--- sound/soc/qcom/lpass-platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/qcom/lpass-platform.c +2 -1
@@ -61,7 +61,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,int ret, dma_ch, dir = substream->stream;struct lpass_pcm_data *data; - data =devm_kzalloc (soc_runtime->dev,sizeof (*data),GFP_KERNEL ); + data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -118,6 +118,7 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component,if (v->free_dma_channel) v->free_dma_channel (drvdata, data->dma_ch); +kfree (data);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 195/757 ASoC: qcom: lpass-cpu: fix concurrency issue
In reply to Greg Kroah-HartmanFrom: Rohit kumar <[email protected]>
[ Upstream commit 753a6e17942f6f425ca622e1610625998312ad89 ]
i2sctl register value is set to 0 during hw_free(). This impacts any ongoing concurrent session on the same i2s port. As trigger() stop already resets enable bit to 0, there is no need of explicit hw_free. Removing it to fix the issue.
--- sound/soc/qcom/lpass-cpu.c | 16 ---------------- 1 file changed, 16 deletions(-)
sound/soc/qcom/lpass-cpu.c +0 -16
@@ -209,21 +209,6 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static int lpass_cpu_daiops_hw_free (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct lpass_data *drvdata =snd_soc_dai_get_drvdata (dai); -int ret; - - ret =regmap_write (drvdata->lpaif_map, -LPAIF_I2SCTL_REG (drvdata->variant, dai->driver->id), -0 ); -if (ret) -dev_err (dai->dev,"error writing to i2sctl reg: %d\n" , ret); - -return ret; -} -static int lpass_cpu_daiops_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -304,7 +289,6 @@ const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { .startup = lpass_cpu_daiops_startup, .shutdown = lpass_cpu_daiops_shutdown, .hw_params = lpass_cpu_daiops_hw_params, - .hw_free = lpass_cpu_daiops_hw_free, .prepare = lpass_cpu_daiops_prepare, .trigger = lpass_cpu_daiops_trigger, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 196/757 ath11k: Fix possible memleak in ath11k_qmi_init_service
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 28f1632118818d9dccabf4c0fccfe49686742317 ]
When qmi_add_lookup fail, we should destroy the workqueue
--- drivers/net/wireless/ath/ath11k/qmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath11k/qmi.c +1 -0
@@ -2419,6 +2419,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab) ATH11K_QMI_WLFW_SERVICE_INS_ID_V01);if (ret <0 ) {ath11k_warn (ab,"failed to add qmi lookup\n" ); +destroy_workqueue (ab->qmi.event_wq);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 197/757 brcmfmac: check ndev pointer
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 9c9f015bc9f8839831c7ba0a6d731a3853c464e2 ]
Clang static analysis reports this error
brcmfmac/core.c:490:4: warning: Dereference of null pointer
(*ifp)->ndev->stats.rx_errors++;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~In this block of code
if (ret || !(*ifp) || !(*ifp)->ndev) {
if (ret != -ENODATA && *ifp)
(*ifp)->ndev->stats.rx_errors++;
brcmu_pkt_buf_free_skb(skb);
return -ENODATA;
}(*ifp)->ndev being NULL is caught as an error
But then it is used to report the error.
So add a check before using it.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +1 -1
@@ -486,7 +486,7 @@ static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb, ret =brcmf_proto_hdrpull (drvr, true, skb, ifp);if (ret || !(*ifp) || !(*ifp)->ndev) { -if (ret != -ENODATA && *ifp) +if (ret != -ENODATA && *ifp && (*ifp)->ndev) (*ifp)->ndev->stats.rx_errors++;brcmu_pkt_buf_free_skb (skb);return -ENODATA ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 198/757 mwifiex: Do not use GFP_KERNEL in atomic context
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit d2ab7f00f4321370a8ee14e5630d4349fdacc42e ]
A possible call chain is as follow:
mwifiex_sdio_interrupt (sdio.c)
--> mwifiex_main_process (main.c)
--> mwifiex_process_cmdresp (cmdevt.c)
--> mwifiex_process_sta_cmdresp (sta_cmdresp.c)
--> mwifiex_ret_802_11_scan (scan.c)
--> mwifiex_parse_single_response_buf (scan.c)'mwifiex_sdio_interrupt()' is an interrupt function.
Also note that 'mwifiex_ret_802_11_scan()' already uses GFP_ATOMIC.
So use GFP_ATOMIC instead of GFP_KERNEL when memory is allocated in 'mwifiex_parse_single_response_buf()'.
or
--- drivers/net/wireless/marvell/mwifiex/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/scan.c +1 -1
@@ -1889,7 +1889,7 @@ mwifiex_parse_single_response_buf(struct mwifiex_private *priv, u8 **bss_info, chan,CFG80211_BSS_FTYPE_UNKNOWN , bssid, timestamp, cap_info_bitmap, beacon_period, - ie_buf, ie_len, rssi, GFP_KERNEL); + ie_buf, ie_len, rssi, GFP_ATOMIC);if (bss) { bss_priv = (struct mwifiex_bss_priv *)bss->priv; bss_priv->band = band;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 199/757 drm/malidp: Use struct drm_gem_object_funcs.get_sg_table internally
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
[ Upstream commit d3d1bbe794ab4f7cce13e8ba08a2ac978133375e ]
The malidp driver uses GEM object functions for callbacks. Fix it to use them internally as well.
--- drivers/gpu/drm/arm/malidp_planes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_planes.c +1 -1
@@ -346,7 +346,7 @@ static bool malidp_check_pages_threshold(struct malidp_plane_state *ms,if (cma_obj->sgt) sgt = cma_obj->sgt;else - sgt = obj->dev->driver->gem_prime_get_sg_table (obj); + sgt = obj->funcs->get_sg_table (obj);if (!sgt)return false;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 200/757 staging: rtl8192u: Do not use GFP_KERNEL in atomic context
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit acac75bb451fd39344eb54fad6602dfc9482e970 ]
'rtl8192_irq_rx_tasklet()' is a tasklet initialized in 'rtl8192_init_priv_task()'.
Quoted 1 line
From this function it is possible to allocate some memory with the
GFP_KERNEL flag, which is not allowed in the atomic context of a tasklet.
Use GFP_ATOMIC instead.
The call chain is:
rtl8192_irq_rx_tasklet (in r8192U_core.c)
--> rtl8192_rx_nomal (in r8192U_core.c)
--> ieee80211_rx (in ieee80211/ieee80211_rx.c)
--> RxReorderIndicatePacket (in ieee80211/ieee80211_rx.c)--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +1 -1
@@ -597,7 +597,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, prxbIndicateArray =kmalloc_array (REORDER_WIN_SIZE ,sizeof (struct ieee80211_rxb *), -GFP_KERNEL ); +GFP_ATOMIC );if (!prxbIndicateArray)return ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 201/757 drm/amd/display: fix potential integer overflow when shifting 32 bit variable bl_pwm
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 1d5503331b12a76266049289747dfd94f1643fde ]
The 32 bit unsigned integer bl_pwm is being shifted using 32 bit arithmetic and then being assigned to a 64 bit unsigned integer. There is a potential for a 32 bit overflow so cast bl_pwm to enforce a 64 bit shift operation to avoid this.
Addresses-Coverity: ("unintentional integer overflow")
--- drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c +1 -1
@@ -75,7 +75,7 @@ static unsigned int calculate_16_bit_backlight_from_pwm(struct dce_panel_cntl *delse bl_pwm &=0xFFFF ; - current_backlight = bl_pwm << (1 + bl_int_count); + current_backlight = (uint64_t )bl_pwm << (1 + bl_int_count);if (bl_period ==0 ) bl_period =0xFFFF ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 202/757 selftests/bpf: Fix test_vmlinux test to use bpf_probe_read_user()
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 02f47faa25db134f6043fb6b12a68b5d4c980bb6 ]
The test is reading UAPI kernel structure from user-space. So it doesn't need CO-RE relocations and has to use bpf_probe_read_user().
--- tools/testing/selftests/bpf/progs/test_vmlinux.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/test_vmlinux.c +9 -3
@@ -19,12 +19,14 @@ SEC("tp/syscalls/sys_enter_nanosleep")int handle__tp (struct trace_event_raw_sys_enter *args) {struct __kernel_timespec *ts; +long tv_nsec;if (args->id != __NR_nanosleep)return 0 ; ts = (void *)args->args[0 ]; -if (BPF_CORE_READ (ts, tv_nsec) !=MY_TV_NSEC ) +if (bpf_probe_read_user (&tv_nsec,sizeof (ts->tv_nsec), &ts->tv_nsec) || + tv_nsec !=MY_TV_NSEC )return 0 ; tp_called = true;
@@ -35,12 +37,14 @@ SEC("raw_tp/sys_enter")int BPF_PROG (handle__raw_tp ,struct pt_regs *regs,long id) {struct __kernel_timespec *ts; +long tv_nsec;if (id != __NR_nanosleep)return 0 ; ts = (void *)PT_REGS_PARM1_CORE (regs); -if (BPF_CORE_READ (ts, tv_nsec) !=MY_TV_NSEC ) +if (bpf_probe_read_user (&tv_nsec,sizeof (ts->tv_nsec), &ts->tv_nsec) || + tv_nsec !=MY_TV_NSEC )return 0 ; raw_tp_called = true;
@@ -51,12 +55,14 @@ SEC("tp_btf/sys_enter")int BPF_PROG (handle__tp_btf ,struct pt_regs *regs,long id) {struct __kernel_timespec *ts; +long tv_nsec;if (id != __NR_nanosleep)return 0 ; ts = (void *)PT_REGS_PARM1_CORE (regs); -if (BPF_CORE_READ (ts, tv_nsec) !=MY_TV_NSEC ) +if (bpf_probe_read_user (&tv_nsec,sizeof (ts->tv_nsec), &ts->tv_nsec) || + tv_nsec !=MY_TV_NSEC )return 0 ; tp_btf_called = true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 203/757 drm/gma500: fix error check
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit cdd296cdae1af2d27dae3fcfbdf12c5252ab78cf ]
Reviewing this block of code in cdv_intel_dp_init()
ret = cdv_intel_dp_aux_native_read(gma_encoder, DP_DPCD_REV, ...
cdv_intel_edp_panel_vdd_off(gma_encoder);
if (ret == 0) {
/* if this fails, presume the device is a ghost */
DRM_INFO("failed to retrieve link info, disabling eDP\n");
drm_encoder_cleanup(encoder);
cdv_intel_dp_destroy(connector);
goto err_priv;
} else {The (ret == 0) is not strict enough. cdv_intel_dp_aux_native_read() returns > 0 on success otherwise it is failure.
So change to <=
--- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/gma500/cdv_intel_dp.c +1 -1
@@ -2078,7 +2078,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev intel_dp->dpcd, sizeof(intel_dp->dpcd));cdv_intel_edp_panel_vdd_off (gma_encoder); -if (ret ==0 ) { +if (ret <=0 ) {/* if this fails, presume the device is a ghost */ DRM_INFO ("failed to retrieve link info, disabling eDP\n" );drm_encoder_cleanup (encoder);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 204/757 scsi: qla4xxx: Fix an error handling path in qla4xxx_get_host_stats()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 574918e69720fe62ab3eb42ec3750230c8d16b06 ]
Update the size used in 'dma_free_coherent()' in order to match the one used in the corresponding 'dma_alloc_coherent()'.
--- drivers/scsi/qla4xxx/ql4_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla4xxx/ql4_os.c +1 -1
@@ -1254,7 +1254,7 @@ static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len)le64_to_cpu (ql_iscsi_stats->iscsi_sequence_error); exit_host_stats:if (ql_iscsi_stats) -dma_free_coherent (&ha->pdev->dev, host_stats_size, +dma_free_coherent (&ha->pdev->dev, stats_size, ql_iscsi_stats, iscsi_stats_dma); ql4_printk(KERN_INFO, ha, "%s: Get host stats done\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 205/757 scsi: qla2xxx: Fix the size used in a dma_free_coherent() call
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 650b323c8e7c3ac4830a20895b1d444fd68dd787 ]
Update the size used in 'dma_free_coherent()' in order to match the one used in the corresponding 'dma_alloc_coherent()'.
[mkp: removed memset() hunk that has already been addressed]
--- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -4958,7 +4958,7 @@ qla25xx_set_els_cmds_supported(scsi_qla_host_t *vha) "Done %s.\n", __func__); } -dma_free_coherent (&ha->pdev->dev,DMA_POOL_SIZE , +dma_free_coherent (&ha->pdev->dev,ELS_CMD_MAP_SIZE , els_cmd_map, els_cmd_map_dma);return rval;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 206/757 scsi: qla2xxx: Fix wrong return value in qlt_chk_unresolv_exchg()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit bbf2d06a9d767718bfe6028d6288c03edb98554a ]
In the case of a failed retry, a positive value EIO is returned here. I think this is a typo error. It is necessary to return an error value.
[mkp: caller checks != 0 but the rest of the file uses -Exxx so fix this up to be consistent]
--- drivers/scsi/qla2xxx/qla_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -5668,7 +5668,7 @@ static int qlt_chk_unresolv_exchg(struct scsi_qla_host *vha,/* found existing exchange */ qpair->retry_term_cnt++;if (qpair->retry_term_cnt >=5 ) { - rc =EIO ; + rc = -EIO ; qpair->retry_term_cnt =0 ;ql_log (ql_log_warn, vha,0xffff ,"Unable to send ABTS Respond. Dumping firmware.\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 207/757 scsi: qla2xxx: Fix wrong return value in qla_nvme_register_hba()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit ca4fb89a3d714a770e9c73c649da830f3f4a5326 ]
On an error exit path, a negative error code should be returned instead of a positive return value.
--- drivers/scsi/qla2xxx/qla_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +1 -1
@@ -683,7 +683,7 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha)struct nvme_fc_port_template *tmpl;struct qla_hw_data *ha;struct nvme_fc_port_info pinfo; -int ret =EINVAL ; +int ret = -EINVAL ;if (!IS_ENABLED (CONFIG_NVME_FC ))return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 208/757 scsi: csiostor: Fix wrong return value in csio_hw_prep_fw()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit 44f4daf8678ae5f08c93bbe70792f90cd88e4649 ]
On an error exit path, a negative error code should be returned instead of a positive return value.
--- drivers/scsi/csiostor/csio_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/csiostor/csio_hw.c +1 -1
@@ -2384,7 +2384,7 @@ static int csio_hw_prep_fw(struct csio_hw *hw, struct fw_info *fw_info,FW_HDR_FW_VER_MICRO_G (c),FW_HDR_FW_VER_BUILD_G (c),FW_HDR_FW_VER_MAJOR_G (k),FW_HDR_FW_VER_MINOR_G (k), FW_HDR_FW_VER_MICRO_G(k), FW_HDR_FW_VER_BUILD_G(k)); - ret =EINVAL ; + ret = -EINVAL ; goto bye; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 209/757 libbpf: Fix unintentional success return code in bpf_object__load
In reply to Greg Kroah-HartmanFrom: Alex Gartrell <[email protected]>
[ Upstream commit ef05afa66c59c2031a3798916ef3ff3778232129 ]
There are code paths where EINVAL is returned directly without setting errno. In that case, errno could be 0, which would mask the failure. For example, if a careless programmer set log_level to 10000 out of laziness, they would have to spend a long time trying to figure out why.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -5425,7 +5425,7 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,free (log_buf); goto retry_load; } - ret = -errno; + ret = errno ? -errno : -LIBBPF_ERRNO__LOAD ; cp =libbpf_strerror_r (errno, errmsg,sizeof (errmsg));pr_warn ("load bpf program failed: %s\n" , cp);pr_perm_msg (ret);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 210/757 wilc1000: Fix memleak in wilc_sdio_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 8d95ab34b21ee0f870a9185b6457e8f6eb54914c ]
When devm_clk_get() returns -EPROBE_DEFER, sdio_priv should be freed just like when wilc_cfg80211_init() fails.
--- drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/microchip/wilc1000/sdio.c +3 -2
@@ -149,9 +149,10 @@ static int wilc_sdio_probe(struct sdio_func *func, wilc->dev = &func->dev; wilc->rtc_clk =devm_clk_get (&func->card->dev,"rtc" ); -if (PTR_ERR_OR_ZERO (wilc->rtc_clk) == -EPROBE_DEFER ) +if (PTR_ERR_OR_ZERO (wilc->rtc_clk) == -EPROBE_DEFER ) { +kfree (sdio_priv);return -EPROBE_DEFER ; -else if (!IS_ERR (wilc->rtc_clk)) + }else if (!IS_ERR (wilc->rtc_clk))clk_prepare_enable (wilc->rtc_clk);dev_info (&func->dev,"Driver Initializing success\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 211/757 wilc1000: Fix memleak in wilc_bus_probe
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 9a19a939abfa7d949f584a7ad872e683473fdc14 ]
When devm_clk_get() returns -EPROBE_DEFER, spi_priv should be freed just like when wilc_cfg80211_init() fails.
--- drivers/net/wireless/microchip/wilc1000/spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/microchip/wilc1000/spi.c +3 -2
@@ -112,9 +112,10 @@ static int wilc_bus_probe(struct spi_device *spi) wilc->dev_irq_num = spi->irq; wilc->rtc_clk =devm_clk_get (&spi->dev,"rtc_clk" ); -if (PTR_ERR_OR_ZERO (wilc->rtc_clk) == -EPROBE_DEFER ) +if (PTR_ERR_OR_ZERO (wilc->rtc_clk) == -EPROBE_DEFER ) { +kfree (spi_priv);return -EPROBE_DEFER ; -else if (!IS_ERR (wilc->rtc_clk)) + }else if (!IS_ERR (wilc->rtc_clk))clk_prepare_enable (wilc->rtc_clk);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 212/757 rtw88: dont treat NULL pointer as an array
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit 22b726cbdd09d9891ede8aa122a950d2d0ae5e09 ]
I'm not a standards expert, but this really looks to be undefined behavior, when chip->dig_cck may be NULL. (And, we're trying to do a NULL check a few lines down, because some chip variants will use NULL.)
--- drivers/net/wireless/realtek/rtw88/phy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/phy.c +3 -2
@@ -147,12 +147,13 @@ void rtw_phy_dig_write(struct rtw_dev *rtwdev, u8 igi) {struct rtw_chip_info *chip = rtwdev->chip;struct rtw_hal *hal = &rtwdev->hal; -const struct rtw_hw_reg *dig_cck = &chip->dig_cck[0 ];u32 addr, mask;u8 path; -if (dig_cck) +if (chip->dig_cck) { +const struct rtw_hw_reg *dig_cck = &chip->dig_cck[0 ];rtw_write32_mask (rtwdev, dig_cck->addr, dig_cck->mask, igi >>1 ); + }for (path =0 ; path < hal->rf_path_num; path++) { addr = chip->dig[path].addr;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 213/757 selftests/livepatch: Do not check order when using "comm" for dmesg checking
In reply to Greg Kroah-HartmanFrom: Miroslav Benes <[email protected]>
[ Upstream commit 884ee754f5aedbe54406a4d308a6cc57335747ce ]
check_result() uses "comm" to check expected results of selftests output in dmesg. Everything works fine if timestamps in dmesg are unique. If not, like in this example
[ 86.844422] test_klp_callbacks_demo: pre_unpatch_callback: test_klp_callbacks_mod -> [MODULE_STATE_LIVE] Normal state [ 86.844422] livepatch: 'test_klp_callbacks_demo': starting unpatching transition
, "comm" fails with "comm: file 2 is not in sorted order". Suppress the order checking with --nocheck-order option.
--- tools/testing/selftests/livepatch/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/livepatch/functions.sh +1 -1
@@ -278,7 +278,7 @@ function check_result { # help differentiate repeated testing runs. Remove them with a # post-comparison sed filter. - result=$(dmesg | comm -13 "$SAVED_DMESG" - | \ + result=$(dmesg | comm --nocheck-order -13 "$SAVED_DMESG" - | \ grep -e 'livepatch:' -e 'test_klp' | \ grep -v '\(tainting\|taints\) kernel' | \ sed 's/^\[[ 0-9.]*\] //')
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 214/757 backlight: sky81452-backlight: Fix refcount imbalance on error
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit b7a4f80bc316a56d6ec8750e93e66f42431ed960 ]
When of_property_read_u32_array() returns an error code, a pairing refcount decrement is needed to keep np's refcount balanced.
--- drivers/video/backlight/sky81452-backlight.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/backlight/sky81452-backlight.c +1 -0
@@ -217,6 +217,7 @@ static struct sky81452_bl_platform_data *sky81452_bl_parse_dt( num_entry);if (ret <0 ) {dev_err (dev,"led-sources node is invalid.\n" ); +of_node_put (np);return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 215/757 staging: wfx: fix frame reordering
In reply to Greg Kroah-HartmanFrom: Jérôme Pouiller <[email protected]>
[ Upstream commit 7373f31c4b5e382e5117b71a6792e8005c45aa50 ]
When mac80211 debug is enabled, the trace below appears:
[60744.340037] wlan0: Rx A-MPDU request on aa:bb:cc:97:60:24 tid 0 result -524
This imply that ___ieee80211_start_rx_ba_session will prematurely exit and frame reordering won't be enabled.
--- drivers/staging/wfx/sta.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/staging/wfx/sta.c +10 -9
@@ -682,15 +682,16 @@ int wfx_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_ampdu_params *params) { -/* Aggregation is implemented fully in firmware, -* including block ack negotiation. Do not allow -* mac80211 stack to do anything: it interferes with -* the firmware. -*/ - -/* Note that we still need this function stubbed. */ - -return -ENOTSUPP ; +// Aggregation is implemented fully in firmware +switch (params->action) { +case IEEE80211_AMPDU_RX_START : +case IEEE80211_AMPDU_RX_STOP : +// Just acknowledge it to enable frame re-ordering +return 0 ; +default : +// Leave the firmware doing its business for tx aggregation +return -ENOTSUPP ; + } } int wfx_add_chanctx(struct ieee80211_hw *hw,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 216/757 staging: emxx_udc: Fix passing of NULL to dma_alloc_coherent()
In reply to Greg Kroah-HartmanFrom: Alex Dewar <[email protected]>
[ Upstream commit cc34073c6248e9cec801bf690d1455f264d12357 ]
In nbu2ss_eq_queue() memory is allocated with dma_alloc_coherent(), though, strangely, NULL is passed as the struct device* argument. Pass the UDC's device instead. Fix up the corresponding call to dma_free_coherent() in the same way.
Build-tested on x86 only.
--- drivers/staging/emxx_udc/emxx_udc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/emxx_udc/emxx_udc.c +2 -2
@@ -2593,7 +2593,7 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,if (req->unaligned) {if (!ep->virt_buf) - ep->virt_buf =dma_alloc_coherent (NULL ,PAGE_SIZE , + ep->virt_buf =dma_alloc_coherent (udc->dev,PAGE_SIZE , &ep->phys_buf,GFP_ATOMIC |GFP_DMA );if (ep->epnum >0 ) {
@@ -3148,7 +3148,7 @@ static int nbu2ss_drv_remove(struct platform_device *pdev)for (i =0 ; i <NUM_ENDPOINTS ; i++) { ep = &udc->ep[i];if (ep->virt_buf) -dma_free_coherent (NULL ,PAGE_SIZE , (void *)ep->virt_buf, +dma_free_coherent (udc->dev,PAGE_SIZE , (void *)ep->virt_buf, ep->phys_buf); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 217/757 VMCI: check return value of get_user_pages_fast() for errors
In reply to Greg Kroah-HartmanFrom: Alex Dewar <[email protected]>
[ Upstream commit 90ca6333fd65f318c47bff425e1ea36c0a5539f6 ]
In a couple of places in qp_host_get_user_memory(), get_user_pages_fast() is called without properly checking for errors. If e.g. -EFAULT is returned, this negative value will then be passed on to qp_release_pages(), which expects a u64 as input.
Fix this by only calling qp_release_pages() when we have a positive number returned.
--- drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/misc/vmw_vmci/vmci_queue_pair.c +6 -4
@@ -657,8 +657,9 @@ static int qp_host_get_user_memory(u64 produce_uva,if (retval < (int )produce_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(produce) failed (retval=%d)" , retval); -qp_release_pages (produce_q->kernel_if->u.h.header_page, - retval, false); +if (retval >0 ) +qp_release_pages (produce_q->kernel_if->u.h.header_page, + retval, false); err =VMCI_ERROR_NO_MEM ; goto out; }
@@ -670,8 +671,9 @@ static int qp_host_get_user_memory(u64 produce_uva,if (retval < (int )consume_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(consume) failed (retval=%d)" , retval); -qp_release_pages (consume_q->kernel_if->u.h.header_page, - retval, false); +if (retval >0 ) +qp_release_pages (consume_q->kernel_if->u.h.header_page, + retval, false);qp_release_pages (produce_q->kernel_if->u.h.header_page, produce_q->kernel_if->num_pages, false); err =VMCI_ERROR_NO_MEM ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 218/757 mm/error_inject: Fix allow_error_inject function signatures.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit 76cd61739fd107a7f7ec4c24a045e98d8ee150f0 ]
'static' and 'static noinline' function attributes make no guarantees that gcc/clang won't optimize them. The compiler may decide to inline 'static' function and in such case ALLOW_ERROR_INJECT becomes meaningless. The compiler could have inlined __add_to_page_cache_locked() in one callsite and didn't inline in another. In such case injecting errors into it would cause unpredictable behavior. It's worse with 'static noinline' which won't be inlined, but it still can be optimized. Like the compiler may decide to remove one argument or constant propagate the value depending on the callsite.
To avoid such issues make sure that these functions are global noinline.
--- mm/filemap.c | 8 ++++---- mm/page_alloc.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
mm/filemap.c +4 -4
@@ -827,10 +827,10 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask) }EXPORT_SYMBOL_GPL (replace_page_cache_page); -static int __add_to_page_cache_locked (struct page *page, -struct address_space *mapping, -pgoff_t offset,gfp_t gfp_mask, -void **shadowp) +noinline int __add_to_page_cache_locked(struct page *page, +struct address_space *mapping, +pgoff_t offset,gfp_t gfp_mask, +void **shadowp) {XA_STATE (xas, &mapping->i_pages, offset);int huge =PageHuge (page);
mm/page_alloc.c +1 -1
@@ -3496,7 +3496,7 @@ static inline bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)#endif /* CONFIG_FAIL_PAGE_ALLOC */ -static noinline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) +noinline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) {return __should_fail_alloc_page (gfp_mask, order); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 219/757 drm: panel: Fix bpc for OrtusTech COM43H4M85ULC panel
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 3b8095169982ff4ec2a1b4be61b7224bbef23b48 ]
The OrtusTech COM43H4M85ULC panel is a 18-bit RGB panel. Commit f098f168e91c ("drm: panel: Fix bus format for OrtusTech COM43H4M85ULC panel") has fixed the bus formats, but forgot to address the bpc value. Set it to 6.
--- drivers/gpu/drm/panel/panel-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-simple.c +1 -1
@@ -2941,7 +2941,7 @@ static const struct drm_display_mode ortustech_com43h4m85ulc_mode = {static const struct panel_desc ortustech_com43h4m85ulc = { .modes = &ortustech_com43h4m85ulc_mode, .num_modes =1 , - .bpc =8 , + .bpc =6 , .size = { .width =56 , .height =93 ,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 220/757 samples/bpf: Fix to xdpsock to avoid recycling frames
In reply to Greg Kroah-HartmanFrom: Weqaar Janjua <[email protected]>
[ Upstream commit b69e56cf765155dcac0037d7d0f162a2afab76c2 ]
The txpush program in the xdpsock sample application is supposed to send out all packets in the umem in a round-robin fashion. The problem is that it only cycled through the first BATCH_SIZE worth of packets. Fixed this so that it cycles through all buffers in the umem as intended.
--- samples/bpf/xdpsock_user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
samples/bpf/xdpsock_user.c +5 -5
@@ -1004,7 +1004,7 @@ static void rx_drop_all(void) } } -static void tx_only (struct xsk_socket_info *xsk,u32 frame_nb,int batch_size) +static void tx_only (struct xsk_socket_info *xsk,u32 *frame_nb,int batch_size) {u32 idx;unsigned int i;
@@ -1017,14 +1017,14 @@ static void tx_only(struct xsk_socket_info *xsk, u32 frame_nb, int batch_size)for (i =0 ; i < batch_size; i++) {struct xdp_desc *tx_desc =xsk_ring_prod__tx_desc (&xsk->tx, idx + i); - tx_desc->addr = (frame_nb + i) <<XSK_UMEM__DEFAULT_FRAME_SHIFT ; + tx_desc->addr = (*frame_nb + i) <<XSK_UMEM__DEFAULT_FRAME_SHIFT ; tx_desc->len =PKT_SIZE ; }xsk_ring_prod__submit (&xsk->tx, batch_size); xsk->outstanding_tx += batch_size; - frame_nb += batch_size; - frame_nb %=NUM_FRAMES ; + *frame_nb += batch_size; + *frame_nb %=NUM_FRAMES ;complete_tx_only (xsk, batch_size); }
@@ -1080,7 +1080,7 @@ static void tx_only_all(void) }for (i =0 ; i < num_socks; i++) -tx_only (xsks[i], frame_nb[i], batch_size); +tx_only (xsks[i], &frame_nb[i], batch_size); pkt_cnt += batch_size;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 221/757 ima: Pre-parse the list of keyrings in a KEY_CHECK rule
In reply to Greg Kroah-HartmanFrom: Tyler Hicks <[email protected]>
[ Upstream commit 176377d97d6a3fae971ecb1f47d9b9cb7dab05ef ]
The ima_keyrings buffer was used as a work buffer for strsep()-based parsing of the "keyrings=" option of an IMA policy rule. This parsing was re-performed each time an asymmetric key was added to a kernel keyring for each loaded policy rule that contained a "keyrings=" option.
An example rule specifying this option is:
measure func=KEY_CHECK keyrings=a|b|c
The rule says to measure asymmetric keys added to any of the kernel keyrings named "a", "b", or "c". The size of the buffer size was equal to the size of the largest "keyrings=" value seen in a previously loaded rule (5 + 1 for the NUL-terminator in the previous example) and the buffer was pre-allocated at the time of policy load.
The pre-allocated buffer approach suffered from a couple bugs:
1) There was no locking around the use of the buffer so concurrent key add operations, to two different keyrings, would result in the strsep() loop of ima_match_keyring() to modify the buffer at the same time. This resulted in unexpected results from ima_match_keyring() and, therefore, could cause unintended keys to be measured or keys to not be measured when IMA policy intended for them to be measured.
2) If the kstrdup() that initialized entry->keyrings in ima_parse_rule() failed, the ima_keyrings buffer was freed and set to NULL even when a valid KEY_CHECK rule was previously loaded. The next KEY_CHECK event would trigger a call to strcpy() with a NULL destination pointer and crash the kernel.
Remove the need for a pre-allocated global buffer by parsing the list of keyrings in a KEY_CHECK rule at the time of policy load. The ima_rule_entry will contain an array of string pointers which point to the name of each keyring specified in the rule. No string processing needs to happen at the time of asymmetric key add so iterating through the list and doing a string comparison is all that's required at the time of policy check.
In the process of changing how the "keyrings=" policy option is handled, a couple additional bugs were fixed:
1) The rule parser accepted rules containing invalid "keyrings=" values such as "a|b||c", "a|b|", or simply "|".
2) The /sys/kernel/security/ima/policy file did not display the entire "keyrings=" value if the list of keyrings was longer than what could fit in the fixed size tbuf buffer in ima_policy_show().
--- security/integrity/ima/ima_policy.c | 138 +++++++++++++++++++--------- 1 file changed, 93 insertions(+), 45 deletions(-)
security/integrity/ima/ima_policy.c +93 -45
@@ -59,6 +59,11 @@ enum policy_types { ORIGINAL_TCB = 1, DEFAULT_TCB };enum policy_rule_list {IMA_DEFAULT_POLICY =1 ,IMA_CUSTOM_POLICY }; +struct ima_rule_opt_list { +size_t count; +char *items[]; +}; +struct ima_rule_entry {struct list_head list;int action;
@@ -78,7 +83,7 @@ struct ima_rule_entry {int type;/* audit type */ } lsm[MAX_LSM_RULES ];char *fsname; -char *keyrings;/* Measure keys added to these keyrings */ +struct ima_rule_opt_list *keyrings;/* Measure keys added to these keyrings */ struct ima_template_desc *template; };
@@ -206,10 +211,6 @@ static LIST_HEAD(ima_policy_rules);static LIST_HEAD (ima_temp_rules);static struct list_head *ima_rules = &ima_default_rules; -/* Pre-allocated buffer used for matching keyrings. */ -static char *ima_keyrings; -static size_t ima_keyrings_len; -static int ima_policy__initdata ;static int __init default_measure_policy_setup (char *str)
@@ -253,6 +254,72 @@ static int __init default_appraise_policy_setup(char *str) }__setup ("ima_appraise_tcb" , default_appraise_policy_setup); +static struct ima_rule_opt_list *ima_alloc_rule_opt_list (const substring_t *src) +{ +struct ima_rule_opt_list *opt_list; +size_t count =0 ; +char *src_copy; +char *cur, *next; +size_t i; + + src_copy =match_strdup (src); +if (!src_copy) +return ERR_PTR (-ENOMEM ); + + next = src_copy; +while ((cur =strsep (&next,"|" ))) { +/* Don't accept an empty list item */ +if (!(*cur)) { +kfree (src_copy); +return ERR_PTR (-EINVAL ); + } + count++; + } + +/* Don't accept an empty list */ +if (!count) { +kfree (src_copy); +return ERR_PTR (-EINVAL ); + } + + opt_list =kzalloc (struct_size (opt_list, items, count),GFP_KERNEL ); +if (!opt_list) { +kfree (src_copy); +return ERR_PTR (-ENOMEM ); + } + +/* +* strsep() has already replaced all instances of '|' with '\0', +* leaving a byte sequence of NUL-terminated strings. Reference each +* string with the array of items. +* +* IMPORTANT: Ownership of the allocated buffer is transferred from +* src_copy to the first element in the items array. To free the +* buffer, kfree() must only be called on the first element of the +* array. +*/ +for (i =0 , cur = src_copy; i < count; i++) { + opt_list->items[i] = cur; + cur =strchr (cur,'\0' ) +1 ; + } + opt_list->count = count; + +return opt_list; +} + +static void ima_free_rule_opt_list (struct ima_rule_opt_list *opt_list) +{ +if (!opt_list) +return ; + +if (opt_list->count) { +kfree (opt_list->items[0 ]); + opt_list->count =0 ; + } + +kfree (opt_list); +} +static void ima_lsm_free_rule (struct ima_rule_entry *entry) {int i;
@@ -274,7 +341,7 @@ static void ima_free_rule(struct ima_rule_entry *entry)* the defined_templates list and cannot be freed here */ kfree (entry->fsname); -kfree (entry->keyrings); +ima_free_rule_opt_list (entry->keyrings);ima_lsm_free_rule (entry);kfree (entry); }
@@ -394,8 +461,8 @@ int ima_lsm_policy_change(struct notifier_block *nb, unsigned long event,static bool ima_match_keyring (struct ima_rule_entry *rule,const char *keyring,const struct cred *cred) { -char *next_keyring, *keyrings_ptr;bool matched = false; +size_t i;if ((rule->flags &IMA_UID ) && !rule->uid_op (cred->uid, rule->uid))return false;
@@ -406,15 +473,8 @@ static bool ima_match_keyring(struct ima_rule_entry *rule,if (!keyring)return false; -strcpy (ima_keyrings, rule->keyrings); - -/* -* "keyrings=" is specified in the policy in the format below: -* keyrings=.builtin_trusted_keys|.ima|.evm -*/ - keyrings_ptr = ima_keyrings; -while ((next_keyring =strsep (&keyrings_ptr,"|" )) !=NULL ) { -if (!strcmp (next_keyring, keyring)) { +for (i =0 ; i < rule->keyrings->count; i++) { +if (!strcmp (rule->keyrings->items[i], keyring)) { matched = true;break ; }
@@ -1065,7 +1125,6 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)bool uid_token;struct ima_template_desc *template_desc;int result =0 ; -size_t keyrings_len; ab =integrity_audit_log_start (audit_context (),GFP_KERNEL ,AUDIT_INTEGRITY_POLICY_RULE );
@@ -1231,37 +1290,18 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)case Opt_keyrings:ima_log_string (ab,"keyrings" , args[0 ].from); - keyrings_len =strlen (args[0 ].from) +1 ; - -if ((entry->keyrings) || - (keyrings_len <2 )) { +if (entry->keyrings) { result = -EINVAL ;break ; } -if (keyrings_len > ima_keyrings_len) { -char *tmpbuf; - - tmpbuf =krealloc (ima_keyrings, keyrings_len, -GFP_KERNEL ); -if (!tmpbuf) { - result = -ENOMEM ; -break ; - } - - ima_keyrings = tmpbuf; - ima_keyrings_len = keyrings_len; - } - - entry->keyrings =kstrdup (args[0 ].from,GFP_KERNEL ); -if (!entry->keyrings) { -kfree (ima_keyrings); - ima_keyrings =NULL ; - ima_keyrings_len =0 ; - result = -ENOMEM ; + entry->keyrings =ima_alloc_rule_opt_list (args); +if (IS_ERR (entry->keyrings)) { + result =PTR_ERR (entry->keyrings); + entry->keyrings =NULL ;break ; } - result =0 ; + entry->flags |=IMA_KEYRINGS ;break ;case Opt_fsuuid:
@@ -1574,6 +1614,15 @@ static void policy_func_show(struct seq_file *m, enum ima_hooks func)seq_printf (m,"func=%d " , func); } +static void ima_show_rule_opt_list (struct seq_file *m, +const struct ima_rule_opt_list *opt_list) +{ +size_t i; + +for (i =0 ; i < opt_list->count; i++) +seq_printf (m,"%s%s" , i ?"|" :"" , opt_list->items[i]); +} +int ima_policy_show (struct seq_file *m,void *v) {struct ima_rule_entry *entry = v;
@@ -1630,9 +1679,8 @@ int ima_policy_show(struct seq_file *m, void *v) }if (entry->flags &IMA_KEYRINGS ) { -if (entry->keyrings !=NULL ) -snprintf (tbuf,sizeof (tbuf),"%s" , entry->keyrings); -seq_printf (m,pt (Opt_keyrings), tbuf); +seq_puts (m,"keyrings=" ); +ima_show_rule_opt_list (m, entry->keyrings);seq_puts (m," " ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 222/757 ima: Fail rule parsing when asymmetric key measurement isnt supportable
In reply to Greg Kroah-HartmanFrom: Tyler Hicks <[email protected]>
[ Upstream commit 48ce1ddce16b0d1e3ff948da40a0d5125a4ee1a0 ]
Measuring keys is currently only supported for asymmetric keys. In the future, this might change.
For now, the "func=KEY_CHECK" and "keyrings=" options are only appropriate when CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS is enabled. Make this clear at policy load so that IMA policy authors don't assume that these policy language constructs are supported.
--- security/integrity/ima/ima_policy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
security/integrity/ima/ima_policy.c +4 -2
@@ -1233,7 +1233,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) entry->func =POLICY_CHECK ; else if (strcmp(args[0].from, "KEXEC_CMDLINE") == 0) entry->func = KEXEC_CMDLINE; - else if (strcmp(args[0].from, "KEY_CHECK") == 0) + else if (IS_ENABLED(CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS) && + strcmp(args[0].from, "KEY_CHECK") == 0) entry->func = KEY_CHECK; else result = -EINVAL ;
@@ -1290,7 +1291,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)case Opt_keyrings:ima_log_string (ab,"keyrings" , args[0 ].from); -if (entry->keyrings) { +if (!IS_ENABLED (CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS ) || + entry->keyrings) { result = -EINVAL ;break ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 223/757 drm/crc-debugfs: Fix memleak in crc_control_write
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit f7ec68b341dbd5da13d4c65ce444dcd605f1c42e ]
When verify_crc_source() fails, source needs to be freed. However, current code is returning directly and ends up leaking memory.
--- drivers/gpu/drm/drm_debugfs_crc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_debugfs_crc.c +3 -1
@@ -144,8 +144,10 @@ static ssize_t crc_control_write(struct file *file, const char __user *ubuf, source[len -1 ] ='\0' ; ret = crtc->funcs->verify_crc_source (crtc, source, &values_cnt); -if (ret) +if (ret) { +kfree (source);return ret; + }spin_lock_irq (&crc->lock);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 224/757 Bluetooth: Clear suspend tasks on unregister
In reply to Greg Kroah-HartmanFrom: Abhishek Pandit-Subedi <[email protected]>
[ Upstream commit 0e9952804ec9c8ba60f131225eab80634339f042 ]
While unregistering, make sure to clear the suspend tasks before cancelling the work. If the unregister is called during resume from suspend, this will unnecessarily add 2s to the resume time otherwise.
--- net/bluetooth/hci_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/bluetooth/hci_core.c +11 -0
@@ -3442,6 +3442,16 @@ void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, } } +static void hci_suspend_clear_tasks (struct hci_dev *hdev) +{ +int i; + +for (i =0 ; i < __SUSPEND_NUM_TASKS; i++) +clear_bit (i, hdev->suspend_tasks); + +wake_up (&hdev->suspend_wait_q); +} +static int hci_suspend_wait_event (struct hci_dev *hdev) {#define WAKE_COND \
@@ -3785,6 +3795,7 @@ void hci_unregister_dev(struct hci_dev *hdev)cancel_work_sync (&hdev->power_on);unregister_pm_notifier (&hdev->suspend_notifier); +hci_suspend_clear_tasks (hdev);cancel_work_sync (&hdev->suspend_prepare);hci_dev_do_close (hdev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 225/757 selftests: vm: add fragment CONFIG_GUP_BENCHMARK
In reply to Greg Kroah-HartmanFrom: Anatoly Pugachev <[email protected]>
[ Upstream commit cae1d5a2c5a491141faa747e9944ba40ab4ab786 ]
When running gup_benchmark test the following output states that the config options is missing.
$ sudo ./gup_benchmark open: No such file or directory
$ sudo strace -e trace=file ./gup_benchmark 2>&1 | tail -3 openat(AT_FDCWD, "/sys/kernel/debug/gup_benchmark", O_RDWR) = -1 ENOENT (No such file or directory) open: No such file or directory +++ exited with 1 +++
Fix it by adding config option fragment.
--- tools/testing/selftests/vm/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/vm/config +1 -0
@@ -3,3 +3,4 @@ CONFIG_USERFAULTFD=y CONFIG_TEST_VMALLOC=m CONFIG_DEVICE_PRIVATE=y CONFIG_TEST_HMM=m +CONFIG_GUP_BENCHMARK=y
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 226/757 scsi: ufs: Make ufshcd_print_trs() consider UFSHCD_QUIRK_PRDT_BYTE_GRAN
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit cc770ce34aeeff21991f162f0db1a758ea672727 ]
Fix ufshcd_print_trs() to consider UFSHCD_QUIRK_PRDT_BYTE_GRAN when using utp_transfer_req_desc::prd_table_length, so that it doesn't treat the number of bytes as the number of entries.
Originally from Kiwoong Kim
(https://lkml.kernel.org/r/[email protected]).
--- drivers/scsi/ufs/ufshcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +3 -0
@@ -474,6 +474,9 @@ void ufshcd_print_trs(struct ufs_hba *hba, unsigned long bitmap, bool pr_prdt) prdt_length =le16_to_cpu ( lrbp->utr_descriptor_ptr->prd_table_length); +if (hba->quirks &UFSHCD_QUIRK_PRDT_BYTE_GRAN ) + prdt_length /=sizeof (struct ufshcd_sg_entry ); + dev_err(hba->dev, "UPIU[%d] - PRDT - %d entries phys@0x%llx\n", tag, prdt_length,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 227/757 binder: Remove bogus warning on failed same-process transaction
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
[ Upstream commit e8b8ae7ce32e17a5c29f0289e9e2a39c7dcaa1b8 ]
While binder transactions with the same binder_proc as sender and recipient are forbidden, transactions with the same task_struct as sender and recipient are possible (even though currently there is a weird check in binder_transaction() that rejects them in the target==0 case). Therefore, task_struct identities can't be used to distinguish whether the caller is running in the context of the sender or the recipient.
Since I see no easy way to make this WARN_ON() useful and correct, let's just remove it.
--- drivers/android/binder.c | 2 -- 1 file changed, 2 deletions(-)
drivers/android/binder.c +0 -2
@@ -2323,8 +2323,6 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,* file is done when the transaction is torn * down. */ -WARN_ON (failed_at && - proc->tsk == current->group_leader); }break ;case BINDER_TYPE_PTR :/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 228/757 drm/amdgpu: fix max_entries calculation v4
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
[ Upstream commit ee354ff1c7c210fb41952ebf0a820fb714eae7b1 ]
Calculate the correct value for max_entries or we might run after the page_address array.
v2: Xinhui pointed out we don't need the shift
v3: use local copy of start and simplify some calculation
v4: fix the case that we map less VA range than BO size
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -4
@@ -1691,13 +1691,13 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,uint64_t max_entries;uint64_t addr, last; + max_entries = mapping->last - start +1 ;if (nodes) { addr = nodes->start <<PAGE_SHIFT ; - max_entries = (nodes->size - pfn) * -AMDGPU_GPU_PAGES_IN_CPU_PAGE ; + max_entries =min ((nodes->size - pfn) * +AMDGPU_GPU_PAGES_IN_CPU_PAGE , max_entries); }else { addr =0 ; - max_entries =S64_MAX ; }if (pages_addr) {
@@ -1727,7 +1727,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, addr += pfn <<PAGE_SHIFT ; } - last =min ((uint64_t )mapping->last, start + max_entries -1 ); + last = start + max_entries -1 ; r =amdgpu_vm_bo_update_mapping (adev, vm, false, false, resv, start, last, flags, addr, dma_addr, fence);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 229/757 soundwire: stream: fix NULL/IS_ERR confusion
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 3471d2a192bace106e4da7bcdcdd5ebcca4267d2 ]
snd_soc_dai_get_sdw_stream() can only return -ENOTSUPP or the stream, NULL is not a possible value.
--- drivers/soundwire/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/stream.c +1 -1
@@ -1913,7 +1913,7 @@ void sdw_shutdown_stream(void *sdw_substream) sdw_stream =snd_soc_dai_get_sdw_stream (dai, substream->stream); -if (!sdw_stream) { +if (IS_ERR (sdw_stream)) {dev_err (rtd->dev,"no stream found for DAI %s" , dai->name);return ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 230/757 soundwire: intel: fix NULL/ERR_PTR confusion
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 06dcb4e443643db93b286f861133785ca46f5a19 ]
snd_soc_dai_get_sdw_stream() can only return the pointer to stream or an ERR_PTR value, NULL is not a possible value.
--- drivers/soundwire/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/intel.c +1 -1
@@ -1011,7 +1011,7 @@ static void *intel_get_sdw_stream(struct snd_soc_dai *dai, dma = dai->capture_dma_data;if (!dma) -return NULL ; +return ERR_PTR (-EINVAL );return dma->stream; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 231/757 tty: serial: earlycon dependency
In reply to Greg Kroah-HartmanFrom: Tong Zhang <[email protected]>
[ Upstream commit 0fb9342d06b0f667b915ba58bfefc030e534a218 ]
parse_options() in drivers/tty/serial/earlycon.c calls uart_parse_earlycon in drivers/tty/serial/serial_core.c therefore selecting SERIAL_EARLYCON should automatically select SERIAL_CORE, otherwise will result in symbol not found error during linking if SERIAL_CORE is not configured as builtin
--- drivers/tty/serial/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/Kconfig +1 -0
@@ -8,6 +8,7 @@ menu "Serial drivers" config SERIAL_EARLYCON bool + depends on SERIAL_CORE help Support for early consoles with the earlycon parameter. This enables the console before standard serial driver is probed. The console is
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 232/757 tty: hvcs: Dont NULL tty->driver_data until hvcs_cleanup()
In reply to Greg Kroah-HartmanFrom: Tyrel Datwyler <[email protected]>
[ Upstream commit 63ffcbdad738e3d1c857027789a2273df3337624 ]
The code currently NULLs tty->driver_data in hvcs_close() with the intent of informing the next call to hvcs_open() that device needs to be reconfigured. However, when hvcs_cleanup() is called we copy hvcsd from tty->driver_data which was previoulsy NULLed by hvcs_close() and our call to tty_port_put(&hvcsd->port) doesn't actually do anything since &hvcsd->port ends up translating to NULL by chance. This has the side effect that when hvcs_remove() is called we have one too many port references preventing hvcs_destuct_port() from ever being called. This also prevents us from reusing the /dev/hvcsX node in a future hvcs_probe() and we can eventually run out of /dev/hvcsX devices.
Fix this by waiting to NULL tty->driver_data in hvcs_cleanup().
--- drivers/tty/hvc/hvcs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/tty/hvc/hvcs.c +7 -7
@@ -1216,13 +1216,6 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)tty_wait_until_sent (tty,HVCS_CLOSE_WAIT ); -/* -* This line is important because it tells hvcs_open that this -* device needs to be re-configured the next time hvcs_open is -* called. -*/ - tty->driver_data =NULL ; -free_irq (irq, hvcsd);return ; }else if (hvcsd->port.count <0 ) {
@@ -1237,6 +1230,13 @@ static void hvcs_cleanup(struct tty_struct * tty) {struct hvcs_struct *hvcsd = tty->driver_data; +/* +* This line is important because it tells hvcs_open that this +* device needs to be re-configured the next time hvcs_open is +* called. +*/ + tty->driver_data =NULL ; +tty_port_put (&hvcsd->port); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 233/757 pty: do tty_flip_buffer_push without port->lock in pty_write
In reply to Greg Kroah-HartmanFrom: Artem Savkov <[email protected]>
[ Upstream commit 71a174b39f10b4b93223d374722aa894b5d8a82e ]
b6da31b2c07c "tty: Fix data race in tty_insert_flip_string_fixed_flag" puts tty_flip_buffer_push under port->lock introducing the following possible circular locking dependency:
[30129.876566] ======================================================
[30129.876566] WARNING: possible circular locking dependency detected
[30129.876567] 5.9.0-rc2+ #3 Tainted: G S W
[30129.876568] ------------------------------------------------------
[30129.876568] sysrq.sh/1222 is trying to acquire lock:
[30129.876569] ffffffff92c39480 (console_owner){....}-{0:0}, at: console_unlock+0x3fe/0xa90[30129.876572] but task is already holding lock:
[30129.876572] ffff888107cb9018 (&pool->lock/1){-.-.}-{2:2}, at: show_workqueue_state.cold.55+0x15b/0x6ca[30129.876576] which lock already depends on the new lock.
[30129.876577] the existing dependency chain (in reverse order) is:
[30129.876578] -> #3 (&pool->lock/1){-.-.}-{2:2}:
[30129.876581] _raw_spin_lock+0x30/0x70
[30129.876581] __queue_work+0x1a3/0x10f0
[30129.876582] queue_work_on+0x78/0x80
[30129.876582] pty_write+0x165/0x1e0
[30129.876583] n_tty_write+0x47f/0xf00
[30129.876583] tty_write+0x3d6/0x8d0
[30129.876584] vfs_write+0x1a8/0x650[30129.876588] -> #2 (&port->lock#2){-.-.}-{2:2}:
[30129.876590] _raw_spin_lock_irqsave+0x3b/0x80
[30129.876591] tty_port_tty_get+0x1d/0xb0
[30129.876592] tty_port_default_wakeup+0xb/0x30
[30129.876592] serial8250_tx_chars+0x3d6/0x970
[30129.876593] serial8250_handle_irq.part.12+0x216/0x380
[30129.876593] serial8250_default_handle_irq+0x82/0xe0
[30129.876594] serial8250_interrupt+0xdd/0x1b0
[30129.876595] __handle_irq_event_percpu+0xfc/0x850[30129.876602] -> #1 (&port->lock){-.-.}-{2:2}:
[30129.876605] _raw_spin_lock_irqsave+0x3b/0x80
[30129.876605] serial8250_console_write+0x12d/0x900
[30129.876606] console_unlock+0x679/0xa90
[30129.876606] register_console+0x371/0x6e0
[30129.876607] univ8250_console_init+0x24/0x27
[30129.876607] console_init+0x2f9/0x45e[30129.876609] -> #0 (console_owner){....}-{0:0}:
[30129.876611] __lock_acquire+0x2f70/0x4e90
[30129.876612] lock_acquire+0x1ac/0xad0
[30129.876612] console_unlock+0x460/0xa90
[30129.876613] vprintk_emit+0x130/0x420
[30129.876613] printk+0x9f/0xc5
[30129.876614] show_pwq+0x154/0x618
[30129.876615] show_workqueue_state.cold.55+0x193/0x6ca
[30129.876615] __handle_sysrq+0x244/0x460
[30129.876616] write_sysrq_trigger+0x48/0x4a
[30129.876616] proc_reg_write+0x1a6/0x240
[30129.876617] vfs_write+0x1a8/0x650[30129.876619] other info that might help us debug this:
[30129.876620] Chain exists of: [30129.876621] console_owner --> &port->lock#2 --> &pool->lock/1
[30129.876625] Possible unsafe locking scenario:
[30129.876626] CPU0 CPU1 [30129.876626] ---- ---- [30129.876627] lock(&pool->lock/1); [30129.876628] lock(&port->lock#2); [30129.876630] lock(&pool->lock/1); [30129.876631] lock(console_owner);
[30129.876633] *** DEADLOCK ***
[30129.876634] 5 locks held by sysrq.sh/1222:
[30129.876634] #0: ffff8881d3ce0470 (sb_writers#3){.+.+}-{0:0}, at: vfs_write+0x359/0x650
[30129.876637] #1: ffffffff92c612c0 (rcu_read_lock){....}-{1:2}, at: __handle_sysrq+0x4d/0x460
[30129.876640] #2: ffffffff92c612c0 (rcu_read_lock){....}-{1:2}, at: show_workqueue_state+0x5/0xf0
[30129.876642] #3: ffff888107cb9018 (&pool->lock/1){-.-.}-{2:2}, at: show_workqueue_state.cold.55+0x15b/0x6ca
[30129.876645] #4: ffffffff92c39980 (console_lock){+.+.}-{0:0}, at: vprintk_emit+0x123/0x420[30129.876648] stack backtrace: [30129.876649] CPU: 3 PID: 1222 Comm: sysrq.sh Tainted: G S W 5.9.0-rc2+ #3 [30129.876649] Hardware name: Intel Corporation 2012 Client Platform/Emerald Lake 2, BIOS ACRVMBY1.86C.0078.P00.1201161002 01/16/2012 [30129.876650] Call Trace: [30129.876650] dump_stack+0x9d/0xe0 [30129.876651] check_noncircular+0x34f/0x410 [30129.876653] __lock_acquire+0x2f70/0x4e90 [30129.876656] lock_acquire+0x1ac/0xad0 [30129.876658] console_unlock+0x460/0xa90 [30129.876660] vprintk_emit+0x130/0x420 [30129.876660] printk+0x9f/0xc5 [30129.876661] show_pwq+0x154/0x618 [30129.876662] show_workqueue_state.cold.55+0x193/0x6ca [30129.876664] __handle_sysrq+0x244/0x460 [30129.876665] write_sysrq_trigger+0x48/0x4a [30129.876665] proc_reg_write+0x1a6/0x240 [30129.876666] vfs_write+0x1a8/0x650
It looks like the commit was aimed to protect tty_insert_flip_string and there is no need for tty_flip_buffer_push to be under this lock.
--- drivers/tty/pty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/pty.c +1 -1
@@ -120,10 +120,10 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)spin_lock_irqsave (&to->port->lock, flags);/* Stuff the data into the input queue of the other end */ c =tty_insert_flip_string (to->port, buf, c); +spin_unlock_irqrestore (&to->port->lock, flags);/* And shovel */ if (c)tty_flip_buffer_push (to->port); -spin_unlock_irqrestore (&to->port->lock, flags); }return c; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 234/757 pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 181f4d2f44463fe09fe4df02e03095cb87151c29 ]
According to the data-sheet the way the PWM controller works is that each input clock-cycle the base_unit gets added to a N bit counter and that counter overflowing determines the PWM output frequency.
So assuming e.g. a 16 bit counter this means that if base_unit is set to 1, after 65535 input clock-cycles the counter has been increased from 0 to 65535 and it will overflow on the next cycle, so it will overflow after every 65536 clock cycles and thus the calculations done in pwm_lpss_prepare() should use 65536 and not 65535.
This commit fixes this. Note this also aligns the calculations in pwm_lpss_prepare() with those in pwm_lpss_get_state().
Note this effectively reverts commit 684309e5043e ("pwm: lpss: Avoid potential overflow of base_unit"). The next patch in this series really fixes the potential overflow of the base_unit value.
--- drivers/pwm/pwm-lpss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pwm/pwm-lpss.c +3 -3
@@ -93,7 +93,7 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm,* The equation is: * base_unit = round(base_unit_range * freq / c) */ - base_unit_range =BIT (lpwm->info->base_unit_bits) -1 ; + base_unit_range =BIT (lpwm->info->base_unit_bits); freq *= base_unit_range; base_unit =DIV_ROUND_CLOSEST_ULL (freq, c);
@@ -104,8 +104,8 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm, orig_ctrl = ctrl =pwm_lpss_read (pwm); ctrl &= ~PWM_ON_TIME_DIV_MASK ; - ctrl &= ~(base_unit_range <<PWM_BASE_UNIT_SHIFT ); - base_unit &= base_unit_range; + ctrl &= ~((base_unit_range -1 ) <<PWM_BASE_UNIT_SHIFT ); + base_unit &= (base_unit_range -1 ); ctrl |= (u32 ) base_unit <<PWM_BASE_UNIT_SHIFT ; ctrl |= on_time_div;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 235/757 pwm: lpss: Add range limit check for the base_unit register value
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit ef9f60daab309558c8bb3e086a9a11ee40bd6061 ]
When the user requests a high enough period ns value, then the calculations in pwm_lpss_prepare() might result in a base_unit value of 0.
But according to the data-sheet the way the PWM controller works is that each input clock-cycle the base_unit gets added to a N bit counter and that counter overflowing determines the PWM output frequency. Adding 0 to the counter is a no-op. The data-sheet even explicitly states that writing 0 to the base_unit bits will result in the PWM outputting a continuous 0 signal.
When the user requestes a low enough period ns value, then the calculations in pwm_lpss_prepare() might result in a base_unit value which is bigger then base_unit_range - 1. Currently the codes for this deals with this by applying a mask:
base_unit &= (base_unit_range - 1);
But this means that we let the value overflow the range, we throw away the higher bits and store whatever value is left in the lower bits into the register leading to a random output frequency, rather then clamping the output frequency to the highest frequency which the hardware can do.
This commit fixes both issues by clamping the base_unit value to be between 1 and (base_unit_range - 1).
--- drivers/pwm/pwm-lpss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pwm/pwm-lpss.c +2 -1
@@ -97,6 +97,8 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm, freq *= base_unit_range; base_unit =DIV_ROUND_CLOSEST_ULL (freq, c); +/* base_unit must not be 0 and we also want to avoid overflowing it */ + base_unit =clamp_val (base_unit,1 , base_unit_range -1 ); on_time_div =255ULL * duty_ns;do_div (on_time_div, period_ns);
@@ -105,7 +107,6 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm, orig_ctrl = ctrl =pwm_lpss_read (pwm); ctrl &= ~PWM_ON_TIME_DIV_MASK ; ctrl &= ~((base_unit_range -1 ) <<PWM_BASE_UNIT_SHIFT ); - base_unit &= (base_unit_range -1 ); ctrl |= (u32 ) base_unit <<PWM_BASE_UNIT_SHIFT ; ctrl |= on_time_div;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 236/757 drivers/virt/fsl_hypervisor: Fix error handling path
In reply to Greg Kroah-HartmanFrom: Souptick Joarder <[email protected]>
[ Upstream commit 7f360bec37857bfd5a48cef21d86f58a09a3df63 ]
First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.
Second, if get_user_pages_fast() failed we should unpin num_pinned pages.
This will address both.
As part of these changes, minor update in documentation.
--- drivers/virt/fsl_hypervisor.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/virt/fsl_hypervisor.c +8 -9
@@ -157,7 +157,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)unsigned int i;long ret =0 ; -int num_pinned;/* return value from get_user_pages() */ +int num_pinned =0 ;/* return value from get_user_pages_fast() */ phys_addr_t remote_paddr;/* The next address in the remote buffer */ uint32_t count;/* The number of bytes left to copy */
@@ -174,7 +174,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)return -EINVAL ;/* -* The array of pages returned by get_user_pages() covers only +* The array of pages returned by get_user_pages_fast() covers only * page-aligned memory. Since the user buffer is probably not * page-aligned, we need to handle the discrepancy. *
@@ -224,7 +224,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)/* * 'pages' is an array of struct page pointers that's initialized by -* get_user_pages(). +* get_user_pages_fast(). */ pages =kcalloc (num_pages,sizeof (struct page *),GFP_KERNEL );if (!pages) {
@@ -241,7 +241,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)if (!sg_list_unaligned) {pr_debug ("fsl-hv: could not allocate S/G list\n" ); ret = -ENOMEM ; - goto exit; + goto free_pages; } sg_list =PTR_ALIGN (sg_list_unaligned,sizeof (struct fh_sg_list ));
@@ -250,7 +250,6 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p) num_pages, param.source != -1 ? FOLL_WRITE : 0, pages);if (num_pinned != num_pages) { -/* get_user_pages() failed */ pr_debug ("fsl-hv: could not lock source buffer\n" ); ret = (num_pinned <0 ) ? num_pinned : -EFAULT ; goto exit;
@@ -292,13 +291,13 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p) virt_to_phys(sg_list), num_pages); exit: -if (pages) { -for (i =0 ; i < num_pages; i++) -if (pages[i]) -put_page (pages[i]); +if (pages && (num_pinned >0 )) { +for (i =0 ; i < num_pinned; i++) +put_page (pages[i]); }kfree (sg_list_unaligned); +free_pages:kfree (pages);if (!ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 237/757 sfc: dont double-down() filters in ef100_reset()
In reply to Greg Kroah-HartmanFrom: Edward Cree <[email protected]>
[ Upstream commit 7dcc9d8a40f85cbd76acdebcc45ccdfe4a84337f ]
dev_close(), by way of ef100_net_stop(), already brings down the filter
table, so there's no need to do it again (which just causes lots of WARN_ONs).
Similarly, don't bring it up ourselves, as dev_open() -> ef100_net_open()
will do it, and will fail if it's already been brought up.
--- drivers/net/ethernet/sfc/ef100_nic.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/net/ethernet/sfc/ef100_nic.c +0 -12
@@ -428,24 +428,12 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type)__clear_bit (reset_type, &efx->reset_pending); rc =dev_open (efx->net_dev,NULL ); }else if (reset_type ==RESET_TYPE_ALL ) { -/* A RESET_TYPE_ALL will cause filters to be removed, so we remove filters -* and reprobe after reset to avoid removing filters twice -*/ -down_write (&efx->filter_sem); -ef100_filter_table_down (efx); -up_write (&efx->filter_sem); rc =efx_mcdi_reset (efx, reset_type);if (rc)return rc;netif_device_attach (efx->net_dev); -down_write (&efx->filter_sem); - rc =ef100_filter_table_up (efx); -up_write (&efx->filter_sem); -if (rc) -return rc; - rc =dev_open (efx->net_dev,NULL ); }else { rc =1 ;/* Leave the device closed */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 238/757 ath11k: fix a double free and a memory leak
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 7e8453e35e406981d7c529ff8f804285bc894ba3 ]
clang static analyzer reports this problem
mac.c:6204:2: warning: Attempt to free released memory
kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The channels pointer is allocated in ath11k_mac_setup_channels_rates() When it fails midway, it cleans up the memory it has already allocated. So the error handling needs to skip freeing the memory.
There is a second problem. ath11k_mac_setup_channels_rates(), allocates 3 channels. err_free misses releasing ar->mac.sbands[NL80211_BAND_6GHZ].channels
--- drivers/net/wireless/ath/ath11k/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.c +3 -1
@@ -6006,7 +6006,7 @@ static int __ath11k_mac_register(struct ath11k *ar) ret =ath11k_mac_setup_channels_rates (ar, cap->supported_bands);if (ret) - goto err_free; + goto err;ath11k_mac_setup_ht_vht_cap (ar, cap, &ht_cap);ath11k_mac_setup_he_cap (ar, cap);
@@ -6120,7 +6120,9 @@ static int __ath11k_mac_register(struct ath11k *ar) err_free:kfree (ar->mac.sbands[NL80211_BAND_2GHZ ].channels);kfree (ar->mac.sbands[NL80211_BAND_5GHZ ].channels); +kfree (ar->mac.sbands[NL80211_BAND_6GHZ ].channels); +err:SET_IEEE80211_DEV (ar->hw,NULL );return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 239/757 video: fbdev: vga16fb: fix setting of pixclock because a pass-by-value error
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c72fab81ceaa54408b827a2f0486d9a0f4be34cf ]
The pixclock is being set locally because it is being passed as a pass-by-value argument rather than pass-by-reference, so the computed pixclock is never being set in var->pixclock. Fix this by passing by reference.
[This dates back to 2002, I found the offending commit from the git history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git ]
Addresses-Coverity: ("Unused value")
--- drivers/video/fbdev/vga16fb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/video/fbdev/vga16fb.c +7 -7
@@ -243,7 +243,7 @@ static void vga16fb_update_fix(struct fb_info *info) }static void vga16fb_clock_chip (struct vga16fb_par *par, -unsigned int pixclock, +unsigned int *pixclock,const struct fb_info *info,int mul,int div) {
@@ -259,14 +259,14 @@ static void vga16fb_clock_chip(struct vga16fb_par *par, { 0 /* bad */, 0x00, 0x00}};int err; - pixclock = (pixclock * mul) / div; + *pixclock = (*pixclock * mul) / div; best = vgaclocks; - err = pixclock - best->pixclock; + err = *pixclock - best->pixclock;if (err <0 ) err = -err;for (ptr = vgaclocks +1 ; ptr->pixclock; ptr++) {int tmp; - tmp = pixclock - ptr->pixclock; + tmp = *pixclock - ptr->pixclock;if (tmp <0 ) tmp = -tmp;if (tmp < err) { err = tmp;
@@ -275,7 +275,7 @@ static void vga16fb_clock_chip(struct vga16fb_par *par, } par->misc |= best->misc; par->clkdiv = best->seq_clock_mode; - pixclock = (best->pixclock * div) / mul; + *pixclock = (best->pixclock * div) / mul; }#define FAIL (X ) return -EINVAL
@@ -497,10 +497,10 @@ static int vga16fb_check_var(struct fb_var_screeninfo *var,if (mode &MODE_8BPP )/* pixel clock == vga clock / 2 */ -vga16fb_clock_chip (par, var->pixclock, info,1 ,2 ); +vga16fb_clock_chip (par, &var->pixclock, info,1 ,2 );else /* pixel clock == vga clock */ -vga16fb_clock_chip (par, var->pixclock, info,1 ,1 ); +vga16fb_clock_chip (par, &var->pixclock, info,1 ,1 ); var->red.offset = var->green.offset = var->blue.offset = var->transp.offset =0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 240/757 video: fbdev: sis: fix null ptr dereference
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit ad6f93e9cd56f0b10e9b22e3e137d17a1a035242 ]
Clang static analysis reports this representative error
init.c:2501:18: warning: Array access (from variable 'queuedata') results
in a null pointer dereference
templ |= ((queuedata[i] & 0xc0) << 3);
This is the problem block of code
if(ModeNo > 0x13) {
...
if(SiS_Pr->ChipType == SIS_730) {
queuedata = &FQBQData730[0];
} else {
queuedata = &FQBQData[0];
}} else {
}
queuedata is not set in the else block
Reviewing the old code, the arrays FQBQData730 and FQBQData were used directly.
So hoist the setting of queuedata out of the if-else block.
--- drivers/video/fbdev/sis/init.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/video/fbdev/sis/init.c +5 -6
@@ -2428,6 +2428,11 @@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo, i =0 ; +if (SiS_Pr->ChipType ==SIS_730 ) + queuedata = &FQBQData730[0 ]; +else + queuedata = &FQBQData[0 ]; +if (ModeNo >0x13 ) {/* Get VCLK */
@@ -2445,12 +2450,6 @@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo,/* Get half colordepth */ colorth = colortharray[(SiS_Pr->SiS_ModeType - ModeEGA)]; -if (SiS_Pr->ChipType ==SIS_730 ) { - queuedata = &FQBQData730[0 ]; - }else { - queuedata = &FQBQData[0 ]; - } - do { templ = SiS_CalcDelay2(SiS_Pr, queuedata[i]) * VCLK * colorth;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 241/757 video: fbdev: radeon: Fix memleak in radeonfb_pci_register
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit fe6c6a4af2be8c15bac77f7ea160f947c04840d1 ]
When radeon_kick_out_firmware_fb() fails, info should be freed just like the subsequent error paths.
--- drivers/video/fbdev/aty/radeon_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/aty/radeon_base.c +1 -1
@@ -2307,7 +2307,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, ret =radeon_kick_out_firmware_fb (pdev);if (ret) -return ret; + goto err_release_fb;/* request the mem regions */ ret =pci_request_region (pdev,0 ,"radeonfb framebuffer" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 242/757 ASoC: fsl: imx-es8328: add missing put_device() call in imx_es8328_probe()
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit e525db7e4b44c5b2b5aac0dad24e23cb58c54d22 ]
if of_find_device_by_node() succeed, imx_es8328_probe() doesn't have a corresponding put_device(). Thus add a jump target to fix the exception handling for this function implementation.
--- sound/soc/fsl/imx-es8328.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
sound/soc/fsl/imx-es8328.c +7 -5
@@ -145,13 +145,13 @@ static int imx_es8328_probe(struct platform_device *pdev) data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data) { ret = -ENOMEM ; - goto fail; + goto put_device; } comp =devm_kzalloc (dev,3 *sizeof (*comp),GFP_KERNEL );if (!comp) { ret = -ENOMEM ; - goto fail; + goto put_device; } data->dev = dev;
@@ -182,12 +182,12 @@ static int imx_es8328_probe(struct platform_device *pdev) ret =snd_soc_of_parse_card_name (&data->card,"model" );if (ret) {dev_err (dev,"Unable to parse card name\n" ); - goto fail; + goto put_device; } ret =snd_soc_of_parse_audio_routing (&data->card,"audio-routing" );if (ret) {dev_err (dev,"Unable to parse routing: %d\n" , ret); - goto fail; + goto put_device; } data->card.num_links =1 ; data->card.owner =THIS_MODULE ;
@@ -196,10 +196,12 @@ static int imx_es8328_probe(struct platform_device *pdev) ret =snd_soc_register_card (&data->card);if (ret) {dev_err (dev,"Unable to register: %d\n" , ret); - goto fail; + goto put_device; }platform_set_drvdata (pdev, data); +put_device: +put_device (&ssi_pdev->dev); fail:of_node_put (ssi_np);of_node_put (codec_np);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 243/757 scsi: ufs: ufs-mediatek: Eliminate error message for unbound mphy
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit 30a90782c105fe498df74161392aa143796b6886 ]
Some MediaTek platforms does not have to bind MPHY so users shall not see any unnecessary logs. Simply remove logs for this case.
--- drivers/scsi/ufs/ufs-mediatek.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufs-mediatek.c +4 -1
@@ -129,7 +129,10 @@ static int ufs_mtk_bind_mphy(struct ufs_hba *hba) __func__, err); }else if (IS_ERR (host->mphy)) { err =PTR_ERR (host->mphy); -dev_info (dev,"%s: PHY get failed %d\n" , __func__, err); +if (err != -ENODEV ) { +dev_info (dev,"%s: PHY get failed %d\n" , __func__, + err); + } }if (err)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 244/757 scsi: ufs: ufs-mediatek: Fix HOST_PA_TACTIVATE quirk
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit a3e40b80dc951057033dce86f0e675b2b822b513 ]
Simply add HOST_PA_TACTIVATE quirk back since it was incorrectly removed before.
--- drivers/scsi/ufs/ufs-mediatek.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +0 -6
@@ -672,13 +672,7 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)static void ufs_mtk_fixup_dev_quirks (struct ufs_hba *hba) { -struct ufs_dev_info *dev_info = &hba->dev_info; -u16 mid = dev_info->wmanufacturerid; -ufshcd_fixup_dev_quirks (hba, ufs_mtk_dev_fixups); - -if (mid ==UFS_VENDOR_SAMSUNG ) - hba->dev_quirks &= ~UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE ; }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 245/757 HID: roccat: add bounds checking in kone_sysfs_write_settings()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d4f98dbfe717490e771b6e701904bfcf4b4557f0 ]
This code doesn't check if "settings->startup_profile" is within bounds and that could result in an out of bounds array access. What the code does do is it checks if the settings can be written to the firmware, so it's possible that the firmware has a bounds check? It's safer and easier to verify when the bounds checking is done in the kernel.
--- drivers/hid/hid-roccat-kone.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/hid/hid-roccat-kone.c +16 -7
@@ -294,31 +294,40 @@ static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,struct kone_device *kone =hid_get_drvdata (dev_get_drvdata (dev));struct usb_device *usb_dev =interface_to_usbdev (to_usb_interface (dev));int retval =0 , difference, old_profile; +struct kone_settings *settings = (struct kone_settings *)buf;/* I need to get my data in one piece */ if (off !=0 || count !=sizeof (struct kone_settings ))return -EINVAL ;mutex_lock (&kone->kone_lock); - difference =memcmp (buf, &kone->settings,sizeof (struct kone_settings )); + difference =memcmp (settings, &kone->settings, +sizeof (struct kone_settings ));if (difference) { - retval =kone_set_settings (usb_dev, - (struct kone_settings const *)buf); -if (retval) { -mutex_unlock (&kone->kone_lock); -return retval; +if (settings->startup_profile <1 || + settings->startup_profile >5 ) { + retval = -EINVAL ; + goto unlock; } + retval =kone_set_settings (usb_dev, settings); +if (retval) + goto unlock; + old_profile = kone->settings.startup_profile; -memcpy (&kone->settings, buf,sizeof (struct kone_settings )); +memcpy (&kone->settings, settings,sizeof (struct kone_settings ));kone_profile_activated (kone, kone->settings.startup_profile);if (kone->settings.startup_profile != old_profile)kone_profile_report (kone, kone->settings.startup_profile); } +unlock:mutex_unlock (&kone->kone_lock); +if (retval) +return retval; +return sizeof (struct kone_settings ); } static BIN_ATTR(settings, 0660, kone_sysfs_read_settings,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 246/757 ath11k: fix uninitialized return in ath11k_spectral_process_data()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c7187acc3cd08a17e7b506b2b5277f42d1504d29 ]
There is a success path where "ret" isn't initialized where we never have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
--- drivers/net/wireless/ath/ath11k/spectral.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath11k/spectral.c +2 -0
@@ -773,6 +773,8 @@ static int ath11k_spectral_process_data(struct ath11k *ar, i +=sizeof (*tlv) + tlv_len; } + ret =0 ; + err:kfree (fft_sample); unlock:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 247/757 drm/msm: Avoid div-by-zero in dpu_crtc_atomic_check()
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 22f760941844dbcee6ee446e1896532f6dff01ef ]
The cstate->num_mixers member is only set to a non-zero value once dpu_encoder_virt_mode_set() is called, but the atomic check function can be called by userspace before that. Let's avoid the div-by-zero here and inside _dpu_crtc_setup_lm_bounds() by skipping this part of the atomic check if dpu_encoder_virt_mode_set() hasn't been called yet. This fixes an UBSAN warning:
UBSAN: Undefined behaviour in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:860:31 division by zero CPU: 7 PID: 409 Comm: frecon Tainted: G S 5.4.31 #128 Hardware name: Google Trogdor (rev0) (DT) Call trace: dump_backtrace+0x0/0x14c show_stack+0x20/0x2c dump_stack+0xa0/0xd8 __ubsan_handle_divrem_overflow+0xec/0x110 dpu_crtc_atomic_check+0x97c/0x9d4 drm_atomic_helper_check_planes+0x160/0x1c8 drm_atomic_helper_check+0x54/0xbc drm_atomic_check_only+0x6a8/0x880 drm_atomic_commit+0x20/0x5c drm_atomic_helper_set_config+0x98/0xa0 drm_mode_setcrtc+0x308/0x5dc drm_ioctl_kernel+0x9c/0x114 drm_ioctl+0x2ac/0x4b0 drm_compat_ioctl+0xe8/0x13c __arm64_compat_sys_ioctl+0x184/0x324 el0_svc_common+0xa4/0x154 el0_svc_compat_handler+0x
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +5 -3
@@ -881,7 +881,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,struct drm_plane *plane;struct drm_display_mode *mode; -int cnt =0 , rc =0 , mixer_width, i, z_pos; +int cnt =0 , rc =0 , mixer_width =0 , i, z_pos;struct dpu_multirect_plane_states multirect_plane[DPU_STAGE_MAX *2 ];int multirect_count =0 ;
@@ -914,9 +914,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,memset (pipe_staged,0 ,sizeof (pipe_staged)); - mixer_width = mode->hdisplay / cstate->num_mixers; +if (cstate->num_mixers) { + mixer_width = mode->hdisplay / cstate->num_mixers; -_dpu_crtc_setup_lm_bounds (crtc, state); +_dpu_crtc_setup_lm_bounds (crtc, state); + } crtc_rect.x2 = mode->hdisplay; crtc_rect.y2 = mode->vdisplay;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 248/757 drm/panfrost: Ensure GPU quirks are always initialised
In reply to Greg Kroah-HartmanFrom: Steven Price <[email protected]>
[ Upstream commit 8c3c818c23a5bbce6ff180dd2ee04415241df77c ]
The GPU 'CONFIG' registers used to work around hardware issues are cleared on reset so need to be programmed every time the GPU is reset. However panfrost_device_reset() failed to do this.
To avoid this in future instead move the call to panfrost_gpu_init_quirks() to panfrost_gpu_power_on() so that the regsiters are always programmed just before the cores are powered.
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +2 -1
@@ -304,6 +304,8 @@ void panfrost_gpu_power_on(struct panfrost_device *pfdev)int ret;u32 val; +panfrost_gpu_init_quirks (pfdev); +/* Just turn on everything for now */ gpu_write (pfdev,L2_PWRON_LO , pfdev->features.l2_present); ret = readl_relaxed_poll_timeout(pfdev->iomem + L2_READY_LO,
@@ -355,7 +357,6 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)return err; } -panfrost_gpu_init_quirks (pfdev);panfrost_gpu_power_on (pfdev);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 249/757 iomap: Clear page error before beginning a write
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit e6e7ca92623a43156100306861272e04d46385fc ]
If we find a page in write_begin which is !Uptodate, we need to clear any error on the page before starting to read data into it. This matches how filemap_fault(), do_read_cache_page() and generic_file_buffered_read() handle PageError on !Uptodate pages. When calling iomap_set_range_uptodate() in __iomap_write_begin(), blocks were not being marked as uptodate.
This was found with generic/127 and a specially modified kernel which would fail (some) readahead I/Os. The test read some bytes in a prior page which caused readahead to extend into page 0x34. There was a subsequent write to page 0x34, followed by a read to page 0x34. Because the blocks were still marked as !Uptodate, the read caused all blocks to be re-read, overwriting the write. With this change, and the next one, the bytes which were written are marked as being Uptodate, so even though the page is still marked as !Uptodate, the blocks containing the written data are not re-read from storage.
--- fs/iomap/buffered-io.c | 1 + 1 file changed, 1 insertion(+)
fs/iomap/buffered-io.c +1 -0
@@ -578,6 +578,7 @@ __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int flags,if (PageUptodate (page))return 0 ; +ClearPageError (page); do { iomap_adjust_read_range(inode, iop, &block_start,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 250/757 iomap: Mark read blocks uptodate in write_begin
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 14284fedf59f1647264f4603d64418cf1fcd3eb0 ]
When bringing (portions of) a page uptodate, we were marking blocks that were zeroed as being uptodate, but not blocks that were read from storage.
Like the previous commit, this problem was found with generic/127 and a kernel which failed readahead I/Os. This bug causes writes to be silently lost when working with flaky storage.
--- fs/iomap/buffered-io.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/iomap/buffered-io.c +6 -8
@@ -574,7 +574,6 @@ __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int flags,loff_t block_start = pos & ~(block_size -1 );loff_t block_end = (pos + len + block_size -1 ) & ~(block_size -1 );unsigned from =offset_in_page (pos), to = from + len, poff, plen; -int status;if (PageUptodate (page))return 0 ;
@@ -595,14 +594,13 @@ __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int flags,if (WARN_ON_ONCE (flags &IOMAP_WRITE_F_UNSHARE ))return -EIO ;zero_user_segments (page, poff, from, to, poff + plen); -iomap_set_range_uptodate (page, poff, plen); -continue ; + }else { +int status =iomap_read_page_sync (block_start, page, + poff, plen, srcmap); +if (status) +return status; } - - status =iomap_read_page_sync (block_start, page, poff, plen, - srcmap); -if (status) -return status; +iomap_set_range_uptodate (page, poff, plen); }while ((block_start += plen) < block_end);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 251/757 selftests/lkdtm: Use "comm" instead of "diff" for dmesg
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit d00451c8118f8f7ab8e057bc6ee2f8b7d70b6a1c ]
Instead of full GNU diff (which smaller boot environments may not have), use "comm" which is more available.
--- tools/testing/selftests/lkdtm/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/lkdtm/run.sh +1 -1
@@ -82,7 +82,7 @@ dmesg > "$DMESG" ($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true # Record and dump the results -dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - > "$LOG" || true +dmesg | comm --nocheck-order -13 "$DMESG" - > "$LOG" || true cat "$LOG" # Check for expected output
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 252/757 Bluetooth: Fix memory leak in read_adv_mon_features()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit cafd472a10ff3bccd8afd25a69f20a491cd8d7b8 ]
read_adv_mon_features() is leaking memory. Free rp before returning.
--- net/bluetooth/mgmt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/bluetooth/mgmt.c +8 -4
@@ -4162,7 +4162,7 @@ static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev, {struct adv_monitor *monitor =NULL ;struct mgmt_rp_read_adv_monitor_features *rp =NULL ; -int handle; +int handle, err;size_t rp_size =0 ;__u32 supported =0 ;__u16 num_handles =0 ;
@@ -4197,9 +4197,13 @@ static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev,if (num_handles)memcpy (&rp->handles, &handles, (num_handles *sizeof (u16))); -return mgmt_cmd_complete (sk, hdev->id, -MGMT_OP_READ_ADV_MONITOR_FEATURES , -MGMT_STATUS_SUCCESS , rp, rp_size); + err =mgmt_cmd_complete (sk, hdev->id, +MGMT_OP_READ_ADV_MONITOR_FEATURES , +MGMT_STATUS_SUCCESS , rp, rp_size); + +kfree (rp); + +return err; } static int add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 253/757 Bluetooth: Re-order clearing suspend tasks
In reply to Greg Kroah-HartmanFrom: Abhishek Pandit-Subedi <[email protected]>
[ Upstream commit 3eec158d5eca7dd455118d9e00568aad2371219f ]
Unregister_pm_notifier is a blocking call so suspend tasks should be cleared beforehand. Otherwise, the notifier will wait for completion before returning (and we encounter a 2s timeout on resume).
--- net/bluetooth/hci_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_core.c +1 -1
@@ -3794,8 +3794,8 @@ void hci_unregister_dev(struct hci_dev *hdev)cancel_work_sync (&hdev->power_on); -unregister_pm_notifier (&hdev->suspend_notifier);hci_suspend_clear_tasks (hdev); +unregister_pm_notifier (&hdev->suspend_notifier);cancel_work_sync (&hdev->suspend_prepare);hci_dev_do_close (hdev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 254/757 pinctrl: mcp23s08: Fix mcp23x17_regmap initialiser
In reply to Greg Kroah-HartmanFrom: Thomas Preston <[email protected]>
[ Upstream commit b445f6237744df5e8d4f56f8733b2108c611220a ]
The mcp23x17_regmap is initialised with structs named "mcp23x16". However, the mcp23s08 driver doesn't support the MCP23016 device yet, so this appears to be a typo.
--- drivers/pinctrl/pinctrl-mcp23s08.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/pinctrl/pinctrl-mcp23s08.c +11 -11
@@ -87,7 +87,7 @@ const struct regmap_config mcp23x08_regmap = { };EXPORT_SYMBOL_GPL (mcp23x08_regmap); -static const struct reg_default mcp23x16_defaults[] = { +static const struct reg_default mcp23x17_defaults[] = { {.reg =MCP_IODIR <<1 , .def =0xffff }, {.reg =MCP_IPOL <<1 , .def =0x0000 }, {.reg =MCP_GPINTEN <<1 , .def =0x0000 },
@@ -98,23 +98,23 @@ static const struct reg_default mcp23x16_defaults[] = { {.reg = MCP_OLAT << 1, .def = 0x0000}, }; -static const struct regmap_range mcp23x16_volatile_range = { +static const struct regmap_range mcp23x17_volatile_range = { .range_min =MCP_INTF <<1 , .range_max =MCP_GPIO <<1 , }; -static const struct regmap_access_table mcp23x16_volatile_table = { - .yes_ranges = &mcp23x16_volatile_range, +static const struct regmap_access_table mcp23x17_volatile_table = { + .yes_ranges = &mcp23x17_volatile_range, .n_yes_ranges =1 , }; -static const struct regmap_range mcp23x16_precious_range = { +static const struct regmap_range mcp23x17_precious_range = { .range_min =MCP_GPIO <<1 , .range_max =MCP_GPIO <<1 , }; -static const struct regmap_access_table mcp23x16_precious_table = { - .yes_ranges = &mcp23x16_precious_range, +static const struct regmap_access_table mcp23x17_precious_table = { + .yes_ranges = &mcp23x17_precious_range, .n_yes_ranges =1 , };
@@ -124,10 +124,10 @@ const struct regmap_config mcp23x17_regmap = { .reg_stride = 2, .max_register = MCP_OLAT << 1, - .volatile_table = &mcp23x16_volatile_table, - .precious_table = &mcp23x16_precious_table, - .reg_defaults = mcp23x16_defaults, - .num_reg_defaults = ARRAY_SIZE(mcp23x16_defaults), + .volatile_table = &mcp23x17_volatile_table, + .precious_table = &mcp23x17_precious_table, + .reg_defaults = mcp23x17_defaults, + .num_reg_defaults = ARRAY_SIZE(mcp23x17_defaults), .cache_type = REGCACHE_FLAT, .val_format_endian = REGMAP_ENDIAN_LITTLE, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 255/757 pinctrl: mcp23s08: Fix mcp23x17 precious range
In reply to Greg Kroah-HartmanFrom: Thomas Preston <[email protected]>
[ Upstream commit b9b7fb29433b906635231d0a111224efa009198c ]
On page 23 of the datasheet [0] it says "The register remains unchanged until the interrupt is cleared via a read of INTCAP or GPIO." Include INTCAPA and INTCAPB registers in precious range, so that they aren't accidentally cleared when we read via debugfs.
[0] https://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf
--- drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-mcp23s08.c +1 -1
@@ -109,7 +109,7 @@ static const struct regmap_access_table mcp23x17_volatile_table = { };static const struct regmap_range mcp23x17_precious_range = { - .range_min =MCP_GPIO <<1 , + .range_min =MCP_INTCAP <<1 , .range_max =MCP_GPIO <<1 , };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 256/757 pinctrl: devicetree: Keep deferring even on timeout
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 84f28fc38d2ff99e2ac623325ba37809da611b8e ]
driver_deferred_probe_check_state() may return -ETIMEDOUT instead of -EPROBE_DEFER after all built-in drivers have been probed. This can cause issues for built-in drivers that depend on resources provided by loadable modules.
One such case happens on Tegra where I2C controllers are used during early boot to set up the system PMIC, so the I2C driver needs to be a built-in driver. At the same time, some instances of the I2C controller depend on the DPAUX hardware for pinmuxing. Since the DPAUX is handled by the display driver, which is usually not built-in, the pin control states will not become available until after the root filesystem has been mounted and the display driver loaded from it.
--- drivers/pinctrl/devicetree.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pinctrl/devicetree.c +2 -3
@@ -130,9 +130,8 @@ static int dt_to_map_one_config(struct pinctrl *p,if (!np_pctldev ||of_node_is_root (np_pctldev)) {of_node_put (np_pctldev); ret =driver_deferred_probe_check_state (p->dev); -/* keep deferring if modules are enabled unless we've timed out */ -if (IS_ENABLED (CONFIG_MODULES ) && !allow_default && - (ret == -ENODEV )) +/* keep deferring if modules are enabled */ +if (IS_ENABLED (CONFIG_MODULES ) && !allow_default && ret <0 ) ret = -EPROBE_DEFER ;return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 257/757 drm/msm/adreno: fix probe without iommu
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 0a48db562c6264da2ae8013491efd6e8dc780520 ]
The function iommu_domain_alloc returns NULL on platforms without IOMMU such as msm8974. This resulted in PTR_ERR(-ENODEV) being assigned to gpu->aspace so the correct code path wasn't taken.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +8 -2
@@ -189,10 +189,16 @@ struct msm_gem_address_space * adreno_iommu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev) { - struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type); -struct msm_mmu *mmu =msm_iommu_new (&pdev->dev, iommu); + struct iommu_domain *iommu; +struct msm_mmu *mmu;struct msm_gem_address_space *aspace; + iommu =iommu_domain_alloc (&platform_bus_type); +if (!iommu) +return NULL ; + + mmu =msm_iommu_new (&pdev->dev, iommu); + aspace =msm_gem_address_space_create (mmu,"gpu" ,SZ_16M ,0xffffffff -SZ_16M );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 258/757 s390/bpf: Fix multiple tail calls
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit d72714c1da138e6755d3bd14662dc5b7f17fae7f ]
In order to branch around tail calls (due to out-of-bounds index, exceeding tail call count or missing tail call target), JIT uses label[0] field, which contains the address of the instruction following the tail call. When there are multiple tail calls, label[0] value comes from handling of a previous tail call, which is incorrect.
Fix by getting rid of label array and resolving the label address
locally: for all 3 branches that jump to it, emit 0 offsets at the beginning, and then backpatch them with the correct value.
Also, do not use the long jump infrastructure: the tail call sequence is known to be short, so make all 3 jumps short.
--- arch/s390/net/bpf_jit_comp.c | 61 ++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 34 deletions(-)
arch/s390/net/bpf_jit_comp.c +27 -34
@@ -50,7 +50,6 @@ struct bpf_jit {int r14_thunk_ip;/* Address of expoline thunk for 'br %r14' */ int tail_call_start;/* Tail call start offset */ int excnt;/* Number of exception table entries */ -int labels[1 ];/* Labels for local jumps */ };#define SEEN_MEM BIT(0)/* use mem[] for temporary storage */
@@ -229,18 +228,18 @@ static inline void reg_set_seen(struct bpf_jit *jit, u32 b1)REG_SET_SEEN (b3); \ }) -#define EMIT6_PCREL_LABEL (op1, op2, b1, b2, label, mask) \ +#define EMIT6_PCREL_RIEB (op1, op2, b1, b2, mask, target) \ ({ \ - int rel = (jit->labels[label] - jit->prg) >> 1; \ + unsigned int rel = (int)((target) - jit->prg) / 2; \ _EMIT6((op1) | reg(b1, b2) << 16 | (rel & 0xffff), \ (op2) | (mask) << 12); \ REG_SET_SEEN(b1); \ REG_SET_SEEN(b2); \ }) -#define EMIT6_PCREL_IMM_LABEL (op1, op2, b1, imm, label, mask) \ +#define EMIT6_PCREL_RIEC (op1, op2, b1, imm, mask, target) \ ({ \ - int rel = (jit->labels[label] - jit->prg) >> 1; \ + unsigned int rel = (int)((target) - jit->prg) / 2; \ _EMIT6((op1) | (reg_high(b1) | (mask)) << 16 | \ (rel & 0xffff), (op2) | ((imm) & 0xff) << 8); \ REG_SET_SEEN(b1); \
@@ -1282,7 +1281,9 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,EMIT4 (0xb9040000 ,BPF_REG_0 ,REG_2 );break ; } -case BPF_JMP |BPF_TAIL_CALL : +case BPF_JMP |BPF_TAIL_CALL : { +int patch_1_clrj, patch_2_clij, patch_3_brc; +/* * Implicit input: * B1: pointer to ctx
@@ -1300,16 +1301,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,EMIT6_DISP_LH (0xe3000000 ,0x0016 ,REG_W1 ,REG_0 ,BPF_REG_2 , offsetof(struct bpf_array, map.max_entries));/* if ((u32)%b3 >= (u32)%w1) goto out; */ -if (!is_first_pass (jit) &&can_use_rel (jit, jit->labels[0 ])) { -/* clrj %b3,%w1,0xa,label0 */ -EMIT6_PCREL_LABEL (0xec000000 ,0x0077 ,BPF_REG_3 , -REG_W1 ,0 ,0xa ); - }else { -/* clr %b3,%w1 */ -EMIT2 (0x1500 ,BPF_REG_3 ,REG_W1 ); -/* brcl 0xa,label0 */ -EMIT6_PCREL_RILC (0xc0040000 ,0xa , jit->labels[0 ]); - } +/* clrj %b3,%w1,0xa,out */ + patch_1_clrj = jit->prg; +EMIT6_PCREL_RIEB (0xec000000 ,0x0077 ,BPF_REG_3 ,REG_W1 ,0xa , + jit->prg);/* * if (tail_call_cnt++ > MAX_TAIL_CALL_CNT)
@@ -1324,16 +1319,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,EMIT4_IMM (0xa7080000 ,REG_W0 ,1 );/* laal %w1,%w0,off(%r15) */ EMIT6_DISP_LH (0xeb000000 ,0x00fa ,REG_W1 ,REG_W0 ,REG_15 , off); -if (!is_first_pass (jit) &&can_use_rel (jit, jit->labels[0 ])) { -/* clij %w1,MAX_TAIL_CALL_CNT,0x2,label0 */ -EMIT6_PCREL_IMM_LABEL (0xec000000 ,0x007f ,REG_W1 , -MAX_TAIL_CALL_CNT ,0 ,0x2 ); - }else { -/* clfi %w1,MAX_TAIL_CALL_CNT */ -EMIT6_IMM (0xc20f0000 ,REG_W1 ,MAX_TAIL_CALL_CNT ); -/* brcl 0x2,label0 */ -EMIT6_PCREL_RILC (0xc0040000 ,0x2 , jit->labels[0 ]); - } +/* clij %w1,MAX_TAIL_CALL_CNT,0x2,out */ + patch_2_clij = jit->prg; +EMIT6_PCREL_RIEC (0xec000000 ,0x007f ,REG_W1 ,MAX_TAIL_CALL_CNT , +2 , jit->prg);/* * prog = array->ptrs[index];
@@ -1348,13 +1337,9 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,/* ltg %r1,prog(%b2,%r1) */ EMIT6_DISP_LH (0xe3000000 ,0x0002 ,REG_1 ,BPF_REG_2 ,REG_1 , offsetof(struct bpf_array , ptrs)); -if (!is_first_pass (jit) &&can_use_rel (jit, jit->labels[0 ])) { -/* brc 0x8,label0 */ -EMIT4_PCREL_RIC (0xa7040000 ,0x8 , jit->labels[0 ]); - }else { -/* brcl 0x8,label0 */ -EMIT6_PCREL_RILC (0xc0040000 ,0x8 , jit->labels[0 ]); - } +/* brc 0x8,out */ + patch_3_brc = jit->prg; +EMIT4_PCREL_RIC (0xa7040000 ,8 , jit->prg);/* * Restore registers before calling function
@@ -1371,8 +1356,16 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,/* bc 0xf,tail_call_start(%r1) */ _EMIT4 (0x47f01000 + jit->tail_call_start);/* out: */ - jit->labels[0 ] = jit->prg; +if (jit->prg_buf) { + *(u16 *)(jit->prg_buf + patch_1_clrj +2 ) = + (jit->prg - patch_1_clrj) >>1 ; + *(u16 *)(jit->prg_buf + patch_2_clij +2 ) = + (jit->prg - patch_2_clij) >>1 ; + *(u16 *)(jit->prg_buf + patch_3_brc +2 ) = + (jit->prg - patch_3_brc) >>1 ; + }break ; + }case BPF_JMP |BPF_EXIT :/* return b0 */ last = (i == fp->len -1 ) ?1 :0 ;if (last)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 259/757 net/mlx5: Fix uninitialized variable warning
In reply to Greg Kroah-HartmanFrom: Moshe Tal <[email protected]>
[ Upstream commit 19f5b63bc9932d51292d72c9dc3ec95e5dfa2289 ]
Add variable initialization to eliminate the warning "variable may be used uninitialized".
--- drivers/net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/health.c +1 -1
@@ -242,8 +242,8 @@ static int mlx5e_health_rsc_fmsg_binary(struct devlink_fmsg *fmsg, {u32 data_size; +int err =0 ;u32 offset; -int err;for (offset =0 ; offset < value_len; offset += data_size) { data_size = value_len - offset;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 260/757 net/mlx5: Dont call timecounter cyc2time directly from 1PPS flow
In reply to Greg Kroah-HartmanFrom: Eran Ben Elisha <[email protected]>
[ Upstream commit 0d2ffdc8d4002a62de31ff7aa3bef28c843c3cbe ]
Before calling timecounter_cyc2time(), clock->lock must be taken. Use mlx5_timecounter_cyc2time instead which guarantees a safe access.
--- drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +3 -2
@@ -550,8 +550,9 @@ static int mlx5_pps_event(struct notifier_block *nb,switch (clock->ptp_info.pin_config[pin].func) {case PTP_PF_EXTTS : ptp_event.index = pin; - ptp_event.timestamp =timecounter_cyc2time (&clock->tc, -be64_to_cpu (eqe->data.pps.time_stamp)); + ptp_event.timestamp = +mlx5_timecounter_cyc2time (clock, +be64_to_cpu (eqe->data.pps.time_stamp));if (clock->pps_info.enabled) { ptp_event.type =PTP_CLOCK_PPSUSR ; ptp_event.pps_times.ts_real =
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 261/757 scsi: mpt3sas: Fix sync irqs
In reply to Greg Kroah-HartmanFrom: Tomas Henzl <[email protected]>
[ Upstream commit 45181eab8ba79ed7a41b549f00500c0093828521 ]
_base_process_reply_queue() called from _base_interrupt() may schedule a new irq poll. Fix this by calling synchronize_irq() first.
Also ensure that enable_irq() is called only when necessary to avoid "Unbalanced enable for IRQ..." errors.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +9 -5
@@ -1809,18 +1809,22 @@ mpt3sas_base_sync_reply_irqs(struct MPT3SAS_ADAPTER *ioc)/* TMs are on msix_index == 0 */ if (reply_q->msix_index ==0 )continue ; +synchronize_irq (pci_irq_vector (ioc->pdev, reply_q->msix_index));if (reply_q->irq_poll_scheduled) {/* Calling irq_poll_disable will wait for any pending * callbacks to have completed. */ irq_poll_disable (&reply_q->irqpoll);irq_poll_enable (&reply_q->irqpoll); - reply_q->irq_poll_scheduled = false; - reply_q->irq_line_enable = true; -enable_irq (reply_q->os_irq); -continue ; +/* check how the scheduled poll has ended, +* clean up only if necessary +*/ +if (reply_q->irq_poll_scheduled) { + reply_q->irq_poll_scheduled = false; + reply_q->irq_line_enable = true; +enable_irq (reply_q->os_irq); + } } -synchronize_irq (pci_irq_vector (ioc->pdev, reply_q->msix_index)); } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 262/757 net: stmmac: Fix incorrect location to set real_num_rx|tx_queues
In reply to Greg Kroah-HartmanFrom: Aashish Verma <[email protected]>
[ Upstream commit 686cff3d7022ddf35d7e38bc80191eb92de5989a ]
netif_set_real_num_tx_queues() & netif_set_real_num_rx_queues() should be used to inform network stack about the real Tx & Rx queue (active) number in both stmmac_open() and stmmac_resume(), therefore, we move the code from stmmac_dvr_probe() to stmmac_hw_setup().
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -4
@@ -2740,6 +2740,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)stmmac_enable_tbs (priv, priv->ioaddr, enable, chan); } +/* Configure real RX and TX queues */ +netif_set_real_num_rx_queues (dev, priv->plat->rx_queues_to_use); +netif_set_real_num_tx_queues (dev, priv->plat->tx_queues_to_use); +/* Start the ball rolling... */ stmmac_start_all_dma (priv);
@@ -4827,10 +4831,6 @@ int stmmac_dvr_probe(struct device *device,stmmac_check_ether_addr (priv); -/* Configure real RX and TX queues */ -netif_set_real_num_rx_queues (ndev, priv->plat->rx_queues_to_use); -netif_set_real_num_tx_queues (ndev, priv->plat->tx_queues_to_use); - ndev->netdev_ops = &stmmac_netdev_ops; ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 263/757 net: stmmac: use netif_tx_start|stop_all_queues() function
In reply to Greg Kroah-HartmanFrom: Ong Boon Leong <[email protected]>
[ Upstream commit 9f19306d166688a73356aa636c62e698bf2063cc ]
The current implementation of stmmac_stop_all_queues() and stmmac_start_all_queues() will not work correctly when the value of tx_queues_to_use is changed through ethtool -L DEVNAME rx N tx M command.
Also, netif_tx_start|stop_all_queues() are only needed in driver open() and close() only.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -32
@@ -176,32 +176,6 @@ static void stmmac_enable_all_queues(struct stmmac_priv *priv) } } -/** -* stmmac_stop_all_queues - Stop all queues -* @priv: driver private structure -*/ -static void stmmac_stop_all_queues (struct stmmac_priv *priv) -{ -u32 tx_queues_cnt = priv->plat->tx_queues_to_use; -u32 queue; - -for (queue =0 ; queue < tx_queues_cnt; queue++) -netif_tx_stop_queue (netdev_get_tx_queue (priv->dev, queue)); -} - -/** -* stmmac_start_all_queues - Start all queues -* @priv: driver private structure -*/ -static void stmmac_start_all_queues (struct stmmac_priv *priv) -{ -u32 tx_queues_cnt = priv->plat->tx_queues_to_use; -u32 queue; - -for (queue =0 ; queue < tx_queues_cnt; queue++) -netif_tx_start_queue (netdev_get_tx_queue (priv->dev, queue)); -} -static void stmmac_service_event_schedule (struct stmmac_priv *priv) { if (!test_bit(STMMAC_DOWN, &priv->state) &&
@@ -2872,7 +2846,7 @@ static int stmmac_open(struct net_device *dev) }stmmac_enable_all_queues (priv); -stmmac_start_all_queues (priv); +netif_tx_start_all_queues (priv->dev);return 0 ;
@@ -2915,8 +2889,6 @@ static int stmmac_release(struct net_device *dev)phylink_stop (priv->phylink);phylink_disconnect_phy (priv->phylink); -stmmac_stop_all_queues (priv); -stmmac_disable_all_queues (priv);for (chan =0 ; chan < priv->plat->tx_queues_to_use; chan++)
@@ -5086,7 +5058,6 @@ int stmmac_suspend(struct device *dev)mutex_lock (&priv->lock);netif_device_detach (ndev); -stmmac_stop_all_queues (priv);stmmac_disable_all_queues (priv);
@@ -5213,8 +5184,6 @@ int stmmac_resume(struct device *dev)stmmac_enable_all_queues (priv); -stmmac_start_all_queues (priv); -mutex_unlock (&priv->lock);if (!device_may_wakeup (priv->device) || !priv->plat->pmt) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 264/757 xfs: force the log after remapping a synchronous-writes file
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit 5ffce3cc22a0e89813ed0c7162a68b639aef9ab6 ]
Commit 5833112df7e9 tried to make it so that a remap operation would force the log out to disk if the filesystem is mounted with mandatory synchronous writes. Unfortunately, that commit failed to handle the case where the inode or the file descriptor require mandatory synchronous writes.
Refactor the check into into a helper that will look for all three conditions, and now we can treat reflink just like any other synchronous write.
--- fs/xfs/xfs_file.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
fs/xfs/xfs_file.c +16 -1
@@ -1008,6 +1008,21 @@ xfs_file_fadvise(return ret; } +/* Does this file, inode, or mount want synchronous writes? */ +static inline bool xfs_file_sync_writes (struct file *filp) +{ +struct xfs_inode *ip =XFS_I (file_inode (filp)); + +if (ip->i_mount->m_flags &XFS_MOUNT_WSYNC ) +return true; +if (filp->f_flags & (__O_SYNC |O_DSYNC )) +return true; +if (IS_SYNC (file_inode (filp))) +return true; + +return false; +} + STATIC loff_t xfs_file_remap_range( struct file *file_in,
@@ -1065,7 +1080,7 @@ xfs_file_remap_range(if (ret) goto out_unlock; -if (mp->m_flags &XFS_MOUNT_WSYNC ) +if (xfs_file_sync_writes (file_in) ||xfs_file_sync_writes (file_out))xfs_log_force_inode (dest); out_unlock:xfs_iunlock2_io_mmap (src, dest);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 265/757 cpufreq: armada-37xx: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit c942d1542f1bc5001216fabce9cb8ffbe515777e ]
CONFIG_ARM_ARMADA_37XX_CPUFREQ is tristate option and therefore this cpufreq driver can be compiled as a module. This patch adds missing MODULE_DEVICE_TABLE which generates correct modalias for automatic loading of this cpufreq driver when is compiled as an external module.
--- drivers/cpufreq/armada-37xx-cpufreq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/cpufreq/armada-37xx-cpufreq.c +6 -0
@@ -484,6 +484,12 @@ static int __init armada37xx_cpufreq_driver_init(void)/* late_initcall, to guarantee the driver is loaded after A37xx clock driver */ late_initcall (armada37xx_cpufreq_driver_init); +static const struct of_device_id __maybe_unused armada37xx_cpufreq_of_match[] = { + { .compatible ="marvell,armada-3700-nb-pm" }, + { }, +}; +MODULE_DEVICE_TABLE (of, armada37xx_cpufreq_of_match); +MODULE_AUTHOR ("Gregory CLEMENT <[email protected]>" );MODULE_DESCRIPTION ("Armada 37xx cpufreq driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 266/757 drm: mxsfb: check framebuffer pitch
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit d5a0c816900419105a12e7471bf074319dfa34be ]
The lcdif IP does not support a framebuffer pitch (stride) other than framebuffer width. Check for equality and reject the framebuffer otherwise.
This prevents a distorted picture when using 640x800 and running the Mesa graphics stack. Mesa tries to use a cache aligned stride, which leads at that particular resolution to width != stride. Currently Mesa has no fallback behavior, but rejecting this configuration allows userspace to handle the issue correctly.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +20 -1
@@ -26,6 +26,7 @@#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_irq.h>
@@ -92,8 +93,26 @@ void mxsfb_disable_axi_clk(struct mxsfb_drm_private *mxsfb)clk_disable_unprepare (mxsfb->clk_axi); } +static struct drm_framebuffer * +mxsfb_fb_create (struct drm_device *dev,struct drm_file *file_priv, +const struct drm_mode_fb_cmd2 *mode_cmd) +{ +const struct drm_format_info *info; + + info =drm_get_format_info (dev, mode_cmd); +if (!info) +return ERR_PTR (-EINVAL ); + +if (mode_cmd->width * info->cpp[0 ] != mode_cmd->pitches[0 ]) { +dev_dbg (dev->dev,"Invalid pitch: fb width must match pitch\n" ); +return ERR_PTR (-EINVAL ); + } + +return drm_gem_fb_create (dev, file_priv, mode_cmd); +} +static const struct drm_mode_config_funcs mxsfb_mode_config_funcs = { - .fb_create = drm_gem_fb_create, + .fb_create = mxsfb_fb_create, .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 267/757 cpufreq: qcom: Dont add frequencies without an OPP
In reply to Greg Kroah-HartmanFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bc9b9c5ab9d8d16157737db539929d57562926e9 ]
The driver currently adds all frequencies from the hardware LUT to the cpufreq table, regardless of whether the corresponding OPP exists. This prevents devices from disabling certain OPPs through the device tree and can result in CPU frequencies for which the interconnect bandwidth can't be adjusted. Only add frequencies with an OPP entry.
--- drivers/cpufreq/qcom-cpufreq-hw.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/cpufreq/qcom-cpufreq-hw.c +15 -6
@@ -177,10 +177,15 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev, freq = cpu_hw_rate /1000 ;if (freq != prev_freq && core_count !=LUT_TURBO_IND ) { - table[i].frequency = freq; -qcom_cpufreq_update_opp (cpu_dev, freq, volt); -dev_dbg (cpu_dev,"index=%d freq=%d, core_count %d\n" , i, +if (!qcom_cpufreq_update_opp (cpu_dev, freq, volt)) { + table[i].frequency = freq; +dev_dbg (cpu_dev,"index=%d freq=%d, core_count %d\n" , i, freq, core_count); + }else { +dev_warn (cpu_dev,"failed to update OPP for freq=%d\n" , freq); + table[i].frequency =CPUFREQ_ENTRY_INVALID ; + } + }else if (core_count ==LUT_TURBO_IND ) { table[i].frequency =CPUFREQ_ENTRY_INVALID ; }
@@ -197,9 +202,13 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,* as the boost frequency */ if (prev->frequency ==CPUFREQ_ENTRY_INVALID ) { - prev->frequency = prev_freq; - prev->flags =CPUFREQ_BOOST_FREQ ; -qcom_cpufreq_update_opp (cpu_dev, prev_freq, volt); +if (!qcom_cpufreq_update_opp (cpu_dev, prev_freq, volt)) { + prev->frequency = prev_freq; + prev->flags =CPUFREQ_BOOST_FREQ ; + }else { +dev_warn (cpu_dev,"failed to update OPP for freq=%d\n" , + freq); + } }break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 268/757 ima: Fix NULL pointer dereference in ima_file_hash
In reply to Greg Kroah-HartmanFrom: KP Singh <[email protected]>
[ Upstream commit aa662fc04f5b290b3979332588bf8d812b189962 ]
ima_file_hash can be called when there is no iint->ima_hash available even though the inode exists in the integrity cache. It is fairly common for a file to not have a hash. (e.g. an mknodat, prior to the file being closed).
Another example where this can happen (suggested by Jann Horn):
Process A does:
while(1) {
unlink("/tmp/imafoo");
fd = open("/tmp/imafoo", O_RDWR|O_CREAT|O_TRUNC, 0700);
if (fd == -1) {
perror("open");
continue;
}
write(fd, "A", 1);
close(fd);
}and Process B does:
while (1) {
int fd = open("/tmp/imafoo", O_RDONLY);
if (fd == -1)
continue;
char *mapping = mmap(NULL, 0x1000, PROT_READ|PROT_EXEC,
MAP_PRIVATE, fd, 0);
if (mapping != MAP_FAILED)
munmap(mapping, 0x1000);
close(fd);}
Due to the race to get the iint->mutex between ima_file_hash and process_measurement iint->ima_hash could still be NULL.
--- security/integrity/ima/ima_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
security/integrity/ima/ima_main.c +10 -0
@@ -531,6 +531,16 @@ int ima_file_hash(struct file *file, char *buf, size_t buf_size)return -EOPNOTSUPP ;mutex_lock (&iint->mutex); + +/* +* ima_file_hash can be called when ima_collect_measurement has still +* not been called, we might not always have a hash. +*/ +if (!iint->ima_hash) { +mutex_unlock (&iint->mutex); +return -EOPNOTSUPP ; + } +if (buf) {size_t copied_size;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 269/757 ASoC: topology: disable size checks for bytes_ext controls if needed
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 6788fc1a66a0c1d1cec7a0f84f94b517eae8611c ]
When CONFIG_SND_CTL_VALIDATION is set, accesses to extended bytes control generate spurious error messages when the size exceeds 512 bytes, such as
[ 11.224223] sof_sdw sof_sdw: control 2:0:0:EQIIR5.0 eqiir_coef_5:0:
invalid count 1024
In addition the error check returns -EINVAL which has the nasty side effect of preventing applications accessing controls from working, e.g.
root@plb:~# alsamixer cannot load mixer controls: Invalid argument
It's agreed that the control interface has been abused since 2014, but forcing a check should not prevent existing solutions from working.
This patch skips the checks conditionally if CONFIG_SND_CTL_VALIDATION is set and the byte array provided by topology is > 512. This preserves the checks for all other cases.
--- sound/soc/soc-topology.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/soc-topology.c +11 -0
@@ -592,6 +592,17 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, k->info = snd_soc_bytes_info_ext; k->tlv.c = snd_soc_bytes_tlv_callback; +/* +* When a topology-based implementation abuses the +* control interface and uses bytes_ext controls of +* more than 512 bytes, we need to disable the size +* checks, otherwise accesses to such controls will +* return an -EINVAL error and prevent the card from +* being configured. +*/ +if (IS_ENABLED (CONFIG_SND_CTL_VALIDATION ) && sbe->max >512 ) + k->access |=SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK ; + ext_ops = tplg->bytes_ext_ops; num_ops = tplg->bytes_ext_ops_count;for (i =0 ; i < num_ops; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 270/757 ASoC: tlv320adcx140: Fix digital gain range
In reply to Greg Kroah-HartmanFrom: Camel Guo <[email protected]>
[ Upstream commit 73154aca4a03a2ab4833fd36683feb884af06d4b ]
According to its datasheet, the digital gain should be -100 dB when CHx_DVOL is 1 and 27 dB when CHx_DVOL is 255. But with the current dig_vol_tlv, "Digital CHx Out Volume" shows 27.5 dB if CHx_DVOL is 255 and -95.5 dB if CHx_DVOL is 1. This commit fixes this bug.
--- sound/soc/codecs/tlv320adcx140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tlv320adcx140.c +1 -1
@@ -161,7 +161,7 @@ static const struct regmap_config adcx140_i2c_regmap = { };/* Digital Volume control. From -100 to 27 dB in 0.5 dB steps */ -static DECLARE_TLV_DB_SCALE(dig_vol_tlv, -10000, 50, 0); +static DECLARE_TLV_DB_SCALE(dig_vol_tlv, -10050, 50, 0);/* ADC gain. From 0 to 42 dB in 1 dB steps */ static DECLARE_TLV_DB_SCALE(adc_tlv, 0, 100, 0);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 271/757 coresight: etm4x: Fix etm4_count race by moving cpuhp callbacks to init
In reply to Greg Kroah-HartmanFrom: Sai Prakash Ranjan <[email protected]>
[ Upstream commit 2d1a8bfb61ec0177343e99ebd745e3e4ceb0d0d5 ]
etm4_count keeps track of number of ETMv4 registered and on some systems, a race is observed on etm4_count variable which can lead to multiple calls to cpuhp_setup_state_nocalls_cpuslocked(). This function internally calls cpuhp_store_callbacks() which prevents multiple registrations of callbacks for a given state and due to this race, it returns -EBUSY leading to ETM probe failures like below.
coresight-etm4x: probe of 7040000.etm failed with error -16
This race can easily be triggered with async probe by setting probe type as PROBE_PREFER_ASYNCHRONOUS and with ETM power management property "arm,coresight-loses-context-with-cpu".
Prevent this race by moving cpuhp callbacks to etm driver init since the cpuhp callbacks doesn't have to depend on the etm4_count and can be once setup during driver init. Similarly we move cpu_pm notifier registration to driver init and completely remove etm4_count usage. Also now we can use non cpuslocked version of cpuhp callbacks with this movement.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x.c +31 -34
@@ -48,8 +48,6 @@ module_param(pm_save_enable, int, 0444);MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: 1 = never, 2 = self-hosted" ); -/* The number of ETMv4 currently registered */ -static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];static void etm4_set_default_config (struct etmv4_config *config); static int etm4_set_event_filters(struct etmv4_drvdata *drvdata,
@@ -1397,28 +1395,25 @@ static struct notifier_block etm4_cpu_pm_nb = { .notifier_call = etm4_cpu_pm_notify, }; -/* Setup PM. Called with cpus locked. Deals with error conditions and counts */ -static int etm4_pm_setup_cpuslocked (void ) +/* Setup PM. Deals with error conditions and counts */ +static int __init etm4_pm_setup (void ) {int ret; -if (etm4_count++) -return 0 ; - ret =cpu_pm_register_notifier (&etm4_cpu_pm_nb);if (ret) - goto reduce_count; +return ret; - ret =cpuhp_setup_state_nocalls_cpuslocked (CPUHP_AP_ARM_CORESIGHT_STARTING , -"arm/coresight4:starting" , - etm4_starting_cpu, etm4_dying_cpu); + ret =cpuhp_setup_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING , +"arm/coresight4:starting" , + etm4_starting_cpu, etm4_dying_cpu);if (ret) goto unregister_notifier; - ret =cpuhp_setup_state_nocalls_cpuslocked (CPUHP_AP_ONLINE_DYN , -"arm/coresight4:online" , - etm4_online_cpu,NULL ); + ret =cpuhp_setup_state_nocalls (CPUHP_AP_ONLINE_DYN , +"arm/coresight4:online" , + etm4_online_cpu,NULL );/* HP dyn state ID returned in ret on success */ if (ret >0 ) {
@@ -1427,21 +1422,15 @@ static int etm4_pm_setup_cpuslocked(void) }/* failed dyn state - remove others */ -cpuhp_remove_state_nocalls_cpuslocked (CPUHP_AP_ARM_CORESIGHT_STARTING ); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING ); unregister_notifier:cpu_pm_unregister_notifier (&etm4_cpu_pm_nb); - -reduce_count: - --etm4_count;return ret; } -static void etm4_pm_clear (void ) +static void __init etm4_pm_clear (void ) { -if (--etm4_count !=0 ) -return ; -cpu_pm_unregister_notifier (&etm4_cpu_pm_nb);cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online) {
@@ -1497,22 +1486,12 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (!desc.name)return -ENOMEM ; -cpus_read_lock (); etmdrvdata[drvdata->cpu] = drvdata;if (smp_call_function_single (drvdata->cpu, etm4_init_arch_data, drvdata,1 ))dev_err (dev,"ETM arch init failed\n" ); - ret =etm4_pm_setup_cpuslocked (); -cpus_read_unlock (); - -/* etm4_pm_setup_cpuslocked() does its own cleanup - exit on error */ -if (ret) { - etmdrvdata[drvdata->cpu] =NULL ; -return ret; - } -if (etm4_arch_supported (drvdata->arch) == false) { ret = -EINVAL ; goto err_arch_supported;
@@ -1559,7 +1538,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported: etmdrvdata[drvdata->cpu] =NULL ; -etm4_pm_clear ();return ret; }
@@ -1597,4 +1575,23 @@ static struct amba_driver etm4x_driver = { .probe = etm4_probe, .id_table = etm4_ids, }; -builtin_amba_driver (etm4x_driver); + +static int __init etm4x_init (void ) +{ +int ret; + + ret =etm4_pm_setup (); + +/* etm4_pm_setup() does its own cleanup - exit on error */ +if (ret) +return ret; + + ret =amba_driver_register (&etm4x_driver); +if (ret) { +pr_err ("Error registering etm4x driver\n" ); +etm4_pm_clear (); + } + +return ret; +} +device_initcall (etm4x_init);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 272/757 coresight: fix offset by one error in counting ports
In reply to Greg Kroah-HartmanFrom: Mian Yousaf Kaukab <[email protected]>
[ Upstream commit 9554c3551ed35d79b029e5e69383ae33117d9765 ]
Since port-numbers start from 0, add 1 to port-number to get the port count.
Fix following crash when Coresight is enabled on ACPI based systems:
[ 61.061736] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008 ... [ 61.135494] pc : acpi_coresight_parse_graph+0x1c4/0x37c [ 61.140705] lr : acpi_coresight_parse_graph+0x160/0x37c [ 61.145915] sp : ffff800012f4ba40 [ 61.145917] x29: ffff800012f4ba40 x28: ffff00becce62f98 [ 61.159896] x27: 0000000000000005 x26: ffff00becd8a7c88 [ 61.165195] x25: ffff00becd8a7d88 x24: ffff00becce62f80 [ 61.170492] x23: ffff800011ef99c0 x22: ffff009efb8bc010 [ 61.175790] x21: 0000000000000018 x20: 0000000000000005 [ 61.181087] x19: ffff00becce62e80 x18: 0000000000000020 [ 61.186385] x17: 0000000000000001 x16: 00000000000002a8 [ 61.191682] x15: ffff000838648550 x14: ffffffffffffffff [ 61.196980] x13: 0000000000000000 x12: ffff00becce62d87 [ 61.202277] x11: 00000000ffffff76 x10: 000000000000002e [ 61.207575] x9 : ffff8000107e1a68 x8 : ffff00becce63000 [ 61.212873] x7 : 0000000000000018 x6 : 000000000000003f [ 61.218170] x5 : 0000000000000000 x4 : 0000000000000000 [ 61.223467] x3 : 0000000000000000 x2 : 0000000000000000 [ 61.228764] x1 : ffff00becce62f80 x0 : 0000000000000000 [ 61.234062] Call trace: [ 61.236497] acpi_coresight_parse_graph+0x1c4/0x37c [ 61.241361] coresight_get_platform_data+0xdc/0x130 [ 61.246225] tmc_probe+0x138/0x2dc [ 61.246227] amba_probe+0xdc/0x220 [ 61.255779] really_probe+0xe8/0x49c [ 61.255781] driver_probe_device+0xec/0x140 [ 61.255782] device_driver_attach+0xc8/0xd0 [ 61.255785] __driver_attach+0xac/0x180 [ 61.265857] bus_for_each_dev+0x78/0xcc [ 61.265859] driver_attach+0x2c/0x40 [ 61.265861] bus_add_driver+0x150/0x244 [ 61.265863] driver_register+0x80/0x13c [ 61.273591] amba_driver_register+0x60/0x70 [ 61.273594] tmc_driver_init+0x20/0x2c [ 61.281582] do_one_initcall+0x50/0x230 [ 61.281585] do_initcalls+0x104/0x144 [ 61.291831] kernel_init_freeable+0x168/0x1dc [ 61.291834] kernel_init+0x1c/0x120 [ 61.299215] ret_from_fork+0x10/0x18 [ 61.299219] Code: b9400022 f9400660 9b277c42 8b020000 (f9400404) [ 61.307381] ---[ end trace 63c6c3d7ec6a9b7c ]--- [ 61.315225] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
--- drivers/hwtracing/coresight/coresight-platform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/hwtracing/coresight/coresight-platform.c +5 -5
@@ -711,11 +711,11 @@ static int acpi_coresight_parse_graph(struct acpi_device *adev,return dir;if (dir ==ACPI_CORESIGHT_LINK_MASTER ) { -if (ptr->outport > pdata->nr_outport) - pdata->nr_outport = ptr->outport; +if (ptr->outport >= pdata->nr_outport) + pdata->nr_outport = ptr->outport +1 ; ptr++; }else { -WARN_ON (pdata->nr_inport == ptr->child_port); +WARN_ON (pdata->nr_inport == ptr->child_port +1 );/* * We do not track input port connections for a device. * However we need the highest port number described,
@@ -723,8 +723,8 @@ static int acpi_coresight_parse_graph(struct acpi_device *adev,* record for an output connection. Hence, do not move * the ptr for input connections */ -if (ptr->child_port > pdata->nr_inport) - pdata->nr_inport = ptr->child_port; +if (ptr->child_port >= pdata->nr_inport) + pdata->nr_inport = ptr->child_port +1 ; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 273/757 coresight: cti: disclaim device only when its claimed
In reply to Greg Kroah-HartmanFrom: Tingwei Zhang <[email protected]>
[ Upstream commit 0dee28268ddbe53a981d4d87faf5dc0f1700e698 ]
Coresight_claim_device() is called in cti_starting_cpu() only when CTI is enabled while coresight_disclaim_device() is called uncontionally in cti_dying_cpu(). This triggered below WARNING. Only call disclaim device when CTI device is enabled to fix it.
[ 75.989643] WARNING: CPU: 1 PID: 14 at kernel/drivers/hwtracing/coresight/coresight.c:209 coresight_disclaim_device_unlocked+0x10/0x24 [ 75.989697] CPU: 1 PID: 14 Comm: migration/1 Not tainted 5.9.0-rc1-gff1304be0a05-dirty #21 [ 75.989709] Hardware name: Thundercomm Dragonboard 845c (DT) [ 75.989737] pstate: 80c00085 (Nzcv daIf +PAN +UAO BTYPE=--) [ 75.989758] pc : coresight_disclaim_device_unlocked+0x10/0x24 [ 75.989775] lr : coresight_disclaim_device+0x24/0x38 [ 75.989783] sp : ffff800011cd3c90 . [ 75.990018] Call trace: [ 75.990041] coresight_disclaim_device_unlocked+0x10/0x24 [ 75.990066] cti_dying_cpu+0x34/0x4c [ 75.990101] cpuhp_invoke_callback+0x84/0x1e0 [ 75.990121] take_cpu_down+0x90/0xe0 [ 75.990154] multi_cpu_stop+0x134/0x160 [ 75.990171] cpu_stopper_thread+0xb0/0x13c [ 75.990196] smpboot_thread_fn+0x1c4/0x270 [ 75.990222] kthread+0x128/0x154 [ 75.990251] ret_from_fork+0x10/0x18
--- drivers/hwtracing/coresight/coresight-cti.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-cti.c +2 -1
@@ -742,7 +742,8 @@ static int cti_dying_cpu(unsigned int cpu)spin_lock (&drvdata->spinlock); drvdata->config.hw_powered = false; -coresight_disclaim_device (drvdata->base); +if (drvdata->config.hw_enabled) +coresight_disclaim_device (drvdata->base);spin_unlock (&drvdata->spinlock);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 274/757 coresight: cti: remove pm_runtime_get_sync() from CPU hotplug
In reply to Greg Kroah-HartmanFrom: Tingwei Zhang <[email protected]>
[ Upstream commit 6e8836c6df5327bdb24211424f1ad1411d1ed64a ]
Below BUG is triggered by call pm_runtime_get_sync() in cti_cpuhp_enable_hw(). It's in CPU hotplug callback with interrupt disabled. Pm_runtime_get_sync() calls clock driver to enable clock which could sleep. Remove pm_runtime_get_sync() in cti_cpuhp_enable_hw() since pm_runtime_get_sync() is called in cti_enabld and pm_runtime_put() is called in cti_disabled. No need to increase pm count when CPU gets online since it's not decreased when CPU is offline.
[ 105.800279] BUG: scheduling while atomic: swapper/1/0/0x00000002 [ 105.800290] Modules linked in: [ 105.800327] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G W 5.9.0-rc1-gff1304be0a05-dirty #21 [ 105.800337] Hardware name: Thundercomm Dragonboard 845c (DT) [ 105.800353] Call trace: [ 105.800414] dump_backtrace+0x0/0x1d4 [ 105.800439] show_stack+0x14/0x1c [ 105.800462] dump_stack+0xc0/0x100 [ 105.800490] __schedule_bug+0x58/0x74 [ 105.800523] __schedule+0x590/0x65c [ 105.800538] schedule+0x78/0x10c [ 105.800553] schedule_timeout+0x188/0x250 [ 105.800585] qmp_send.constprop.10+0x12c/0x1b0 [ 105.800599] qmp_qdss_clk_prepare+0x18/0x20 [ 105.800622] clk_core_prepare+0x48/0xd4 [ 105.800639] clk_prepare+0x20/0x34 [ 105.800663] amba_pm_runtime_resume+0x54/0x90 [ 105.800695] __rpm_callback+0xdc/0x138 [ 105.800709] rpm_callback+0x24/0x78 [ 105.800724] rpm_resume+0x328/0x47c [ 105.800739] __pm_runtime_resume+0x50/0x74 [ 105.800768] cti_starting_cpu+0x40/0xa4 [ 105.800795] cpuhp_invoke_callback+0x84/0x1e0 [ 105.800814] notify_cpu_starting+0x9c/0xb8 [ 105.800834] secondary_start_kernel+0xd8/0x164 [ 105.800933] CPU1: Booted secondary processor 0x0000000100 [0x517f803c]
--- drivers/hwtracing/coresight/coresight-cti.c | 3 --- 1 file changed, 3 deletions(-)
drivers/hwtracing/coresight/coresight-cti.c +0 -3
@@ -141,9 +141,7 @@ static int cti_enable_hw(struct cti_drvdata *drvdata)static void cti_cpuhp_enable_hw (struct cti_drvdata *drvdata) {struct cti_config *config = &drvdata->config; -struct device *dev = &drvdata->csdev->dev; -pm_runtime_get_sync (dev->parent);spin_lock (&drvdata->spinlock); config->hw_powered = true;
@@ -163,7 +161,6 @@ static void cti_cpuhp_enable_hw(struct cti_drvdata *drvdata)/* did not re-enable due to no claim / no request */ cti_hp_not_enabled:spin_unlock (&drvdata->spinlock); -pm_runtime_put (dev->parent); }/* disable hardware */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 275/757 coresight: etm4x: Ensure default perf settings filter user/kernel
In reply to Greg Kroah-HartmanFrom: Mike Leach <[email protected]>
[ Upstream commit 096dcfb9cd6fefa7c03884b50c247593dc5f7dd3 ]
Moving from using an address filter to trace the default "all addresses" range to no filtering to acheive the same result, has caused the perf filtering of kernel/user address spaces from not working unless an explicit address filter was used.
This is due to the original code using a side-effect of the address filtering rather than setting the global TRCVICTLR exception level filtering.
The use of the mode sysfs file is also similarly affected.
A helper function is added to fix both instances.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++------ drivers/hwtracing/coresight/coresight-etm4x.h | 3 ++ 2 files changed, 25 insertions(+), 10 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x.c +22 -10
@@ -52,6 +52,7 @@ static struct etmv4_drvdata *etmdrvdata[NR_CPUS];static void etm4_set_default_config (struct etmv4_config *config);static int etm4_set_event_filters (struct etmv4_drvdata *drvdata,struct perf_event *event); +static u64 etm4_get_access_type (struct etmv4_config *config);static enum cpuhp_state hp_online;
@@ -783,6 +784,22 @@ static void etm4_init_arch_data(void *info)CS_LOCK (drvdata->base); } +/* Set ELx trace filter access in the TRCVICTLR register */ +static void etm4_set_victlr_access (struct etmv4_config *config) +{ +u64 access_type; + + config->vinst_ctrl &= ~(ETM_EXLEVEL_S_VICTLR_MASK |ETM_EXLEVEL_NS_VICTLR_MASK ); + +/* +* TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering +* bits in vinst_ctrl, same bit pattern as TRCACATRn values returned by +* etm4_get_access_type() but with a relative shift in this register. +*/ + access_type =etm4_get_access_type (config) <<ETM_EXLEVEL_LSHIFT_TRCVICTLR ; + config->vinst_ctrl |= (u32 )access_type; +} +static void etm4_set_default_config (struct etmv4_config *config) {/* disable all events tracing */
@@ -800,6 +817,9 @@ static void etm4_set_default_config(struct etmv4_config *config)/* TRCVICTLR::EVENT = 0x01, select the always on logic */ config->vinst_ctrl =BIT (0 ); + +/* TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering */ +etm4_set_victlr_access (config); }static u64 etm4_get_ns_access_type (struct etmv4_config *config)
@@ -1064,7 +1084,7 @@ static int etm4_set_event_filters(struct etmv4_drvdata *drvdata,void etm4_config_trace_mode (struct etmv4_config *config) { -u32 addr_acc, mode; +u32 mode; mode = config->mode; mode &= (ETM_MODE_EXCL_KERN |ETM_MODE_EXCL_USER );
@@ -1076,15 +1096,7 @@ void etm4_config_trace_mode(struct etmv4_config *config)if (!(mode &ETM_MODE_EXCL_KERN ) && !(mode &ETM_MODE_EXCL_USER ))return ; - addr_acc = config->addr_acc[ETM_DEFAULT_ADDR_COMP ]; -/* clear default config */ - addr_acc &= ~(ETM_EXLEVEL_NS_APP |ETM_EXLEVEL_NS_OS | -ETM_EXLEVEL_NS_HYP ); - - addr_acc |=etm4_get_ns_access_type (config); - - config->addr_acc[ETM_DEFAULT_ADDR_COMP ] = addr_acc; - config->addr_acc[ETM_DEFAULT_ADDR_COMP +1 ] = addr_acc; +etm4_set_victlr_access (config); }static int etm4_online_cpu (unsigned int cpu)
drivers/hwtracing/coresight/coresight-etm4x.h +3 -0
@@ -192,6 +192,9 @@#define ETM_EXLEVEL_NS_HYP BIT(14)#define ETM_EXLEVEL_NS_NA BIT(15) +/* access level control in TRCVICTLR - same bits as TRCACATRn but shifted */ +#define ETM_EXLEVEL_LSHIFT_TRCVICTLR 8 +/* secure / non secure masks - TRCVICTLR, IDR3 */ #define ETM_EXLEVEL_S_VICTLR_MASK GENMASK(19, 16)/* NS MON (EL3) mode never implemented */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 276/757 coresight: etm4x: Fix issues within reset interface of sysfs
In reply to Greg Kroah-HartmanFrom: Jonathan Zhou <[email protected]>
[ Upstream commit 4020fc8d4658dc1dbc27c5644bcb6254caa05e5e ]
The member @nr_addr_cmp is not a bool value, using operator '>' instead to avoid unexpected failure.
--- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +1 -1
@@ -206,7 +206,7 @@ static ssize_t reset_store(struct device *dev,* each trace run. */ config->vinst_ctrl =BIT (0 ); -if (drvdata->nr_addr_cmp == true) { +if (drvdata->nr_addr_cmp >0 ) { config->mode |=ETM_MODE_VIEWINST_STARTSTOP ;/* SSSTATUS, bit[9] */ config->vinst_ctrl |=BIT (9 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 277/757 coresight: cti: Write regsiters directly in cti_enable_hw()
In reply to Greg Kroah-HartmanFrom: Tingwei Zhang <[email protected]>
[ Upstream commit 984f37efa3857dcefa649fbdf64abb94591935c3 ]
Deadlock as below is triggered by one CPU holds drvdata->spinlock and calls cti_enable_hw(). Smp_call_function_single() is called in cti_enable_hw() and tries to let another CPU write CTI registers. That CPU is trying to get drvdata->spinlock in cti_cpu_pm_notify() and doesn't response to IPI from smp_call_function_single().
[ 988.335937] CPU: 6 PID: 10258 Comm: sh Tainted: G W L 5.8.0-rc6-mainline-16783-gc38daa79b26b-dirty #1 [ 988.346364] Hardware name: Thundercomm Dragonboard 845c (DT) [ 988.352073] pstate: 20400005 (nzCv daif +PAN -UAO BTYPE=--) [ 988.357689] pc : smp_call_function_single+0x158/0x1b8 [ 988.362782] lr : smp_call_function_single+0x124/0x1b8 ... [ 988.451638] Call trace: [ 988.454119] smp_call_function_single+0x158/0x1b8 [ 988.458866] cti_enable+0xb4/0xf8 [coresight_cti] [ 988.463618] coresight_control_assoc_ectdev+0x6c/0x128 [coresight] [ 988.469855] coresight_enable+0x1f0/0x364 [coresight] [ 988.474957] enable_source_store+0x5c/0x9c [coresight] [ 988.480140] dev_attr_store+0x14/0x28 [ 988.483839] sysfs_kf_write+0x38/0x4c [ 988.487532] kernfs_fop_write+0x1c0/0x2b0 [ 988.491585] vfs_write+0xfc/0x300 [ 988.494931] ksys_write+0x78/0xe0 [ 988.498283] __arm64_sys_write+0x18/0x20 [ 988.502240] el0_svc_common+0x98/0x160 [ 988.506024] do_el0_svc+0x78/0x80 [ 988.509377] el0_sync_handler+0xd4/0x270 [ 988.513337] el0_sync+0x164/0x180
This change write CTI registers directly in cti_enable_hw(). Config->hw_powered has been checked to be true with spinlock holded. CTI is powered and can be programmed until spinlock is released.
--- drivers/hwtracing/coresight/coresight-cti.c | 24 +++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-)
drivers/hwtracing/coresight/coresight-cti.c +5 -19
@@ -86,22 +86,16 @@ void cti_write_all_hw_regs(struct cti_drvdata *drvdata)CS_LOCK (drvdata->base); } -static void cti_enable_hw_smp_call (void *info) -{ -struct cti_drvdata *drvdata = info; - -cti_write_all_hw_regs (drvdata); -} -/* write regs to hardware and enable */ static int cti_enable_hw (struct cti_drvdata *drvdata) {struct cti_config *config = &drvdata->config;struct device *dev = &drvdata->csdev->dev; +unsigned long flags;int rc =0 ;pm_runtime_get_sync (dev->parent); -spin_lock (&drvdata->spinlock); +spin_lock_irqsave (&drvdata->spinlock, flags);/* no need to do anything if enabled or unpowered*/ if (config->hw_enabled || !config->hw_powered)
@@ -112,19 +106,11 @@ static int cti_enable_hw(struct cti_drvdata *drvdata)if (rc) goto cti_err_not_enabled; -if (drvdata->ctidev.cpu >=0 ) { - rc =smp_call_function_single (drvdata->ctidev.cpu, - cti_enable_hw_smp_call, - drvdata,1 ); -if (rc) - goto cti_err_not_enabled; - }else { -cti_write_all_hw_regs (drvdata); - } +cti_write_all_hw_regs (drvdata); config->hw_enabled = true;atomic_inc (&drvdata->config.enable_req_count); -spin_unlock (&drvdata->spinlock); +spin_unlock_irqrestore (&drvdata->spinlock, flags);return rc; cti_state_unchanged:
@@ -132,7 +118,7 @@ static int cti_enable_hw(struct cti_drvdata *drvdata)/* cannot enable due to error */ cti_err_not_enabled: -spin_unlock (&drvdata->spinlock); +spin_unlock_irqrestore (&drvdata->spinlock, flags);pm_runtime_put (dev->parent);return rc; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 278/757 coresight: etm4x: Handle unreachable sink in perf mode
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit 859d510e58dac94f0b204b7b5cccafbc130d2291 ]
If the specified/hinted sink is not reachable from a subset of the CPUs, we could end up unable to trace the event on those CPUs. This is the best effort we could do until we support 1:1 configurations. Fail gracefully in such cases avoiding a WARN_ON, which can be easily triggered by the user on certain platforms (Arm N1SDP), with the following trace paths :
CPU0
\
-- Funnel0 --> ETF0 -->
/ \
CPU1 \
MainFunnel
CPU2 /
\ /
-- Funnel1 --> ETF1 -->
/CPU1
$ perf record --per-thread -e cs_etm/@ETF0/u -- <app>
could trigger the following WARNING, when the event is scheduled on CPU2.
[10919.513250] ------------[ cut here ]------------ [10919.517861] WARNING: CPU: 2 PID: 24021 at
drivers/hwtracing/coresight/coresight-etm-perf.c:316 etm_event_start+0xf8/0x100
...
[10919.564403] CPU: 2 PID: 24021 Comm: perf Not tainted 5.8.0+ #24 [10919.570308] pstate: 80400089 (Nzcv daIf +PAN -UAO BTYPE=--) [10919.575865] pc : etm_event_start+0xf8/0x100 [10919.580034] lr : etm_event_start+0x80/0x100 [10919.584202] sp : fffffe001932f940 [10919.587502] x29: fffffe001932f940 x28: fffffc834995f800 [10919.592799] x27: 0000000000000000 x26: fffffe0011f3ced0 [10919.598095] x25: fffffc837fce244c x24: fffffc837fce2448 [10919.603391] x23: 0000000000000002 x22: fffffc8353529c00 [10919.608688] x21: fffffc835bb31000 x20: 0000000000000000 [10919.613984] x19: fffffc837fcdcc70 x18: 0000000000000000 [10919.619281] x17: 0000000000000000 x16: 0000000000000000 [10919.624577] x15: 0000000000000000 x14: 00000000000009f8 [10919.629874] x13: 00000000000009f8 x12: 0000000000000018 [10919.635170] x11: 0000000000000000 x10: 0000000000000000 [10919.640467] x9 : fffffe00108cd168 x8 : 0000000000000000 [10919.645763] x7 : 0000000000000020 x6 : 0000000000000001 [10919.651059] x5 : 0000000000000002 x4 : 0000000000000001 [10919.656356] x3 : 0000000000000000 x2 : 0000000000000000 [10919.661652] x1 : fffffe836eb40000 x0 : 0000000000000000 [10919.666949] Call trace: [10919.669382] etm_event_start+0xf8/0x100 [10919.673203] etm_event_add+0x40/0x60 [10919.676765] event_sched_in.isra.134+0xcc/0x210 [10919.681281] merge_sched_in+0xb0/0x2a8 [10919.685017] visit_groups_merge.constprop.140+0x15c/0x4b8 [10919.690400] ctx_sched_in+0x15c/0x170 [10919.694048] perf_event_sched_in+0x6c/0xa0 [10919.698130] ctx_resched+0x60/0xa0 [10919.701517] perf_event_exec+0x288/0x2f0 [10919.705425] begin_new_exec+0x4c8/0xf58 [10919.709247] load_elf_binary+0x66c/0xf30 [10919.713155] exec_binprm+0x15c/0x450 [10919.716716] __do_execve_file+0x508/0x748 [10919.720711] __arm64_sys_execve+0x40/0x50 [10919.724707] do_el0_svc+0xf4/0x1b8 [10919.728095] el0_sync_handler+0xf8/0x124 [10919.732003] el0_sync+0x140/0x180
Even though we don't support using separate sinks for the ETMs yet (e.g, for 1:1 configurations), we should at least honor the user's choice and handle the limitations gracefully, by simply skipping the tracing on ETMs which can't reach the requested sink.
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hwtracing/coresight/coresight-etm-perf.c +10 -0
@@ -321,6 +321,16 @@ static void etm_event_start(struct perf_event *event, int flags)if (!event_data) goto fail; +/* +* Check if this ETM is allowed to trace, as decided +* at etm_setup_aux(). This could be due to an unreachable +* sink from this ETM. We can't do much in this case if +* the sink was specified or hinted to the driver. For +* now, simply don't record anything on this ETM. +*/ +if (!cpumask_test_cpu (cpu, &event_data->mask)) + goto fail_end_stop; + path =etm_event_cpu_path (event_data, cpu);/* We need a sink, no need to continue without one */ sink =coresight_get_sink (path);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 279/757 coresight: etm4x: Fix issues on trcseqevr access
In reply to Greg Kroah-HartmanFrom: Jonathan Zhou <[email protected]>
[ Upstream commit 4cd83037cd957ad97756055355ab4ee63f259380 ]
The TRCSEQEVR(3) is reserved, using '@nrseqstate - 1' instead to avoid accessing the reserved register.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x.c +2 -2
@@ -1193,7 +1193,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); -for (i =0 ; i < drvdata->nrseqstate; i++) +for (i =0 ; i < drvdata->nrseqstate -1 ; i++) state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR );
@@ -1298,7 +1298,7 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata)writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR );writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); -for (i =0 ; i < drvdata->nrseqstate; i++) +for (i =0 ; i < drvdata->nrseqstate -1 ; i++)writel_relaxed (state->trcseqevr[i], drvdata->base +TRCSEQEVRn (i));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 280/757 nvmem: core: fix missing of_node_put() in of_nvmem_device_get()
In reply to Greg Kroah-HartmanFrom: Vadym Kochan <[email protected]>
[ Upstream commit b1c194dcdb1425fa59eec61ab927cfff33096149 ]
of_parse_phandle() returns device_node with incremented ref count which needs to be decremented by of_node_put() when device_node is not used.
--- drivers/nvmem/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvmem/core.c +4 -1
@@ -835,6 +835,7 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *id) {struct device_node *nvmem_np; +struct nvmem_device *nvmem;int index =0 ;if (id)
@@ -844,7 +845,9 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *id)if (!nvmem_np)return ERR_PTR (-ENOENT ); - return __nvmem_device_get(nvmem_np, device_match_of_node); + nvmem =__nvmem_device_get (nvmem_np, device_match_of_node); +of_node_put (nvmem_np); + return nvmem; }EXPORT_SYMBOL_GPL (of_nvmem_device_get);#endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 281/757 selftests: mptcp: interpret \n as a new line
In reply to Greg Kroah-HartmanFrom: Matthieu Baerts <[email protected]>
[ Upstream commit 8b974778f998ab1be23eca7436fc13d2d8c6bd59 ]
In case of errors, this message was printed:
(...)
# read: Resource temporarily unavailable
# client exit code 0, server 3
# \nnetns ns1-0-BJlt5D socket stat for 10003:
(...)
Obviously, the idea was to add a new line before the socket stat and not print "\nnetns".
--- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 4 ++-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.sh +2 -2
@@ -444,9 +444,9 @@ do_transfer() duration=$(printf "(duration %05sms)" $duration) if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2 - echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port" - echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2 ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port" cat "$capout"
tools/testing/selftests/net/mptcp/mptcp_join.sh +2 -2
@@ -176,9 +176,9 @@ do_transfer() if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo " client exit code $retc, server $rets" 1>&2 - echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port" - echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2 ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port" cat "$capout"
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 282/757 dmaengine: ti: k3-udma-glue: fix channel enable functions
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 52c74d3d356b60f3c53dc69e5109752347e144e8 ]
Now the K3 UDMA glue layer enable functions perform RMW operation on UDMA RX/TX RT_CTL registers to set EN bit and enable channel, which is incorrect, because only EN bit has to be set in those registers to enable channel (all other bits should be cleared 0).
More over, this causes issues when bootloader leaves UDMA channel RX/TX RT_CTL registers in incorrect state - TDOWN bit set, for example. As result, UDMA channel will just perform teardown right after it's enabled.
Hence, fix it by writing correct values (EN=1) directly in UDMA channel RX/TX RT_CTL registers in k3_udma_glue_enable_tx/rx_chn() functions.
--- drivers/dma/ti/k3-udma-glue.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/dma/ti/k3-udma-glue.c +3 -14
@@ -378,17 +378,11 @@ EXPORT_SYMBOL_GPL(k3_udma_glue_pop_tx_chn);int k3_udma_glue_enable_tx_chn (struct k3_udma_glue_tx_channel *tx_chn) { -u32 txrt_ctl; - - txrt_ctl =UDMA_PEER_RT_EN_ENABLE ;xudma_tchanrt_write (tx_chn->udma_tchanx,UDMA_CHAN_RT_PEER_RT_EN_REG , - txrt_ctl); +UDMA_PEER_RT_EN_ENABLE ); - txrt_ctl =xudma_tchanrt_read (tx_chn->udma_tchanx, -UDMA_CHAN_RT_CTL_REG ); - txrt_ctl |=UDMA_CHAN_RT_CTL_EN ;xudma_tchanrt_write (tx_chn->udma_tchanx,UDMA_CHAN_RT_CTL_REG , - txrt_ctl); +UDMA_CHAN_RT_CTL_EN );k3_udma_glue_dump_tx_rt_chn (tx_chn,"txchn en" );return 0 ;
@@ -1058,19 +1052,14 @@ EXPORT_SYMBOL_GPL(k3_udma_glue_rx_flow_disable);int k3_udma_glue_enable_rx_chn (struct k3_udma_glue_rx_channel *rx_chn) { -u32 rxrt_ctl; -if (rx_chn->remote)return -EINVAL ;if (rx_chn->flows_ready < rx_chn->flow_num)return -EINVAL ; - rxrt_ctl =xudma_rchanrt_read (rx_chn->udma_rchanx, -UDMA_CHAN_RT_CTL_REG ); - rxrt_ctl |=UDMA_CHAN_RT_CTL_EN ;xudma_rchanrt_write (rx_chn->udma_rchanx,UDMA_CHAN_RT_CTL_REG , - rxrt_ctl); +UDMA_CHAN_RT_CTL_EN );xudma_rchanrt_write (rx_chn->udma_rchanx,UDMA_CHAN_RT_PEER_RT_EN_REG ,UDMA_PEER_RT_EN_ENABLE );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 283/757 selftests/bpf: Fix endianness issue in sk_assign
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit b6ed6cf4a3acdeab9aed8e0a524850761ec9b152 ]
server_map's value size is 8, but the test tries to put an int there. This sort of works on x86 (unless followed by non-0), but hard fails on s390.
Fix by using __s64 instead of int.
--- tools/testing/selftests/bpf/prog_tests/sk_assign.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sk_assign.c +1 -1
@@ -265,7 +265,7 @@ void test_sk_assign(void)TEST ("ipv6 udp port redir" ,AF_INET6 ,SOCK_DGRAM , false), TEST("ipv6 udp addr redir", AF_INET6, SOCK_DGRAM, true), }; -int server =-1 ; +__s64 server =-1 ;int server_map;int self_net;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 284/757 selftests/bpf: Fix endianness issue in test_sockopt_sk
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit fec47bbc10b243690f5d0ee484a0bbdee273e71b ]
getsetsockopt() calls getsockopt() with optlen == 1, but then checks the resulting int. It is ok on little endian, but not on big endian.
Fix by checking char instead.
--- tools/testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/sockopt_sk.c +2 -2
@@ -45,9 +45,9 @@ static int getsetsockopt(void) goto err; } -if (*(int *)big_buf !=0x08 ) { +if (*big_buf !=0x08 ) {log_err ("Unexpected getsockopt(IP_TOS) optval 0x%x != 0x08" , - *(int *)big_buf); + (int )*big_buf); goto err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 285/757 Bluetooth: Fix auto-creation of hci_conn at Conn Complete event
In reply to Greg Kroah-HartmanFrom: Sonny Sasaka <[email protected]>
[ Upstream commit a46b7ed4d52d09bd6c7ab53b2217d04fc2f02c65 ]
Currently the code auto-creates hci_conn only if the remote address has been discovered before. This may not be the case. For example, the remote device may trigger connection after reboot at already-paired state so there is no inquiry result found, but it is still correct to create the hci_conn when Connection Complete event is received.
A better guard is to check against bredr allowlist. Devices in the allowlist have been given permission to auto-connect.
--- net/bluetooth/hci_event.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
net/bluetooth/hci_event.c +11 -6
@@ -2569,7 +2569,6 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)static void hci_conn_complete_evt (struct hci_dev *hdev,struct sk_buff *skb) {struct hci_ev_conn_complete *ev = (void *) skb->data; -struct inquiry_entry *ie;struct hci_conn *conn;BT_DBG ("%s" , hdev->name);
@@ -2578,13 +2577,19 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) conn =hci_conn_hash_lookup_ba (hdev, ev->link_type, &ev->bdaddr);if (!conn) { -/* Connection may not exist if auto-connected. Check the inquiry -* cache to see if we've already discovered this bdaddr before. -* If found and link is an ACL type, create a connection class +/* Connection may not exist if auto-connected. Check the bredr +* allowlist to see if this device is allowed to auto connect. +* If link is an ACL type, create a connection class * automatically. +* +* Auto-connect will only occur if the event filter is +* programmed with a given address. Right now, event filter is +* only used during suspend. */ - ie =hci_inquiry_cache_lookup (hdev, &ev->bdaddr); -if (ie && ev->link_type ==ACL_LINK ) { +if (ev->link_type ==ACL_LINK && +hci_bdaddr_list_lookup_with_flags (&hdev->whitelist, + &ev->bdaddr, +BDADDR_BREDR )) { conn =hci_conn_add (hdev, ev->link_type, &ev->bdaddr,HCI_ROLE_SLAVE );if (!conn) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 286/757 xhci: dont create endpoint debugfs entry before ring buffer is set.
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
[ Upstream commit 167657a1bb5fcde53ac304ce6c564bd90a2f9185 ]
Make sure xHC completes the configure endpoint command and xhci driver sets the ring pointers correctly before we create the user readable debugfs file.
In theory there was a small gap where a user could have read the debugfs file and cause a NULL pointer dereference error as ring pointer was not yet set, in practise we want this change to simplify the upcoming streams debugfs support.
--- drivers/usb/host/xhci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/host/xhci.c +1 -2
@@ -1915,8 +1915,6 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, ep_ctx =xhci_get_ep_ctx (xhci, virt_dev->in_ctx, ep_index);trace_xhci_add_endpoint (ep_ctx); -xhci_debugfs_create_endpoint (xhci, virt_dev, ep_index); - xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n", (unsigned int) ep->desc.bEndpointAddress, udev->slot_id,
@@ -2949,6 +2947,7 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)xhci_check_bw_drop_ep_streams (xhci, virt_dev, i); virt_dev->eps[i].ring = virt_dev->eps[i].new_ring; virt_dev->eps[i].new_ring =NULL ; +xhci_debugfs_create_endpoint (xhci, virt_dev, i); } command_cleanup:kfree (command->completion);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 287/757 drm/msm: Fix the a650 hw_apriv check
In reply to Greg Kroah-HartmanFrom: Jordan Crouse <[email protected]>
[ Upstream commit e9ba8d550dd1e28870a0bdc7c11af026c2a94702 ]
Commit 604234f33658 ("drm/msm: Enable expanded apriv support for a650") was checking the result of adreno_is_a650() before the gpu revision got probed in adreno_gpu_init() so it was always coming across as false. Snoop into the revision ID ahead of time to correctly set the hw_apriv flag so that it can be used by msm_gpu to properly setup global buffers.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +10 -1
@@ -1048,6 +1048,8 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) {struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct adreno_platform_config *config = pdev->dev.platform_data; +const struct adreno_info *info;struct device_node *node;struct a6xx_gpu *a6xx_gpu;struct adreno_gpu *adreno_gpu;
@@ -1064,7 +1066,14 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu->registers =NULL ; adreno_gpu->reg_offsets = a6xx_register_offsets; -if (adreno_is_a650 (adreno_gpu)) +/* +* We need to know the platform type before calling into adreno_gpu_init +* so that the hw_apriv flag can be correctly set. Snoop into the info +* and grab the revision number +*/ + info =adreno_info (config->rev); + +if (info && info->revn ==650 ) adreno_gpu->base.hw_apriv = true; ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs,1 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 288/757 net: dsa: rtl8366: Check validity of passed VLANs
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 6641a2c42b0a307b7638d10e5d4b90debc61389d ]
The rtl8366_set_vlan() and rtl8366_set_pvid() get invalid VLANs tossed at it, especially VLAN0, something the hardware and driver cannot handle. Check validity and bail out like we do in the other callbacks.
--- drivers/net/dsa/rtl8366.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/dsa/rtl8366.c +6 -0
@@ -43,6 +43,9 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,int ret;int i; +if (!smi->ops->is_vlan_valid (smi, vid)) +return -EINVAL ; +dev_dbg (smi->dev,"setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n" , vid, member, untag);
@@ -118,6 +121,9 @@ int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,int ret;int i; +if (!smi->ops->is_vlan_valid (smi, vid)) +return -EINVAL ; +/* Try to find an existing MC entry for this VID */ for (i =0 ; i < smi->num_vlan_mc; i++) { ret = smi->ops->get_vlan_mc (smi, i, &vlanmc);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 289/757 net: dsa: rtl8366: Refactor VLAN/PVID init
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 7e1301ed1881447d2a25f9c6423738c33cbca133 ]
The VLANs and PVIDs on the RTL8366 utilizes a "member configuration" (MC) which is largely unexplained in the code.
This set-up requires a special ordering: rtl8366_set_pvid() must be called first, followed by rtl8366_set_vlan(), else the MC will not be properly allocated. Relax this by factoring out the code obtaining an MC and reuse the helper in both rtl8366_set_pvid() and rtl8366_set_vlan() so we remove this strict ordering requirement.
In the process, add some better comments and debug prints so people who read the code understand what is going on.
--- drivers/net/dsa/realtek-smi-core.h | 4 +- drivers/net/dsa/rtl8366.c | 273 +++++++++++++++-------------- 2 files changed, 146 insertions(+), 131 deletions(-)
drivers/net/dsa/realtek-smi-core.h +3 -1
@@ -25,6 +25,9 @@ struct rtl8366_mib_counter {const char *name; }; +/** +* struct rtl8366_vlan_mc - Virtual LAN member configuration +*/ struct rtl8366_vlan_mc {u16 vid;u16 untag;
@@ -119,7 +122,6 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi);int rtl8366_mc_is_used (struct realtek_smi *smi,int mc_index,int *used);int rtl8366_set_vlan (struct realtek_smi *smi,int vid,u32 member,u32 untag,u32 fid); -int rtl8366_get_pvid (struct realtek_smi *smi,int port,int *val);int rtl8366_set_pvid (struct realtek_smi *smi,unsigned int port,unsigned int vid);int rtl8366_enable_vlan4k (struct realtek_smi *smi,bool enable);
drivers/net/dsa/rtl8366.c +143 -130
332 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 290/757 net: dsa: rtl8366: Skip PVID setting if not requested
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 3dfe8dde093a07e82fa472c0f8c29a7f6a2006a5 ]
We go to lengths to determine whether the PVID should be set for this port or not, and then fail to take it into account. Fix this oversight.
--- drivers/net/dsa/rtl8366.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/dsa/rtl8366.c +3 -0
@@ -436,6 +436,9 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port,"failed to set up VLAN %04x" , vid); +if (!pvid) +continue ; + ret =rtl8366_set_pvid (smi, port, vid);if (ret) dev_err(smi->dev,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 291/757 net: wilc1000: clean up resource in error path of init mon interface
In reply to Greg Kroah-HartmanFrom: Huang Guobin <[email protected]>
[ Upstream commit 55bd149978679742374c800e56e8f6bc74378bbe ]
The wilc_wfi_init_mon_int() forgets to clean up resource when register_netdevice() failed. Add the missed call to fix it. And the return value of netdev_priv can't be NULL, so remove the unnecessary error handling.
--- drivers/net/wireless/microchip/wilc1000/mon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/microchip/wilc1000/mon.c +1 -2
@@ -235,11 +235,10 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl,if (register_netdevice (wl->monitor_dev)) {netdev_err (real_dev,"register_netdevice failed\n" ); +free_netdev (wl->monitor_dev);return NULL ; } priv =netdev_priv (wl->monitor_dev); -if (!priv) -return NULL ; priv->real_ndev = real_dev;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 292/757 ASoC: tas2770: Fix calling reset in probe
In reply to Greg Kroah-HartmanFrom: Dan Murphy <[email protected]>
[ Upstream commit b0bcbe615756d5923eec4e95996e4041627e5741 ]
tas2770_reset is called during i2c probe. The reset calls the snd_soc_component_write which depends on the tas2770->component being available. The component pointer is not set until codec_probe so move the reset to the codec_probe after the pointer is set.
--- sound/soc/codecs/tas2770.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/tas2770.c +2 -2
@@ -575,6 +575,8 @@ static int tas2770_codec_probe(struct snd_soc_component *component) tas2770->component = component; +tas2770_reset (tas2770); +return 0 ; }
@@ -771,8 +773,6 @@ static int tas2770_i2c_probe(struct i2c_client *client, tas2770->channel_size =0 ; tas2770->slot_width =0 ; -tas2770_reset (tas2770); - result =tas2770_register_codec (tas2770);if (result)dev_err (tas2770->dev,"Register codec failed.\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 293/757 ASoC: tas2770: Add missing bias level power states
In reply to Greg Kroah-HartmanFrom: Dan Murphy <[email protected]>
[ Upstream commit 4272caf34aa4699eca8e6e7f4a8e5ea2bde275c9 ]
Add the BIAS_STANDBY and BIAS_PREPARE to the set_bias_level or else the driver will return -EINVAL which is not correct as they are valid states.
--- sound/soc/codecs/tas2770.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/tas2770.c +6 -1
@@ -57,7 +57,12 @@ static int tas2770_set_bias_level(struct snd_soc_component *component,TAS2770_PWR_CTRL_MASK , TAS2770_PWR_CTRL_ACTIVE);break ; - +case SND_SOC_BIAS_STANDBY : +case SND_SOC_BIAS_PREPARE : +snd_soc_component_update_bits (component, +TAS2770_PWR_CTRL , +TAS2770_PWR_CTRL_MASK ,TAS2770_PWR_CTRL_MUTE ); +break ;case SND_SOC_BIAS_OFF : snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 294/757 ASoC: tas2770: Fix required DT properties in the code
In reply to Greg Kroah-HartmanFrom: Dan Murphy <[email protected]>
[ Upstream commit 4b8ab8a7761fe2ba1c4e741703a848cb8f390f79 ]
The devicetree binding indicates that the ti,asi-format, ti,imon-slot-no and ti,vmon-slot-no are not required but the driver requires them or it fails to probe. Honor the binding and allow these entries to be optional and set the corresponding values to the default values for each as defined in the data sheet.
--- sound/soc/codecs/tas2770.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
sound/soc/codecs/tas2770.c +10 -11
@@ -708,29 +708,28 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770) rc =fwnode_property_read_u32 (dev->fwnode,"ti,asi-format" , &tas2770->asi_format);if (rc) { -dev_err (tas2770->dev,"Looking up %s property failed %d\n" , -"ti,asi-format" , rc); - goto end; +dev_info (tas2770->dev,"Property %s is missing setting default slot\n" , +"ti,asi-format" ); + tas2770->asi_format =0 ; } rc =fwnode_property_read_u32 (dev->fwnode,"ti,imon-slot-no" , &tas2770->i_sense_slot);if (rc) { -dev_err (tas2770->dev,"Looking up %s property failed %d\n" , -"ti,imon-slot-no" , rc); - goto end; +dev_info (tas2770->dev,"Property %s is missing setting default slot\n" , +"ti,imon-slot-no" ); + tas2770->i_sense_slot =0 ; } rc =fwnode_property_read_u32 (dev->fwnode,"ti,vmon-slot-no" , &tas2770->v_sense_slot);if (rc) { -dev_err (tas2770->dev,"Looking up %s property failed %d\n" , -"ti,vmon-slot-no" , rc); - goto end; +dev_info (tas2770->dev,"Property %s is missing setting default slot\n" , +"ti,vmon-slot-no" ); + tas2770->v_sense_slot =2 ; } -end: -return rc; +return 0 ; } static int tas2770_i2c_probe(struct i2c_client *client,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 295/757 ASoC: tas2770: Fix error handling with update_bits
In reply to Greg Kroah-HartmanFrom: Dan Murphy <[email protected]>
[ Upstream commit cadab0aefcbadf488b16caf2770430e69f4d7839 ]
snd_soc_update_bits returns a 1 when the bit was successfully updated, returns a 0 is no update was needed and a negative if the call failed. The code is currently failing the case of a successful update by just checking for a non-zero number. Modify these checks and return the error code only if there is a negative.
--- sound/soc/codecs/tas2770.c | 52 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 28 deletions(-)
sound/soc/codecs/tas2770.c +24 -28
@@ -140,23 +140,18 @@ static int tas2770_dac_event(struct snd_soc_dapm_widget *w,TAS2770_PWR_CTRL ,TAS2770_PWR_CTRL_MASK , TAS2770_PWR_CTRL_MUTE); -if (ret) - goto end;break ;case SND_SOC_DAPM_PRE_PMD : ret =snd_soc_component_update_bits (component,TAS2770_PWR_CTRL ,TAS2770_PWR_CTRL_MASK ,TAS2770_PWR_CTRL_SHUTDOWN ); -if (ret) - goto end;break ;default :dev_err (tas2770->dev,"Not supported evevt\n" );return -EINVAL ; } -end:if (ret <0 )return ret;
@@ -248,6 +243,9 @@ static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth)return -EINVAL ; } +if (ret <0 ) +return ret; + tas2770->channel_size = bitwidth; ret = snd_soc_component_update_bits(component,
@@ -256,16 +254,15 @@ static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth)TAS2770_TDM_CFG_REG5_50_MASK ,TAS2770_TDM_CFG_REG5_VSNS_ENABLE | tas2770->v_sense_slot); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG6 ,TAS2770_TDM_CFG_REG6_ISNS_MASK |TAS2770_TDM_CFG_REG6_50_MASK ,TAS2770_TDM_CFG_REG6_ISNS_ENABLE | tas2770->i_sense_slot); - -end:if (ret <0 )return ret;
@@ -283,36 +280,35 @@ static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate)TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK , TAS2770_TDM_CFG_REG0_SMP_48KHZ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_31_MASK ,TAS2770_TDM_CFG_REG0_31_44_1_48KHZ ); -if (ret) - goto end;break ;case 44100 : ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK ,TAS2770_TDM_CFG_REG0_SMP_44_1KHZ ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_31_MASK ,TAS2770_TDM_CFG_REG0_31_44_1_48KHZ ); -if (ret) - goto end;break ;case 96000 : ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK ,TAS2770_TDM_CFG_REG0_SMP_48KHZ ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0, TAS2770_TDM_CFG_REG0_31_MASK,
@@ -323,8 +319,9 @@ static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate)TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK , TAS2770_TDM_CFG_REG0_SMP_44_1KHZ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0, TAS2770_TDM_CFG_REG0_31_MASK,
@@ -335,22 +332,22 @@ static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate)TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK , TAS2770_TDM_CFG_REG0_SMP_48KHZ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_31_MASK ,TAS2770_TDM_CFG_REG0_31_176_4_192KHZ ); -if (ret) - goto end;break ;case 17640 : ret =snd_soc_component_update_bits (component,TAS2770_TDM_CFG_REG0 ,TAS2770_TDM_CFG_REG0_SMP_MASK ,TAS2770_TDM_CFG_REG0_SMP_44_1KHZ ); -if (ret) - goto end; +if (ret <0 ) +return ret; + ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG0, TAS2770_TDM_CFG_REG0_31_MASK,
@@ -360,7 +357,6 @@ static int tas2770_set_samplerate(struct tas2770_priv *tas2770, int samplerate) ret = -EINVAL ; } -end:if (ret <0 )return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 296/757 ASoC: tlv320aic32x4: Fix bdiv clock rate derivation
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 40b37136287ba6b34aa2f1f6123f3d6d205dc2f0 ]
Current code expects a single channel to be always used. Fix this situation by forwarding the number of channels used. Then fix the derivation of the bdiv clock rate.
--- sound/soc/codecs/tlv320aic32x4.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +6 -3
@@ -665,7 +665,7 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component, }static int aic32x4_setup_clocks (struct snd_soc_component *component, -unsigned int sample_rate) +unsigned int sample_rate,unsigned int channels) {u8 aosr;u16 dosr;
@@ -753,7 +753,9 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component, dosr);clk_set_rate (clocks[5 ].clk, - sample_rate *32 ); + sample_rate *32 * + channels); +return 0 ; } }
@@ -775,7 +777,8 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,u8 iface1_reg =0 ;u8 dacsetup_reg =0 ; -aic32x4_setup_clocks (component,params_rate (params)); +aic32x4_setup_clocks (component,params_rate (params), +params_channels (params));switch (params_width (params)) {case 16 :
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 297/757 net: dsa: rtl8366rb: Support all 4096 VLANs
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit a7920efdd86d8a0d74402dbc80ead03b023294ba ]
There is an off-by-one error in rtl8366rb_is_vlan_valid() making VLANs 0..4094 valid while it should be 1..4095. Fix it.
--- drivers/net/dsa/rtl8366rb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/rtl8366rb.c +1 -1
@@ -1255,7 +1255,7 @@ static bool rtl8366rb_is_vlan_valid(struct realtek_smi *smi, unsigned int vlan)if (smi->vlan4k_enabled) max =RTL8366RB_NUM_VIDS -1 ; -if (vlan ==0 || vlan >= max) +if (vlan ==0 || vlan > max)return false;return true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 298/757 ASoC: SOF: control: add size checks for ext_bytes control .put()
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 2ca210112ad91880d2d5a3f85fecc838600afbce ]
Make sure the TLV header and size are consistent before copying from userspace.
--- sound/soc/sof/control.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/sof/control.c +11 -0
@@ -298,6 +298,10 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol,const struct snd_ctl_tlv __user *tlvd = (const struct snd_ctl_tlv __user *)binary_data; +/* make sure we have at least a header */ +if (size <sizeof (struct snd_ctl_tlv )) +return -EINVAL ; +/* * The beginning of bytes data contains a header from where * the length (as bytes) is needed to know the correct copy
@@ -306,6 +310,13 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol,if (copy_from_user (&header, tlvd,sizeof (const struct snd_ctl_tlv )))return -EFAULT ; +/* make sure TLV info is consistent */ +if (header.length +sizeof (struct snd_ctl_tlv ) > size) { +dev_err_ratelimited (scomp->dev,"error: inconsistent TLV, data %d + header %zu > %d\n" , + header.length,sizeof (struct snd_ctl_tlv ), size); +return -EINVAL ; + } +/* be->max is coming from topology */ if (header.length > be->max) { dev_err_ratelimited(scomp->dev, "error: Bytes data size %d exceeds max %d.\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 299/757 ASoC: tas2770: Fix unbalanced calls to pm_runtime
In reply to Greg Kroah-HartmanFrom: Dan Murphy <[email protected]>
[ Upstream commit d3d71c99b541040da198f43da3bbd85d8e9598cb ]
Fix the unbalanced call to the pm_runtime_disable when removing the module. pm_runtime_enable is not called nor is the pm_runtime setup in the code. Remove the i2c_remove function and the pm_runtime_disable.
--- sound/soc/codecs/tas2770.c | 9 --------- 1 file changed, 9 deletions(-)
sound/soc/codecs/tas2770.c +0 -9
@@ -16,7 +16,6 @@#include <linux/i2c.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> -#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/firmware.h> #include <linux/regmap.h>
@@ -781,13 +780,6 @@ static int tas2770_i2c_probe(struct i2c_client *client,return result; } -static int tas2770_i2c_remove (struct i2c_client *client) -{ -pm_runtime_disable (&client->dev); -return 0 ; -} - -static const struct i2c_device_id tas2770_i2c_id[] = { {"tas2770" ,0 }, { }
@@ -808,7 +800,6 @@ static struct i2c_driver tas2770_i2c_driver = { .of_match_table = of_match_ptr(tas2770_of_match), }, .probe = tas2770_i2c_probe, - .remove = tas2770_i2c_remove, .id_table = tas2770_i2c_id, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 300/757 spi: omap2-mcspi: Improve performance waiting for CHSTAT
In reply to Greg Kroah-HartmanFrom: Aswath Govindraju <[email protected]>
[ Upstream commit 7b1d96813317358312440d0d07abbfbeb0ef8d22 ]
This reverts commit 13d515c796 (spi: omap2-mcspi: Switch to readl_poll_timeout()).
The amount of time spent polling for the MCSPI_CHSTAT bits to be set on AM335x-icev2 platform is less than 1us (about 0.6us) in most cases, with or without using DMA. So, in most cases the function need not sleep. Also, setting the sleep_usecs to zero would not be optimal here because ktime_add_us() used in readl_poll_timeout() is slower compared to the direct addition used after the revert. So, it is sub-optimal to use readl_poll_timeout in this case.
When DMA is not enabled, this revert results in an increase of about 27% in throughput and decrease of about 20% in CPU usage. However, the CPU usage and throughput are almost the same when used with DMA.
Therefore, fix this by reverting the commit which switched to using readl_poll_timeout().
--- drivers/spi/spi-omap2-mcspi.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/spi/spi-omap2-mcspi.c +13 -4
@@ -24,7 +24,6 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/gcd.h> -#include <linux/iopoll.h> #include <linux/spi/spi.h>
@@ -348,9 +347,19 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,static int mcspi_wait_for_reg_bit (void __iomem *reg,unsigned long bit) { -u32 val; - -return readl_poll_timeout (reg, val, val & bit,1 ,MSEC_PER_SEC ); +unsigned long timeout; + + timeout = jiffies +msecs_to_jiffies (1000 ); +while (!(readl_relaxed (reg) & bit)) { +if (time_after (jiffies, timeout)) { +if (!(readl_relaxed (reg) & bit)) +return -ETIMEDOUT ; +else +return 0 ; + } +cpu_relax (); + } +return 0 ; } static int mcspi_wait_for_completion(struct omap2_mcspi *mcspi,
Signature · 1 line
2.25.1