media: davinci-isif: avoid uninitialized variable use
Subsystems (59)
Sasha Levin
maintainerPATCH 603/671 bpf, offload: Unlock on error in bpf_offload_dev_create()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d0fbb51dfaa612f960519b798387be436e8f83c5 ]
We need to drop the bpf_devs_lock on error before returning.
--- kernel/bpf/offload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/bpf/offload.c +3 -1
@@ -645,8 +645,10 @@ struct bpf_offload_dev *bpf_offload_dev_create(void)down_write (&bpf_devs_lock);if (!offdevs_inited) { err =rhashtable_init (&offdevs, &offdevs_params); -if (err) +if (err) { +up_write (&bpf_devs_lock);return ERR_PTR (err); + } offdevs_inited = true; }up_write (&bpf_devs_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 604/671 afs: Fix missing timeout reset
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit c74386d50fbaf4a54fd3fe560f1abc709c0cff4b ]
In afs_wait_for_call_to_complete(), rather than immediately aborting an operation if a signal occurs, the code attempts to wait for it to complete, using a schedule timeout of 2*RTT (or min 2 jiffies) and a check that we're still receiving relevant packets from the server before we consider aborting the call. We may even ping the server to check on the status of the call.
However, there's a missing timeout reset in the event that we do actually get a packet to process, such that if we then get a couple of short stalls, we then time out when progress is actually being made.
Fix this by resetting the timeout any time we get something to process. If it's the failure of the call then the call state will get changed and we'll exit the loop shortly thereafter.
A symptom of this is data fetches and stores failing with EINTR when they really shouldn't.
--- fs/afs/rxrpc.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/rxrpc.c +1 -0
@@ -573,6 +573,7 @@ static long afs_wait_for_call_to_complete(struct afs_call *call, call->need_attention = false;__set_current_state (TASK_RUNNING );afs_deliver_to_call (call); + timeout = rtt2;continue ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 605/671 net: qca_spi: Move reset_count to struct qcaspi
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit bc19c32904e36548335b35fdce6ce734e20afc0a ]
The reset counter is specific for every QCA700x chip. So move this into the private driver struct. Otherwise we get unpredictable reset behavior in setups with multiple QCA700x chips.
--- drivers/net/ethernet/qualcomm/qca_spi.c | 9 ++++----- drivers/net/ethernet/qualcomm/qca_spi.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/qualcomm/qca_spi.c +4 -5
@@ -475,7 +475,6 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event)u16 signature =0 ;u16 spi_config;u16 wrbuf_space =0 ; -static u16 reset_count;if (event ==QCASPI_EVENT_CPUON ) {/* Read signature twice, if not valid
@@ -528,13 +527,13 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event) qca->sync =QCASPI_SYNC_RESET ; qca->stats.trig_reset++; - reset_count =0 ; + qca->reset_count =0 ;break ;case QCASPI_SYNC_RESET : - reset_count++; + qca->reset_count++;netdev_dbg (qca->net_dev,"sync: waiting for CPU on, count %u.\n" , - reset_count); -if (reset_count >=QCASPI_RESET_TIMEOUT ) { + qca->reset_count); +if (qca->reset_count >=QCASPI_RESET_TIMEOUT ) {/* reset did not seem to take place, try again */ qca->sync =QCASPI_SYNC_UNKNOWN ; qca->stats.reset_timeout++;
drivers/net/ethernet/qualcomm/qca_spi.h +1 -0
@@ -92,6 +92,7 @@ struct qcaspi {unsigned int intr_req;unsigned int intr_svc; +u16 reset_count;#ifdef CONFIG_DEBUG_FS struct dentry *device_root;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 606/671 hv_netvsc: Fix offset usage in netvsc_send_table()
In reply to Sasha LevinFrom: Haiyang Zhang <[email protected]>
[ Upstream commit 71f21959dd5516031db4f011e15e9a9508b93a7d ]
To reach the data region, the existing code adds offset in struct nvsp_5_send_indirect_table on the beginning of this struct. But the offset should be based on the beginning of its container, struct nvsp_message. This bug causes the first table entry missing, and adds an extra zero from the zero pad after the data region. This can put extra burden on the channel 0.
So, correct the offset usage. Also add a boundary check to ensure not reading beyond data region.
--- drivers/net/hyperv/hyperv_net.h | 3 ++- drivers/net/hyperv/netvsc.c | 26 ++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-)
drivers/net/hyperv/hyperv_net.h +2 -1
@@ -616,7 +616,8 @@ struct nvsp_5_send_indirect_table {/* The number of entries in the send indirection table */ u32 count; -/* The offset of the send indirection table from top of this struct. +/* The offset of the send indirection table from the beginning of +* struct nvsp_message. * The send indirection table tells which channel to put the send * traffic on. Each entry is a channel number. */
drivers/net/hyperv/netvsc.c +18 -8
@@ -1182,20 +1182,28 @@ static int netvsc_receive(struct net_device *ndev, }static void netvsc_send_table (struct net_device *ndev, -const struct nvsp_message *nvmsg) +const struct nvsp_message *nvmsg, +u32 msglen) {struct net_device_context *net_device_ctx =netdev_priv (ndev); -u32 count, *tab; +u32 count, offset, *tab;int i; count = nvmsg->msg.v5_msg.send_table.count; + offset = nvmsg->msg.v5_msg.send_table.offset; +if (count !=VRSS_SEND_TAB_SIZE ) {netdev_err (ndev,"Received wrong send-table size:%u\n" , count);return ; } - tab = (u32 *)((unsigned long )&nvmsg->msg.v5_msg.send_table + - nvmsg->msg.v5_msg.send_table.offset); +if (offset > msglen - count *sizeof (u32)) { +netdev_err (ndev,"Received send-table offset too big:%u\n" , + offset); +return ; + } + + tab = (void *)nvmsg + offset;for (i =0 ; i < count; i++) net_device_ctx->tx_table[i] = tab[i];
@@ -1213,12 +1221,13 @@ static void netvsc_send_vf(struct net_device *ndev, net_device_ctx->vf_alloc ? "added" : "removed"); } -static void netvsc_receive_inband (struct net_device *ndev, -const struct nvsp_message *nvmsg) +static void netvsc_receive_inband (struct net_device *ndev, +const struct nvsp_message *nvmsg, +u32 msglen) {switch (nvmsg->hdr.msg_type) {case NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE : -netvsc_send_table (ndev, nvmsg); +netvsc_send_table (ndev, nvmsg, msglen);break ;case NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION :
@@ -1235,6 +1244,7 @@ static int netvsc_process_raw_pkt(struct hv_device *device, int budget) {const struct nvsp_message *nvmsg =hv_pkt_data (desc); +u32 msglen =hv_pkt_datalen (desc);trace_nvsp_recv (ndev, channel, nvmsg);
@@ -1250,7 +1260,7 @@ static int netvsc_process_raw_pkt(struct hv_device *device,break ;case VM_PKT_DATA_INBAND : -netvsc_receive_inband (ndev, nvmsg); +netvsc_receive_inband (ndev, nvmsg, msglen);break ;default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 607/671 hv_netvsc: Fix send_table offset in case of a host bug
In reply to Sasha LevinFrom: Haiyang Zhang <[email protected]>
[ Upstream commit 171c1fd98df3d5948d9a9eb755274850fa5e59c6 ]
If negotiated NVSP version <= NVSP_PROTOCOL_VERSION_6, the offset may be wrong (too small) due to a host bug. This can cause missing the end of the send indirection table, and add multiple zero entries from leading zeros before the data region. This bug adds extra burden on channel 0.
So fix the offset by computing it from the data structure sizes. This will ensure netvsc driver runs normally on unfixed hosts, and future fixed hosts.
--- drivers/net/hyperv/netvsc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/hyperv/netvsc.c +14 -2
@@ -1182,6 +1182,7 @@ static int netvsc_receive(struct net_device *ndev, }static void netvsc_send_table (struct net_device *ndev, +struct netvsc_device *nvscdev,const struct nvsp_message *nvmsg,u32 msglen) {
@@ -1197,6 +1198,16 @@ static void netvsc_send_table(struct net_device *ndev,return ; } +/* If negotiated version <= NVSP_PROTOCOL_VERSION_6, the offset may be +* wrong due to a host bug. So fix the offset here. +*/ +if (nvscdev->nvsp_version <=NVSP_PROTOCOL_VERSION_6 && + msglen >=sizeof (struct nvsp_message_header ) + +sizeof (union nvsp_6_message_uber ) + count *sizeof (u32)) + offset =sizeof (struct nvsp_message_header ) + +sizeof (union nvsp_6_message_uber ); + +/* Boundary check for all versions */ if (offset > msglen - count *sizeof (u32)) {netdev_err (ndev,"Received send-table offset too big:%u\n" , offset);
@@ -1222,12 +1233,13 @@ static void netvsc_send_vf(struct net_device *ndev, }static void netvsc_receive_inband (struct net_device *ndev, +struct netvsc_device *nvscdev,const struct nvsp_message *nvmsg,u32 msglen) {switch (nvmsg->hdr.msg_type) {case NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE : -netvsc_send_table (ndev, nvmsg, msglen); +netvsc_send_table (ndev, nvscdev, nvmsg, msglen);break ;case NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION :
@@ -1260,7 +1272,7 @@ static int netvsc_process_raw_pkt(struct hv_device *device,break ;case VM_PKT_DATA_INBAND : -netvsc_receive_inband (ndev, nvmsg, msglen); +netvsc_receive_inband (ndev, net_device, nvmsg, msglen);break ;default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 608/671 afs: Fix large file support
In reply to Sasha LevinFrom: Marc Dionne <[email protected]>
[ Upstream commit b485275f1aca8a9da37fd35e4fad673935e827da ]
By default s_maxbytes is set to MAX_NON_LFS, which limits the usable file size to 2GB, enforced by the vfs.
Commit b9b1f8d5930a ("AFS: write support fixes") added support for the 64-bit fetch and store server operations, but did not change this value. As a result, attempts to write past the 2G mark result in EFBIG errors:
$ dd if=/dev/zero of=foo bs=1M count=1 seek=2048 dd: error writing 'foo': File too large
Set s_maxbytes to MAX_LFS_FILESIZE.
--- fs/afs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/super.c +1 -0
@@ -392,6 +392,7 @@ static int afs_fill_super(struct super_block *sb,/* fill in the superblock */ sb->s_blocksize =PAGE_SIZE ; sb->s_blocksize_bits =PAGE_SHIFT ; + sb->s_maxbytes =MAX_LFS_FILESIZE ; sb->s_magic =AFS_FS_MAGIC ; sb->s_op = &afs_super_ops;if (!as->dyn_root)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 609/671 ioat: ioat_alloc_ring() failure handling.
In reply to Sasha LevinFrom: "[email protected]" <[email protected]>
[ Upstream commit b0b5ce1010ffc50015eaec72b0028aaae3f526bb ]
If dma_alloc_coherent() returns NULL in ioat_alloc_ring(), ring allocation must not proceed.
Until now, if the first call to dma_alloc_coherent() in ioat_alloc_ring() returned NULL, the processing could proceed, failing with NULL-pointer dereferencing further down the line.
--- drivers/dma/ioat/dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/ioat/dma.c +2 -1
@@ -388,10 +388,11 @@ ioat_alloc_ring(struct dma_chan *c, int order, gfp_t flags) descs->virt =dma_alloc_coherent (to_dev (ioat_chan),SZ_2M , &descs->hw, flags); -if (!descs->virt && (i >0 )) { +if (!descs->virt) {int idx;for (idx =0 ; idx < i; idx++) { + descs = &ioat_chan->descs[idx];dma_free_coherent (to_dev (ioat_chan),SZ_2M , descs->virt, descs->hw); descs->virt =NULL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 610/671 drm: panel-lvds: Potential Oops in probe error handling
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit fb2ee9bf084bcaeff1e5be100decc0eacb4af2d5 ]
The "lvds->backlight" pointer could be NULL in situations where of_parse_phandle() returns NULL. This code is cleaner if we use the managed devm_of_find_backlight() so the clean up is automatic.
--- drivers/gpu/drm/panel/panel-lvds.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/panel/panel-lvds.c +4 -17
@@ -199,7 +199,6 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)static int panel_lvds_probe (struct platform_device *pdev) {struct panel_lvds *lvds; -struct device_node *np;int ret; lvds =devm_kzalloc (&pdev->dev,sizeof (*lvds),GFP_KERNEL );
@@ -245,14 +244,9 @@ static int panel_lvds_probe(struct platform_device *pdev)return ret; } - np =of_parse_phandle (lvds->dev->of_node,"backlight" ,0 ); -if (np) { - lvds->backlight =of_find_backlight_by_node (np); -of_node_put (np); - -if (!lvds->backlight) -return -EPROBE_DEFER ; - } + lvds->backlight =devm_of_find_backlight (lvds->dev); +if (IS_ERR (lvds->backlight)) +return PTR_ERR (lvds->backlight);/* * TODO: Handle all power supplies specified in the DT node in a generic
@@ -268,14 +262,10 @@ static int panel_lvds_probe(struct platform_device *pdev) ret =drm_panel_add (&lvds->panel);if (ret <0 ) - goto error; +return ret;dev_set_drvdata (lvds->dev, lvds);return 0 ; - -error: -put_device (&lvds->backlight->dev); -return ret; }static int panel_lvds_remove (struct platform_device *pdev)
@@ -286,9 +276,6 @@ static int panel_lvds_remove(struct platform_device *pdev)panel_lvds_disable (&lvds->panel); -if (lvds->backlight) -put_device (&lvds->backlight->dev); -return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 611/671 mt7601u: fix bbp version check in mt7601u_wait_bbp_ready
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 15e14f76f85f4f0eab3b8146e1cd3c58ce272823 ]
Fix bbp ready check in mt7601u_wait_bbp_ready. The issue is reported by coverity with the following error:
Logical vs. bitwise operator
The expression's value does not depend on the operands; inadvertent use of the wrong operator is a likely logic error.
Addresses-Coverity-ID: 1309441 ("Logical vs. bitwise operator")
--- drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt7601u/phy.c +1 -1
@@ -221,7 +221,7 @@ int mt7601u_wait_bbp_ready(struct mt7601u_dev *dev)do { val =mt7601u_bbp_rr (dev,MT_BBP_REG_VERSION ); -if (val && ~val) +if (val && val !=0xff )break ; }while (--i);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 612/671 media: rcar-vin: Fix incorrect return statement in rvin_try_format()
In reply to Sasha LevinFrom: Niklas Söderlund <[email protected]>
[ Upstream commit a0862a40364e2f87109317e31c51c9d7bc89e33f ]
While refactoring code the return statement became corrupted, fix it by returning the correct return code.
--- drivers/media/platform/rcar-vin/rcar-v4l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/rcar-vin/rcar-v4l2.c +2 -1
@@ -196,6 +196,7 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which, ret =v4l2_subdev_call (sd, pad, set_fmt, pad_cfg, &format);if (ret <0 && ret != -ENOIOCTLCMD ) goto done; + ret =0 ;v4l2_fill_pix_format (pix, &format.format);
@@ -230,7 +231,7 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which, done:v4l2_subdev_free_pad_config (pad_cfg); -return 0 ; +return ret; } static int rvin_querycap(struct file *file, void *priv,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 613/671 media: ov6650: Fix incorrect use of JPEG colorspace
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 12500731895ef09afc5b66b86b76c0884fb9c7bf ]
Since its initial submission, the driver selects V4L2_COLORSPACE_JPEG for supported formats other than V4L2_MBUS_FMT_SBGGR8_1X8. According to v4l2-compliance test program, V4L2_COLORSPACE_JPEG applies exclusively to V4L2_PIX_FMT_JPEG. Since the sensor does not support JPEG format, fix it to always select V4L2_COLORSPACE_SRGB.
--- drivers/media/i2c/ov6650.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/i2c/ov6650.c +2 -11
@@ -203,7 +203,6 @@ struct ov6650 {unsigned long pclk_max;/* from resolution and format */ struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code; -enum v4l2_colorspace colorspace; };
@@ -520,7 +519,7 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace = priv->colorspace; + mf->colorspace =V4L2_COLORSPACE_SRGB ; mf->field =V4L2_FIELD_NONE ;return 0 ;
@@ -627,11 +626,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->pclk_max =8000000 ; } -if (code ==MEDIA_BUS_FMT_SBGGR8_1X8 ) - priv->colorspace =V4L2_COLORSPACE_SRGB ; -else if (code !=0 ) - priv->colorspace =V4L2_COLORSPACE_JPEG ; -if (half_scale) {dev_dbg (&client->dev,"max resolution: QCIF\n" ); coma_set |=COMA_QCIF ;
@@ -666,7 +660,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->code = code;if (!ret) { - mf->colorspace = priv->colorspace; mf->width = priv->rect.width >> half_scale; mf->height = priv->rect.height >> half_scale; }
@@ -689,6 +682,7 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd, &mf->height, 2, H_CIF, 1, 0); mf->field =V4L2_FIELD_NONE ; + mf->colorspace =V4L2_COLORSPACE_SRGB ;switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 :
@@ -699,13 +693,11 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,case MEDIA_BUS_FMT_YUYV8_2X8 :case MEDIA_BUS_FMT_VYUY8_2X8 :case MEDIA_BUS_FMT_UYVY8_2X8 : - mf->colorspace =V4L2_COLORSPACE_JPEG ;break ;default : mf->code =MEDIA_BUS_FMT_SBGGR8_1X8 ;/* fall through */ case MEDIA_BUS_FMT_SBGGR8_1X8 : - mf->colorspace =V4L2_COLORSPACE_SRGB ;break ; }
@@ -1006,7 +998,6 @@ static int ov6650_probe(struct i2c_client *client, priv->rect.height =H_CIF ; priv->half_scale = false; priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; - priv->colorspace =V4L2_COLORSPACE_JPEG ; ret =ov6650_video_probe (client);if (ret)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 614/671 media: ov6650: Fix some format attributes not under control
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1c6a2b63095154bbf9e8f38d79487a728331bf65 ]
User arguments passed to .get/set_fmt() pad operation callbacks may contain unsupported values. The driver takes control over frame size and pixel code as well as colorspace and field attributes but has never cared for remainig format attributes, i.e., ycbcr_enc, quantization and xfer_func, introduced by commit 11ff030c7365 ("[media]
v4l2-mediabus: improve colorspace support"). Fix it.
Set up a static v4l2_mbus_framefmt structure with attributes initialized to reasonable defaults and use it for updating content of user provided arguments. In case of V4L2_SUBDEV_FORMAT_ACTIVE, postpone frame size update, now performed from inside ov6650_s_fmt() helper, util the user argument is first updated in ov6650_set_fmt() with default frame format content. For V4L2_SUBDEV_FORMAT_TRY, don't copy all attributes to pad config, only those handled by the driver, then fill the response with the default frame format updated with resulting pad config format code and frame size.
--- drivers/media/i2c/ov6650.c | 51 +++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 12 deletions(-)
drivers/media/i2c/ov6650.c +39 -12
@@ -215,6 +215,17 @@ static u32 ov6650_codes[] = { MEDIA_BUS_FMT_Y8_1X8, }; +static const struct v4l2_mbus_framefmt ov6650_def_fmt = { + .width =W_CIF , + .height =H_CIF , + .code =MEDIA_BUS_FMT_SBGGR8_1X8 , + .colorspace =V4L2_COLORSPACE_SRGB , + .field =V4L2_FIELD_NONE , + .ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT , + .quantization =V4L2_QUANTIZATION_DEFAULT , + .xfer_func =V4L2_XFER_FUNC_DEFAULT , +}; +/* read a register */ static int ov6650_reg_read (struct i2c_client *client,u8 reg,u8 *val) {
@@ -516,11 +527,13 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd,if (format->pad)return -EINVAL ; +/* initialize response with default media bus frame format */ + *mf = ov6650_def_fmt; + +/* update media bus format code and frame size */ mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace =V4L2_COLORSPACE_SRGB ; - mf->field =V4L2_FIELD_NONE ;return 0 ; }
@@ -659,10 +672,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)if (!ret) priv->code = code; -if (!ret) { - mf->width = priv->rect.width >> half_scale; - mf->height = priv->rect.height >> half_scale; - }return ret; }
@@ -681,9 +690,6 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,v4l_bound_align_image (&mf->width,2 ,W_CIF ,1 , &mf->height,2 ,H_CIF ,1 ,0 ); - mf->field =V4L2_FIELD_NONE ; - mf->colorspace =V4L2_COLORSPACE_SRGB ; -switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 : mf->code =MEDIA_BUS_FMT_Y8_1X8 ;
@@ -701,10 +707,31 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,break ; } -if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) -return ov6650_s_fmt (sd, mf); - cfg->try_fmt = *mf; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { +/* store media bus format code and frame size in pad config */ + cfg->try_fmt.width = mf->width; + cfg->try_fmt.height = mf->height; + cfg->try_fmt.code = mf->code; +/* return default mbus frame format updated with pad config */ + *mf = ov6650_def_fmt; + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + + }else { +/* apply new media bus format code and frame size */ +int ret =ov6650_s_fmt (sd, mf); + +if (ret) +return ret; + +/* return default format updated with active size and code */ + *mf = ov6650_def_fmt; + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 615/671 media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 39034bb0c26b76a2c3abc54aa28c185f18b40c2f ]
Commit da298c6d98d5 ("[media] v4l2: replace video op g_mbus_fmt by pad op get_fmt") converted a former ov6650_g_fmt() video operation callback to an ov6650_get_fmt() pad operation callback. However, the converted function disregards a format->which flag that pad operations should obey and always returns active frame format settings.
That can be fixed by always responding to V4L2_SUBDEV_FORMAT_TRY with -EINVAL, or providing the response from a pad config argument, likely updated by a former user call to V4L2_SUBDEV_FORMAT_TRY .set_fmt(). Since implementation of the latter is trivial, go for it.
--- drivers/media/i2c/ov6650.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/i2c/ov6650.c +9 -3
@@ -531,10 +531,16 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, *mf = ov6650_def_fmt;/* update media bus format code and frame size */ - mf->width = priv->rect.width >> priv->half_scale; - mf->height = priv->rect.height >> priv->half_scale; - mf->code = priv->code; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + }else { + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 616/671 cw1200: Fix a signedness bug in cw1200_load_firmware()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4a50d454502f1401171ff061a5424583f91266db ]
The "priv->hw_type" is an enum and in this context GCC will treat it as an unsigned int so the error handling will never trigger.
--- drivers/net/wireless/st/cw1200/fwio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/st/cw1200/fwio.c +3 -3
@@ -323,12 +323,12 @@ int cw1200_load_firmware(struct cw1200_common *priv) goto out; } - priv->hw_type =cw1200_get_hw_type (val32, &major_revision); -if (priv->hw_type <0 ) { + ret =cw1200_get_hw_type (val32, &major_revision); +if (ret <0 ) {pr_err ("Can't deduce hardware type.\n" ); - ret = -ENOTSUPP ; goto out; } + priv->hw_type = ret;/* Set DPLL Reg value, and read back to confirm writes work */ ret = cw1200_reg_write_32(priv, ST90TDS_TSET_GEN_R_W_REG_ID,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 617/671 hwrng: omap3-rom - Fix missing clock by probing with device tree
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 0c0ef9ea6f3f0d5979dc7b094b0a184c1a94716b ]
Commit 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") removed old omap3 clock framework aliases but caused omap3-rom-rng to stop working with clock not found error.
Based on discussions on the mailing list it was requested by Tero Kristo that it would be best to fix this issue by probing omap3-rom-rng using device tree to provide a proper clk property. The other option would be to add back the missing clock alias, but that does not help moving things forward with removing old legacy platform_data.
Let's also add a proper device tree binding and keep it together with the fix.
--- .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 +++++++++++++++++++ arch/arm/boot/dts/omap3-n900.dts | 6 +++++ arch/arm/mach-omap2/pdata-quirks.c | 12 +-------- drivers/char/hw_random/omap3-rom-rng.c | 17 ++++++++++-- 4 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt
Documentation/devicetree/bindings/rng/omap3_rom_rng.txt new file +27 -0
@@ -0,0 +1,27 @@ +OMAP ROM RNG driver binding + +Secure SoCs may provide RNG via secure ROM calls like Nokia N900 does. The +implementation can depend on the SoC secure ROM used. + +- compatible: + Usage: required + Value type: <string> + Definition: must be "nokia,n900-rom-rng" + +- clocks: + Usage: required + Value type: <prop-encoded-array> + Definition: reference to the the RNG interface clock + +- clock-names: + Usage: required + Value type: <stringlist> + Definition: must be "ick" + +Example: + + rom_rng: rng { + compatible = "nokia,n900-rom-rng"; + clocks = <&rng_ick>; + clock-names = "ick"; + };
arch/arm/boot/dts/omap3-n900.dts +6 -0
@@ -158,6 +158,12 @@ pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ }; + rom_rng: rng { + compatible = "nokia,n900-rom-rng"; + clocks = <&rng_ick>; + clock-names = "ick"; + }; + /* controlled (enabled/disabled) directly by bcm2048 and wl1251 */ vctcxo: vctcxo { compatible = "fixed-clock";
arch/arm/mach-omap2/pdata-quirks.c +1 -11
@@ -263,14 +263,6 @@ static void __init am3517_evm_legacy_init(void)am35xx_emac_reset (); } -static struct platform_device omap3_rom_rng_device = { - .name ="omap3-rom-rng" , - .id =-1 , - .dev = { - .platform_data = rx51_secure_rng_call, - }, -}; -static void __init nokia_n900_legacy_init (void ) {hsmmc2_internal_input_clk ();
@@ -286,9 +278,6 @@ static void __init nokia_n900_legacy_init(void)pr_warn ("RX-51: Not enabling ARM errata 430973 workaround\n" );pr_warn ("Thumb binaries may crash randomly without this workaround\n" ); } - -pr_info ("RX-51: Registering OMAP3 HWRNG device\n" ); -platform_device_register (&omap3_rom_rng_device); } }
@@ -466,6 +455,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {OF_DEV_AUXDATA ("ti,davinci_mdio" ,0x5c030000 ,"davinci_mdio.0" ,NULL ),OF_DEV_AUXDATA ("ti,am3517-emac" ,0x5c000000 ,"davinci_emac.0" , &am35xx_emac_pdata), +OF_DEV_AUXDATA ("nokia,n900-rom-rng" ,0 ,NULL , rx51_secure_rng_call),/* McBSP modules with sidetone core */ #if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP) OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49022000, "49022000.mcbsp", &mcbsp_pdata),
drivers/char/hw_random/omap3-rom-rng.c +15 -2
@@ -20,6 +20,8 @@#include <linux/workqueue.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #define RNG_RESET 0x01
@@ -86,14 +88,18 @@ static int omap3_rom_rng_read(struct hwrng *rng, void *data, size_t max, bool w)static struct hwrng omap3_rom_rng_ops = { .name ="omap3-rom" , - .read = omap3_rom_rng_read, };static int omap3_rom_rng_probe (struct platform_device *pdev) {int ret =0 ; -pr_info ("initializing\n" ); + omap3_rom_rng_ops.read =of_device_get_match_data (&pdev->dev); +if (!omap3_rom_rng_ops.read) { +dev_err (&pdev->dev,"missing rom code handler\n" ); + +return -ENODEV ; + } omap3_rom_rng_call = pdev->dev.platform_data;if (!omap3_rom_rng_call) {
@@ -126,9 +132,16 @@ static int omap3_rom_rng_remove(struct platform_device *pdev)return 0 ; } +static const struct of_device_id omap_rom_rng_match[] = { + { .compatible ="nokia,n900-rom-rng" , .data = omap3_rom_rng_read, }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, omap_rom_rng_match); +static struct platform_driver omap3_rom_rng_driver = { .driver = { .name ="omap3-rom-rng" , + .of_match_table = omap_rom_rng_match, }, .probe = omap3_rom_rng_probe, .remove = omap3_rom_rng_remove,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 618/671 pinctl: ti: iodelay: fix error checking on pinctrl_count_index_with_args call
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 5ff8aca906f3a7a7db79fad92f2a4401107ef50d ]
The call to pinctrl_count_index_with_args checks for a -EINVAL return however this function calls pinctrl_get_list_and_count and this can return -ENOENT. Rather than check for a specific error, fix this by checking for any error return to catch the -ENOENT case.
Addresses-Coverity: ("Improper use of negative")
--- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/ti/pinctrl-ti-iodelay.c +1 -1
@@ -496,7 +496,7 @@ static int ti_iodelay_dt_node_to_map(struct pinctrl_dev *pctldev,return -EINVAL ; rows =pinctrl_count_index_with_args (np, name); -if (rows == -EINVAL ) +if (rows <0 )return rows; *map =devm_kzalloc (iod->dev,sizeof (**map),GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 619/671 arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node
In reply to Sasha LevinFrom: Christian Hewitt <[email protected]>
[ Upstream commit d5f6fa904ecbadbb8e9fa6302b0fc165bec0559a ]
Fix DTC warnings:
arch/arm/dts/meson-gxl-s905x-khadas-vim.dtb: Warning (avoid_unnecessary_addr_size):
/gpio-keys-polled: unnecessary #address-cells/#size-cells
without "ranges" or child "reg" property
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -3
@@ -33,11 +33,9 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + power-button { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 620/671 media: v4l: cadence: Fix how unsued lanes are handled in 'csi2rx_start()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 2eca8e4c1df4864b937752c3aa2f7925114f4806 ]
The 2nd parameter of 'find_first_zero_bit()' is a number of bits, not of bytes. So use 'csi2rx->max_lanes' instead of 'sizeof(lanes_used)'.
--- drivers/media/platform/cadence/cdns-csi2rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/cadence/cdns-csi2rx.c +1 -1
@@ -129,7 +129,7 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)*/ for (i = csi2rx->num_lanes; i < csi2rx->max_lanes; i++) {unsigned int idx =find_first_zero_bit (&lanes_used, -sizeof (lanes_used)); + csi2rx->max_lanes);set_bit (idx, &lanes_used); reg |=CSI2RX_STATIC_CFG_DLANE_MAP (i, i +1 ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 621/671 arm64: dts: apq8096-db820c: Increase load on l21 for SDCARD
In reply to Sasha LevinFrom: Loic Poulain <[email protected]>
[ Upstream commit e38161bd325ea541ef2f258d8e28281077dde524 ]
In the same way as for msm8974-hammerhead, l21 load, used for SDCARD VMMC, needs to be increased in order to prevent any voltage drop issues (due to limited current) happening with some SDCARDS or during specific operations (e.g. write).
--- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +2 -0
@@ -580,6 +580,8 @@ l21 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; + regulator-allow-set-load; + regulator-system-load = <200000>; }; l22 { regulator-min-microvolt = <3300000>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 622/671 PCI: dwc: Fix find_next_bit() usage
In reply to Sasha LevinFrom: Niklas Cassel <[email protected]>
[ Upstream commit 1137e61dcb99f7f8b54e77ed83f68b5b485a3e34 ]
find_next_bit() takes a parameter of size long, and performs arithmetic that assumes that the argument is of size long.
Therefore we cannot pass a u32, since this will cause find_next_bit() to read outside the stack buffer and will produce the following print:
BUG: KASAN: stack-out-of-bounds in find_next_bit+0x38/0xb0
--- drivers/pci/controller/dwc/pcie-designware-host.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +6 -5
@@ -78,7 +78,8 @@ static struct msi_domain_info dw_pcie_msi_domain_info = {irqreturn_t dw_handle_msi_irq (struct pcie_port *pp) {int i, pos, irq; -u32 val, num_ctrls; +unsigned long val; +u32 status, num_ctrls;irqreturn_t ret =IRQ_NONE ; num_ctrls = pp->num_vectors /MAX_MSI_IRQS_PER_CTRL ;
@@ -86,14 +87,14 @@ irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)for (i =0 ; i < num_ctrls; i++) {dw_pcie_rd_own_conf (pp,PCIE_MSI_INTR0_STATUS + (i *MSI_REG_CTRL_BLOCK_SIZE ), -4 , &val); -if (!val) +4 , &status); +if (!status)continue ; ret =IRQ_HANDLED ; + val = status; pos =0 ; -while ((pos =find_next_bit ((unsigned long *) &val, -MAX_MSI_IRQS_PER_CTRL , +while ((pos =find_next_bit (&val,MAX_MSI_IRQS_PER_CTRL , pos)) !=MAX_MSI_IRQS_PER_CTRL ) { irq = irq_find_mapping(pp->irq_domain, (i * MAX_MSI_IRQS_PER_CTRL) +
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 623/671 spi: atmel: fix handling of cs_change set on non-last xfer
In reply to Sasha LevinFrom: Mans Rullgard <[email protected]>
[ Upstream commit fed8d8c7a6dc2a76d7764842853d81c770b0788e ]
The driver does the wrong thing when cs_change is set on a non-last xfer in a message. When cs_change is set, the driver deactivates the CS and leaves it off until a later xfer again has cs_change set whereas it should be briefly toggling CS off and on again.
This patch brings the behaviour of the driver back in line with the documentation and common sense. The delay of 10 us is the same as is used by the default spi_transfer_one_message() function in spi.c.
--- drivers/spi/spi-atmel.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/spi-atmel.c +3 -7
@@ -305,7 +305,6 @@ struct atmel_spi {bool use_cs_gpios;bool keep_cs; -bool cs_active;u32 fifo_size; };
@@ -1381,11 +1380,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, &msg->transfers)) { as->keep_cs = true; }else { - as->cs_active = !as->cs_active; -if (as->cs_active) -cs_activate (as, msg->spi); -else -cs_deactivate (as, msg->spi); +cs_deactivate (as, msg->spi); +udelay (10 ); +cs_activate (as, msg->spi); } }
@@ -1408,7 +1405,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master,atmel_spi_lock (as);cs_activate (as, spi); - as->cs_active = true; as->keep_cs = false; msg->status =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 624/671 ipmi: Fix memory leak in __ipmi_bmc_register
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 4aa7afb0ee20a97fbf0c5bab3df028d5fb85fdab ]
In the impelementation of __ipmi_bmc_register() the allocated memory for bmc should be released in case ida_simple_get() fails.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_msghandler.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/char/ipmi/ipmi_msghandler.c +4 -1
@@ -2965,8 +2965,11 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf, bmc->pdev.name ="ipmi_bmc" ; rv =ida_simple_get (&ipmi_bmc_ida,0 ,0 ,GFP_KERNEL ); -if (rv <0 ) +if (rv <0 ) { +kfree (bmc); goto out; + } + bmc->pdev.dev.driver = &ipmidriver.driver; bmc->pdev.id = rv; bmc->pdev.dev.release = release_bmc_device;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 625/671 rtlwifi: Remove unnecessary NULL check in rtl_regd_init
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 091c6e9c083f7ebaff00b37ad13562d51464d175 ]
When building with Clang + -Wtautological-pointer-compare:
drivers/net/wireless/realtek/rtlwifi/regd.c:389:33: warning: comparison of address of 'rtlpriv->regd' equal to a null pointer is always false [-Wtautological-pointer-compare]
if (wiphy == NULL || &rtlpriv->regd == NULL)
~~~~~~~~~^~~~ ~~~~1 warning generated.
The address of an array member is never NULL unless it is the first struct member so remove the unnecessary check. This was addressed in the staging version of the driver in commit f986978b32b3 ("Staging:
rtlwifi: remove unnecessary NULL check").
While we are here, fix the following checkpatch warning:
CHECK: Comparison to NULL could be written "!wiphy" 35: FILE: drivers/net/wireless/realtek/rtlwifi/regd.c:389:
+ if (wiphy == NULL)
--- drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/regd.c +1 -1
@@ -427,7 +427,7 @@ int rtl_regd_init(struct ieee80211_hw *hw,struct wiphy *wiphy = hw->wiphy;struct country_code_to_enum_rd *country =NULL ; -if (wiphy ==NULL || &rtlpriv->regd ==NULL ) +if (!wiphy)return -EINVAL ;/* init country_code from efuse channel plan */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 626/671 scsi: esas2r: unlock on error in esas2r_nvram_read_direct()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 906ca6353ac09696c1bf0892513c8edffff5e0a6 ]
This error path is missing an unlock.
--- drivers/scsi/esas2r/esas2r_flash.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/esas2r/esas2r_flash.c +1 -0
@@ -1197,6 +1197,7 @@ bool esas2r_nvram_read_direct(struct esas2r_adapter *a)if (!esas2r_read_flash_block (a, a->nvram,FLS_OFFSET_NVR ,sizeof (struct esas2r_sas_nvram ))) {esas2r_hdebug ("NVRAM read failed, using defaults" ); +up (&a->nvram_semaphore);return false; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 627/671 clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume
In reply to Sasha LevinFrom: Marian Mihailescu <[email protected]>
[ Upstream commit e21be0d1d7bd7f78a77613f6bcb6965e72b22fc1 ]
Save and restore top PLL related configuration registers for big (APLL) and LITTLE (KPLL) cores during suspend/resume cycle. So far, CPU clocks were reset to default values after suspend/resume cycle and performance after system resume was affected when performance governor has been selected.
--- drivers/clk/samsung/clk-exynos5420.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/samsung/clk-exynos5420.c +2 -0
@@ -171,6 +171,8 @@ static const unsigned long exynos5x_clk_regs[] __initconst = {GATE_BUS_CPU ,GATE_SCLK_CPU ,CLKOUT_CMU_CPU , +APLL_CON0 , +KPLL_CON0 ,CPLL_CON0 ,DPLL_CON0 , EPLL_CON0,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 628/671 SUNRPC: Fix svcauth_gss_proxy_init()
In reply to Sasha LevinFrom: Chuck Lever <[email protected]>
[ Upstream commit 5866efa8cbfbadf3905072798e96652faf02dbe8 ]
gss_read_proxy_verf() assumes things about the XDR buffer containing the RPC Call that are not true for buffers generated by svc_rdma_recv().
RDMA's buffers look more like what the upper layer generates for
sending: head is a kmalloc'd buffer; it does not point to a page whose contents are contiguous with the first page in the buffers' page array. The result is that ACCEPT_SEC_CONTEXT via RPC/RDMA has stopped working on Linux NFS servers that use gssproxy.
This does not affect clients that use only TCP to send their ACCEPT_SEC_CONTEXT operation (that's all Linux clients). Other clients, like Solaris NFS clients, send ACCEPT_SEC_CONTEXT on the same transport as they send all other NFS operations. Such clients can send ACCEPT_SEC_CONTEXT via RPC/RDMA.
I thought I had found every direct reference in the server RPC code to the rqstp->rq_pages field.
Bug found at the 2019 Westford NFS bake-a-thon.
--- net/sunrpc/auth_gss/svcauth_gss.c | 84 +++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 21 deletions(-)
net/sunrpc/auth_gss/svcauth_gss.c +63 -21
@@ -1054,24 +1054,32 @@ gss_read_verf(struct rpc_gss_wire_cred *gc,return 0 ; } -/* Ok this is really heavily depending on a set of semantics in -* how rqstp is set up by svc_recv and pages laid down by the -* server when reading a request. We are basically guaranteed that -* the token lays all down linearly across a set of pages, starting -* at iov_base in rq_arg.head[0] which happens to be the first of a -* set of pages stored in rq_pages[]. -* rq_arg.head[0].iov_base will provide us the page_base to pass -* to the upcall. -*/ -static inline int -gss_read_proxy_verf (struct svc_rqst *rqstp, -struct rpc_gss_wire_cred *gc,__be32 *authp, -struct xdr_netobj *in_handle, -struct gssp_in_token *in_token) +static void gss_free_in_token_pages (struct gssp_in_token *in_token) { -struct kvec *argv = &rqstp->rq_arg.head[0 ];u32 inlen; -int res; +int i; + + i =0 ; + inlen = in_token->page_len; +while (inlen) { +if (in_token->pages[i]) +put_page (in_token->pages[i]); + inlen -= inlen >PAGE_SIZE ?PAGE_SIZE : inlen; + } + +kfree (in_token->pages); + in_token->pages =NULL ; +} + +static int gss_read_proxy_verf (struct svc_rqst *rqstp, +struct rpc_gss_wire_cred *gc,__be32 *authp, +struct xdr_netobj *in_handle, +struct gssp_in_token *in_token) +{ +struct kvec *argv = &rqstp->rq_arg.head[0 ]; +unsigned int page_base, length; +int pages, i, res; +size_t inlen; res =gss_read_common_verf (gc, argv, authp, in_handle);if (res)
@@ -1081,10 +1089,36 @@ gss_read_proxy_verf(struct svc_rqst *rqstp,if (inlen > (argv->iov_len + rqstp->rq_arg.page_len))return SVC_DENIED ; - in_token->pages = rqstp->rq_pages; - in_token->page_base = (ulong )argv->iov_base & ~PAGE_MASK ; + pages =DIV_ROUND_UP (inlen,PAGE_SIZE ); + in_token->pages =kcalloc (pages,sizeof (struct page *),GFP_KERNEL ); +if (!in_token->pages) +return SVC_DENIED ; + in_token->page_base =0 ; in_token->page_len = inlen; +for (i =0 ; i < pages; i++) { + in_token->pages[i] =alloc_page (GFP_KERNEL ); +if (!in_token->pages[i]) { +gss_free_in_token_pages (in_token); +return SVC_DENIED ; + } + } + length = min_t(unsigned int, inlen, argv->iov_len); +memcpy (page_address (in_token->pages[0 ]), argv->iov_base, length); + inlen -= length; + + i =1 ; + page_base = rqstp->rq_arg.page_base; +while (inlen) { + length = min_t(unsigned int, inlen, PAGE_SIZE); +memcpy (page_address (in_token->pages[i]), +page_address (rqstp->rq_arg.pages[i]) + page_base, + length); + + inlen -= length; + page_base =0 ; + i++; + }return 0 ; }
@@ -1259,8 +1293,11 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,break ;case GSS_S_COMPLETE : status =gss_proxy_save_rsc (sn->rsc_cache, &ud, &handle); -if (status) +if (status) { +pr_info ("%s: gss_proxy_save_rsc failed (%d)\n" , + __func__, status); goto out; + } cli_handle.data = (u8 *)&handle; cli_handle.len =sizeof (handle);break ;
@@ -1271,15 +1308,20 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,/* Got an answer to the upcall; use it: */ if (gss_write_init_verf (sn->rsc_cache, rqstp, - &cli_handle, &ud.major_status)) + &cli_handle, &ud.major_status)) { +pr_info ("%s: gss_write_init_verf failed\n" , __func__); goto out; + }if (gss_write_resv (resv,PAGE_SIZE , &cli_handle, &ud.out_token, - ud.major_status, ud.minor_status)) + ud.major_status, ud.minor_status)) { +pr_info ("%s: gss_write_resv failed\n" , __func__); goto out; + } ret =SVC_COMPLETE ; out: +gss_free_in_token_pages (&ud.in_token);gssp_free_upcall_data (&ud);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 629/671 RDMA/mlx5: Return proper error value
In reply to Sasha LevinFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 546d30099ed204792083f043cd7e016de86016a3 ]
Returned value from mlx5_mr_cache_alloc() is checked to be error or real pointer. Return proper error code instead of NULL which is not checked later.
--- drivers/infiniband/hw/mlx5/mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -457,7 +457,7 @@ struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev, int entry)if (entry <0 || entry >=MAX_MR_CACHE_ENTRIES ) {mlx5_ib_err (dev,"cache entry %d is out of range\n" , entry); -return NULL ; +return ERR_PTR (-EINVAL ); } ent = &cache->ent[entry];
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 630/671 dpaa_eth: perform DMA unmapping before read
In reply to Sasha LevinFrom: Madalin Bucur <[email protected]>
[ Upstream commit c70fd3182caef014e6c628b412f81aa57a3ef9e4 ]
DMA unmapping is required before accessing the HW provided timestamping information.
--- .../net/ethernet/freescale/dpaa/dpaa_eth.c | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +17 -15
@@ -1620,18 +1620,6 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv, skbh = (struct sk_buff **)phys_to_virt (addr); skb = *skbh; -if (priv->tx_tstamp &&skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) { -memset (&shhwtstamps,0 ,sizeof (shhwtstamps)); - -if (!fman_port_get_tstamp (priv->mac_dev->port[TX ], (void *)skbh, - &ns)) { - shhwtstamps.hwtstamp =ns_to_ktime (ns); -skb_tstamp_tx (skb, &shhwtstamps); - }else { -dev_warn (dev,"fman_port_get_tstamp failed!\n" ); - } - } -if (unlikely (qm_fd_get_format (fd) == qm_fd_sg)) { nr_frags =skb_shinfo (skb)->nr_frags; dma_unmap_single(dev, addr,
@@ -1654,14 +1642,28 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,dma_unmap_page (dev,qm_sg_addr (&sgt[i]),qm_sg_entry_get_len (&sgt[i]), dma_dir); } - -/* Free the page frag that we allocated on Tx */ -skb_free_frag (phys_to_virt (addr)); }else {dma_unmap_single (dev, addr,skb_tail_pointer (skb) - (u8 *)skbh, dma_dir); } +/* DMA unmapping is required before accessing the HW provided info */ +if (priv->tx_tstamp &&skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) { +memset (&shhwtstamps,0 ,sizeof (shhwtstamps)); + +if (!fman_port_get_tstamp (priv->mac_dev->port[TX ], (void *)skbh, + &ns)) { + shhwtstamps.hwtstamp =ns_to_ktime (ns); +skb_tstamp_tx (skb, &shhwtstamps); + }else { +dev_warn (dev,"fman_port_get_tstamp failed!\n" ); + } + } + +if (qm_fd_get_format (fd) == qm_fd_sg) +/* Free the page frag that we allocated on Tx */ +skb_free_frag (phys_to_virt (addr)); +return skb; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 631/671 dpaa_eth: avoid timestamp read on error paths
In reply to Sasha LevinFrom: Madalin Bucur <[email protected]>
[ Upstream commit 9a4f4f3a894ff4487f5597b7aabba9432b238292 ]
The dpaa_cleanup_tx_fd() function is called by the frame transmit confirmation callback but also on several error paths. This function is reading the transmit timestamp value. Avoid reading an invalid timestamp value on the error paths.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +10 -7
@@ -1600,13 +1600,15 @@ static int dpaa_eth_refill_bpools(struct dpaa_priv *priv)* Skb freeing is not handled here. * * This function may be called on error paths in the Tx function, so guard -* against cases when not all fd relevant fields were filled in. +* against cases when not all fd relevant fields were filled in. To avoid +* reading the invalid transmission timestamp for the error paths set ts to +* false. * * Return the skb backpointer, since for S/G frames the buffer containing it * gets freed here. */ static struct sk_buff *dpaa_cleanup_tx_fd (const struct dpaa_priv *priv, -const struct qm_fd *fd) +const struct qm_fd *fd,bool ts) {const enum dma_data_direction dma_dir =DMA_TO_DEVICE ;struct device *dev = priv->net_dev->dev.parent;
@@ -1648,7 +1650,8 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv, }/* DMA unmapping is required before accessing the HW provided info */ - if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) { + if (ts && priv->tx_tstamp && + skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) { memset(&shhwtstamps, 0, sizeof(shhwtstamps)); if (!fman_port_get_tstamp(priv->mac_dev->port[TX], (void *)skbh,
@@ -2118,7 +2121,7 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)if (likely (dpaa_xmit (priv, percpu_stats, queue_mapping, &fd) ==0 ))return NETDEV_TX_OK ; -dpaa_cleanup_tx_fd (priv, &fd); +dpaa_cleanup_tx_fd (priv, &fd, false); skb_to_fd_failed: enomem: percpu_stats->tx_errors++;
@@ -2164,7 +2167,7 @@ static void dpaa_tx_error(struct net_device *net_dev, percpu_priv->stats.tx_errors++; - skb =dpaa_cleanup_tx_fd (priv, fd); + skb =dpaa_cleanup_tx_fd (priv, fd, false);dev_kfree_skb (skb); }
@@ -2205,7 +2208,7 @@ static void dpaa_tx_conf(struct net_device *net_dev, percpu_priv->tx_confirm++; - skb =dpaa_cleanup_tx_fd (priv, fd); + skb =dpaa_cleanup_tx_fd (priv, fd, true);consume_skb (skb); }
@@ -2435,7 +2438,7 @@ static void egress_ern(struct qman_portal *portal, percpu_priv->stats.tx_fifo_errors++;count_ern (percpu_priv, msg); - skb =dpaa_cleanup_tx_fd (priv, fd); + skb =dpaa_cleanup_tx_fd (priv, fd, false);dev_kfree_skb_any (skb); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 632/671 scsi: core: scsi_trace: Use get_unaligned_be*()
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit b1335f5b0486f61fb66b123b40f8e7a98e49605d ]
This patch fixes an unintended sign extension on left shifts. From Colin
King: "Shifting a u8 left will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an u64 will sign extend the value causing the upper 32 bits to be set in the result."
Fix this by using get_unaligned_be*() instead.
--- drivers/scsi/scsi_trace.c | 113 +++++++++++--------------------------- 1 file changed, 33 insertions(+), 80 deletions(-)
drivers/scsi/scsi_trace.c +33 -80
@@ -21,7 +21,7 @@#include <trace/events/scsi.h> #define SERVICE_ACTION16 (cdb) (cdb[1] & 0x1f) -#define SERVICE_ACTION32 (cdb) ((cdb[8] << 8) | cdb[9]) +#define SERVICE_ACTION32 (cdb) (get_unaligned_be16(&cdb[8]))static const char *scsi_trace_misc (struct trace_seq *,unsigned char *,int );
@@ -51,17 +51,12 @@ static const char * scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; +u32 lba, txlen; - lba |= (cdb[2 ] <<24 ); - lba |= (cdb[3 ] <<16 ); - lba |= (cdb[4 ] <<8 ); - lba |= cdb[5 ]; - txlen |= (cdb[7 ] <<8 ); - txlen |= cdb[8 ]; + lba =get_unaligned_be32 (&cdb[2 ]); + txlen =get_unaligned_be16 (&cdb[7 ]); -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +trace_seq_printf (p,"lba=%u txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );if (cdb[0 ] ==WRITE_SAME )
@@ -76,19 +71,12 @@ static const char * scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; - - lba |= (cdb[2 ] <<24 ); - lba |= (cdb[3 ] <<16 ); - lba |= (cdb[4 ] <<8 ); - lba |= cdb[5 ]; - txlen |= (cdb[6 ] <<24 ); - txlen |= (cdb[7 ] <<16 ); - txlen |= (cdb[8 ] <<8 ); - txlen |= cdb[9 ]; - -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +u32 lba, txlen; + + lba =get_unaligned_be32 (&cdb[2 ]); + txlen =get_unaligned_be32 (&cdb[6 ]); + +trace_seq_printf (p,"lba=%u txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );trace_seq_putc (p,0 );
@@ -99,23 +87,13 @@ static const char * scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; - - lba |= ((u64 )cdb[2 ] <<56 ); - lba |= ((u64 )cdb[3 ] <<48 ); - lba |= ((u64 )cdb[4 ] <<40 ); - lba |= ((u64 )cdb[5 ] <<32 ); - lba |= (cdb[6 ] <<24 ); - lba |= (cdb[7 ] <<16 ); - lba |= (cdb[8 ] <<8 ); - lba |= cdb[9 ]; - txlen |= (cdb[10 ] <<24 ); - txlen |= (cdb[11 ] <<16 ); - txlen |= (cdb[12 ] <<8 ); - txlen |= cdb[13 ]; - -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +u64 lba; +u32 txlen; + + lba =get_unaligned_be64 (&cdb[2 ]); + txlen =get_unaligned_be32 (&cdb[10 ]); + +trace_seq_printf (p,"lba=%llu txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );if (cdb[0 ] ==WRITE_SAME_16 )
@@ -130,8 +108,8 @@ static const char * scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p), *cmd; -sector_t lba =0 , txlen =0 ; -u32 ei_lbrt =0 ; +u64 lba; +u32 ei_lbrt, txlen;switch (SERVICE_ACTION32 (cdb)) {case READ_32 :
@@ -151,26 +129,12 @@ scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len) goto out; } - lba |= ((u64 )cdb[12 ] <<56 ); - lba |= ((u64 )cdb[13 ] <<48 ); - lba |= ((u64 )cdb[14 ] <<40 ); - lba |= ((u64 )cdb[15 ] <<32 ); - lba |= (cdb[16 ] <<24 ); - lba |= (cdb[17 ] <<16 ); - lba |= (cdb[18 ] <<8 ); - lba |= cdb[19 ]; - ei_lbrt |= (cdb[20 ] <<24 ); - ei_lbrt |= (cdb[21 ] <<16 ); - ei_lbrt |= (cdb[22 ] <<8 ); - ei_lbrt |= cdb[23 ]; - txlen |= (cdb[28 ] <<24 ); - txlen |= (cdb[29 ] <<16 ); - txlen |= (cdb[30 ] <<8 ); - txlen |= cdb[31 ]; - -trace_seq_printf (p,"%s_32 lba=%llu txlen=%llu protect=%u ei_lbrt=%u" , - cmd, (unsigned long long )lba, - (unsigned long long )txlen, cdb[10 ] >>5 , ei_lbrt); + lba =get_unaligned_be64 (&cdb[12 ]); + ei_lbrt =get_unaligned_be32 (&cdb[20 ]); + txlen =get_unaligned_be32 (&cdb[28 ]); + +trace_seq_printf (p,"%s_32 lba=%llu txlen=%u protect=%u ei_lbrt=%u" , + cmd, lba, txlen, cdb[10 ] >>5 , ei_lbrt);if (SERVICE_ACTION32 (cdb) ==WRITE_SAME_32 )trace_seq_printf (p," unmap=%u" , cdb[10 ] >>3 &1 );
@@ -185,7 +149,7 @@ static const char * scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -unsigned int regions = cdb[7 ] <<8 | cdb[8 ]; +unsigned int regions =get_unaligned_be16 (&cdb[7 ]);trace_seq_printf (p,"regions=%u" , (regions -8 ) /16 );trace_seq_putc (p,0 );
@@ -197,8 +161,8 @@ static const char * scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p), *cmd; -sector_t lba =0 ; -u32 alloc_len =0 ; +u64 lba; +u32 alloc_len;switch (SERVICE_ACTION16 (cdb)) {case SAI_READ_CAPACITY_16 :
@@ -212,21 +176,10 @@ scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len) goto out; } - lba |= ((u64 )cdb[2 ] <<56 ); - lba |= ((u64 )cdb[3 ] <<48 ); - lba |= ((u64 )cdb[4 ] <<40 ); - lba |= ((u64 )cdb[5 ] <<32 ); - lba |= (cdb[6 ] <<24 ); - lba |= (cdb[7 ] <<16 ); - lba |= (cdb[8 ] <<8 ); - lba |= cdb[9 ]; - alloc_len |= (cdb[10 ] <<24 ); - alloc_len |= (cdb[11 ] <<16 ); - alloc_len |= (cdb[12 ] <<8 ); - alloc_len |= cdb[13 ]; - -trace_seq_printf (p,"%s lba=%llu alloc_len=%u" , cmd, - (unsigned long long )lba, alloc_len); + lba =get_unaligned_be64 (&cdb[2 ]); + alloc_len =get_unaligned_be32 (&cdb[10 ]); + +trace_seq_printf (p,"%s lba=%llu alloc_len=%u" , cmd, lba, alloc_len); out:trace_seq_putc (p,0 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 633/671 MIPS: Loongson: Fix return value of loongson_hwmon_init
In reply to Sasha LevinFrom: Tiezhu Yang <[email protected]>
[ Upstream commit dece3c2a320b0a6d891da6ff774ab763969b6860 ]
When call function hwmon_device_register failed, use the actual return value instead of always -ENOMEM.
--- drivers/platform/mips/cpu_hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/mips/cpu_hwmon.c +1 -1
@@ -159,7 +159,7 @@ static int __init loongson_hwmon_init(void) cpu_hwmon_dev =hwmon_device_register (NULL );if (IS_ERR (cpu_hwmon_dev)) { - ret = -ENOMEM ; + ret =PTR_ERR (cpu_hwmon_dev);pr_err ("hwmon_device_register fail!\n" ); goto fail_hwmon_device_register; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 634/671 media: exynos4-is: Fix recursive locking in isp_video_release()
In reply to Sasha LevinFrom: Seung-Woo Kim <[email protected]>
[ Upstream commit 704c6c80fb471d1bb0ef0d61a94617d1d55743cd ]
Quoted 1 line
From
isp_video_release(),&isp->video_lockis held and subsequent
vb2_fop_release() tries to lock vdev->lock which is same with the previous one. Replace vb2_fop_release() with _vb2_fop_release() to fix the recursive locking.
--- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/exynos4-is/fimc-isp-video.c +1 -1
@@ -316,7 +316,7 @@ static int isp_video_release(struct file *file) ivc->streaming =0 ; } -vb2_fop_release (file); +_vb2_fop_release (file,NULL );if (v4l2_fh_is_singular_file (file)) {fimc_pipeline_call (&ivc->ve, close);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 635/671 hv_netvsc: flag software created hash value
In reply to Sasha LevinFrom: Stephen Hemminger <[email protected]>
[ Upstream commit df9f540ca74297a84bafacfa197e9347b20beea5 ]
When the driver needs to create a hash value because it was not done at higher level, then the hash should be marked as a software not hardware hash.
--- drivers/net/hyperv/netvsc_drv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/hyperv/netvsc_drv.c +3 -4
@@ -295,9 +295,9 @@ static inline u32 netvsc_get_hash(else if (flow.basic.n_proto ==htons (ETH_P_IPV6 )) hash =jhash2 ((u32 *)&flow.addrs.v6addrs,8 , hashrnd);else - hash =0 ; +return 0 ; -skb_set_hash (skb, hash,PKT_HASH_TYPE_L3 ); +__skb_set_sw_hash (skb, hash, false); }return hash;
@@ -804,8 +804,7 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, skb->protocol == htons(ETH_P_IP))netvsc_comp_ipcsum (skb); -/* Do L4 checksum offload if enabled and present. -*/ +/* Do L4 checksum offload if enabled and present. */ if (csum_info && (net->features &NETIF_F_RXCSUM )) {if (csum_info->receive.tcp_checksum_succeeded || csum_info->receive.udp_checksum_succeeded)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 636/671 hwmon: (pmbus/ibm-cffps) Switch LEDs to blocking brightness call
In reply to Sasha LevinFrom: Eddie James <[email protected]>
[ Upstream commit 9861ff954c7e83e2f738ce16fbe15f8a1e121771 ]
Since i2c_smbus functions can sleep, the brightness setting function for this driver must be the blocking version to avoid scheduling while atomic.
--- drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/ibm-cffps.c +6 -4
@@ -269,8 +269,8 @@ static int ibm_cffps_read_word_data(struct i2c_client *client, int page,return rc; } -static void ibm_cffps_led_brightness_set (struct led_classdev *led_cdev, -enum led_brightness brightness) +static int ibm_cffps_led_brightness_set (struct led_classdev *led_cdev, +enum led_brightness brightness) {int rc; struct ibm_cffps *psu = container_of(led_cdev, struct ibm_cffps, led);
@@ -286,9 +286,11 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev, rc =i2c_smbus_write_byte_data (psu->client,CFFPS_SYS_CONFIG_CMD , psu->led_state);if (rc <0 ) -return ; +return rc; led_cdev->brightness = brightness; + +return 0 ; } static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
@@ -324,7 +326,7 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu) client->addr); psu->led.name = psu->led_name; psu->led.max_brightness =LED_FULL ; - psu->led.brightness_set = ibm_cffps_led_brightness_set; + psu->led.brightness_set_blocking = ibm_cffps_led_brightness_set; psu->led.blink_set = ibm_cffps_led_blink_set; rc =devm_led_classdev_register (dev, &psu->led);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 637/671 net: neigh: use long type to store jiffies delta
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ]
A difference of two unsigned long needs long storage.
--- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/neighbour.c +2 -2
@@ -1885,8 +1885,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, goto nla_put_failure; {unsigned long now = jiffies; -unsigned int flush_delta = now - tbl->last_flush; -unsigned int rand_delta = now - tbl->last_rand; +long flush_delta = now - tbl->last_flush; +long rand_delta = now - tbl->last_rand;struct neigh_hash_table *nht;struct ndt_config ndc = { .ndtc_key_len = tbl->key_len,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 638/671 regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
In reply to Sasha LevinFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 458ea3ad033fc86e291712ce50cbe60c3428cf30 ]
Those regulators are not actually supported by the AB8500 regulator driver. There is no ab8500_regulator_info for them and no entry in ab8505_regulator_match.
As such, they cannot be registered successfully, and looking them up in ab8505_regulator_match causes an out-of-bounds array read.
--- include/linux/regulator/ab8500.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/regulator/ab8500.h +0 -2
@@ -43,8 +43,6 @@ enum ab8505_regulator_id {AB8505_LDO_ANAMIC2 ,AB8505_LDO_AUX8 ,AB8505_LDO_ANA , -AB8505_SYSCLKREQ_2 , -AB8505_SYSCLKREQ_4 , AB8505_NUM_REGULATORS, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 639/671 f2fs: fix potential overflow
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 1f0d5c911b64165c9754139a26c8c2fad352c132 ]
We expect 64-bit calculation result from below statement, however in 32-bit machine, looped left shift operation on pgoff_t type variable may cause overflow issue, fix it by forcing type cast.
page->index << PAGE_SHIFT;
--- fs/f2fs/data.c | 2 +- fs/f2fs/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/data.c +1 -1
@@ -1857,7 +1857,7 @@ static int __write_data_page(struct page *page, bool *submitted,loff_t i_size =i_size_read (inode);const pgoff_t end_index = ((unsigned long long ) i_size) >>PAGE_SHIFT ; -loff_t psize = (page->index +1 ) <<PAGE_SHIFT ; +loff_t psize = (loff_t)(page->index +1 ) <<PAGE_SHIFT ;unsigned offset =0 ;bool need_balance_fs = false;int err =0 ;
fs/f2fs/file.c +1 -1
@@ -1101,7 +1101,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, } dn.ofs_in_node++; i++; - new_size = (dst + i) <<PAGE_SHIFT ; + new_size = (loff_t)(dst + i) <<PAGE_SHIFT ;if (dst_inode->i_size < new_size)f2fs_i_size_write (dst_inode, new_size); }while (--ilen && (do_replace[i] || blkaddr[i] ==NULL_ADDR ));
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 640/671 rtc: brcmstb-waketimer: add missed clk_disable_unprepare
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 94303f8930ed78aea0f189b703c9d79fff9555d7 ]
This driver forgets to disable and unprepare clock when remove. Add a call to clk_disable_unprepare to fix it.
--- drivers/rtc/rtc-brcmstb-waketimer.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-brcmstb-waketimer.c +1 -0
@@ -287,6 +287,7 @@ static int brcmstb_waketmr_remove(struct platform_device *pdev)struct brcmstb_waketmr *timer =dev_get_drvdata (&pdev->dev);unregister_reboot_notifier (&timer->reboot_notifier); +clk_disable_unprepare (timer->clk);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 641/671 packet: fix data-race in fanout_flow_is_huge()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit b756ad928d98e5ef0b74af7546a6a31a8dadde00 ]
KCSAN reported the following data-race [1]
Adding a couple of READ_ONCE()/WRITE_ONCE() should silence it.
Since the report hinted about multiple cpus using the history concurrently, I added a test avoiding writing on it if the victim slot already contains the desired value.
[1]
BUG: KCSAN: data-race in fanout_demux_rollover / fanout_demux_rollover
read to 0xffff8880b01786cc of 4 bytes by task 18921 on cpu 1:
fanout_flow_is_huge net/packet/af_packet.c:1303 [inline] fanout_demux_rollover+0x33e/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
write to 0xffff8880b01786cc of 4 bytes by task 18922 on cpu 0:
fanout_flow_is_huge net/packet/af_packet.c:1306 [inline] fanout_demux_rollover+0x3a4/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 18922 Comm: syz-executor.3 Not tainted 5.4.0-rc6+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/packet/af_packet.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/packet/af_packet.c +9 -3
@@ -1297,15 +1297,21 @@ static void packet_sock_destruct(struct sock *sk)static bool fanout_flow_is_huge (struct packet_sock *po,struct sk_buff *skb) { -u32 rxhash; +u32 *history = po->rollover->history; +u32 victim, rxhash;int i, count =0 ; rxhash =skb_get_hash (skb);for (i =0 ; i <ROLLOVER_HLEN ; i++) -if (po->rollover->history[i] == rxhash) +if (READ_ONCE (history[i]) == rxhash) count++; - po->rollover->history[prandom_u32 () %ROLLOVER_HLEN ] = rxhash; + victim =prandom_u32 () %ROLLOVER_HLEN ; + +/* Avoid dirtying the cache line if possible */ +if (READ_ONCE (history[victim]) != rxhash) +WRITE_ONCE (history[victim], rxhash); +return count > (ROLLOVER_HLEN >>1 ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 642/671 mfd: intel-lpss: Add default I2C device properties for Gemini Lake
In reply to Sasha LevinFrom: Jarkko Nikula <[email protected]>
[ Upstream commit 3f31bc67e4dc6a555341dffefe328ddd58e8b431 ]
It turned out Intel Gemini Lake doesn't use the same I2C timing parameters as Broxton.
I got confirmation from the Windows team that Gemini Lake systems should use updated timing parameters that differ from those used in Broxton based systems.
--- drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/mfd/intel-lpss-pci.c +20 -8
@@ -126,6 +126,18 @@ static const struct intel_lpss_platform_info apl_i2c_info = { .properties = apl_i2c_properties, }; +static struct property_entry glk_i2c_properties[] = { +PROPERTY_ENTRY_U32 ("i2c-sda-hold-time-ns" ,313 ), +PROPERTY_ENTRY_U32 ("i2c-sda-falling-time-ns" ,171 ), +PROPERTY_ENTRY_U32 ("i2c-scl-falling-time-ns" ,290 ), + { }, +}; + +static const struct intel_lpss_platform_info glk_i2c_info = { + .clk_rate =133000000 , + .properties = glk_i2c_properties, +}; +static const struct intel_lpss_platform_info cnl_i2c_info = { .clk_rate =216000000 , .properties = spt_i2c_properties,
@@ -165,14 +177,14 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info },/* GLK */ - { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&glk_i2c_info }, { PCI_VDEVICE(INTEL, 0x31bc), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x31be), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x31c0), (kernel_ulong_t)&bxt_uart_info },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 643/671 i2c: stm32f7: report dma error during probe
In reply to Sasha LevinFrom: Alain Volmat <[email protected]>
[ Upstream commit d77eceb2de99f5d7e0c645bad15511fe1af59e09 ]
Distinguish between the case where dma information is not provided within the DT and the case of an error during the dma init. Exit the probe with error in case of an error during dma init.
--- drivers/i2c/busses/i2c-stm32.c | 16 ++++++++-------- drivers/i2c/busses/i2c-stm32f7.c | 9 +++++++++ 2 files changed, 17 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-stm32.c +8 -8
@@ -21,13 +21,13 @@ struct stm32_i2c_dma *stm32_i2c_dma_request(struct device *dev, dma =devm_kzalloc (dev,sizeof (*dma),GFP_KERNEL );if (!dma) -return NULL ; +return ERR_PTR (-ENOMEM );/* Request and configure I2C TX dma channel */ - dma->chan_tx =dma_request_slave_channel (dev,"tx" ); -if (!dma->chan_tx) { + dma->chan_tx =dma_request_chan (dev,"tx" ); +if (IS_ERR (dma->chan_tx)) {dev_dbg (dev,"can't request DMA tx channel\n" ); - ret = -EINVAL ; + ret =PTR_ERR (dma->chan_tx); goto fail_al; }
@@ -43,10 +43,10 @@ struct stm32_i2c_dma *stm32_i2c_dma_request(struct device *dev, }/* Request and configure I2C RX dma channel */ - dma->chan_rx =dma_request_slave_channel (dev,"rx" ); -if (!dma->chan_rx) { + dma->chan_rx =dma_request_chan (dev,"rx" ); +if (IS_ERR (dma->chan_rx)) {dev_err (dev,"can't request DMA rx channel\n" ); - ret = -EINVAL ; + ret =PTR_ERR (dma->chan_rx); goto fail_tx; }
@@ -76,7 +76,7 @@ struct stm32_i2c_dma *stm32_i2c_dma_request(struct device *dev,devm_kfree (dev, dma);dev_info (dev,"can't use DMA\n" ); -return NULL ; +return ERR_PTR (ret); }void stm32_i2c_dma_free (struct stm32_i2c_dma *dma)
drivers/i2c/busses/i2c-stm32f7.c +9 -0
@@ -1914,6 +1914,15 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) i2c_dev->dma =stm32_i2c_dma_request (i2c_dev->dev, phy_addr,STM32F7_I2C_TXDR ,STM32F7_I2C_RXDR ); +if (PTR_ERR (i2c_dev->dma) == -ENODEV ) + i2c_dev->dma =NULL ; +else if (IS_ERR (i2c_dev->dma)) { + ret =PTR_ERR (i2c_dev->dma); +if (ret != -EPROBE_DEFER ) +dev_err (&pdev->dev, +"Failed to request dma error %i\n" , ret); + goto clk_free; + } ret =i2c_add_adapter (adap);if (ret)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 644/671 tipc: update mon's self addr when node addr generated
In reply to Sasha LevinFrom: Hoang Le <[email protected]>
[ Upstream commit 46cb01eeeb86fca6afe24dda1167b0cb95424e29 ]
In commit 25b0b9c4e835 ("tipc: handle collisions of 32-bit node address hash values"), the 32-bit node address only generated after one second trial period expired. However the self's addr in struct tipc_monitor do not update according to node address generated. This lead to it is always zero as initial value. As result, sorting algorithm using this value does not work as expected, neither neighbor monitoring framework.
In this commit, we add a fix to update self's addr when 32-bit node address generated.
--- net/tipc/monitor.c | 15 +++++++++++++++ net/tipc/monitor.h | 1 + net/tipc/net.c | 2 ++ 3 files changed, 18 insertions(+)
net/tipc/monitor.c +15 -0
@@ -665,6 +665,21 @@ void tipc_mon_delete(struct net *net, int bearer_id)kfree (mon); } +void tipc_mon_reinit_self (struct net *net) +{ +struct tipc_monitor *mon; +int bearer_id; + +for (bearer_id =0 ; bearer_id <MAX_BEARERS ; bearer_id++) { + mon =tipc_monitor (net, bearer_id); +if (!mon) +continue ; +write_lock_bh (&mon->lock); + mon->self->addr =tipc_own_addr (net); +write_unlock_bh (&mon->lock); + } +} +int tipc_nl_monitor_set_threshold (struct net *net,u32 cluster_size) {struct tipc_net *tn =tipc_net (net);
net/tipc/monitor.h +1 -0
@@ -77,6 +77,7 @@ int __tipc_nl_add_monitor(struct net *net, struct tipc_nl_msg *msg, u32 bearer_id);int tipc_nl_add_monitor_peer (struct net *net,struct tipc_nl_msg *msg,u32 bearer_id,u32 *prev_node); +void tipc_mon_reinit_self (struct net *net);extern const int tipc_max_domain_size;#endif
net/tipc/net.c +2 -0
@@ -42,6 +42,7 @@#include "node.h" #include "bcast.h" #include "netlink.h" +#include "monitor.h" /* * The TIPC locking policy is designed to ensure a very fine locking
@@ -136,6 +137,7 @@ static void tipc_net_finalize(struct net *net, u32 addr)tipc_set_node_addr (net, addr);tipc_named_reinit (net);tipc_sk_reinit (net); +tipc_mon_reinit_self (net);tipc_nametbl_publish (net,TIPC_CFG_SRV , addr, addr,TIPC_CLUSTER_SCOPE ,0 , addr); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 645/671 tty: serial: imx: use the sg count from dma_map_sg
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit 596fd8dffb745afcebc0ec6968e17fe29f02044c ]
The dmaengine_prep_slave_sg needs to use sg count returned by dma_map_sg, not use sport->dma_tx_nents, because the return value of dma_map_sg is not always same with "nents".
--- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/imx.c +1 -1
@@ -624,7 +624,7 @@ static void imx_uart_dma_tx(struct imx_port *sport)dev_err (dev,"DMA mapping error for TX.\n" );return ; } - desc =dmaengine_prep_slave_sg (chan, sgl, sport->dma_tx_nents, + desc =dmaengine_prep_slave_sg (chan, sgl, ret,DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT );if (!desc) { dma_unmap_sg(dev, sgl, sport->dma_tx_nents,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 646/671 tty: serial: pch_uart: correct usage of dma_unmap_sg
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit 74887542fdcc92ad06a48c0cca17cdf09fc8aa00 ]
Per Documentation/DMA-API-HOWTO.txt,
To unmap a scatterlist, just call:
dma_unmap_sg(dev, sglist, nents, direction);
.. note::
The 'nents' argument to the dma_unmap_sg call must be the _same_ one you passed into the dma_map_sg call, it should _NOT_ be the 'count' value _returned_ from the dma_map_sg call.
However in the driver, priv->nent is directly assigned with value returned from dma_map_sg, and dma_unmap_sg use priv->nent for unmap, this breaks the API usage.
So introduce a new entry orig_nent to remember 'nents'.
--- drivers/tty/serial/pch_uart.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/serial/pch_uart.c +4 -1
@@ -235,6 +235,7 @@ struct eg20t_port {struct dma_chan *chan_rx;struct scatterlist *sg_tx_p;int nent; +int orig_nent;struct scatterlist sg_rx;int tx_dma_use;void *rx_buf_virt;
@@ -789,9 +790,10 @@ static void pch_dma_tx_complete(void *arg) } xmit->tail &=UART_XMIT_SIZE -1 ;async_tx_ack (priv->desc_tx); -dma_unmap_sg (port->dev, sg, priv->nent,DMA_TO_DEVICE ); +dma_unmap_sg (port->dev, sg, priv->orig_nent,DMA_TO_DEVICE ); priv->tx_dma_use =0 ; priv->nent =0 ; + priv->orig_nent =0 ;kfree (priv->sg_tx_p);pch_uart_hal_enable_interrupt (priv,PCH_UART_HAL_TX_INT ); }
@@ -1015,6 +1017,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)dev_err (priv->port.dev,"%s:dma_map_sg Failed\n" , __func__);return 0 ; } + priv->orig_nent = num; priv->nent = nent;for (i =0 ; i < nent; i++, sg++) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 647/671 mmc: sdio: fix wl1251 vendor id
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit e5db673e7fe2f971ec82039a28dc0811c2100e87 ]
v4.11-rc1 did introduce a patch series that rearranged the sdio quirks into a header file. Unfortunately this did forget to handle SDIO_VENDOR_ID_TI differently between wl1251 and wl1271 with the result that although the wl1251 was found on the sdio bus, the firmware did not load any more and there was no interface registration.
This patch defines separate constants to be used by sdio quirks and drivers.
--- include/linux/mmc/sdio_ids.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/mmc/sdio_ids.h +2 -0
@@ -68,6 +68,8 @@#define SDIO_VENDOR_ID_TI 0x0097#define SDIO_DEVICE_ID_TI_WL1271 0x4076 +#define SDIO_VENDOR_ID_TI_WL1251 0x104c +#define SDIO_DEVICE_ID_TI_WL1251 0x9066#define SDIO_VENDOR_ID_STE 0x0020#define SDIO_DEVICE_ID_STE_CW1200 0x2280
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 648/671 mmc: core: fix wl1251 sdio quirks
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit 16568b4a4f0c34bd35cfadac63303c7af7812764 ]
wl1251 and wl1271 have different vendor id and device id. So we need to handle both with sdio quirks.
--- drivers/mmc/core/quirks.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/core/quirks.h +7 -0
@@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = {END_FIXUP }; +static const struct mmc_fixup sdio_fixup_methods[] = { +SDIO_FIXUP (SDIO_VENDOR_ID_TI_WL1251 ,SDIO_DEVICE_ID_TI_WL1251 , + add_quirk,MMC_QUIRK_NONSTD_FUNC_IF ), + +SDIO_FIXUP (SDIO_VENDOR_ID_TI_WL1251 ,SDIO_DEVICE_ID_TI_WL1251 , + add_quirk,MMC_QUIRK_DISABLE_CD ), +SDIO_FIXUP (SDIO_VENDOR_ID_TI ,SDIO_DEVICE_ID_TI_WL1271 , add_quirk,MMC_QUIRK_NONSTD_FUNC_IF ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 649/671 affs: fix a memory leak in affs_remount
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 450c3d4166837c496ebce03650c08800991f2150 ]
In affs_remount if data is provided it is duplicated into new_opts. The allocated memory for new_opts is only released if parse_options fails.
There's a bit of history behind new_options, originally there was save/replace options on the VFS layer so the 'data' passed must not change (thus strdup), this got cleaned up in later patches. But not completely.
There's no reason to do the strdup in cases where the filesystem does not need to reuse the 'data' again, because strsep would modify it directly.
--- fs/affs/super.c | 6 ------ 1 file changed, 6 deletions(-)
fs/affs/super.c +0 -6
@@ -561,14 +561,9 @@ affs_remount(struct super_block *sb, int *flags, char *data)int root_block;unsigned long mount_flags;int res =0 ; -char *new_opts;char volume[32 ];char *prefix =NULL ; - new_opts =kstrdup (data,GFP_KERNEL ); -if (data && !new_opts) -return -ENOMEM ; -pr_debug ("%s(flags=0x%x,opts=\"%s\")\n" , __func__, *flags, data);sync_filesystem (sb);
@@ -579,7 +574,6 @@ affs_remount(struct super_block *sb, int *flags, char *data) &blocksize, &prefix, volume, &mount_flags)) {kfree (prefix); -kfree (new_opts);return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 650/671 rtc: msm6242: Fix reading of 10-hour digit
In reply to Sasha LevinFrom: Kars de Jong <[email protected]>
[ Upstream commit e34494c8df0cd96fc432efae121db3212c46ae48 ]
The driver was reading the wrong register as the 10-hour digit due to a misplaced ')'. It was in fact reading the 1-second digit register due to this bug.
Also remove the use of a magic number for the hour mask and use the define for it which was already present.
--- drivers/rtc/rtc-msm6242.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-msm6242.c +2 -1
@@ -132,7 +132,8 @@ static int msm6242_read_time(struct device *dev, struct rtc_time *tm)msm6242_read (priv,MSM6242_SECOND1 ); tm->tm_min =msm6242_read (priv,MSM6242_MINUTE10 ) *10 +msm6242_read (priv,MSM6242_MINUTE1 ); - tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 &3 )) *10 + + tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 ) & +MSM6242_HOUR10_HR_MASK ) *10 +msm6242_read (priv,MSM6242_HOUR1 ); tm->tm_mday =msm6242_read (priv,MSM6242_DAY10 ) *10 +msm6242_read (priv,MSM6242_DAY1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 651/671 watchdog: sprd: Fix the incorrect pointer getting from driver data
In reply to Sasha LevinFrom: Shuiqing Li <[email protected]>
[ Upstream commit 39e68d9e7ab276880980ee5386301fb218202192 ]
The device driver data saved the 'struct sprd_wdt' object, it is incorrect to get 'struct watchdog_device' object from the driver data, thus fix it.
--- drivers/watchdog/sprd_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/watchdog/sprd_wdt.c +2 -4
@@ -342,10 +342,9 @@ static int sprd_wdt_probe(struct platform_device *pdev)static int __maybe_unused sprd_wdt_pm_suspend (struct device *dev) { -struct watchdog_device *wdd =dev_get_drvdata (dev);struct sprd_wdt *wdt =dev_get_drvdata (dev); -if (watchdog_active (wdd)) +if (watchdog_active (&wdt->wdd))sprd_wdt_stop (&wdt->wdd);sprd_wdt_disable (wdt);
@@ -354,7 +353,6 @@ static int __maybe_unused sprd_wdt_pm_suspend(struct device *dev)static int __maybe_unused sprd_wdt_pm_resume (struct device *dev) { -struct watchdog_device *wdd =dev_get_drvdata (dev);struct sprd_wdt *wdt =dev_get_drvdata (dev);int ret;
@@ -362,7 +360,7 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev)if (ret)return ret; -if (watchdog_active (wdd)) { +if (watchdog_active (&wdt->wdd)) { ret =sprd_wdt_start (&wdt->wdd);if (ret) {sprd_wdt_disable (wdt);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 652/671 scsi: qla4xxx: fix double free bug
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit 3fe3d2428b62822b7b030577cd612790bdd8c941 ]
The variable init_fw_cb is released twice, resulting in a double free bug. The call to the function dma_free_coherent() before goto is removed to get rid of potential double free.
--- drivers/scsi/qla4xxx/ql4_mbx.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/qla4xxx/ql4_mbx.c +0 -3
@@ -640,9 +640,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)if (qla4xxx_get_ifcb (ha, &mbox_cmd[0 ], &mbox_sts[0 ], init_fw_cb_dma) !=QLA_SUCCESS ) { -dma_free_coherent (&ha->pdev->dev, -sizeof (struct addr_ctrl_blk ), - init_fw_cb, init_fw_cb_dma); goto exit_init_fw_cb; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 653/671 scsi: bnx2i: fix potential use after free
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit 29d28f2b8d3736ac61c28ef7e20fda63795b74d9 ]
The member hba->pcidev may be used after its reference is dropped. Move the put function to where it is never used to avoid potential use after free issues.
--- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -915,12 +915,12 @@ void bnx2i_free_hba(struct bnx2i_hba *hba)INIT_LIST_HEAD (&hba->ep_ofld_list);INIT_LIST_HEAD (&hba->ep_active_list);INIT_LIST_HEAD (&hba->ep_destroy_list); -pci_dev_put (hba->pcidev);if (hba->regview) {pci_iounmap (hba->pcidev, hba->regview); hba->regview =NULL ; } +pci_dev_put (hba->pcidev);bnx2i_free_mp_bdt (hba);bnx2i_release_free_cid_que (hba);iscsi_host_free (shost);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 654/671 scsi: target: core: Fix a pr_debug() argument
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c941e0d172605731de9b4628bd4146d35cf2e7d6 ]
Print the string for which conversion failed instead of printing the function name twice.
--- drivers/target/target_core_fabric_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_fabric_lib.c +1 -1
@@ -131,7 +131,7 @@ static int srp_get_pr_transport_id(memset (buf +8 ,0 , leading_zero_bytes); rc =hex2bin (buf +8 + leading_zero_bytes, p, count);if (rc <0 ) { -pr_debug ("hex2bin failed for %s: %d\n" , __func__, rc); +pr_debug ("hex2bin failed for %s: %d\n" , p, rc);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 655/671 powerpc/powernv: Disable native PCIe port management
In reply to Sasha LevinFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 9d72dcef891030545f39ad386a30cf91df517fb2 ]
On PowerNV the PCIe topology is (currently) managed by the powernv platform code in Linux in cooperation with the platform firmware. Linux's native PCIe port service drivers operate independently of both and this can cause problems.
The main issue is that the portbus driver will conflict with the platform specific hotplug driver (pnv_php) over ownership of the MSI used to notify the host when a hotplug event occurs. The portbus driver claims this MSI on behalf of the individual port services because the same interrupt is used for hotplug events, PMEs (on root ports), and link bandwidth change notifications. The portbus driver will always claim the interrupt even if the individual port service drivers, such as pciehp, are compiled out.
The second, bigger, problem is that the hotplug port service driver fundamentally does not work on PowerNV. The platform assumes that all PCI devices have a corresponding arch-specific handle derived from the DT node for the device (pci_dn) and without one the platform will not allow a PCI device to be enabled. This problem is largely due to historical baggage, but it can't be resolved without significant re-factoring of the platform PCI support.
We can fix these problems in the interim by setting the "pcie_ports_disabled" flag during platform initialisation. The flag indicates the platform owns the PCIe ports which stops the portbus driver from being registered.
This does have the side effect of disabling all port services drivers that is: AER, PME, BW notifications, hotplug, and DPC. However, this is not a huge disadvantage on PowerNV since these services are either unused or handled through other means.
--- arch/powerpc/platforms/powernv/pci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/powerpc/platforms/powernv/pci.c +17 -0
@@ -1095,6 +1095,23 @@ void __init pnv_pci_init(void)if (!firmware_has_feature (FW_FEATURE_OPAL ))return ; +#ifdef CONFIG_PCIEPORTBUS +/* +* On PowerNV PCIe devices are (currently) managed in cooperation +* with firmware. This isn't *strictly* required, but there's enough +* assumptions baked into both firmware and the platform code that +* it's unwise to allow the portbus services to be used. +* +* We need to fix this eventually, but for now set this flag to disable +* the portbus driver. The AER service isn't required since that AER +* events are handled via EEH. The pciehp hotplug driver can't work +* without kernel changes (and portbus binding breaks pnv_php). The +* other services also require some thinking about how we're going +* to integrate them. +*/ + pcie_ports_disabled = true; +#endif +/* Look for IODA IO-Hubs. */ for_each_compatible_node (np,NULL ,"ibm,ioda-hub" ) {pnv_pci_init_ioda_hub (np);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 656/671 afs: Remove set but not used variables 'before', 'after'
In reply to Sasha LevinFrom: zhengbin <[email protected]>
[ Upstream commit 51590df4f3306cb1f43dca54e3ccdd121ab89594 ]
Fixes gcc '-Wunused-but-set-variable' warning:
fs/afs/dir_edit.c: In function afs_set_contig_bits:fs/afs/dir_edit.c:75:20: warning: variable after set but not used [-Wunused-but-set-variable] fs/afs/dir_edit.c: In function afs_set_contig_bits:fs/afs/dir_edit.c:75:12: warning: variable before set but not used [-Wunused-but-set-variable] fs/afs/dir_edit.c: In function afs_clear_contig_bits:fs/afs/dir_edit.c:100:20: warning: variable after set but not used [-Wunused-but-set-variable] fs/afs/dir_edit.c: In function afs_clear_contig_bits:fs/afs/dir_edit.c:100:12: warning: variable before set but not used [-Wunused-but-set-variable]
They are never used since commit 63a4681ff39c.
--- fs/afs/dir_edit.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
fs/afs/dir_edit.c +2 -10
@@ -72,13 +72,11 @@ static int afs_find_contig_bits(union afs_xdr_dir_block *block, unsigned int nr_static void afs_set_contig_bits (union afs_xdr_dir_block *block,int bit,unsigned int nr_slots) { -u64 mask, before, after; +u64 mask; mask = (1 << nr_slots) -1 ; mask <<= bit; - before = *(u64 *)block->hdr.bitmap; - block->hdr.bitmap[0 ] |= (u8)(mask >>0 *8 ); block->hdr.bitmap[1 ] |= (u8)(mask >>1 *8 ); block->hdr.bitmap[2 ] |= (u8)(mask >>2 *8 );
@@ -87,8 +85,6 @@ static void afs_set_contig_bits(union afs_xdr_dir_block *block, block->hdr.bitmap[5 ] |= (u8)(mask >>5 *8 ); block->hdr.bitmap[6 ] |= (u8)(mask >>6 *8 ); block->hdr.bitmap[7 ] |= (u8)(mask >>7 *8 ); - - after = *(u64 *)block->hdr.bitmap; }/*
@@ -97,13 +93,11 @@ static void afs_set_contig_bits(union afs_xdr_dir_block *block,static void afs_clear_contig_bits (union afs_xdr_dir_block *block,int bit,unsigned int nr_slots) { -u64 mask, before, after; +u64 mask; mask = (1 << nr_slots) -1 ; mask <<= bit; - before = *(u64 *)block->hdr.bitmap; - block->hdr.bitmap[0 ] &= ~(u8)(mask >>0 *8 ); block->hdr.bitmap[1 ] &= ~(u8)(mask >>1 *8 ); block->hdr.bitmap[2 ] &= ~(u8)(mask >>2 *8 );
@@ -112,8 +106,6 @@ static void afs_clear_contig_bits(union afs_xdr_dir_block *block, block->hdr.bitmap[5 ] &= ~(u8)(mask >>5 *8 ); block->hdr.bitmap[6 ] &= ~(u8)(mask >>6 *8 ); block->hdr.bitmap[7 ] &= ~(u8)(mask >>7 *8 ); - - after = *(u64 *)block->hdr.bitmap; }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 657/671 dmaengine: ti: edma: fix missed failure handling
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ]
When devm_kcalloc fails, it forgets to call edma_free_slot. Replace direct return with failure handler to fix it.
--- drivers/dma/ti/edma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma/ti/edma.c +4 -2
@@ -2345,8 +2345,10 @@ static int edma_probe(struct platform_device *pdev) ecc->tc_list =devm_kcalloc (dev, ecc->num_tc,sizeof (*ecc->tc_list),GFP_KERNEL ); -if (!ecc->tc_list) -return -ENOMEM ; +if (!ecc->tc_list) { + ret = -ENOMEM ; + goto err_reg1; + }for (i =0 ;; i++) { ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 658/671 crypto: sun4i-ss - fix big endian issues
In reply to Sasha LevinFrom: Corentin Labbe <[email protected]>
[ Upstream commit d1d787bcebfe122a5bd443ae565696661e2e9656 ]
When testing BigEndian kernel, the sun4i-ss was failling all crypto tests.
This patch fix endian issues with it.
--- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/crypto/sunxi-ss/sun4i-ss-hash.c +11 -10
@@ -179,7 +179,7 @@ static int sun4i_hash(struct ahash_request *areq)*/ unsigned int i =0 , end, fill, min_fill, nwait, nbw =0 , j =0 , todo;unsigned int in_i =0 ; -u32 spaces, rx_cnt =SS_RX_DEFAULT , bf[32 ] = {0 }, wb =0 , v, ivmode =0 ; +u32 spaces, rx_cnt =SS_RX_DEFAULT , bf[32 ] = {0 }, v, ivmode =0 ;struct sun4i_req_ctx *op =ahash_request_ctx (areq);struct crypto_ahash *tfm =crypto_ahash_reqtfm (areq);struct sun4i_tfm_ctx *tfmctx =crypto_ahash_ctx (tfm);
@@ -188,6 +188,7 @@ static int sun4i_hash(struct ahash_request *areq)struct sg_mapping_iter mi;int in_r, err =0 ;size_t copied =0 ; +__le32 wb =0 ; dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x", __func__, crypto_tfm_alg_name(areq->base.tfm),
@@ -399,7 +400,7 @@ static int sun4i_hash(struct ahash_request *areq) nbw = op->len -4 * nwait;if (nbw) { - wb = *(u32 *)(op->buf + nwait *4 ); + wb =cpu_to_le32 (*(u32 *)(op->buf + nwait *4 )); wb &=GENMASK ((nbw *8 ) -1 ,0 ); op->byte_count += nbw;
@@ -408,7 +409,7 @@ static int sun4i_hash(struct ahash_request *areq)/* write the remaining bytes of the nbw buffer */ wb |= ((1 <<7 ) << (nbw *8 )); - bf[j++] = wb; + bf[j++] =le32_to_cpu (wb);/* * number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
@@ -427,13 +428,13 @@ static int sun4i_hash(struct ahash_request *areq)/* write the length of data */ if (op->mode ==SS_OP_SHA1 ) { -__be64 bits =cpu_to_be64 (op->byte_count <<3 ); - bf[j++] =lower_32_bits (bits); - bf[j++] =upper_32_bits (bits); +__be64 *bits = (__be64 *)&bf[j]; + *bits =cpu_to_be64 (op->byte_count <<3 ); + j +=2 ; }else { -__le64 bits = op->byte_count <<3 ; - bf[j++] =lower_32_bits (bits); - bf[j++] =upper_32_bits (bits); +__le64 *bits = (__le64 *)&bf[j]; + *bits =cpu_to_le64 (op->byte_count <<3 ); + j +=2 ; }writesl (ss->base +SS_RXFIFO , bf, j);
@@ -475,7 +476,7 @@ static int sun4i_hash(struct ahash_request *areq) } }else {for (i =0 ; i <4 ; i++) { - v =readl (ss->base +SS_MD0 + i *4 ); + v =cpu_to_le32 (readl (ss->base +SS_MD0 + i *4 ));memcpy (areq->result + i *4 , &v,4 ); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 659/671 drm/radeon: fix bad DMA from INTERRUPT_CNTL2
In reply to Sasha LevinFrom: Sam Bobroff <[email protected]>
[ Upstream commit 62d91dd2851e8ae2ca552f1b090a3575a4edf759 ]
The INTERRUPT_CNTL2 register expects a valid DMA address, but is currently set with a GPU MC address. This can cause problems on systems that detect the resulting DMA read from an invalid address (found on a Power8 guest).
Instead, use the DMA address of the dummy page because it will always be safe.
--- drivers/gpu/drm/radeon/cik.c | 4 ++-- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cik.c +2 -2
@@ -6965,8 +6965,8 @@ static int cik_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* XXX this should actually be a bus address, not an MC address. same on older asics */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -3690,8 +3690,8 @@ int r600_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/si.c +2 -2
@@ -5993,8 +5993,8 @@ static int si_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 660/671 arm64: dts: juno: Fix UART frequency
In reply to Sasha LevinFrom: Andre Przywara <[email protected]>
[ Upstream commit 39a1a8941b27c37f79508426e27a2ec29829d66c ]
Older versions of the Juno *SoC* TRM [1] recommended that the UART clock source should be 7.2738 MHz, whereas the *system* TRM [2] stated a more correct value of 7.3728 MHz. Somehow the wrong value managed to end up in our DT.
Doing a prime factorisation, a modulo divide by 115200 and trying to buy a 7.2738 MHz crystal at your favourite electronics dealer suggest that the old value was actually a typo. The actual UART clock is driven by a PLL, configured via a parameter in some board.txt file in the firmware, which reads 7.37 MHz (sic!).
Fix this to correct the baud rate divisor calculation on the Juno board.
[1] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0515b.b/DDI0515B_b_juno_arm_development_platform_soc_trm.pdf
[2] http://infocenter.arm.com/help/topic/com.arm.doc.100113_0000_07_en/arm_versatile_express_juno_development_platform_(v2m_juno)_technical_reference_manual_100113_0000_07_en.pdf
--- arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/arm/juno-clocks.dtsi +2 -2
@@ -8,10 +8,10 @@ */ / { /* SoC fixed clocks */ - soc_uartclk: refclk7273800hz { + soc_uartclk: refclk7372800hz { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <7273800>; + clock-frequency = <7372800>; clock-output-names = "juno:uartclk"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 661/671 scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan
In reply to Sasha LevinFrom: Martin Wilck <[email protected]>
[ Upstream commit d341e9a8f2cffe4000c610225c629f62c7489c74 ]
In qla2x00_find_all_fabric_devs(), fcport->flags & FCF_LOGIN_NEEDED is a necessary condition for logging into new rports, but not for dropping lost ones.
--- drivers/scsi/qla2xxx/qla_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +3 -3
@@ -5710,8 +5710,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)if (test_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags))break ; -if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 || - (fcport->flags &FCF_LOGIN_NEEDED ) ==0 ) +if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 )continue ;if (fcport->scan_state ==QLA_FCPORT_SCAN ) {
@@ -5734,7 +5733,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha) } } -if (fcport->scan_state ==QLA_FCPORT_FOUND ) +if (fcport->scan_state ==QLA_FCPORT_FOUND && + (fcport->flags &FCF_LOGIN_NEEDED ) !=0 )qla24xx_fcport_handle_login (vha, fcport); }return (rval);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 662/671 scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI
In reply to Sasha LevinFrom: Huacai Chen <[email protected]>
[ Upstream commit 45dc8f2d9c94ed74a5e31e63e9136a19a7e16081 ]
Commit 4fa183455988 ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/ pci_free_irq_vectors calls.") use pci_alloc_irq_vectors() to replace pci_enable_msi() but it didn't handle the return value correctly. This bug make qla2x00 always fail to setup MSI if MSI-X fail, so fix it.
BTW, improve the log message of return value in qla2x00_request_irqs() to avoid confusion.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +3 -3
@@ -3573,7 +3573,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) skip_msix:ql_log (ql_log_info, vha,0x0037 , -"Falling back-to MSI mode -%d.\n" , ret); +"Falling back-to MSI mode -- ret=%d.\n" , ret); if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) && !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
@@ -3581,13 +3581,13 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) goto skip_msi; ret =pci_alloc_irq_vectors (ha->pdev,1 ,1 ,PCI_IRQ_MSI ); -if (!ret) { +if (ret >0 ) {ql_dbg (ql_dbg_init, vha,0x0038 ,"MSI: Enabled.\n" ); ha->flags.msi_enabled =1 ; }else ql_log (ql_log_warn, vha,0x0039 , -"Falling back-to INTa mode -- %d.\n" , ret); +"Falling back-to INTa mode -- ret=%d.\n" , ret); skip_msi:/* Skip INTx on ISP82xx. */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 663/671 Revert "arm64: dts: juno: add dma-ranges property"
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit 54fb3fe0f211d4729a2551cf9497bd612189af9d ]
This reverts commit 193d00a2b35ee3353813b4006a18131122087205.
Commit 951d48855d86 ("of: Make of_dma_get_range() work on bus nodes") reworked the logic such that of_dma_get_range() works correctly starting from a bus node containing "dma-ranges".
Since on Juno we don't have a SoC level bus node and "dma-ranges" is present only in the root node, we get the following error:
OF: translation of DMA address(0) to CPU address failed node(/sram@2e000000)
OF: translation of DMA address(0) to CPU address failed node(/uart@7ff80000)
...
OF: translation of DMA address(0) to CPU address failed node(/mhu@2b1f0000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
So let's fix it by dropping the "dma-ranges" property for now. This should be fine since it doesn't represent any kind of device-visible restriction; it was only there for completeness, and we've since given in to the assumption that missing "dma-ranges" implies a 1:1 mapping anyway.
We can add it later with a proper SoC bus node and moving all the devices that belong there along with the "dma-ranges" if required.
--- arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/arm/juno-base.dtsi +0 -1
@@ -6,7 +6,6 @@ /* * Devices shared by all Juno boards */ - dma-ranges = <0 0 0 0 0x100 0>; memtimer: timer@2a810000 { compatible = "arm,armv7-timer-mem";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 664/671 tipc: fix wrong timeout input for tipc_wait_for_cond()
In reply to Sasha LevinFrom: Tung Nguyen <[email protected]>
[ Upstream commit 12db3c8083fcab4270866a88191933f2d9f24f89 ]
In function __tipc_shutdown(), the timeout value passed to tipc_wait_for_cond() is not jiffies.
This commit fixes it by converting that value from milliseconds to jiffies.
--- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/socket.c +1 -1
@@ -501,7 +501,7 @@ static void __tipc_shutdown(struct socket *sock, int error)struct sock *sk = sock->sk;struct tipc_sock *tsk =tipc_sk (sk);struct net *net =sock_net (sk); -long timeout =CONN_TIMEOUT_DEFAULT ; +long timeout =msecs_to_jiffies (CONN_TIMEOUT_DEFAULT );u32 dnode =tsk_peer_node (tsk);struct sk_buff *skb;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 665/671 powerpc/archrandom: fix arch_get_random_seed_int()
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit b6afd1234cf93aa0d71b4be4788c47534905f0be ]
Commit 01c9348c7620ec65
powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*
updated arch_get_random_[int|long]() to be NOPs, and moved the hardware RNG backing to arch_get_random_seed_[int|long]() instead. However, it failed to take into account that arch_get_random_int() was implemented in terms of arch_get_random_long(), and so we ended up with a version of the former that is essentially a NOP as well.
Fix this by calling arch_get_random_seed_long() from arch_get_random_seed_int() instead.
--- arch/powerpc/include/asm/archrandom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/archrandom.h +1 -1
@@ -28,7 +28,7 @@ static inline int arch_get_random_seed_int(unsigned int *v)unsigned long val;int rc; - rc =arch_get_random_long (&val); + rc =arch_get_random_seed_long (&val);if (rc) *v = val;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 666/671 samples/bpf: Fix broken xdp_rxq_info due to map order assumptions
In reply to Sasha LevinFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit edbca120a8cdfa5a5793707e33497aa5185875ca ]
In the days of using bpf_load.c the order in which the 'maps' sections were defines in BPF side (*_kern.c) file, were used by userspace side to identify the map via using the map order as an index. In effect the order-index is created based on the order the maps sections are stored in the ELF-object file, by the LLVM compiler.
This have also carried over in libbpf via API bpf_map__next(NULL, obj) to extract maps in the order libbpf parsed the ELF-object file.
When BTF based maps were introduced a new section type ".maps" were created. I found that the LLVM compiler doesn't create the ".maps" sections in the order they are defined in the C-file. The order in the ELF file is based on the order the map pointer is referenced in the code.
This combination of changes lead to xdp_rxq_info mixing up the map file-descriptors in userspace, resulting in very broken behaviour, but without warning the user.
This patch fix issue by instead using bpf_object__find_map_by_name() to find maps via their names. (Note, this is the ELF name, which can be longer than the name the kernel retains).
--- samples/bpf/xdp_rxq_info_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
samples/bpf/xdp_rxq_info_user.c +3 -3
@@ -472,9 +472,9 @@ int main(int argc, char **argv)if (bpf_prog_load_xattr (&prog_load_attr, &obj, &prog_fd))return EXIT_FAIL ; - map =bpf_map__next (NULL , obj); - stats_global_map =bpf_map__next (map, obj); - rx_queue_index_map =bpf_map__next (stats_global_map, obj); + map =bpf_object__find_map_by_name (obj,"config_map" ); + stats_global_map =bpf_object__find_map_by_name (obj,"stats_global_map" ); + rx_queue_index_map =bpf_object__find_map_by_name (obj,"rx_queue_index_map" );if (!map || !stats_global_map || !rx_queue_index_map) {printf ("finding a map in obj file failed\n" );return EXIT_FAIL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 667/671 soc: aspeed: Fix snoop_file_poll()'s return type
In reply to Sasha LevinFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit a4e55ccd4392e70f296d12e81b93c6ca96ee21d5 ]
snoop_file_poll() is defined as returning 'unsigned int' but the .poll method is declared as returning '__poll_t', a bitwise type.
Fix this by using the proper return type and using the EPOLL constants instead of the POLL ones, as required for __poll_t.
--- drivers/misc/aspeed-lpc-snoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/aspeed-lpc-snoop.c +2 -2
@@ -101,13 +101,13 @@ static ssize_t snoop_file_read(struct file *file, char __user *buffer,return ret ? ret : copied; } -static unsigned int snoop_file_poll (struct file *file, +static __poll_t snoop_file_poll (struct file *file,struct poll_table_struct *pt) {struct aspeed_lpc_snoop_channel *chan =snoop_file_to_chan (file);poll_wait (file, &chan->wq, pt); -return !kfifo_is_empty (&chan->fifo) ?POLLIN :0 ; +return !kfifo_is_empty (&chan->fifo) ?EPOLLIN :0 ; }static const struct file_operations snoop_fops = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 668/671 usb: dwc3: Allow building USB_DWC3_QCOM without EXTCON
In reply to Sasha LevinFrom: Marc Gonzalez <[email protected]>
[ Upstream commit 77a4946516fe488b6a33390de6d749f934a243ba ]
Keep EXTCON support optional, as some platforms do not need it.
Do the same for USB_DWC3_OMAP while we're at it.
--- drivers/usb/dwc3/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/dwc3/Kconfig +4 -2
@@ -52,7 +52,8 @@ comment "Platform Glue Driver Support" config USB_DWC3_OMAP tristate "Texas Instruments OMAP5 and similar Platforms" - depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST) + depends on ARCH_OMAP2PLUS || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
@@ -113,7 +114,8 @@ config USB_DWC3_ST config USB_DWC3_QCOM tristate "Qualcomm Platform" - depends on EXTCON && (ARCH_QCOM || COMPILE_TEST) + depends on ARCH_QCOM || COMPILE_TEST + depends on EXTCON || !EXTCON depends on OF default USB_DWC3 help
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 669/671 IB/iser: Fix dma_nents type definition
In reply to Sasha LevinFrom: Max Gurtovoy <[email protected]>
[ Upstream commit c1545f1a200f4adc4ef8dd534bf33e2f1aa22c2f ]
The retured value from ib_dma_map_sg saved in dma_nents variable. To avoid future mismatch between types, define dma_nents as an integer instead of unsigned.
--- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/ulp/iser/iscsi_iser.h +1 -1
@@ -197,7 +197,7 @@ struct iser_data_buf {struct scatterlist *sg;int size;unsigned long data_len; -unsigned int dma_nents; +int dma_nents; };/* fwd declarations */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 670/671 serial: stm32: fix clearing interrupt error flags
In reply to Sasha LevinFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 1250ed7114a977cdc2a67a0c09d6cdda63970eb9 ]
The interrupt clear flag register is a "write 1 to clear" register. So, only writing ones allows to clear flags:
- Replace buggy stm32_clr_bits() by a simple write to clear error flags
- Replace useless read/modify/write stm32_set_bits() routine by a simple write to clear TC (transfer complete) flag.
--- drivers/tty/serial/stm32-usart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -3
@@ -239,8 +239,8 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded)* cleared by the sequence [read SR - read DR]. */ if ((sr &USART_SR_ERR_MASK ) && ofs->icr !=UNDEF_REG ) -stm32_clr_bits (port, ofs->icr,USART_ICR_ORECF | -USART_ICR_PECF |USART_ICR_FECF ); +writel_relaxed (sr &USART_SR_ERR_MASK , + port->membase + ofs->icr); c =stm32_get_char (port, &sr, &stm32_port->last_res); port->icount.rx++;
@@ -409,7 +409,7 @@ static void stm32_transmit_chars(struct uart_port *port)if (ofs->icr ==UNDEF_REG )stm32_clr_bits (port, ofs->isr,USART_SR_TC );else -stm32_set_bits (port, ofs->icr,USART_ICR_TCCF ); +writel_relaxed (USART_ICR_TCCF , port->membase + ofs->icr);if (stm32_port->tx_ch)stm32_transmit_chars_dma (port);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 671/671 arm64: dts: meson-gxm-khadas-vim2: fix uart_A bluetooth node
In reply to Sasha LevinFrom: Christian Hewitt <[email protected]>
[ Upstream commit 388a2772979b625042524d8b91280616ab4ff5ee ]
--- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +3 -0
@@ -413,6 +413,9 @@ bluetooth { compatible = "brcm,bcm43438-bt"; shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; + max-speed = <2000000>; + clocks = <&wifi32k>; + clock-names = "lpo"; }; };
Signature · 1 line
2.20.1