4.14.168-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 189/343 net: ena: fix: Free napi resources when ena_up() fails
In reply to Greg Kroah-HartmanFrom: Sameeh Jubran <[email protected]>
[ Upstream commit b287cdbd1cedfc9606682c6e02b58d00ff3a33ae ]
ena_up() calls ena_init_napi() but does not call ena_del_napi() in case of failure. This causes a segmentation fault upon rmmod when netif_napi_del() is called. Fix this bug by calling ena_del_napi() before returning error from ena_up().
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -0
@@ -1796,6 +1796,7 @@ err_setup_rx: err_setup_tx:ena_free_io_irq (adapter); err_req_irq: +ena_del_napi (adapter);return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/343 net: ena: fix incorrect test of supported hash function
In reply to Greg Kroah-HartmanFrom: Sameeh Jubran <[email protected]>
[ Upstream commit d3cfe7ddbc3dfbb9b201615b7fef8fd66d1b5fe8 ]
ena_com_set_hash_function() tests if a hash function is supported by the device before setting it.
The test returns the opposite result than needed. Reverse the condition to return the correct value.
Also use the BIT macro instead of inline shift.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -1
@@ -2002,7 +2002,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)if (unlikely (ret))return ret; -if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { +if (!(get_resp.u.flow_hash_func.supported_func &BIT (rss->hash_func))) {pr_err ("Func hash %d isn't supported by device, abort\n" , rss->hash_func);return -EOPNOTSUPP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/343 net: ena: fix ena_com_fill_hash_function() implementation
In reply to Greg Kroah-HartmanFrom: Sameeh Jubran <[email protected]>
[ Upstream commit 11bd7a00c0d8ffe33d1e926f8e789b4aea787186 ]
ena_com_fill_hash_function() didn't configure the rss->hash_func.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -0
@@ -2087,6 +2087,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,return -EINVAL ; } + rss->hash_func = func; rc =ena_com_set_hash_function (ena_dev);/* Restore the old function */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/343 dmaengine: tegra210-adma: restore channel status
In reply to Greg Kroah-HartmanFrom: Sameer Pujar <[email protected]>
[ Upstream commit f33e7bb3eb922618612a90f0a828c790e8880773 ]
Status of ADMA channel registers is not saved and restored during system suspend. During active playback if system enters suspend, this results in wrong state of channel registers during system resume and playback fails to resume properly. Fix this by saving following channel registers in runtime suspend and restore during runtime resume.
* ADMA_CH_LOWER_SRC_ADDR
* ADMA_CH_LOWER_TRG_ADDR
* ADMA_CH_FIFO_CTRL
* ADMA_CH_CONFIG
* ADMA_CH_CTRL
* ADMA_CH_CMD
* ADMA_CH_TC
Runtime PM calls will be inovked during system resume path if a playback or capture needs to be resumed. Hence above changes work fine for system suspend case.
--- drivers/dma/tegra210-adma.c | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)
drivers/dma/tegra210-adma.c +45 -1
@@ -98,6 +98,7 @@ struct tegra_adma_chan_regs {unsigned int src_addr;unsigned int trg_addr;unsigned int fifo_ctrl; +unsigned int cmd;unsigned int tc; };
@@ -127,6 +128,7 @@ struct tegra_adma_chan {enum dma_transfer_direction sreq_dir;unsigned int sreq_index;bool sreq_reserved; +struct tegra_adma_chan_regs ch_regs;/* Transfer count and position info */ unsigned int tx_buf_count;
@@ -635,8 +637,30 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,static int tegra_adma_runtime_suspend (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int i; tdma->global_cmd =tdma_read (tdma,ADMA_GLOBAL_CMD ); +if (!tdma->global_cmd) + goto clk_disable; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; + ch_reg->cmd =tdma_ch_read (tdc,ADMA_CH_CMD ); +/* skip if channel is not active */ +if (!ch_reg->cmd) +continue ; + ch_reg->tc =tdma_ch_read (tdc,ADMA_CH_TC ); + ch_reg->src_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_SRC_ADDR ); + ch_reg->trg_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_TRG_ADDR ); + ch_reg->ctrl =tdma_ch_read (tdc,ADMA_CH_CTRL ); + ch_reg->fifo_ctrl =tdma_ch_read (tdc,ADMA_CH_FIFO_CTRL ); + ch_reg->config =tdma_ch_read (tdc,ADMA_CH_CONFIG ); + } + +clk_disable:clk_disable_unprepare (tdma->ahub_clk);return 0 ;
@@ -645,7 +669,9 @@ static int tegra_adma_runtime_suspend(struct device *dev)static int tegra_adma_runtime_resume (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); -int ret; +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int ret, i; ret =clk_prepare_enable (tdma->ahub_clk);if (ret) {
@@ -654,6 +680,24 @@ static int tegra_adma_runtime_resume(struct device *dev) }tdma_write (tdma,ADMA_GLOBAL_CMD , tdma->global_cmd); +if (!tdma->global_cmd) +return 0 ; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; +/* skip if channel was not active earlier */ +if (!ch_reg->cmd) +continue ; +tdma_ch_write (tdc,ADMA_CH_TC , ch_reg->tc); +tdma_ch_write (tdc,ADMA_CH_LOWER_SRC_ADDR , ch_reg->src_addr); +tdma_ch_write (tdc,ADMA_CH_LOWER_TRG_ADDR , ch_reg->trg_addr); +tdma_ch_write (tdc,ADMA_CH_CTRL , ch_reg->ctrl); +tdma_ch_write (tdc,ADMA_CH_FIFO_CTRL , ch_reg->fifo_ctrl); +tdma_ch_write (tdc,ADMA_CH_CONFIG , ch_reg->config); +tdma_ch_write (tdc,ADMA_CH_CMD , ch_reg->cmd); + } +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/343 mmc: core: fix possible use after free of host
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 8e1943af2986db42bee2b8dddf49a36cdb2e9219 ]
In the function mmc_alloc_host, the function put_device is called to release allocated resources when mmc_gpio_alloc fails. Finally, the function pointed by host->class_dev.class->dev_release (i.e., mmc_host_classdev_release) is used to release resources including the host structure. However, after put_device, host is used and released again. Resulting in a use-after-free bug.
--- drivers/mmc/core/host.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mmc/core/host.c +0 -2
@@ -376,8 +376,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)if (mmc_gpio_alloc (host)) {put_device (&host->class_dev); -ida_simple_remove (&mmc_host_ida, host->index); -kfree (host);return NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/343 lightnvm: pblk: fix lock order in pblk_rb_tear_down_check
In reply to Greg Kroah-HartmanFrom: Igor Konopko <[email protected]>
[ Upstream commit 486b5aac85f6ec0b2df3e82a6a629d5eb7804db5 ]
In pblk_rb_tear_down_check() the spinlock functions are not called in proper order.
--- drivers/lightnvm/pblk-rb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/lightnvm/pblk-rb.c +1 -1
@@ -825,8 +825,8 @@ int pblk_rb_tear_down_check(struct pblk_rb *rb) } out: -spin_unlock (&rb->w_lock);spin_unlock_irq (&rb->s_lock); +spin_unlock (&rb->w_lock);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/343 afs: Fix the afs.cell and afs.volume xattr handlers
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit c73aa4102f5b9f261a907c3b3df94cd2c478504d ]
Fix the ->get handlers for the afs.cell and afs.volume xattrs to pass the source data size to memcpy() rather than target buffer size.
Overcopying the source data occasionally causes the kernel to oops.
--- fs/afs/xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/afs/xattr.c +2 -2
@@ -50,7 +50,7 @@ static int afs_xattr_get_cell(const struct xattr_handler *handler,return namelen;if (namelen > size)return -ERANGE ; -memcpy (buffer, cell->name, size); +memcpy (buffer, cell->name, namelen);return namelen; }
@@ -104,7 +104,7 @@ static int afs_xattr_get_volume(const struct xattr_handler *handler,return namelen;if (namelen > size)return -ERANGE ; -memcpy (buffer, volname, size); +memcpy (buffer, volname, namelen);return namelen; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/343 vfio/mdev: Avoid release parent reference during error path
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 60e7f2c3fe9919cee9534b422865eed49f4efb15 ]
During mdev parent registration in mdev_register_device(), if parent device is duplicate, it releases the reference of existing parent device.
This is incorrect. Existing parent device should not be touched.
--- drivers/vfio/mdev/mdev_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/vfio/mdev/mdev_core.c +1 -0
@@ -182,6 +182,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)/* Check for duplicate */ parent =__find_parent_device (dev);if (parent) { + parent =NULL ; ret = -EEXIST ; goto add_dev_err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/343 vfio/mdev: Fix aborting mdev child device removal if one fails
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 6093e348a5e2475c5bb2e571346460f939998670 ]
device_for_each_child() stops executing callback function for remaining child devices, if callback hits an error.
Each child mdev device is independent of each other.
While unregistering parent device, mdev core must remove all child mdev devices.
Therefore, mdev_device_remove_cb() always returns success so that device_for_each_child doesn't abort if one child removal hits error.
While at it, improve remove and unregister functions for below simplicity.
There isn't need to pass forced flag pointer during mdev parent removal which invokes mdev_device_remove(). So simplify the flow.
mdev_device_remove() is called from two paths.
1. mdev_unregister_driver()
mdev_device_remove_cb()
mdev_device_remove()
2. remove_store()
mdev_device_remove()
--- drivers/vfio/mdev/mdev_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/vfio/mdev/mdev_core.c +4 -6
@@ -150,10 +150,10 @@ static int mdev_device_remove_ops(struct mdev_device *mdev, bool force_remove)static int mdev_device_remove_cb (struct device *dev,void *data) { -if (!dev_is_mdev (dev)) -return 0 ; +if (dev_is_mdev (dev)) +mdev_device_remove (dev, true); -return mdev_device_remove (dev, data ? *(bool *)data : true); +return 0 ; }/*
@@ -241,7 +241,6 @@ EXPORT_SYMBOL(mdev_register_device);void mdev_unregister_device (struct device *dev) {struct mdev_parent *parent; -bool force_remove = true;mutex_lock (&parent_list_lock); parent =__find_parent_device (dev);
@@ -255,8 +254,7 @@ void mdev_unregister_device(struct device *dev)list_del (&parent->next);class_compat_remove_link (mdev_bus_compat_class, dev,NULL ); -device_for_each_child (dev, (void *)&force_remove, - mdev_device_remove_cb); +device_for_each_child (dev,NULL , mdev_device_remove_cb);parent_remove_sysfs_files (parent);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/343 l2tp: Fix possible NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 638a3a1e349ddf5b82f222ff5cb3b4f266e7c278 ]
BUG: unable to handle kernel NULL pointer dereference at 0000000000000128 PGD 0 P4D 0 Oops: 0000 [#1 CPU: 0 PID: 5697 Comm: modprobe Tainted: G W 5.1.0-rc7+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:__lock_acquire+0x53/0x10b0 Code: 8b 1c 25 40 5e 01 00 4c 8b 6d 10 45 85 e4 0f 84 bd 06 00 00 44 8b 1d 7c d2 09 02 49 89 fe 41 89 d2 45 85 db 0f 84 47 02 00 00 <48> 81 3f a0 05 70 83 b8 00 00 00 00 44 0f 44 c0 83 fe 01 0f 86 3a RSP: 0018:ffffc90001c07a28 EFLAGS: 00010002 RAX: 0000000000000000 RBX: ffff88822f038440 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000128 RBP: ffffc90001c07a88 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000001 R13: 0000000000000000 R14: 0000000000000128 R15: 0000000000000000 FS: 00007fead0811540(0000) GS:ffff888237a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000128 CR3: 00000002310da000 CR4: 00000000000006f0 Call Trace: ? __lock_acquire+0x24e/0x10b0 lock_acquire+0xdf/0x230 ? flush_workqueue+0x71/0x530 flush_workqueue+0x97/0x530 ? flush_workqueue+0x71/0x530 l2tp_exit_net+0x170/0x2b0 [l2tp_core ? l2tp_exit_net+0x93/0x2b0 [l2tp_core ops_exit_list.isra.6+0x36/0x60 unregister_pernet_operations+0xb8/0x110 unregister_pernet_device+0x25/0x40 l2tp_init+0x55/0x1000 [l2tp_core ? 0xffffffffa018d000 do_one_initcall+0x6c/0x3cc ? do_init_module+0x22/0x1f1 ? rcu_read_lock_sched_held+0x97/0xb0 ? kmem_cache_alloc_trace+0x325/0x3b0 do_init_module+0x5b/0x1f1 load_module+0x1db1/0x2690 ? m_show+0x1d0/0x1d0 __do_sys_finit_module+0xc5/0xd0 __x64_sys_finit_module+0x15/0x20 do_syscall_64+0x6b/0x1d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7fead031a839 Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 1f f6 2c 00 f7 d8 64 89 01 48 RSP: 002b:00007ffe8d9acca8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 0000560078398b80 RCX: 00007fead031a839 RDX: 0000000000000000 RSI: 000056007659dc2e RDI: 0000000000000003 RBP: 000056007659dc2e R08: 0000000000000000 R09: 0000560078398b80 R10: 0000000000000003 R11: 0000000000000246 R12: 0000000000000000 R13: 00005600783a04a0 R14: 0000000000040000 R15: 0000560078398b80 Modules linked in: l2tp_core(+) e1000 ip_tables ipv6 [last unloaded: l2tp_core CR2: 0000000000000128 ---[ end trace 8322b2b8bf83f8e1
If alloc_workqueue fails in l2tp_init, l2tp_net_ops is unregistered on failure path. Then l2tp_exit_net is called which will flush NULL workqueue, this patch add a NULL check to fix it.
--- net/l2tp/l2tp_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/l2tp/l2tp_core.c +2 -1
@@ -1892,7 +1892,8 @@ static __net_exit void l2tp_exit_net(struct net *net) }rcu_read_unlock_bh (); -flush_workqueue (l2tp_wq); +if (l2tp_wq) +flush_workqueue (l2tp_wq);rcu_barrier (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/343 media: omap_vout: potential buffer overflow in vidioc_dqbuf()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit dd6e2a981bfe83aa4a493143fd8cf1edcda6c091 ]
The "b->index" is a u32 the comes from the user in the ioctl. It hasn't been checked. We aren't supposed to use it but we're instead supposed to use the value that gets written to it when we call videobuf_dqbuf().
The videobuf_dqbuf() first memsets it to zero and then re-initializes it inside the videobuf_status() function. It's this final value which we want.
Hans Verkuil pointed out that we need to check the return from videobuf_dqbuf(). I ended up doing a little cleanup related to that as well.
--- drivers/media/platform/omap/omap_vout.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/media/platform/omap/omap_vout.c +6 -9
@@ -1527,23 +1527,20 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)unsigned long size;struct videobuf_buffer *vb; - vb = q->bufs[b->index]; -if (!vout->streaming)return -EINVAL ; -if (file->f_flags &O_NONBLOCK ) -/* Call videobuf_dqbuf for non blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,1 ); -else -/* Call videobuf_dqbuf for blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,0 ); + ret =videobuf_dqbuf (q, b, !!(file->f_flags &O_NONBLOCK )); +if (ret) +return ret; + + vb = q->bufs[b->index]; addr = (unsigned long ) vout->buf_phy_addr[vb->i]; size = (unsigned long ) vb->size;dma_unmap_single (vout->vid_dev->v4l2_dev.dev, addr, size,DMA_TO_DEVICE ); -return ret; +return 0 ; }static int vidioc_streamon (struct file *file,void *fh,enum v4l2_buf_type i)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/343 media: davinci/vpbe: array underflow in vpbe_enum_outputs()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b72845ee5577b227131b1fef23f9d9a296621d7b ]
In vpbe_enum_outputs() we check if (temp_index >= cfg->num_outputs) but the problem is that "temp_index" can be negative. This patch changes the types to unsigned to address this array underflow bug.
--- drivers/media/platform/davinci/vpbe.c | 2 +- include/media/davinci/vpbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +1 -1
@@ -126,7 +126,7 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev, struct v4l2_output *output) {struct vpbe_config *cfg = vpbe_dev->cfg; -int temp_index = output->index; +unsigned int temp_index = output->index;if (temp_index >= cfg->num_outputs)return -EINVAL ;
include/media/davinci/vpbe.h +1 -1
@@ -92,7 +92,7 @@ struct vpbe_config {struct encoder_config_info *ext_encoders;/* amplifier information goes here */ struct amp_config_info *amp; -int num_outputs; +unsigned int num_outputs;/* Order is venc outputs followed by LCD and then external encoders */ struct vpbe_output *outputs; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/343 platform/x86: alienware-wmi: printing the wrong error code
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6d1f8b3d75419a8659ac916a1e9543bb3513a882 ]
The "out_data" variable is uninitialized at the point. Originally, this used to print "status" instead and that seems like the correct thing to print.
--- drivers/platform/x86/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/alienware-wmi.c +1 -1
@@ -570,7 +570,7 @@ static ssize_t show_hdmi_source(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"input [gpu] unknown\n" ); } -pr_err ("alienware-wmi: unknown HDMI source status: %d\n" , out_data); +pr_err ("alienware-wmi: unknown HDMI source status: %u\n" , status);return scnprintf (buf,PAGE_SIZE ,"input gpu [unknown]\n" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/343 crypto: caam - fix caam_dump_sg that iterates through scatterlist
In reply to Greg Kroah-HartmanFrom: Iuliana Prodan <[email protected]>
[ Upstream commit 8c65d35435e8cbfdf953cafe5ebe3648ee9276a2 ]
Fix caam_dump_sg by correctly determining the next scatterlist entry in the list.
--- drivers/crypto/caam/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/caam/error.c +1 -1
@@ -22,7 +22,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,size_t len;void *buf; -for (it = sg; it && tlen >0 ; it =sg_next (sg)) { +for (it = sg; it && tlen >0 ; it =sg_next (it)) {/* * make sure the scatterlist's page * has a valid virtual memory mapping
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/343 netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 680f6af5337c98d116e4f127cea7845339dba8da ]
If userspace provides a rule blob with trailing data after last target, we trigger a splat, then convert ruleset to 64bit format (with trailing data), then pass that to do_replace_finish() which then returns -EINVAL.
Erroring out right away avoids the splat plus unneeded translation and error unwind.
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -2164,7 +2164,9 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user,if (ret <0 )return ret; -WARN_ON (size_remaining); +if (size_remaining) +return -EINVAL ; +return state->buf_kern_offset; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/343 pwm: meson: Consider 128 a valid pre-divider
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 51496e4446875726d50a5617a6e0e0dabbc2e6da ]
The pre-divider allows configuring longer PWM periods compared to using the input clock directly. The pre-divider is 7 bit wide, meaning it's maximum value is 128 (the register value is off-by-one: 0x7f or 127).
Change the loop to also allow for the maximum possible value to be considered valid.
--- drivers/pwm/pwm-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-meson.c +2 -2
@@ -188,7 +188,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,do_div (fin_ps, fin_freq);/* Calc pre_div with the period */ -for (pre_div =0 ; pre_div <MISC_CLK_DIV_MASK ; pre_div++) { +for (pre_div =0 ; pre_div <=MISC_CLK_DIV_MASK ; pre_div++) { cnt =DIV_ROUND_CLOSEST_ULL ((u64 )period *1000 , fin_ps * (pre_div +1 )); dev_dbg(meson->chip.dev, "fin_ps=%llu pre_div=%u cnt=%u\n",
@@ -197,7 +197,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,break ; } -if (pre_div ==MISC_CLK_DIV_MASK ) { +if (pre_div >MISC_CLK_DIV_MASK ) {dev_err (meson->chip.dev,"unable to get period pre_div\n" );return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 205/343 pwm: meson: Dont disable PWM when setting duty repeatedly
In reply to Greg Kroah-HartmanFrom: Bichao Zheng <[email protected]>
[ Upstream commit a279345807e1e0ae79567a52cfdd9d30c9174a3c ]
There is an abnormally low about 20ms,when setting duty repeatedly. Because setting the duty will disable PWM and then enable. Delete this operation now.
--- drivers/pwm/pwm-meson.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/pwm/pwm-meson.c +0 -5
@@ -325,11 +325,6 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,if (state->period != channel->state.period || state->duty_cycle != channel->state.duty_cycle || state->polarity != channel->state.polarity) { -if (channel->state.enabled) { -meson_pwm_disable (meson, pwm->hwpwm); - channel->state.enabled = false; - } -if (state->polarity != channel->state.polarity) {if (state->polarity ==PWM_POLARITY_NORMAL ) meson->inverter_mask |=BIT (pwm->hwpwm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/343 ARM: riscpc: fix lack of keyboard interrupts after irq conversion
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ]
Fix lack of keyboard interrupts for RiscPC due to incorrect conversion.
--- arch/arm/mach-rpc/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rpc/irq.c +2 -1
@@ -118,7 +118,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;void __init rpc_init_irq (void ) { -unsigned int irq, clr, set =0 ; +unsigned int irq, clr, set;iomd_writeb (0 ,IOMD_IRQMASKA );iomd_writeb (0 ,IOMD_IRQMASKB );
@@ -130,6 +130,7 @@ void __init rpc_init_irq(void)for (irq =0 ; irq <NR_IRQS ; irq++) { clr =IRQ_NOREQUEST ; + set =0 ;if (irq <=6 || (irq >=9 && irq <=15 )) clr |=IRQ_NOPROBE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/343 kdb: do a sanity check on the cpu in kdb_per_cpu()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b586627e10f57ee3aa8f0cfab0d6f7dc4ae63760 ]
The "whichcpu" comes from argv[3]. The cpu_online() macro looks up the cpu in a bitmap of online cpus, but if the value is too high then it could read beyond the end of the bitmap and possibly Oops.
--- kernel/debug/kdb/kdb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_main.c +1 -1
@@ -2634,7 +2634,7 @@ static int kdb_per_cpu(int argc, const char **argv) diag =kdbgetularg (argv[3 ], &whichcpu);if (diag)return diag; -if (!cpu_online (whichcpu)) { +if (whichcpu >= nr_cpu_ids || !cpu_online (whichcpu)) {kdb_printf ("cpu %ld is not online\n" , whichcpu);return KDB_BADCPUNUM ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 208/343 backlight: lm3630a: Return 0 on success in update_status functions
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit d3f48ec0954c6aac736ab21c34a35d7554409112 ]
lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status() both return the brightness value if the brightness was successfully updated. Writing to these attributes via sysfs would cause a 'Bad address' error to be returned. These functions should return 0 on success, so let's change it to correct that error.
--- drivers/video/backlight/lm3630a_bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/lm3630a_bl.c +2 -2
@@ -201,7 +201,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access\n" );
@@ -278,7 +278,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access REG_CTRL\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/343 thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
In reply to Greg Kroah-HartmanFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bf45ac18b78038e43af3c1a273cae4ab5704d2ce ]
The CPU load values passed to the thermal_power_cpu_get_power tracepoint are zero for all CPUs, unless, unless the thermal_power_cpu_limit tracepoint is enabled too:
irq/41-rockchip-98 [000] .... 290.972410: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x0,0x0,0x0,0x0}} dynamic_power=4815
vs
irq/41-rockchip-96 [000] .... 95.773585: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x56,0x64,0x64,0x5e}} dynamic_power=4959
irq/41-rockchip-96 [000] .... 95.773596: thermal_power_cpu_limit:
cpus=0000000f freq=408000 cdev_state=10 power=416
There seems to be no good reason for omitting the CPU load information depending on another tracepoint. My guess is that the intention was to check whether thermal_power_cpu_get_power is (still) enabled, however 'load_cpu != NULL' already indicates that it was at least enabled when cpufreq_get_requested_power() was entered, there seems little gain from omitting the assignment if the tracepoint was just disabled, so just remove the check.
--- drivers/thermal/cpu_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/cpu_cooling.c +1 -1
@@ -514,7 +514,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, load =0 ; total_load += load; -if (trace_thermal_power_cpu_limit_enabled () && load_cpu) +if (load_cpu) load_cpu[i] = load; i++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/343 EDAC/mc: Fix edac_mc_find() in case no device is found
In reply to Greg Kroah-HartmanFrom: Robert Richter <[email protected]>
[ Upstream commit 29a0c843973bc385918158c6976e4dbe891df969 ]
The function should return NULL in case no device is found, but it always returns the last checked mc device from the list even if the index did not match. Fix that.
I did some analysis why this did not raise any issues for about 3 years and the reason is that edac_mc_find() is mostly used to search for existing devices. Thus, the bug is not triggered.
[ bp: Drop the if (mci->mc_idx > idx) test in favor of readability. ]
--- drivers/edac/edac_mc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/edac/edac_mc.c +4 -8
@@ -680,22 +680,18 @@ static int del_mc_from_global_list(struct mem_ctl_info *mci)struct mem_ctl_info *edac_mc_find (int idx) { -struct mem_ctl_info *mci =NULL ; +struct mem_ctl_info *mci;struct list_head *item;mutex_lock (&mem_ctls_mutex);list_for_each (item, &mc_devices) { mci = list_entry(item, struct mem_ctl_info, link); - -if (mci->mc_idx >= idx) { -if (mci->mc_idx == idx) { - goto unlock; - } -break ; - } +if (mci->mc_idx == idx) + goto unlock; } + mci =NULL ; unlock:mutex_unlock (&mem_ctls_mutex);return mci;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/343 ARM: dts: sun8i-h3: Fix wifi in Beelink X2 DT
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit ca0961011db57e39880df0b5708df8aa3339dc6f ]
mmc1 node where wifi module is connected doesn't have properly defined power supplies so wifi module is never powered up. Fix that by specifying additional power supplies.
Additionally, this STB may have either Realtek or Broadcom based wifi module. One based on Broadcom module also needs external clock to work properly. Fix that by adding clock property to wifi_pwrseq node.
--- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +4 -0
@@ -79,6 +79,8 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + clocks = <&rtc 1>; + clock-names = "ext_clock"; }; sound_spdif {
@@ -128,6 +130,8 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc3v3>; + mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; non-removable; status = "okay";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 212/343 dmaengine: tegra210-adma: Fix crash during probe
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
[ Upstream commit b53611fb1ce9b1786bd18205473e0c1d6bfa8934 ]
Commit f33e7bb3eb92 ("dmaengine: tegra210-adma: restore channel status") added support to save and restore the DMA channel registers when runtime suspending the ADMA. This change is causing the kernel to crash when probing the ADMA, if the device is probed deferred when looking up the channel interrupts. The crash occurs because not all of the channel base addresses have been setup at this point and in the clean-up path of the probe, pm_runtime_suspend() is called invoking its callback which expects all the channel base addresses to be initialised.
Although this could be fixed by simply checking for a NULL address, on further review of the driver it seems more appropriate that we only call pm_runtime_get_sync() after all the channel interrupts and base addresses have been configured. Therefore, fix this crash by moving the calls to pm_runtime_enable(), pm_runtime_get_sync() and tegra_adma_init() after the DMA channels have been initialised.
--- drivers/dma/tegra210-adma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/dma/tegra210-adma.c +13 -13
@@ -744,16 +744,6 @@ static int tegra_adma_probe(struct platform_device *pdev)return PTR_ERR (tdma->ahub_clk); } -pm_runtime_enable (&pdev->dev); - - ret =pm_runtime_get_sync (&pdev->dev); -if (ret <0 ) - goto rpm_disable; - - ret =tegra_adma_init (tdma); -if (ret) - goto rpm_put; -INIT_LIST_HEAD (&tdma->dma_dev.channels);for (i =0 ; i < tdma->nr_channels; i++) {struct tegra_adma_chan *tdc = &tdma->channels[i];
@@ -771,6 +761,16 @@ static int tegra_adma_probe(struct platform_device *pdev) tdc->tdma = tdma; } +pm_runtime_enable (&pdev->dev); + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) + goto rpm_disable; + + ret =tegra_adma_init (tdma); +if (ret) + goto rpm_put; +dma_cap_set (DMA_SLAVE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_PRIVATE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_CYCLIC , tdma->dma_dev.cap_mask);
@@ -812,13 +812,13 @@ static int tegra_adma_probe(struct platform_device *pdev) dma_remove:dma_async_device_unregister (&tdma->dma_dev); -irq_dispose: -while (--i >=0 ) -irq_dispose_mapping (tdma->channels[i].irq); rpm_put:pm_runtime_put_sync (&pdev->dev); rpm_disable:pm_runtime_disable (&pdev->dev); +irq_dispose: +while (--i >=0 ) +irq_dispose_mapping (tdma->channels[i].irq);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 213/343 arm64: dts: meson: libretech-cc: set eMMC as removable
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit 9f72e321d5506fe3e162a6308a4a295d7f10bb5d ]
The eMMC on this board is add-on module which is not mandatory. Removing 'non-removable' property should prevent some errors when booting a board w/o an eMMC module present.
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +0 -1
@@ -226,7 +226,6 @@ cap-mmc-highspeed; mmc-ddr-3_3v; max-frequency = <50000000>; - non-removable; disable-wp; mmc-pwrseq = <&emmc_pwrseq>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 214/343 RDMA/qedr: Fix incorrect device rate.
In reply to Greg Kroah-HartmanFrom: Sagiv Ozeri <[email protected]>
[ Upstream commit 69054666df0a9b4e8331319f98b6b9a88bc3fcc4 ]
Use the correct enum value introduced in commit 12113a35ada6 ("IB/core:
Add HDR speed enum") Prior to this change a 50Gbps port would show 40Gbps.
This patch also cleaned up the redundant redefiniton of ib speeds for qedr.
--- drivers/infiniband/hw/qedr/verbs.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +9 -16
@@ -178,54 +178,47 @@ int qedr_query_device(struct ib_device *ibdev,return 0 ; } -#define QEDR_SPEED_SDR (1) -#define QEDR_SPEED_DDR (2) -#define QEDR_SPEED_QDR (4) -#define QEDR_SPEED_FDR10 (8) -#define QEDR_SPEED_FDR (16) -#define QEDR_SPEED_EDR (32) -static inline void get_link_speed_and_width (int speed,u8 *ib_speed,u8 *ib_width) {switch (speed) {case 1000 : - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ;break ;case 10000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_1X ;break ;case 20000 : - *ib_speed =QEDR_SPEED_DDR ; + *ib_speed =IB_SPEED_DDR ; *ib_width =IB_WIDTH_4X ;break ;case 25000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_1X ;break ;case 40000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_4X ;break ;case 50000 : - *ib_speed =QEDR_SPEED_QDR ; - *ib_width =IB_WIDTH_4X ; + *ib_speed =IB_SPEED_HDR ; + *ib_width =IB_WIDTH_1X ;break ;case 100000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_4X ;break ;default :/* Unsupported */ - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 215/343 spi: spi-fsl-spi: call spi_finalize_current_message() at the end
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 44a042182cb1e9f7916e015c836967bf638b33c4 ]
spi_finalize_current_message() shall be called once all actions are finished, otherwise the last actions might step over a newly started transfer.
--- drivers/spi/spi-fsl-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-spi.c +1 -1
@@ -407,7 +407,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, } m->status = status; -spi_finalize_current_message (master);if (status || !cs_change) {ndelay (nsecs);
@@ -415,6 +414,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, }fsl_spi_setup_transfer (spi,NULL ); +spi_finalize_current_message (master);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 216/343 crypto: ccp - fix AES CFB error exposed by new test vectors
In reply to Greg Kroah-HartmanFrom: Hook, Gary <[email protected]>
[ Upstream commit c3b359d6567c0b8f413e924feb37cf025067d55a ]
Updated testmgr will exhibit this error message when loading the ccp-crypto module:
alg: skcipher: cfb-aes-ccp encryption failed with err -22 on test vector 3, cfg="in-place"
Update the CCP crypto driver to correctly treat CFB as a streaming mode cipher (instead of block mode). Update the configuration for CFB to specify the block size as a single byte;
--- drivers/crypto/ccp/ccp-crypto-aes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/ccp/ccp-crypto-aes.c +4 -4
@@ -1,7 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AMD Cryptographic Coprocessor (CCP) AES crypto API support * -* Copyright (C) 2013,2016 Advanced Micro Devices, Inc. +* Copyright (C) 2013-2019 Advanced Micro Devices, Inc. * * Author: Tom Lendacky <[email protected]> *
@@ -79,8 +80,7 @@ static int ccp_aes_crypt(struct ablkcipher_request *req, bool encrypt)return -EINVAL ;if (((ctx->u.aes.mode ==CCP_AES_MODE_ECB ) || - (ctx->u.aes.mode ==CCP_AES_MODE_CBC ) || - (ctx->u.aes.mode ==CCP_AES_MODE_CFB )) && + (ctx->u.aes.mode ==CCP_AES_MODE_CBC )) && (req->nbytes & (AES_BLOCK_SIZE -1 )))return -EINVAL ;
@@ -291,7 +291,7 @@ static struct ccp_aes_def aes_algs[] = { .version = CCP_VERSION(3, 0), .name = "cfb(aes)", .driver_name = "cfb-aes-ccp", - .blocksize = AES_BLOCK_SIZE, + .blocksize = 1, .ivsize = AES_BLOCK_SIZE, .alg_defaults = &ccp_aes_defaults, },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/343 crypto: ccp - Fix 3DES complaint from ccp-crypto module
In reply to Greg Kroah-HartmanFrom: Hook, Gary <[email protected]>
[ Upstream commit 89646fdda4cae203185444ac7988835f36a21ee1 ]
Crypto self-tests reveal an error:
alg: skcipher: cbc-des3-ccp encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
The offset value should not be recomputed when retrieving the context. Also, a code path exists which makes decisions based on older (version 3) hardware; a v3 device deosn't support 3DES so remove this check.
--- drivers/crypto/ccp/ccp-ops.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/crypto/ccp/ccp-ops.c +4 -11
@@ -1293,6 +1293,9 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)int ret;/* Error checks */ +if (cmd_q->ccp->vdata->version <CCP_VERSION (5 ,0 )) +return -EINVAL ; +if (!cmd_q->ccp->vdata->perform->des3)return -EINVAL ;
@@ -1375,8 +1378,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)* passthru option to convert from big endian to little endian. */ if (des3->mode !=CCP_DES3_MODE_ECB ) { -u32 load_mode; - op.sb_ctx = cmd_q->sb_ctx; ret = ccp_init_dm_workarea(&ctx, cmd_q,
@@ -1392,12 +1393,8 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)if (ret) goto e_ctx; -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - load_mode =CCP_PASSTHRU_BYTESWAP_NOOP ; -else - load_mode =CCP_PASSTHRU_BYTESWAP_256BIT ; ret =ccp_copy_to_sb (cmd_q, &ctx, op.jobid, op.sb_ctx, - load_mode); +CCP_PASSTHRU_BYTESWAP_256BIT );if (ret) { cmd->engine_error = cmd_q->cmd_error; goto e_ctx;
@@ -1459,10 +1456,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) }/* ...but we only need the last DES3_EDE_BLOCK_SIZE bytes */ -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - dm_offset =CCP_SB_BYTES - des3->iv_len; -else - dm_offset =0 ;ccp_get_dm_area (&ctx, dm_offset, des3->iv,0 ,DES3_EDE_BLOCK_SIZE ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 218/343 serial: stm32: fix rx error handling
In reply to Greg Kroah-HartmanFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 4f01d833fdcdd6f9b85d9e5d5d7568eb683626a7 ]
- Fixes parity and framing error bit by clearing parity and framing error flag. The current implementation doesn't clear the error bits when an error is detected.
- Fixes the incorrect name of framing error clearing flag in header file.
- Fixes misalignement between data frame and errors status. The status read for "n" frame was the status of "n+1" frame".
- Fixes break detection was not triggered by the expected register.
--- drivers/tty/serial/stm32-usart.c | 54 +++++++++++++++++++++----------- drivers/tty/serial/stm32-usart.h | 10 ++---- 2 files changed, 37 insertions(+), 27 deletions(-)
drivers/tty/serial/stm32-usart.c +35 -19
@@ -118,35 +118,51 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded)while (stm32_pending_rx (port, &sr, &stm32_port->last_res, threaded)) { sr |=USART_SR_DUMMY_RX ; - c =stm32_get_char (port, &sr, &stm32_port->last_res); flag =TTY_NORMAL ; - port->icount.rx++; +/* +* Status bits has to be cleared before reading the RDR: +* In FIFO mode, reading the RDR will pop the next data +* (if any) along with its status bits into the SR. +* Not doing so leads to misalignement between RDR and SR, +* and clear status bits of the next rx data. +* +* Clear errors flags for stm32f7 and stm32h7 compatible +* devices. On stm32f4 compatible devices, the error bit is +* 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 ); + + c =stm32_get_char (port, &sr, &stm32_port->last_res); + port->icount.rx++;if (sr &USART_SR_ERR_MASK ) { -if (sr &USART_SR_LBD ) { - port->icount.brk++; -if (uart_handle_break (port)) -continue ; - }else if (sr &USART_SR_ORE ) { -if (ofs->icr !=UNDEF_REG ) -writel_relaxed (USART_ICR_ORECF , - port->membase + - ofs->icr); +if (sr &USART_SR_ORE ) { port->icount.overrun++; }else if (sr &USART_SR_PE ) { port->icount.parity++; }else if (sr &USART_SR_FE ) { - port->icount.frame++; +/* Break detection if character is null */ +if (!c) { + port->icount.brk++; +if (uart_handle_break (port)) +continue ; + }else { + port->icount.frame++; + } } sr &= port->read_status_mask; -if (sr &USART_SR_LBD ) - flag =TTY_BREAK ; -else if (sr &USART_SR_PE ) +if (sr &USART_SR_PE ) { flag =TTY_PARITY ; -else if (sr &USART_SR_FE ) - flag =TTY_FRAME ; + }else if (sr &USART_SR_FE ) { +if (!c) + flag =TTY_BREAK ; +else + flag =TTY_FRAME ; + } }if (uart_handle_sysrq_char (port, c))
@@ -569,14 +585,14 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,if (termios->c_iflag &INPCK ) port->read_status_mask |=USART_SR_PE |USART_SR_FE ;if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) - port->read_status_mask |=USART_SR_LBD ; + port->read_status_mask |=USART_SR_FE ;/* Characters to ignore */ port->ignore_status_mask =0 ;if (termios->c_iflag &IGNPAR ) port->ignore_status_mask =USART_SR_PE |USART_SR_FE ;if (termios->c_iflag &IGNBRK ) { - port->ignore_status_mask |=USART_SR_LBD ; + port->ignore_status_mask |=USART_SR_FE ;/* * If we're ignoring parity and break indicators, * ignore overruns too (for real raw support).
drivers/tty/serial/stm32-usart.h +2 -8
@@ -108,7 +108,6 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_RXNE BIT(5)#define USART_SR_TC BIT(6)#define USART_SR_TXE BIT(7) -#define USART_SR_LBD BIT(8)#define USART_SR_CTSIF BIT(9)#define USART_SR_CTS BIT(10)/* F7 */ #define USART_SR_RTOF BIT(11)/* F7 */
@@ -120,8 +119,7 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_SBKF BIT(18)/* F7 */ #define USART_SR_WUF BIT(20)/* H7 */ #define USART_SR_TEACK BIT(21)/* F7 */ -#define USART_SR_ERR_MASK (USART_SR_LBD | USART_SR_ORE | \ - USART_SR_FE | USART_SR_PE) +#define USART_SR_ERR_MASK (USART_SR_ORE | USART_SR_FE | USART_SR_PE)/* Dummy bits */ #define USART_SR_DUMMY_RX BIT(16)
@@ -166,8 +164,6 @@ struct stm32_usart_info stm32h7_info = {/* USART_CR2 */ #define USART_CR2_ADD_MASK GENMASK(3, 0)/* F4 */ #define USART_CR2_ADDM7 BIT(4)/* F7 */ -#define USART_CR2_LBDL BIT(5) -#define USART_CR2_LBDIE BIT(6)#define USART_CR2_LBCL BIT(8)#define USART_CR2_CPHA BIT(9)#define USART_CR2_CPOL BIT(10)
@@ -224,12 +220,10 @@ struct stm32_usart_info stm32h7_info = {/* USART_ICR */ #define USART_ICR_PECF BIT(0)/* F7 */ -#define USART_ICR_FFECF BIT(1)/* F7 */ -#define USART_ICR_NCF BIT(2)/* F7 */ +#define USART_ICR_FECF BIT(1)/* F7 */ #define USART_ICR_ORECF BIT(3)/* F7 */ #define USART_ICR_IDLECF BIT(4)/* F7 */ #define USART_ICR_TCCF BIT(6)/* F7 */ -#define USART_ICR_LBDCF BIT(8)/* F7 */ #define USART_ICR_CTSCF BIT(9)/* F7 */ #define USART_ICR_RTOCF BIT(11)/* F7 */ #define USART_ICR_EOBCF BIT(12)/* F7 */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 219/343 serial: stm32: fix transmit_chars when tx is stopped
In reply to Greg Kroah-HartmanFrom: Erwan Le Ray <[email protected]>
[ Upstream commit b83b957c91f68e53f0dc596e129e8305761f2a32 ]
Disables the tx irq when the transmission is ended and updates stop_tx conditions for code cleanup.
--- drivers/tty/serial/stm32-usart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -8
@@ -310,13 +310,8 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } -if (uart_tx_stopped (port)) { -stm32_stop_tx (port); -return ; - } - -if (uart_circ_empty (xmit)) { -stm32_stop_tx (port); +if (uart_circ_empty (xmit) ||uart_tx_stopped (port)) { +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE );return ; }
@@ -329,7 +324,7 @@ static void stm32_transmit_chars(struct uart_port *port)uart_write_wakeup (port);if (uart_circ_empty (xmit)) -stm32_stop_tx (port); +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE ); }static irqreturn_t stm32_interrupt (int irq,void *ptr)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 220/343 serial: stm32: Add support of TC bit status check
In reply to Greg Kroah-HartmanFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 64c32eab660386f9904bb295a104c9c425e9f8b2 ]
Adds a check on the Transmission Complete bit status before closing the com port. Prevents the port closure before the end of the transmission. TC poll loop is moved from stm32_tx_dma_complete to stm32_shutdown routine, in order to check TC before shutdown in both dma and PIO tx modes.
TC clear is added in stm32_transmit_char routine, in order to be cleared before transmitting in both dma and PIO tx modes.
--- drivers/tty/serial/stm32-usart.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/tty/serial/stm32-usart.c +15 -17
@@ -180,21 +180,6 @@ static void stm32_tx_dma_complete(void *arg)struct uart_port *port = arg;struct stm32_port *stm32port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32port->info->ofs; -unsigned int isr; -int ret; - - ret =readl_relaxed_poll_timeout_atomic (port->membase + ofs->isr, - isr, - (isr &USART_SR_TC ), -10 ,100000 ); - -if (ret) -dev_err (port->dev,"terminal count not set\n" ); - -if (ofs->icr ==UNDEF_REG ) -stm32_clr_bits (port, ofs->isr,USART_SR_TC ); -else -stm32_set_bits (port, ofs->icr,USART_CR_TC );stm32_clr_bits (port, ofs->cr3,USART_CR3_DMAT ); stm32port->tx_dma_busy = false;
@@ -286,7 +271,6 @@ static void stm32_transmit_chars_dma(struct uart_port *port)/* Issue pending DMA TX requests */ dma_async_issue_pending (stm32port->tx_ch); -stm32_clr_bits (port, ofs->isr,USART_SR_TC );stm32_set_bits (port, ofs->cr3,USART_CR3_DMAT ); xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE -1 );
@@ -315,6 +299,11 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } +if (ofs->icr ==UNDEF_REG ) +stm32_clr_bits (port, ofs->isr,USART_SR_TC ); +else +stm32_set_bits (port, ofs->icr,USART_ICR_TCCF ); +if (stm32_port->tx_ch)stm32_transmit_chars_dma (port);else
@@ -491,12 +480,21 @@ static void stm32_shutdown(struct uart_port *port)struct stm32_port *stm32_port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;struct stm32_usart_config *cfg = &stm32_port->info->cfg; -u32 val; +u32 val, isr; +int ret; val =USART_CR1_TXEIE |USART_CR1_RXNEIE |USART_CR1_TE |USART_CR1_RE ; val |=BIT (cfg->uart_enable_bit);if (stm32_port->fifoen) val |=USART_CR1_FIFOEN ; + + ret =readl_relaxed_poll_timeout (port->membase + ofs->isr, + isr, (isr &USART_SR_TC ), +10 ,100000 ); + +if (ret) +dev_err (port->dev,"transmission complete not set\n" ); +stm32_clr_bits (port, ofs->cr1, val);dev_pm_clear_wake_irq (port->dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 221/343 serial: stm32: fix wakeup source initialization
In reply to Greg Kroah-HartmanFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 5297f274e8b61ceb9676cba6649d3de9d03387ad ]
Fixes dedicated_irq_wakeup issue and deactivated uart as wakeup source by default.
--- drivers/tty/serial/stm32-usart.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/tty/serial/stm32-usart.c +15 -13
@@ -447,7 +447,6 @@ static int stm32_startup(struct uart_port *port) {struct stm32_port *stm32_port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; -struct stm32_usart_config *cfg = &stm32_port->info->cfg;const char *name =to_platform_device (port->dev)->name;u32 val;int ret;
@@ -458,15 +457,6 @@ static int stm32_startup(struct uart_port *port)if (ret)return ret; -if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) { - ret =dev_pm_set_dedicated_wake_irq (port->dev, - stm32_port->wakeirq); -if (ret) { -free_irq (port->irq, port); -return ret; - } - } - val =USART_CR1_RXNEIE |USART_CR1_TE |USART_CR1_RE ;if (stm32_port->fifoen) val |=USART_CR1_FIFOEN ;
@@ -497,7 +487,6 @@ static void stm32_shutdown(struct uart_port *port)stm32_clr_bits (port, ofs->cr1, val); -dev_pm_clear_wake_irq (port->dev);free_irq (port->irq, port); }
@@ -904,11 +893,18 @@ static int stm32_serial_probe(struct platform_device *pdev) ret =device_init_wakeup (&pdev->dev, true);if (ret) goto err_uninit; + + ret =dev_pm_set_dedicated_wake_irq (&pdev->dev, + stm32port->wakeirq); +if (ret) + goto err_nowup; + +device_set_wakeup_enable (&pdev->dev, false); } ret =uart_add_one_port (&stm32_usart_driver, &stm32port->port);if (ret) - goto err_nowup; + goto err_wirq; ret =stm32_of_dma_rx_probe (stm32port, pdev);if (ret)
@@ -922,6 +918,10 @@ static int stm32_serial_probe(struct platform_device *pdev)return 0 ; +err_wirq: +if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >=0 ) +dev_pm_clear_wake_irq (&pdev->dev); + err_nowup:if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >=0 )device_init_wakeup (&pdev->dev, false);
@@ -959,8 +959,10 @@ static int stm32_serial_remove(struct platform_device *pdev)TX_BUF_L , stm32_port->tx_buf, stm32_port->tx_dma_buf); -if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) +if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) { +dev_pm_clear_wake_irq (&pdev->dev);device_init_wakeup (&pdev->dev, false); + }clk_disable_unprepare (stm32_port->clk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 222/343 misc: sgi-xp: Properly initialize buf in xpc_get_rsvd_page_pa
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b0576f9ecb5c51e9932531d23c447b2739261841 ]
Clang warns:
drivers/misc/sgi-xp/xpc_partition.c:73:14: warning: variable 'buf' is uninitialized when used within its own initialization [-Wuninitialized]
void *buf = buf;
~~~ ^~~1 warning generated.
Arnd's explanation during review:
/*
* Returns the physical address of the partition's reserved page through
* an iterative number of calls.
*
* On first call, 'cookie' and 'len' should be set to 0, and 'addr'
* set to the nasid of the partition whose reserved page's address is
* being sought.
* On subsequent calls, pass the values, that were passed back on the
* previous call.
*
* While the return status equals SALRET_MORE_PASSES, keep calling
* this function after first copying 'len' bytes starting at 'addr'
* into 'buf'. Once the return status equals SALRET_OK, 'addr' will
* be the physical address of the partition's reserved page. If the
* return status equals neither of these, an error as occurred. */
static inline s64
sn_partition_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
so *len is set to zero on the first call and tells the bios how many bytes are accessible at 'buf', and it does get updated by the BIOS to tell us how many bytes it needs, and then we allocate that and try again.
--- drivers/misc/sgi-xp/xpc_partition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/sgi-xp/xpc_partition.c +1 -1
@@ -70,7 +70,7 @@ xpc_get_rsvd_page_pa(int nasid)unsigned long rp_pa = nasid;/* seed with nasid */ size_t len =0 ;size_t buf_len =0 ; -void *buf = buf; +void *buf =NULL ;void *buf_base =NULL ;enum xp_retval (*get_partition_rsvd_page_pa) (void *, u64 *, unsigned long *, size_t *) =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 223/343 PCI: PM: Avoid possible suspend-to-idle issue
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit d491f2b75237ef37d8867830ab7fad8d9659e853 ]
If a PCI driver leaves the device handled by it in D0 and calls pci_save_state() on the device in its ->suspend() or ->suspend_late() callback, it can expect the device to stay in D0 over the whole s2idle cycle. However, that may not be the case if there is a spurious wakeup while the system is suspended, because in that case pci_pm_suspend_noirq() will run again after pci_pm_resume_noirq() which calls pci_restore_state(), via pci_pm_default_resume_early(), so state_saved is cleared and the second iteration of pci_pm_suspend_noirq() will invoke pci_prepare_to_sleep() which may change the power state of the device.
To avoid that, add a new internal flag, skip_bus_pm, that will be set by pci_pm_suspend_noirq() when it runs for the first time during the given system suspend-resume cycle if the state of the device has been saved already and the device is still in D0. Setting that flag will cause the next iterations of pci_pm_suspend_noirq() to set state_saved for pci_pm_resume_noirq(), so that it always restores the device state from the originally saved data, and avoid calling pci_prepare_to_sleep() for the device.
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/pci/pci-driver.c +16 -1
@@ -728,6 +728,8 @@ static int pci_pm_suspend(struct device *dev)struct pci_dev *pci_dev =to_pci_dev (dev);const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm :NULL ; + pci_dev->skip_bus_pm = false; +if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_suspend (dev,PMSG_SUSPEND );
@@ -801,7 +803,20 @@ static int pci_pm_suspend_noirq(struct device *dev) } } -if (!pci_dev->state_saved) { +if (pci_dev->skip_bus_pm) { +/* +* The function is running for the second time in a row without +* going through full resume, which is possible only during +* suspend-to-idle in a spurious wakeup case. Moreover, the +* device was originally left in D0, so its power state should +* not be changed here and the device register values saved +* originally should be restored on resume again. +*/ + pci_dev->state_saved = true; + }else if (pci_dev->state_saved) { +if (pci_dev->current_state ==PCI_D0 ) + pci_dev->skip_bus_pm = true; + }else {pci_save_state (pci_dev);if (pci_power_manageable (pci_dev))pci_prepare_to_sleep (pci_dev);
include/linux/pci.h +1 -0
@@ -346,6 +346,7 @@ struct pci_dev {D3cold, not set for devices powered on/off by the corresponding bridge */ + unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */ unsigned int ignore_hotplug:1; /* Ignore hotplug events */ unsigned int hotplug_user_indicators:1; /* SlotCtl indicatorscontrolled exclusively by
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 224/343 iommu: Use right function to get group for device
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
[ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ]
The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead.
--- drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +3 -3
@@ -1856,9 +1856,9 @@ int iommu_request_dm_for_dev(struct device *dev)int ret;/* Device must already be in a group before calling this function */ - group =iommu_group_get_for_dev (dev); -if (IS_ERR (group)) -return PTR_ERR (group); + group =iommu_group_get (dev); +if (!group) +return -EINVAL ;mutex_lock (&group->mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 225/343 signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ]
The locking in force_sig_info is not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem in force_sig as force_sig is only built to handle synchronous exceptions.
Further the function force_sig_info changes the signal state if the signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked and SIGNAL_UNKILLABLE won't prevent it from being delivered.
So using force_sig rather than send_sig for SIGKILL is confusing and pointless.
Because it won't impact the sending of the signal and and because using force_sig is wrong, replace force_sig with send_sig.
--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/connect.c +1 -1
@@ -2320,7 +2320,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) task =xchg (&server->tsk,NULL );if (task) -force_sig (SIGKILL , task); +send_sig (SIGKILL , task,1 ); } static struct TCP_Server_Info *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 226/343 inet: frags: call inet_frags_fini() after unregister_pernet_subsys()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ae7352d384a552d8c799c242e74a934809990a71 ]
Both IPv6 and 6lowpan are calling inet_frags_fini() too soon.
inet_frags_fini() is dismantling a kmem_cache, that might be needed later when unregister_pernet_subsys() eventually has to remove frags queues from hash tables and free them.
This fixes potential use-after-free, and is a prereq for the following patch.
--- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv6/reassembly.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ieee802154/6lowpan/reassembly.c +1 -1
@@ -634,7 +634,7 @@ err_sysctl:void lowpan_net_frag_exit (void ) { -inet_frags_fini (&lowpan_frags);lowpan_frags_sysctl_unregister ();unregister_pernet_subsys (&lowpan_frags_ops); +inet_frags_fini (&lowpan_frags); }
net/ipv6/reassembly.c +1 -1
@@ -593,8 +593,8 @@ err_protocol:void ipv6_frag_exit (void ) { -inet_frags_fini (&ip6_frags);ip6_frags_sysctl_unregister ();unregister_pernet_subsys (&ip6_frags_ops);inet6_del_protocol (&frag_protocol,IPPROTO_FRAGMENT ); +inet_frags_fini (&ip6_frags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 227/343 netvsc: unshare skb in VF rx handler
In reply to Greg Kroah-HartmanFrom: Stephen Hemminger <[email protected]>
[ Upstream commit 996ed04741467f6d1552440c92988b132a9487ec ]
The netvsc VF skb handler should make sure that skb is not shared. Similar logic already exists in bonding and team device drivers.
This is not an issue in practice because the VF devicex does not send up shared skb's. But the netvsc driver should do the right thing if it did.
--- drivers/net/hyperv/netvsc_drv.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/hyperv/netvsc_drv.c +6 -0
@@ -1840,6 +1840,12 @@ static rx_handler_result_t netvsc_vf_handle_frame(struct sk_buff **pskb)struct netvsc_vf_pcpu_stats *pcpu_stats =this_cpu_ptr (ndev_ctx->vf_stats); + skb =skb_share_check (skb,GFP_ATOMIC ); +if (unlikely (!skb)) +return RX_HANDLER_CONSUMED ; + + *pskb = skb; + skb->dev = ndev;u64_stats_update_begin (&pcpu_stats->syncp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 228/343 cpufreq: brcmstb-avs-cpufreq: Fix initial command check
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8 ]
There is a logical error in brcm_avs_is_firmware_loaded() whereby if the firmware returns -EINVAL, we will be reporting this as an error. The comment is correct, the code was not.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +2 -2
@@ -762,8 +762,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv) rc =brcm_avs_get_pmap (priv,NULL ); magic =readl (priv->base +AVS_MBOX_MAGIC ); -return (magic ==AVS_FIRMWARE_MAGIC ) && (rc != -ENOTSUPP ) && - (rc != -EINVAL ); +return (magic ==AVS_FIRMWARE_MAGIC ) && ((rc != -ENOTSUPP ) || + (rc != -EINVAL )); }static unsigned int brcm_avs_cpufreq_get (unsigned int cpu)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 229/343 cpufreq: brcmstb-avs-cpufreq: Fix types for voltage/frequency
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 4c5681fcc684c762b09435de3e82ffeee7769d21 ]
What we read back from the register is going to be capped at 32-bits, and cpufreq_freq_table.frequency is an unsigned int. Avoid any possible value truncation by using the appropriate return value.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +4 -4
@@ -468,12 +468,12 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate)return __issue_avs_command (priv,AVS_CMD_SET_PSTATE , true, args); } -static unsigned long brcm_avs_get_voltage (void __iomem *base) +static u32 brcm_avs_get_voltage (void __iomem *base) {return readl (base +AVS_MBOX_VOLTAGE1 ); } -static unsigned long brcm_avs_get_frequency (void __iomem *base) +static u32 brcm_avs_get_frequency (void __iomem *base) {return readl (base +AVS_MBOX_FREQUENCY ) *1000 ;/* in kHz */ }
@@ -973,14 +973,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_voltage (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_voltage (priv->base)); }static ssize_t show_brcm_avs_frequency (struct cpufreq_policy *policy,char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_frequency (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_frequency (priv->base)); }cpufreq_freq_attr_ro (brcm_avs_pstate);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 230/343 media: vivid: fix incorrect assignment operation when setting video mode
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit d4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c ]
The assigment of FB_VMODE_NONINTERLACE to var->vmode should be a bit-wise or of FB_VMODE_NONINTERLACE instead of an assignment, otherwise the previous clearing of the FB_VMODE_MASK bits of var->vmode makes no sense and is redundant.
Addresses-Coverity: ("Unused value")
--- drivers/media/platform/vivid/vivid-osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-osd.c +1 -1
@@ -167,7 +167,7 @@ static int _vivid_fb_check_var(struct fb_var_screeninfo *var, struct vivid_dev * var->nonstd =0 ; var->vmode &= ~FB_VMODE_MASK ; - var->vmode =FB_VMODE_NONINTERLACED ; + var->vmode |=FB_VMODE_NONINTERLACED ;/* Dummy values */ var->hsync_len =24 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 231/343 mpls: fix warning with multi-label encap
In reply to Greg Kroah-HartmanFrom: George Wilkie <[email protected]>
[ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ]
If you configure a route with multiple labels, e.g.
ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4
A warning is logged:
kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid length.
This happens because mpls_iptunnel_policy has set the type of MPLS_IPTUNNEL_DST to fixed size NLA_U32.
Change it to a minimum size.nla_get_labels() does the remaining validation.
--- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mpls/mpls_iptunnel.c +1 -1
@@ -28,7 +28,7 @@#include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX +1 ] = { - [MPLS_IPTUNNEL_DST ] = { .type =NLA_U32 }, + [MPLS_IPTUNNEL_DST ] = { .len =sizeof (u32) }, [MPLS_IPTUNNEL_TTL ] = { .type =NLA_U8 }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 232/343 iommu/vt-d: Duplicate iommu_resv_region objects per device list
In reply to Greg Kroah-HartmanFrom: Eric Auger <[email protected]>
[ Upstream commit 5f64ce5411b467f1cfea6c63e2494c22b773582b ]
intel_iommu_get_resv_regions() aims to return the list of reserved regions accessible by a given @device. However several devices can access the same reserved memory region and when building the list it is not safe to use a single iommu_resv_region object, whose container is the RMRR. This iommu_resv_region must be duplicated per device reserved region list.
Let's remove the struct iommu_resv_region from the RMRR unit and allocate the iommu_resv_region directly in intel_iommu_get_resv_regions(). We hold the dmar_global_lock instead of the rcu-lock to allow sleeping.
--- drivers/iommu/intel-iommu.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/iommu/intel-iommu.c +17 -17
@@ -442,7 +442,6 @@ struct dmar_rmrr_unit {u64 end_address;/* reserved end address */ struct dmar_dev_scope *devices;/* target devices */ int devices_cnt;/* target device count */ -struct iommu_resv_region *resv;/* reserved region handle */ };struct dmar_atsr_unit {
@@ -4171,7 +4170,6 @@ static inline void init_iommu_pm_ops(void) {}int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg) {struct acpi_dmar_reserved_memory *rmrr; -int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct dmar_rmrr_unit *rmrru;size_t length;
@@ -4185,22 +4183,16 @@ int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg) rmrru->end_address = rmrr->end_address; length = rmrr->end_address - rmrr->base_address +1 ; - rmrru->resv =iommu_alloc_resv_region (rmrr->base_address, length, prot, -IOMMU_RESV_DIRECT ); -if (!rmrru->resv) - goto free_rmrru; rmrru->devices =dmar_alloc_dev_scope ((void *)(rmrr +1 ), ((void *)rmrr) + rmrr->header.length, &rmrru->devices_cnt);if (rmrru->devices_cnt && rmrru->devices ==NULL ) - goto free_all; + goto free_rmrru;list_add (&rmrru->list, &dmar_rmrr_units);return 0 ; -free_all: -kfree (rmrru->resv); free_rmrru:kfree (rmrru); out:
@@ -4418,7 +4410,6 @@ static void intel_iommu_free_dmars(void)list_for_each_entry_safe (rmrru, rmrr_n, &dmar_rmrr_units, list) {list_del (&rmrru->list);dmar_free_dev_scope (&rmrru->devices, &rmrru->devices_cnt); -kfree (rmrru->resv);kfree (rmrru); }
@@ -5186,22 +5177,33 @@ static void intel_iommu_remove_device(struct device *dev)static void intel_iommu_get_resv_regions (struct device *device,struct list_head *head) { +int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct iommu_resv_region *reg;struct dmar_rmrr_unit *rmrr;struct device *i_dev;int i; -rcu_read_lock (); +down_read (&dmar_global_lock);for_each_rmrr_units (rmrr) {for_each_active_dev_scope (rmrr->devices, rmrr->devices_cnt, i, i_dev) { +struct iommu_resv_region *resv; +size_t length; +if (i_dev != device)continue ; -list_add_tail (&rmrr->resv->list, head); + length = rmrr->end_address - rmrr->base_address +1 ; + resv =iommu_alloc_resv_region (rmrr->base_address, + length, prot, +IOMMU_RESV_DIRECT ); +if (!resv) +break ; + +list_add_tail (&resv->list, head); } } -rcu_read_unlock (); +up_read (&dmar_global_lock); reg = iommu_alloc_resv_region(IOAPIC_RANGE_START, IOAPIC_RANGE_END - IOAPIC_RANGE_START + 1,
@@ -5216,10 +5218,8 @@ static void intel_iommu_put_resv_regions(struct device *dev, {struct iommu_resv_region *entry, *next; -list_for_each_entry_safe (entry, next, head, list) { -if (entry->type ==IOMMU_RESV_MSI ) -kfree (entry); - } +list_for_each_entry_safe (entry, next, head, list) +kfree (entry); }#ifdef CONFIG_INTEL_IOMMU_SVM
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 233/343 qed: iWARP - Use READ_ONCE and smp_store_release to access ep->state
In reply to Greg Kroah-HartmanFrom: Michal Kalderon <[email protected]>
[ Upstream commit 6117561e1bb30b2fe7f51e1961f34dbedd0bec8a ]
Destroy QP waits for it's ep object state to be set to CLOSED before proceeding. ep->state can be updated from a different context. Add smp_store_release/READ_ONCE to synchronize.
--- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +11 -5
@@ -509,7 +509,8 @@ int qed_iwarp_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)/* Make sure ep is closed before returning and freeing memory. */ if (ep) { -while (ep->state !=QED_IWARP_EP_CLOSED && wait_count++ <200 ) +while (READ_ONCE (ep->state) !=QED_IWARP_EP_CLOSED && + wait_count++ <200 )msleep (100 );if (ep->state !=QED_IWARP_EP_CLOSED )
@@ -991,8 +992,6 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn, params.ep_context = ep; - ep->state =QED_IWARP_EP_CLOSED ; -switch (fw_return_code) {case RDMA_RETURN_OK : ep->qp->max_rd_atomic_req = ep->cm_info.ord;
@@ -1052,6 +1051,10 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn,break ; } +if (fw_return_code !=RDMA_RETURN_OK ) +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); + ep->event_cb (ep->cb_context, ¶ms);/* on passive side, if there is no associated QP (REJECT) we need to
@@ -2069,7 +2072,9 @@ void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn, params.status = (fw_return_code ==IWARP_QP_IN_ERROR_GOOD_CLOSE ) ?0 : -ECONNRESET ; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); +spin_lock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);list_del (&ep->list_entry);spin_unlock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);
@@ -2157,7 +2162,8 @@ qed_iwarp_tcp_connect_unsuccessful(struct qed_hwfn *p_hwfn, params.event =QED_IWARP_EVENT_ACTIVE_COMPLETE ; params.ep_context = ep; params.cm_info = &ep->cm_info; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED );switch (fw_return_code) {case IWARP_CONN_ERROR_TCP_CONNECT_INVALID_PACKET :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 234/343 powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit d4aa219a074a5abaf95a756b9f0d190b5c03a945 ]
Allow external callers to force the cacheinfo code to release all its references to cache nodes, e.g. before processing device tree updates post-migration, and to rebuild the hierarchy afterward.
CPU online/offline must be blocked by callers; enforce this.
--- arch/powerpc/kernel/cacheinfo.c | 21 +++++++++++++++++++++ arch/powerpc/kernel/cacheinfo.h | 4 ++++ 2 files changed, 25 insertions(+)
arch/powerpc/kernel/cacheinfo.c +21 -0
@@ -865,4 +865,25 @@ void cacheinfo_cpu_offline(unsigned int cpu_id)if (cache) cache_cpu_clear(cache, cpu_id); } + +void cacheinfo_teardown (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_offline (cpu); +} + +void cacheinfo_rebuild (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_online (cpu); +} +#endif /* (CONFIG_PPC_PSERIES && CONFIG_SUSPEND) || CONFIG_HOTPLUG_CPU */
arch/powerpc/kernel/cacheinfo.h +4 -0
@@ -6,4 +6,8 @@extern void cacheinfo_cpu_online (unsigned int cpu_id);extern void cacheinfo_cpu_offline (unsigned int cpu_id); +/* Allow migration/suspend to tear down and rebuild the hierarchy. */ +extern void cacheinfo_teardown (void ); +extern void cacheinfo_rebuild (void ); +#endif /* _PPC_CACHEINFO_H */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 235/343 powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit e610a466d16a086e321f0bd421e2fc75cff28605 ]
It's common for the platform to replace the cache device nodes after a migration. Since the cacheinfo code is never informed about this, it never drops its references to the source system's cache nodes, causing it to wind up in an inconsistent state resulting in warnings and oopses as soon as CPU online/offline occurs after the migration, e.g.
cache for /cpus/l3-cache@3113(Unified) refers to cache for /cpus/l2-cache@200d(Unified)
WARNING: CPU: 15 PID: 86 at arch/powerpc/kernel/cacheinfo.c:176 release_cache+0x1bc/0x1d0
[...]
NIP release_cache+0x1bc/0x1d0
LR release_cache+0x1b8/0x1d0
Call Trace:
release_cache+0x1b8/0x1d0 (unreliable)
cacheinfo_cpu_offline+0x1c4/0x2c0
unregister_cpu_online+0x1b8/0x260
cpuhp_invoke_callback+0x114/0xf40
cpuhp_thread_fun+0x270/0x310
smpboot_thread_fn+0x2c8/0x390
kthread+0x1b8/0x1c0
ret_from_kernel_thread+0x5c/0x68Using device tree notifiers won't work since we want to rebuild the hierarchy only after all the removals and additions have occurred and the device tree is in a consistent state. Call cacheinfo_teardown() before processing device tree updates, and rebuild the hierarchy afterward.
--- arch/powerpc/platforms/pseries/mobility.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/powerpc/platforms/pseries/mobility.c +10 -0
@@ -23,6 +23,7 @@#include <asm/machdep.h> #include <asm/rtas.h> #include "pseries.h" +#include "../../kernel/cacheinfo.h" static struct kobject *mobility_kobj;
@@ -359,11 +360,20 @@ void post_mobility_fixup(void)*/ cpus_read_lock (); +/* +* It's common for the destination firmware to replace cache +* nodes. Release all of the cacheinfo hierarchy's references +* before updating the device tree. +*/ +cacheinfo_teardown (); + rc =pseries_devicetree_update (MIGRATION_SCOPE );if (rc)printk (KERN_ERR "Post-mobility device tree update " "failed: %d\n" , rc); +cacheinfo_rebuild (); +cpus_read_unlock ();/* Possibly switch to a new RFI flush type */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 236/343 drm/msm/mdp5: Fix mdp5_cfg_init error return
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ]
If mdp5_cfg_init fails because of an unknown major version, a null pointer dereference occurs. This is because the caller of init expects error pointers, but init returns NULL on error. Fix this by returning the expected values on error.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +1 -1
@@ -635,7 +635,7 @@ fail:if (cfg_handler)mdp5_cfg_destroy (cfg_handler); -return NULL ; +return ERR_PTR (ret); }static struct mdp5_cfg_platform *mdp5_get_config (struct platform_device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 237/343 net: netem: fix backlog accounting for corrupted GSO frames
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 177b8007463c4f36c9a2c7ce7aa9875a4cad9bd5 ]
When GSO frame has to be corrupted netem uses skb_gso_segment() to produce the list of frames, and re-enqueues the segments one by one. The backlog length has to be adjusted to account for new frames.
The current calculation is incorrect, leading to wrong backlog lengths in the parent qdisc (both bytes and packets), and incorrect packet backlog count in netem itself.
Parent backlog goes negative, netem's packet backlog counts all non-first segments twice (thus remaining non-zero even after qdisc is emptied).
Move the variables used to count the adjustment into local scope to make 100% sure they aren't used at any stage in backports.
--- net/sched/sch_netem.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/sched/sch_netem.c +8 -5
@@ -431,8 +431,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,struct netem_skb_cb *cb;struct sk_buff *skb2;struct sk_buff *segs =NULL ; -unsigned int len =0 , last_len, prev_len =qdisc_pkt_len (skb); -int nb =0 ; +unsigned int prev_len =qdisc_pkt_len (skb);int count =1 ;int rc =NET_XMIT_SUCCESS ;int rc_drop =NET_XMIT_DROP ;
@@ -489,6 +488,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, segs =netem_segment (skb, sch, to_free);if (!segs)return rc_drop; +qdisc_skb_cb (segs)->pkt_len = segs->len; }else { segs = skb; }
@@ -579,6 +579,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, finish_segs:if (segs) { +unsigned int len, last_len; +int nb =0 ; + + len = skb->len; +while (segs) { skb2 = segs->next; segs->next =NULL ;
@@ -594,9 +599,7 @@ finish_segs: } segs = skb2; } - sch->q.qlen += nb; -if (nb >1 ) -qdisc_tree_reduce_backlog (sch,1 - nb, prev_len - len); +qdisc_tree_reduce_backlog (sch, -nb, prev_len - len); }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 238/343 net/af_iucv: always register net_device notifier
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 06996c1d4088a0d5f3e7789d7f96b4653cc947cc ]
Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still open HiperTransport-based connections. For robust operation these connections require the af_iucv_netdev_notifier, so register it unconditionally.
Also handle any error that register_netdevice_notifier() returns.
--- net/iucv/af_iucv.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
net/iucv/af_iucv.c +20 -7
@@ -2446,6 +2446,13 @@ out:return err; } +static void afiucv_iucv_exit (void ) +{ +device_unregister (af_iucv_dev); +driver_unregister (&af_iucv_driver); + pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +} +static int __init afiucv_init (void ) {int err;
@@ -2479,11 +2486,18 @@ static int __init afiucv_init(void) err =afiucv_iucv_init ();if (err) goto out_sock; - }else -register_netdevice_notifier (&afiucv_netdev_notifier); + } + + err =register_netdevice_notifier (&afiucv_netdev_notifier); +if (err) + goto out_notifier; +dev_add_pack (&iucv_packet_type);return 0 ; +out_notifier: +if (pr_iucv) +afiucv_iucv_exit (); out_sock:sock_unregister (PF_IUCV ); out_proto:
@@ -2497,12 +2511,11 @@ out: static void __exit afiucv_exit(void) {if (pr_iucv) { -device_unregister (af_iucv_dev); -driver_unregister (&af_iucv_driver); - pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +afiucv_iucv_exit ();symbol_put (iucv_if); - }else -unregister_netdevice_notifier (&afiucv_netdev_notifier); + } + +unregister_netdevice_notifier (&afiucv_netdev_notifier);dev_remove_pack (&iucv_packet_type);sock_unregister (PF_IUCV );proto_unregister (&iucv_proto);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 239/343 ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ]
If multiple serializers are connected in the system and the number of channels will need to use more than one serializer the mask to enable the serializers were left to 0 if tdm_mask is provided
--- sound/soc/davinci/davinci-mcasp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/soc/davinci/davinci-mcasp.c +6 -7
@@ -882,14 +882,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, active_slots =hweight32 (mcasp->tdm_mask[stream]); active_serializers = (channels + active_slots -1 ) / active_slots; -if (active_serializers ==1 ) { +if (active_serializers ==1 ) active_slots = channels; -for (i =0 ; i < total_slots; i++) { -if ((1 << i) & mcasp->tdm_mask[stream]) { - mask |= (1 << i); -if (--active_slots <=0 ) -break ; - } +for (i =0 ; i < total_slots; i++) { +if ((1 << i) & mcasp->tdm_mask[stream]) { + mask |= (1 << i); +if (--active_slots <=0 ) +break ; } } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 240/343 rtc: pcf8563: Fix interrupt trigger method
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 65f662cbf829834fa4d94190eb7691e5a9cb92d8 ]
The PCF8563 datasheet says the interrupt line is active low and stays active until the events are cleared, i.e. a level trigger interrupt.
Fix the flags used to request the interrupt.
--- drivers/rtc/rtc-pcf8563.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -605,7 +605,7 @@ static int pcf8563_probe(struct i2c_client *client,if (client->irq >0 ) { err =devm_request_threaded_irq (&client->dev, client->irq,NULL , pcf8563_irq, -IRQF_SHARED |IRQF_ONESHOT |IRQF_TRIGGER_FALLING , +IRQF_SHARED |IRQF_ONESHOT |IRQF_TRIGGER_LOW , pcf8563_driver.driver.name, client);if (err) { dev_err(&client->dev, "unable to request IRQ %d\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 241/343 rtc: pcf8563: Clear event flags and disable interrupts before requesting irq
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3572e8aea3bf925dac1dbf86127657c39fe5c254 ]
Besides the alarm, the PCF8563 also has a timer triggered interrupt. In cases where the previous system left the timer and interrupts on, or somehow the bits got enabled, the interrupt would keep triggering as the kernel doesn't know about it.
Clear both the alarm and timer event flags, and disable the interrupts, before requesting the interrupt line.
--- drivers/rtc/rtc-pcf8563.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pcf8563.c +5 -6
@@ -563,7 +563,6 @@ static int pcf8563_probe(struct i2c_client *client,struct pcf8563 *pcf8563;int err;unsigned char buf; -unsigned char alm_pending;dev_dbg (&client->dev,"%s\n" , __func__);
@@ -587,13 +586,13 @@ static int pcf8563_probe(struct i2c_client *client,return err; } - err =pcf8563_get_alarm_mode (client,NULL , &alm_pending); -if (err) { -dev_err (&client->dev,"%s: read error\n" , __func__); +/* Clear flags and disable interrupts */ + buf =0 ; + err =pcf8563_write_block_data (client,PCF8563_REG_ST2 ,1 , &buf); +if (err <0 ) { +dev_err (&client->dev,"%s: write error\n" , __func__);return err; } -if (alm_pending) -pcf8563_set_alarm_mode (client,0 ); pcf8563->rtc = devm_rtc_device_register(&client->dev, pcf8563_driver.driver.name,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 242/343 drm/msm/a3xx: remove TPL1 regs from snapshot
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit f47bee2ba447bebc304111c16ef1e1a73a9744dd ]
These regs are write-only, and the hw throws a hissy-fit (ie. reboots) when we try to read them for GPU state snapshot, in response to a GPU hang. It is rather impolite when GPU recovery triggers an insta- reboot, so lets remove the TPL1 registers from the snapshot.
--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +11 -13
@@ -394,19 +394,17 @@ static const unsigned int a3xx_registers[] = {0x2200 ,0x2212 ,0x2214 ,0x2217 ,0x221a ,0x221a ,0x2240 ,0x227e ,0x2280 ,0x228b ,0x22c0 ,0x22c0 ,0x22c4 ,0x22ce ,0x22d0 ,0x22d8 ,0x22df ,0x22e6 ,0x22e8 ,0x22e9 ,0x22ec ,0x22ec ,0x22f0 ,0x22f7 , -0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2348 ,0x2349 ,0x2350 ,0x2356 , -0x2360 ,0x2360 ,0x2440 ,0x2440 ,0x2444 ,0x2444 ,0x2448 ,0x244d , -0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 ,0x2472 ,0x2472 , -0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 ,0x24e4 ,0x24ef , -0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e ,0x2510 ,0x2511 , -0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea ,0x25ec ,0x25ed , -0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 ,0x261a ,0x261a , -0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 ,0x26c4 ,0x26ce , -0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 ,0x26ec ,0x26ec , -0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 ,0x2748 ,0x2749 , -0x2750 ,0x2756 ,0x2760 ,0x2760 ,0x300c ,0x300e ,0x301c ,0x301d , -0x302a ,0x302a ,0x302c ,0x302d ,0x3030 ,0x3031 ,0x3034 ,0x3036 , -0x303c ,0x303c ,0x305e ,0x305f , +0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2440 ,0x2440 ,0x2444 ,0x2444 , +0x2448 ,0x244d ,0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 , +0x2472 ,0x2472 ,0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 , +0x24e4 ,0x24ef ,0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e , +0x2510 ,0x2511 ,0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea , +0x25ec ,0x25ed ,0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 , +0x261a ,0x261a ,0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 , +0x26c4 ,0x26ce ,0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 , +0x26ec ,0x26ec ,0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 , +0x300c ,0x300e ,0x301c ,0x301d ,0x302a ,0x302a ,0x302c ,0x302d , +0x3030 ,0x3031 ,0x3034 ,0x3036 ,0x303c ,0x303c ,0x305e ,0x305f , ~0 /* sentinel */ };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 243/343 perf/ioctl: Add check for the sample_period value
In reply to Greg Kroah-HartmanFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 913a90bc5a3a06b1f04c337320e9aeee2328dd77 ]
perf_event_open() limits the sample_period to 63 bits. See:
0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Make ioctl() consistent with it.
Also on PowerPC, negative sample_period could cause a recursive PMIs leading to a hang (reported when running perf-fuzzer).
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -4762,6 +4762,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)if (perf_event_check_period (event, value))return -EINVAL ; +if (!event->attr.freq && (value & (1ULL <<63 ))) +return -EINVAL ; +event_function_call (event, __perf_event_period, &value);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 244/343 dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c24a5c735f87d0549060de31367c095e8810b895 ]
The commit
080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
has been mistakenly submitted. The further investigations show that the original code does better job since the memory side transfer size has never been configured by DMA users.
As per latest revision of documentation: "Channel minimum transfer size (CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and minimum value that can be programmed is 1."
This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
--- drivers/dma/hsu/hsu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/hsu/hsu.c +2 -2
@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)if (hsuc->direction ==DMA_MEM_TO_DEV ) { bsr = config->dst_maxburst; - mtsr = config->src_addr_width; + mtsr = config->dst_addr_width; }else if (hsuc->direction ==DMA_DEV_TO_MEM ) { bsr = config->src_maxburst; - mtsr = config->dst_addr_width; + mtsr = config->src_addr_width; }hsu_chan_disable (hsuc);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 245/343 clk: qcom: Fix -Wunused-const-variable
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit da642427bd7710ec4f4140f693f59aa8521a358c ]
Clang produces the following warning
drivers/clk/qcom/gcc-msm8996.c:133:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map' [-Wunused-const-variable] static const structparent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] =
{ ^drivers/clk/qcom/gcc-msm8996.c:141:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { ^ drivers/clk/qcom/gcc-msm8996.c:187:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map' [-Wunused-const-variable] static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { ^ drivers/clk/qcom/gcc-msm8996.c:197:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
It looks like these were never used.
--- drivers/clk/qcom/gcc-msm8996.c | 36 ---------------------------------- 1 file changed, 36 deletions(-)
drivers/clk/qcom/gcc-msm8996.c +0 -36
@@ -140,22 +140,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll0_early_div" -}; -static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = { {P_XO ,0 }, {P_GPLL0 ,1 },
@@ -194,26 +178,6 @@ static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL1 ,4 }, - {P_GPLL4 ,5 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll1" , -"gpll4" , -"gpll0_early_div" -}; -static struct clk_fixed_factor xo = { .mult =1 , .div =1 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 246/343 nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 0493c4792b4eb260441e57f52cc11a9ded48b5a7 ]
The i.MX6 and i.MX8 both have a bit-field spanning bits 27:22 called the WAIT field.
The WAIT field according to the documentation for both parts "specifies time interval between auto read and write access in one time program. It is given in number of ipg_clk periods."
This patch ensures that the relevant field is read and written back to the timing register.
--- drivers/nvmem/imx-ocotp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvmem/imx-ocotp.c +2 -1
@@ -199,7 +199,8 @@ static int imx_ocotp_write(void *context, unsigned int offset, void *val, strobe_prog = clk_rate / (1000000000 /10000 ) +2 * (DEF_RELAX +1 ) -1 ; strobe_read = clk_rate / (1000000000 /40 ) +2 * (DEF_RELAX +1 ) -1 ; - timing = strobe_prog &0x00000FFF ; + timing =readl (priv->base +IMX_OCOTP_ADDR_TIMING ) &0x0FC00000 ; + timing |= strobe_prog &0x00000FFF ; timing |= (relax <<12 ) &0x0000F000 ; timing |= (strobe_read <<16 ) &0x003F0000 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 247/343 bnxt_en: Fix ethtool selftest crash under error conditions.
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit d27e2ca1166aefd54d9c48fb6647dee8115a5dfc ]
After ethtool loopback packet tests, we re-open the nic for the next IRQ test. If the open fails, we must not proceed with the IRQ test or we will crash with NULL pointer dereference. Fix it by checking the bnxt_open_nic() return code before proceeding.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +3 -3
@@ -2463,7 +2463,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,bool offline = false;u8 test_results =0 ;u8 test_mask =0 ; -int rc, i; +int rc =0 , i;if (!bp->num_tests || !BNXT_SINGLE_PF (bp))return ;
@@ -2521,9 +2521,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, }bnxt_hwrm_phy_loopback (bp, false);bnxt_half_close_nic (bp); -bnxt_open_nic (bp, false, true); + rc =bnxt_open_nic (bp, false, true); } -if (bnxt_test_irq (bp)) { +if (rc ||bnxt_test_irq (bp)) { buf[BNXT_IRQ_TEST_IDX ] =1 ; etest->flags |=ETH_TEST_FL_FAILED ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 248/343 iommu/amd: Make iommu_disable safer
In reply to Greg Kroah-HartmanFrom: Kevin Mitchell <[email protected]>
[ Upstream commit 3ddbe913e55516d3e2165d43d4d5570761769878 ]
Make it safe to call iommu_disable during early init error conditions before mmio_base is set, but after the struct amd_iommu has been added to the amd_iommu_list. For example, this happens if firmware fails to fill in mmio_phys in the ACPI table leading to a NULL pointer dereference in iommu_feature_disable.
--- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/amd_iommu_init.c +3 -0
@@ -420,6 +420,9 @@ static void iommu_enable(struct amd_iommu *iommu)static void iommu_disable (struct amd_iommu *iommu) { +if (!iommu->mmio_base) +return ; +/* Disable command buffer */ iommu_feature_disable (iommu,CONTROL_CMDBUF_EN );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 249/343 mfd: intel-lpss: Release IDA resources
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 02f36911c1b41fcd8779fa0c135aab0554333fa5 ]
ida instances allocate some internal memory for ->free_bitmap in addition to the base 'struct ida'. Use ida_destroy() to release that memory at module_exit().
--- drivers/mfd/intel-lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/intel-lpss.c +1 -0
@@ -541,6 +541,7 @@ module_init(intel_lpss_init); static void __exit intel_lpss_exit(void) { +ida_destroy (&intel_lpss_devid_ida);debugfs_remove (intel_lpss_debugfs); }module_exit (intel_lpss_exit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 250/343 rxrpc: Fix uninitialized error code in rxrpc_send_data_packet()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 3427beb6375d04e9627c67343872e79341a684ea ]
With gcc 4.1:
net/rxrpc/output.c: In function ‘rxrpc_send_data_packet’:
net/rxrpc/output.c:338: warning: ‘ret’ may be used uninitialized in this function
Indeed, if the first jump to the send_fragmentable label is made, and the address family is not handled in the switch() statement, ret will be used uninitialized.
Fix this by BUG()'ing as is done in other places in rxrpc where internal support for future address families will need adding. It should not be possible to reach this normally as the address families are checked up-front.
--- net/rxrpc/output.c | 3 +++ 1 file changed, 3 insertions(+)
net/rxrpc/output.c +3 -0
@@ -404,6 +404,9 @@ send_fragmentable: }break ;#endif + +default : +BUG (); }up_write (&conn->params.local->defrag_sem);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 251/343 devres: allow const resource arguments
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9dea44c91469512d346e638694c22c30a5273992 ]
devm_ioremap_resource() does not currently take 'const' arguments, which results in a warning from the first driver trying to do it anyway:
drivers/gpio/gpio-amd-fch.c: In function 'amd_fch_gpio_probe':drivers/gpio/gpio-amd-fch.c:171:49: error: passing argument 2 of 'devm_ioremap_resource' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
priv->base = devm_ioremap_resource(&pdev->dev, &amd_fch_gpio_iores);
^~~~~~~~~~~~~~~~~~~Change the prototype to allow it, as there is no real reason not to.
--- include/linux/device.h | 3 ++- lib/devres.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/device.h +2 -1
@@ -682,7 +682,8 @@ extern unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order);extern void devm_free_pages (struct device *dev,unsigned long addr); -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res); +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res);/* allows to add/remove a custom action to devres stack */ int devm_add_action (struct device *dev,void (*action)(void *),void *data);
lib/devres.c +2 -1
@@ -132,7 +132,8 @@ EXPORT_SYMBOL(devm_iounmap);* if (IS_ERR(base)) * return PTR_ERR(base); */ -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res) +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res) {resource_size_t size;const char *name;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 252/343 RDMA/hns: Fixs hw access invalid dma memory error
In reply to Greg Kroah-HartmanFrom: Xi Wang <[email protected]>
[ Upstream commit ec5bc2cc69b4fc494e04d10fc5226f6f9cf67c56 ]
When smmu is enable, if execute the perftest command and then use 'kill -9' to exit, follow this operation repeatedly, the kernel will have a high probability to print the following smmu event:
arm-smmu-v3 arm-smmu-v3.1.auto: event 0x10 received:
arm-smmu-v3 arm-smmu-v3.1.auto: 0x00007d0000000010 arm-smmu-v3 arm-smmu-v3.1.auto: 0x0000020900000080 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000
This is because the hw will periodically refresh the qpc cache until the next reset.
This patch fixed it by removing the action that release qpc memory in the 'hns_roce_qp_free' function.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +0 -1
@@ -241,7 +241,6 @@ void hns_roce_qp_free(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)if ((hr_qp->ibqp.qp_type) !=IB_QPT_GSI ) {hns_roce_table_put (hr_dev, &qp_table->irrl_table, hr_qp->qpn); -hns_roce_table_put (hr_dev, &qp_table->qp_table, hr_qp->qpn); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 253/343 net: pasemi: fix an use-after-free in pasemi_mac_phy_init()
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit faf5577f2498cea23011b5c785ef853ded22700b ]
The phy_dn variable is still being used in of_phy_connect() after the of_node_put() call, which may result in use-after-free.
--- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1053,7 +1053,6 @@ static int pasemi_mac_phy_init(struct net_device *dev) dn =pci_device_to_OF_node (mac->pdev); phy_dn =of_parse_phandle (dn,"phy-handle" ,0 ); -of_node_put (phy_dn); mac->link =0 ; mac->speed =0 ;
@@ -1062,6 +1061,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 ,PHY_INTERFACE_MODE_SGMII ); +of_node_put (phy_dn);if (!phydev) {printk (KERN_ERR "%s: Could not attach to phy\n" , dev->name);return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 254/343 scsi: libfc: fix null pointer dereference on a null lport
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 41a6bf6529edd10a6def42e3b2c34a7474bcc2f5 ]
Currently if lport is null then the null lport pointer is dereference when printing out debug via the FC_LPORT_DB macro. Fix this by using the more generic FC_LIBFC_DBG debug macro instead that does not use lport.
Addresses-Coverity: ("Dereference after null check")
--- drivers/scsi/libfc/fc_exch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libfc/fc_exch.c +1 -1
@@ -2603,7 +2603,7 @@ void fc_exch_recv(struct fc_lport *lport, struct fc_frame *fp)/* lport lock ? */ if (!lport || lport->state ==LPORT_ST_DISABLED ) { -FC_LPORT_DBG (lport,"Receiving frames for an lport that " +FC_LIBFC_DBG ("Receiving frames for an lport that " "has not been initialized correctly\n" );fc_frame_free (fp);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 255/343 clk: sunxi-ng: v3s: add the missing PLL_DDR1
In reply to Greg Kroah-HartmanFrom: Icenowy Zheng <[email protected]>
[ Upstream commit c5ed9475c22c89d5409402055142372e35d26a3f ]
The user manual of V3/V3s/S3 declares a PLL_DDR1, however it's forgot when developing the V3s CCU driver.
Add back the missing PLL_DDR1.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++++++---- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 ++++-- 2 files changed, 19 insertions(+), 6 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +15 -4
@@ -84,7 +84,7 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve",BIT (28 ),/* lock */ 0); -static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr_clk, "pll-ddr", +static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr0_clk, "pll-ddr0","osc24M" ,0x020 ,8 ,5 ,/* N */ 4, 2, /* K */
@@ -123,6 +123,14 @@ static SUNXI_CCU_NK_WITH_GATE_LOCK_POSTDIV(pll_periph1_clk, "pll-periph1",2 ,/* post-div */ 0); +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", +"osc24M" ,0x04c , +8 ,7 ,/* N */ +0 ,2 ,/* M */ +BIT (31 ),/* gate */ +BIT (28 ),/* lock */ + 0); +static const char *const cpu_parents[] = {"osc32k" ,"osc24M" ,"pll-cpu" ,"pll-cpu" }; static SUNXI_CCU_MUX(cpu_clk, "cpu", cpu_parents,
@@ -310,7 +318,8 @@ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0cc, BIT(16), 0); -static const char *const dram_parents[] = {"pll-ddr" ,"pll-periph0-2x" }; +static const char *const dram_parents[] = {"pll-ddr0" ,"pll-ddr1" , +"pll-periph0-2x" }; static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents, 0x0f4, 0, 4, 20, 2, CLK_IS_CRITICAL);
@@ -369,10 +378,11 @@ static struct ccu_common *sun8i_v3s_ccu_clks[] = { &pll_audio_base_clk.common, &pll_video_clk.common, &pll_ve_clk.common, - &pll_ddr_clk.common, + &pll_ddr0_clk.common, &pll_periph0_clk.common, &pll_isp_clk.common, &pll_periph1_clk.common, + &pll_ddr1_clk.common, &cpu_clk.common, &axi_clk.common, &ahb1_clk.common,
@@ -457,11 +467,12 @@ static struct clk_hw_onecell_data sun8i_v3s_hw_clks = { [CLK_PLL_AUDIO_8X] = &pll_audio_8x_clk.hw, [CLK_PLL_VIDEO] = &pll_video_clk.common.hw, [CLK_PLL_VE] = &pll_ve_clk.common.hw, - [CLK_PLL_DDR] = &pll_ddr_clk.common.hw, + [CLK_PLL_DDR0] = &pll_ddr0_clk.common.hw, [CLK_PLL_PERIPH0] = &pll_periph0_clk.common.hw, [CLK_PLL_PERIPH0_2X] = &pll_periph0_2x_clk.hw, [CLK_PLL_ISP] = &pll_isp_clk.common.hw, [CLK_PLL_PERIPH1] = &pll_periph1_clk.common.hw, + [CLK_PLL_DDR1] = &pll_ddr1_clk.common.hw, [CLK_CPU] = &cpu_clk.common.hw, [CLK_AXI] = &axi_clk.common.hw, [CLK_AHB1] = &ahb1_clk.common.hw,
drivers/clk/sunxi-ng/ccu-sun8i-v3s.h +4 -2
@@ -29,7 +29,7 @@#define CLK_PLL_AUDIO_8X 5#define CLK_PLL_VIDEO 6#define CLK_PLL_VE 7 -#define CLK_PLL_DDR 8 +#define CLK_PLL_DDR0 8#define CLK_PLL_PERIPH0 9#define CLK_PLL_PERIPH0_2X 10#define CLK_PLL_ISP 11
@@ -58,6 +58,8 @@/* And the GPU module clock is exported */ -#define CLK_NUMBER (CLK_MIPI_CSI + 1) +#define CLK_PLL_DDR1 74 + +#define CLK_NUMBER (CLK_PLL_DDR1 + 1)#endif /* _CCU_SUN8I_H3_H_ */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 256/343 PM: sleep: Fix possible overflow in pm_system_cancel_wakeup()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 2933954b71f10d392764f95eec0f0aa2d103054b ]
It is not actually guaranteed that pm_abort_suspend will be nonzero when pm_system_cancel_wakeup() is called which may lead to subtle issues, so make it use atomic_dec_if_positive() instead of atomic_dec() for the safety sake.
--- drivers/base/power/wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/wakeup.c +1 -1
@@ -877,7 +877,7 @@ EXPORT_SYMBOL_GPL(pm_system_wakeup);void pm_system_cancel_wakeup (void ) { -atomic_dec (&pm_abort_suspend); +atomic_dec_if_positive (&pm_abort_suspend); }void pm_wakeup_clear (bool reset)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 257/343 libertas_tf: Use correct channel range in lbtf_geo_init
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 2ec4ad49b98e4a14147d04f914717135eca7c8b1 ]
It seems we should use 'range' instead of 'priv->range' in lbtf_geo_init(), because 'range' is the corret one related to current regioncode.
--- drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/libertas_tf/cmd.c +1 -1
@@ -69,7 +69,7 @@ static void lbtf_geo_init(struct lbtf_private *priv)break ; } -for (ch = priv->range.start; ch < priv->range.end; ch++) +for (ch = range->start; ch < range->end; ch++) priv->channels[CHAN_TO_IDX (ch)].flags =0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 258/343 qed: reduce maximum stack frame size
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 7c116e02a4a7575c8c62bfd2106e3e3ec8fb99dc ]
clang warns about an overly large stack frame in one function when it decides to inline all __qed_get_vport_*() functions into __qed_get_vport_stats():
drivers/net/ethernet/qlogic/qed/qed_l2.c:1889:13: error: stack frame size of 1128 bytes in function '_qed_get_vport_stats' [-Werror,-Wframe-larger-than=]
Use a noinline_for_stack annotation to prevent clang from inlining these, which keeps the maximum stack usage at around half of that in the worst case, similar to what we get with gcc.
--- drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +++++++++++------------- 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_l2.c +15 -19
@@ -1629,10 +1629,9 @@ static void __qed_get_vport_pstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_pstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_pstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_pstorm_per_queue_stat pstats;u32 pstats_addr =0 , pstats_len =0 ;
@@ -1659,10 +1658,9 @@ static void __qed_get_vport_pstats(struct qed_hwfn *p_hwfn,HILO_64_REGPAIR (pstats.error_drop_pkts); } -static void __qed_get_vport_tstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_tstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct tstorm_per_port_stat tstats;u32 tstats_addr, tstats_len;
@@ -1705,10 +1703,9 @@ static void __qed_get_vport_ustats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_ustats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack +void __qed_get_vport_ustats(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_ustorm_per_queue_stat ustats;u32 ustats_addr =0 , ustats_len =0 ;
@@ -1747,10 +1744,9 @@ static void __qed_get_vport_mstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_mstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_mstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_mstorm_per_queue_stat mstats;u32 mstats_addr =0 , mstats_len =0 ;
@@ -1776,9 +1772,9 @@ static void __qed_get_vport_mstats(struct qed_hwfn *p_hwfn,HILO_64_REGPAIR (mstats.tpa_coalesced_bytes); } -static void __qed_get_vport_port_stats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats) +static noinline_for_stack void +__qed_get_vport_port_stats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats) {struct qed_eth_stats_common *p_common = &p_stats->common;struct port_stats port_stats;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 259/343 usb: host: xhci-hub: fix extra endianness conversion
In reply to Greg Kroah-HartmanFrom: Ruslan Bilovol <[email protected]>
[ Upstream commit 6269e4c76eacabaea0d0099200ae1a455768d208 ]
Don't do extra cpu_to_le32 conversion for put_unaligned_le32 because it is already implemented in this function.
Fixes sparse error:
xhci-hub.c:1152:44: warning: incorrect type in argument 1 (different base types)
xhci-hub.c:1152:44: expected unsigned int [usertype] val
xhci-hub.c:1152:44: got restricted __le32 [usertype]
--- drivers/usb/host/xhci-hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -1118,7 +1118,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, } port_li =readl (port_array[wIndex] +PORTLI ); status =xhci_get_ext_port_status (temp, port_li); -put_unaligned_le32 (cpu_to_le32 (status), &buf[4 ]); +put_unaligned_le32 (status, &buf[4 ]); }break ;case SetPortFeature:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 260/343 mic: avoid statically declaring a struct device.
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit bc83f79bd2119230888fb8574639d5a51b38f903 ]
Generally, declaring a platform device as a static variable is a bad idea and can cause all kinds of problems, in particular with the DMA configuration and lifetime rules.
A specific problem we hit here is from a bug in clang that warns about certain (otherwise valid) macros when used in static variables:
drivers/misc/mic/card/mic_x100.c:285:27: warning: shift count >= width of type [-Wshift-count-overflow]
static u64 mic_dma_mask = DMA_BIT_MASK(64);
^~~~~~~~~~~~~~~~
include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
^ ~~~A slightly better way here is to create the platform device dynamically and set the dma mask in the probe function.
This avoids the warning and some other problems, but is still not ideal because the device creation should really be separated from the driver, and the fact that the device has no parent means we have to force the dma mask rather than having it set up from the bus that the device is actually on.
--- drivers/misc/mic/card/mic_x100.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/misc/mic/card/mic_x100.c +12 -16
@@ -249,6 +249,9 @@ static int __init mic_probe(struct platform_device *pdev) mdrv->dev = &pdev->dev;snprintf (mdrv->name,sizeof (mic_driver_name), mic_driver_name); +/* FIXME: use dma_set_mask_and_coherent() and check result */ +dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )); + mdev->mmio.pa =MIC_X100_MMIO_BASE ; mdev->mmio.len =MIC_X100_MMIO_LEN ; mdev->mmio.va = devm_ioremap(&pdev->dev, MIC_X100_MMIO_BASE,
@@ -294,18 +297,6 @@ static void mic_platform_shutdown(struct platform_device *pdev)mic_remove (pdev); } -static u64 mic_dma_mask =DMA_BIT_MASK (64 ); - -static struct platform_device mic_platform_dev = { - .name = mic_driver_name, - .id =0 , - .num_resources =0 , - .dev = { - .dma_mask = &mic_dma_mask, - .coherent_dma_mask =DMA_BIT_MASK (64 ), - }, -}; -static struct platform_driver __refdata mic_platform_driver = { .probe = mic_probe, .remove = mic_remove,
@@ -315,6 +306,8 @@ static struct platform_driver __refdata mic_platform_driver = { }, }; +static struct platform_device *mic_platform_dev; +static int __init mic_init (void ) {int ret;
@@ -328,9 +321,12 @@ static int __init mic_init(void)request_module ("mic_x100_dma" );mic_init_card_debugfs (); - ret =platform_device_register (&mic_platform_dev); + + mic_platform_dev =platform_device_register_simple (mic_driver_name, +0 ,NULL ,0 ); + ret =PTR_ERR_OR_ZERO (mic_platform_dev);if (ret) { -pr_err ("platform_device_register ret %d\n" , ret); +pr_err ("platform_device_register_full ret %d\n" , ret); goto cleanup_debugfs; } ret =platform_driver_register (&mic_platform_driver);
@@ -341,7 +337,7 @@ static int __init mic_init(void)return ret; device_unregister: -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev); cleanup_debugfs:mic_exit_card_debugfs (); done:
@@ -351,7 +347,7 @@ done: static void __exit mic_exit(void) {platform_driver_unregister (&mic_platform_driver); -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev);mic_exit_card_debugfs (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 261/343 x86/kgbd: Use NMI_VECTOR not APIC_DM_NMI
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2591bc4e8d70b4e1330d327fb7e3921f4e070a51 ]
apic->send_IPI_allbutself() takes a vector number as argument.
APIC_DM_NMI is clearly not a vector number. It's defined to 0x400 which is outside the vector space.
Use NMI_VECTOR instead as that's what it is intended to be.
--- arch/x86/kernel/kgdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/kgdb.c +1 -1
@@ -438,7 +438,7 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs)*/ void kgdb_roundup_cpus (unsigned long flags) { - apic->send_IPI_allbutself (APIC_DM_NMI ); + apic->send_IPI_allbutself (NMI_VECTOR ); }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 262/343 crypto: ccp - Reduce maximum stack usage
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 72c8117adfced37df101c8c0b3f363e0906f83f0 ]
Each of the operations in ccp_run_cmd() needs several hundred bytes of kernel stack. Depending on the inlining, these may need separate stack slots that add up to more than the warning limit, as shown in this clang based build:
drivers/crypto/ccp/ccp-ops.c:871:12: error: stack frame size of 1164 bytes in function 'ccp_run_aes_cmd' [-Werror,-Wframe-larger-than=] static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
The problem may also happen when there is no warning, e.g. in the ccp_run_cmd()->ccp_run_aes_cmd()->ccp_run_aes_gcm_cmd() call chain with over 2000 bytes.
Mark each individual function as 'noinline_for_stack' to prevent this from happening, and move the calls to the two special cases for aes into the top-level function. This will keep the actual combined stack usage to the mimimum: 828 bytes for ccp_run_aes_gcm_cmd() and at most 524 bytes for each of the other cases.
--- drivers/crypto/ccp/ccp-ops.c | 52 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/crypto/ccp/ccp-ops.c +31 -21
@@ -458,8 +458,8 @@ static int ccp_copy_from_sb(struct ccp_cmd_queue *cmd_q,return ccp_copy_to_from_sb (cmd_q, wa, jobid, sb, byte_swap, true); } -static int ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -614,8 +614,8 @@ e_key:return ret; } -static int ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx, final_wa, tag;
@@ -897,7 +897,8 @@ e_key:return ret; } -static int ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -907,12 +908,6 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)bool in_place = false;int ret; -if (aes->mode ==CCP_AES_MODE_CMAC ) -return ccp_run_aes_cmac_cmd (cmd_q, cmd); - -if (aes->mode ==CCP_AES_MODE_GCM ) -return ccp_run_aes_gcm_cmd (cmd_q, cmd); -if (!((aes->key_len ==AES_KEYSIZE_128 ) || (aes->key_len ==AES_KEYSIZE_192 ) || (aes->key_len ==AES_KEYSIZE_256 )))
@@ -1080,8 +1075,8 @@ e_key:return ret; } -static int ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_xts_aes_engine *xts = &cmd->u.xts;struct ccp_dm_workarea key, ctx;
@@ -1280,7 +1275,8 @@ e_key:return ret; } -static int ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_des3_engine *des3 = &cmd->u.des3;
@@ -1476,7 +1472,8 @@ e_key:return ret; } -static int ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_sha_engine *sha = &cmd->u.sha;struct ccp_dm_workarea ctx;
@@ -1820,7 +1817,8 @@ e_ctx:return ret; } -static int ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_rsa_engine *rsa = &cmd->u.rsa;struct ccp_dm_workarea exp, src, dst;
@@ -1951,8 +1949,8 @@ e_sb:return ret; } -static int ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_engine *pt = &cmd->u.passthru;struct ccp_dm_workarea mask;
@@ -2083,7 +2081,8 @@ e_mask:return ret; } -static int ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q, +static noinline_for_stack int +ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_nomap_engine *pt = &cmd->u.passthru_nomap;
@@ -2424,7 +2423,8 @@ e_src:return ret; } -static int ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_ecc_engine *ecc = &cmd->u.ecc;
@@ -2461,7 +2461,17 @@ int ccp_run_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)switch (cmd->engine) {case CCP_ENGINE_AES : - ret =ccp_run_aes_cmd (cmd_q, cmd); +switch (cmd->u.aes.mode) { +case CCP_AES_MODE_CMAC : + ret =ccp_run_aes_cmac_cmd (cmd_q, cmd); +break ; +case CCP_AES_MODE_GCM : + ret =ccp_run_aes_gcm_cmd (cmd_q, cmd); +break ; +default : + ret =ccp_run_aes_cmd (cmd_q, cmd); +break ; + }break ;case CCP_ENGINE_XTS_AES_128 : ret =ccp_run_xts_aes_cmd (cmd_q, cmd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 263/343 ALSA: aoa: onyx: always initialize register read value
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit f474808acb3c4b30552d9c59b181244e0300d218 ]
A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value.
--- sound/aoa/codecs/onyx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/aoa/codecs/onyx.c +3 -1
@@ -74,8 +74,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)return 0 ; } v =i2c_smbus_read_byte_data (onyx->i2c, reg); -if (v <0 ) +if (v <0 ) { + *value =0 ;return -1 ; + } *value = (u8 )v; onyx->cache[ONYX_REG_CONTROL -FIRSTREGISTER ] = *value;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 264/343 tipc: reduce risk of wakeup queue starvation
In reply to Greg Kroah-HartmanFrom: Jon Maloy <[email protected]>
[ Upstream commit 7c5b42055964f587e55bd87ef334c3a27e95d144 ]
In commit 365ad353c256 ("tipc: reduce risk of user starvation during link congestion") we allowed senders to add exactly one list of extra buffers to the link backlog queues during link congestion (aka "oversubscription"). However, the criteria for when to stop adding wakeup messages to the input queue when the overload abates is inaccurate, and may cause starvation problems during very high load.
Currently, we stop adding wakeup messages after 10 total failed attempts where we find that there is no space left in the backlog queue for a certain importance level. The counter for this is accumulated across all levels, which may lead the algorithm to leave the loop prematurely, although there may still be plenty of space available at some levels. The result is sometimes that messages near the wakeup queue tail are not added to the input queue as they should be.
We now introduce a more exact algorithm, where we keep adding wakeup messages to a level as long as the backlog queue has free slots for the corresponding level, and stop at the moment there are no more such slots or when there are no more wakeup messages to dequeue.
--- net/tipc/link.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
net/tipc/link.c +21 -8
@@ -811,18 +811,31 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)*/ void link_prepare_wakeup (struct tipc_link *l) { +struct sk_buff_head *wakeupq = &l->wakeupq; +struct sk_buff_head *inputq = l->inputq;struct sk_buff *skb, *tmp; -int imp, i =0 ; +struct sk_buff_head tmpq; +int avail[5 ] = {0 ,}; +int imp =0 ; + +__skb_queue_head_init (&tmpq); - skb_queue_walk_safe(&l->wakeupq, skb, tmp) { +for (; imp <=TIPC_SYSTEM_IMPORTANCE ; imp++) + avail[imp] = l->backlog[imp].limit - l->backlog[imp].len; + + skb_queue_walk_safe(wakeupq, skb, tmp) { imp =TIPC_SKB_CB (skb)->chain_imp; -if (l->backlog[imp].len < l->backlog[imp].limit) { -skb_unlink (skb, &l->wakeupq); -skb_queue_tail (l->inputq, skb); - }else if (i++ >10 ) { -break ; - } +if (avail[imp] <=0 ) +continue ; + avail[imp]--; +__skb_unlink (skb, wakeupq); +__skb_queue_tail (&tmpq, skb); } + +spin_lock_bh (&inputq->lock); +skb_queue_splice_tail (&tmpq, inputq); +spin_unlock_bh (&inputq->lock); + }void tipc_link_reset (struct tipc_link *l)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 265/343 ARM: dts: stm32: add missing vdda-supply to adc on stm32h743i-eval
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 493e84c5dc4d703d976b5875f5db22dae08a0782 ]
Add missing vdda-supply required by STM32 ADC.
board")
--- arch/arm/boot/dts/stm32h743i-eval.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/stm32h743i-eval.dts +1 -0
@@ -71,6 +71,7 @@ }; &adc_12 { + vdda-supply = <&vdda>; vref-supply = <&vdda>; status = "okay"; adc1: adc@0 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 266/343 net/mlx5: Fix mlx5_ifc_query_lag_out_bits
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit ea77388b02270b0af8dc57f668f311235ea068f0 ]
Remove the "reserved_at_40" field to match the device specification.
--- include/linux/mlx5/mlx5_ifc.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +0 -2
@@ -8671,8 +8671,6 @@ struct mlx5_ifc_query_lag_out_bits {u8 syndrome[0x20 ]; -u8 reserved_at_40[0x40 ]; -struct mlx5_ifc_lagc_bits ctx; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 267/343 cifs: fix rmmod regression in cifs.ko caused by force_sig changes
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ]
The global change from force_sig caused module unloading of cifs.ko to fail (since the cifsd process could not be killed, "rmmod cifs" now would always fail)
--- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/connect.c +1 -0
@@ -921,6 +921,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); +allow_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 268/343 crypto: caam - free resources in case caam_rng registration failed
In reply to Greg Kroah-HartmanFrom: Iuliana Prodan <[email protected]>
[ Upstream commit c59a1d41672a89b5cac49db1a472ff889e35a2d2 ]
Check the return value of the hardware registration for caam_rng and free resources in case of failure.
--- drivers/crypto/caam/caamrng.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/caam/caamrng.c +4 -1
@@ -353,7 +353,10 @@ static int __init caam_rng_init(void) goto free_rng_ctx;dev_info (dev,"registering rng-caam\n" ); -return hwrng_register (&caam_rng); + + err =hwrng_register (&caam_rng); +if (!err) +return err; free_rng_ctx:kfree (rng_ctx);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 269/343 ext4: set error return correctly when ext4_htree_store_dirent fails
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 7a14826ede1d714f0bb56de8167c0e519041eeda ]
Currently when the call to ext4_htree_store_dirent fails the error return variable 'ret' is is not being set to the error code and variable count is instead, hence the error code is not being returned. Fix this by assigning ret to the error return code.
Addresses-Coverity: ("Unused value")
--- fs/ext4/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inline.c +1 -1
@@ -1425,7 +1425,7 @@ int htree_inlinedir_to_tree(struct file *dir_file, err =ext4_htree_store_dirent (dir_file, hinfo->hash, hinfo->minor_hash, de, &tmp_str);if (err) { - count = err; + ret = err; goto out; } count++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 270/343 ASoC: es8328: Fix copy-paste error in es8328_right_line_controls
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 630742c296341a8cfe00dfd941392025ba8dd4e8 ]
It seems 'es8328_rline_enum' should be used
in es8328_right_line_controls
--- sound/soc/codecs/es8328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/es8328.c +1 -1
@@ -231,7 +231,7 @@ static const struct soc_enum es8328_rline_enum =ARRAY_SIZE (es8328_line_texts), es8328_line_texts);static const struct snd_kcontrol_new es8328_right_line_controls = -SOC_DAPM_ENUM ("Route" , es8328_lline_enum); +SOC_DAPM_ENUM ("Route" , es8328_rline_enum);/* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 271/343 ASoC: cs4349: Use PM ops cs4349_runtime_pm
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 9b4275c415acca6264a3d7f1182589959c93d530 ]
sound/soc/codecs/cs4349.c:358:32: warning:
cs4349_runtime_pm defined but not used [-Wunused-const-variable=]
cs4349_runtime_pm ops already defined, it seems we should enable it.
--- sound/soc/codecs/cs4349.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4349.c +1 -0
@@ -380,6 +380,7 @@ static struct i2c_driver cs4349_i2c_driver = { .driver = { .name = "cs4349", .of_match_table = cs4349_of_match, + .pm = &cs4349_runtime_pm, }, .id_table = cs4349_i2c_id, .probe = cs4349_i2c_probe,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 272/343 ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 554b75bde64bcad9662530726d1483f7ef012069 ]
sound/soc/codecs/wm8737.c:112:29: warning:
high_3d defined but not used [-Wunused-const-variable=]
'high_3d' should be used for 3D High Cut-off.
--- sound/soc/codecs/wm8737.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8737.c +1 -1
@@ -170,7 +170,7 @@ SOC_DOUBLE("Polarity Invert Switch", WM8737_ADC_CONTROL, 5, 6, 1, 0),SOC_SINGLE ("3D Switch" ,WM8737_3D_ENHANCE ,0 ,1 ,0 ),SOC_SINGLE ("3D Depth" ,WM8737_3D_ENHANCE ,1 ,15 ,0 ),SOC_ENUM ("3D Low Cut-off" , low_3d), -SOC_ENUM ("3D High Cut-off" , low_3d), +SOC_ENUM ("3D High Cut-off" , high_3d),SOC_SINGLE_TLV ("3D ADC Volume" ,WM8737_3D_ENHANCE ,7 ,1 ,1 , adc_tlv), SOC_SINGLE("Noise Gate Switch", WM8737_NOISE_GATE, 0, 1, 0),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 273/343 net/rds: Add a few missing rds_stat_names entries
In reply to Greg Kroah-HartmanFrom: Gerd Rausch <[email protected]>
[ Upstream commit 55c70ca00c982fbc0df4c4d3e31747fb73f4ddb5 ]
In a previous commit, fields were added to "struct rds_statistics" but array "rds_stat_names" was not updated accordingly.
Please note the inconsistent naming of the string representations that is done in the name of compatibility
with the Oracle internal code-base.
s_recv_bytes_added_to_socket -> "recv_bytes_added_to_sock"s_recv_bytes_removed_from_socket -> "recv_bytes_freed_fromsock"
--- net/rds/stats.c | 2 ++ 1 file changed, 2 insertions(+)
net/rds/stats.c +2 -0
@@ -76,6 +76,8 @@ static const char *const rds_stat_names[] = {"cong_update_received" ,"cong_send_error" ,"cong_send_blocked" , +"recv_bytes_added_to_sock" , + "recv_bytes_freed_fromsock", }; void rds_stats_info_copy(struct rds_info_iterator *iter,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 274/343 bnxt_en: Fix handling FRAG_ERR when NVM_INSTALL_UPDATE cmd fails
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit dd2ebf3404c7c295014bc025dea23960960ceb1a ]
If FW returns FRAG_ERR in response error code, driver is resending the command only when HWRM command returns success. Fix the code to resend NVM_INSTALL_UPDATE command with DEFRAG install flags, if FW returns FRAG_ERR in its response error code.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +5 -7
@@ -1667,21 +1667,19 @@ static int bnxt_flash_package_from_file(struct net_device *dev,mutex_lock (&bp->hwrm_cmd_lock); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; - -if (resp->error_code) { +if (hwrm_err) {u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err; -if (error_code ==NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { +if (resp->error_code && error_code == +NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { install.flags |=cpu_to_le16 (NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG ); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; } +if (hwrm_err) + goto flash_pkg_exit; }if (resp->result) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 275/343 signal: Allow cifs and drbd to receive their terminating signals
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 33da8e7c814f77310250bb54a9db36a44c5de784 ]
My recent to change to only use force_sig for a synchronous events wound up breaking signal reception cifs and drbd. I had overlooked the fact that by default kthreads start out with all signals set to SIG_IGN. So a change I thought was safe turned out to have made it impossible for those kernel thread to catch their signals.
Reverting the work on force_sig is a bad idea because what the code was doing was very much a misuse of force_sig. As the way force_sig ultimately allowed the signal to happen was to change the signal handler to SIG_DFL. Which after the first signal will allow userspace to send signals to these kernel threads. At least for wake_ack_receiver in drbd that does not appear actively wrong.
So correct this problem by adding allow_kernel_signal that will allow signals whose siginfo reports they were sent by the kernel through, but will not allow userspace generated signals, and update cifs and drbd to call allow_kernel_signal in an appropriate place so that their thread can receive this signal.
Fixing things this way ensures that userspace won't be able to send signals and cause problems, that it is clear which signals the threads are expecting to receive, and it guarantees that nothing else in the system will be affected.
This change was partly inspired by similar cifs and drbd patches that added allow_signal.
--- drivers/block/drbd/drbd_main.c | 2 ++ fs/cifs/connect.c | 2 +- include/linux/signal.h | 15 ++++++++++++++- kernel/signal.c | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_main.c +2 -0
@@ -334,6 +334,8 @@ static int drbd_thread_setup(void *arg) thi->name[0 ], resource->name); +allow_kernel_signal (DRBD_SIGKILL ); +allow_kernel_signal (SIGXCPU ); restart: retval = thi->function (thi);
fs/cifs/connect.c +1 -1
@@ -921,7 +921,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); -allow_signal (SIGKILL ); +allow_kernel_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
include/linux/signal.h +14 -1
@@ -268,6 +268,9 @@ extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);extern void exit_signals (struct task_struct *tsk);extern void kernel_sigaction (int ,__sighandler_t ); +#define SIG_KTHREAD ((__force __sighandler_t)2) +#define SIG_KTHREAD_KERNEL ((__force __sighandler_t)3) +static inline void allow_signal (int sig) {/*
@@ -275,7 +278,17 @@ static inline void allow_signal(int sig)* know it'll be handled, so that they don't get converted to * SIGKILL or just silently dropped. */ -kernel_sigaction (sig, (__force __sighandler_t )2 ); +kernel_sigaction (sig,SIG_KTHREAD ); +} + +static inline void allow_kernel_signal (int sig) +{ +/* +* Kernel threads handle their own signals. Let the signal code +* know signals sent by the kernel will be handled, so that they +* don't get silently dropped. +*/ +kernel_sigaction (sig,SIG_KTHREAD_KERNEL ); }static inline void disallow_signal (int sig)
kernel/signal.c +5 -0
@@ -85,6 +85,11 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force) handler == SIG_DFL && !(force && sig_kernel_only(sig)))return 1 ; +/* Only allow kernel generated signals to this kthread */ +if (unlikely ((t->flags &PF_KTHREAD ) && + (handler ==SIG_KTHREAD_KERNEL ) && !force)) +return true; +return sig_handler_ignored (handler, sig); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 276/343 ASoC: sun4i-i2s: RX and TX counter registers are swapped
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit cf2c0e1ce9544df42170fb921f12da82dc0cc8d6 ]
The RX and TX counters registers offset have been swapped, fix that.
--- sound/soc/sunxi/sun4i-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +2 -2
@@ -80,8 +80,8 @@#define SUN4I_I2S_CLK_DIV_MCLK_MASK GENMASK(3, 0)#define SUN4I_I2S_CLK_DIV_MCLK (mclk) ((mclk) << 0) -#define SUN4I_I2S_RX_CNT_REG 0x28 -#define SUN4I_I2S_TX_CNT_REG 0x2c +#define SUN4I_I2S_TX_CNT_REG 0x28 +#define SUN4I_I2S_RX_CNT_REG 0x2c#define SUN4I_I2S_TX_CHAN_SEL_REG 0x30#define SUN4I_I2S_CHAN_SEL (num_chan) (((num_chan) - 1) << 0)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 277/343 dmaengine: dw: platform: Switch to acpi_dma_controller_register()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e7b8514e4d68bec21fc6385fa0a66797ddc34ac9 ]
There is a possibility to have registered ACPI DMA controller while it has been gone already.
To avoid the potential crash, move to non-managed acpi_dma_controller_register().
--- drivers/dma/dw/platform.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/dma/dw/platform.c +12 -2
@@ -87,13 +87,20 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)dma_cap_set (DMA_SLAVE , info->dma_cap); info->filter_fn = dw_dma_acpi_filter; - ret =devm_acpi_dma_controller_register (dev, acpi_dma_simple_xlate, - info); + ret =acpi_dma_controller_register (dev, acpi_dma_simple_xlate, info);if (ret) dev_err(dev, "could not register acpi_dma_controller\n"); } + +static void dw_dma_acpi_controller_free (struct dw_dma *dw) +{ +struct device *dev = dw->dma.dev; + +acpi_dma_controller_free (dev); +}#else /* !CONFIG_ACPI */ static inline void dw_dma_acpi_controller_register (struct dw_dma *dw) {} +static inline void dw_dma_acpi_controller_free (struct dw_dma *dw) {}#endif /* !CONFIG_ACPI */ #ifdef CONFIG_OF
@@ -249,6 +256,9 @@ static int dw_remove(struct platform_device *pdev) {struct dw_dma_chip *chip =platform_get_drvdata (pdev); +if (ACPI_HANDLE (&pdev->dev)) +dw_dma_acpi_controller_free (chip->dw); +if (pdev->dev.of_node)of_dma_controller_free (pdev->dev.of_node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 278/343 mac80211: minstrel_ht: fix per-group max throughput rate initialization
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 56dd918ff06e3ee24d8067e93ed12b2a39e71394 ]
The group number needs to be multiplied by the number of rates per group to get the full rate index
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -529,7 +529,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)/* (re)Initialize group rate indexes */ for (j =0 ; j <MAX_THR_RATES ; j++) - tmp_group_tp_rate[j] = group; + tmp_group_tp_rate[j] =MCS_GROUP_RATES * group;for (i =0 ; i <MCS_GROUP_RATES ; i++) {if (!(mi->supported[group] &BIT (i)))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 279/343 media: atmel: atmel-isi: fix timeout value for stop streaming
In reply to Greg Kroah-HartmanFrom: Alexandre Kroupski <[email protected]>
[ Upstream commit 623fd246bb40234fe68dd4e7c1f1f081f9c45a3d ]
In case of sensor malfunction, stop streaming timeout takes much longer than expected. This is due to conversion of time to jiffies: milliseconds multiplied with HZ (ticks/second) gives out a value of jiffies with 10^3 greater. We need to also divide by 10^3 to obtain the right jiffies value. In other words FRAME_INTERVAL_MILLI_SEC must be in seconds in order to multiply by HZ and get the right jiffies value to add to the current jiffies for the timeout expire time.
--- drivers/media/platform/atmel/atmel-isi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/atmel/atmel-isi.c +1 -1
@@ -496,7 +496,7 @@ static void stop_streaming(struct vb2_queue *vq)spin_unlock_irq (&isi->irqlock);if (!isi->enable_preview_path) { - timeout = jiffies +FRAME_INTERVAL_MILLI_SEC *HZ ; + timeout = jiffies + (FRAME_INTERVAL_MILLI_SEC *HZ ) /1000 ;/* Wait until the end of the current frame. */ while ((isi_readl (isi,ISI_STATUS ) &ISI_CTRL_CDC ) &&time_before (jiffies, timeout))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 280/343 rtc: pcf2127: bugfix: read rtc disables watchdog
In reply to Greg Kroah-HartmanFrom: Bruno Thomsen <[email protected]>
[ Upstream commit 7f43020e3bdb63d65661ed377682702f8b34d3ea ]
The previous fix listed bulk read of registers as root cause of accendential disabling of watchdog, since the watchdog counter register (WD_VAL) was zeroed.
Tested with the same PCF2127 chip as Sean reveled root cause of WD_VAL register value zeroing was caused by reading CTRL2 register which is one of the watchdog feature control registers.
So the solution is to not read the first two control registers (CTRL1 and CTRL2) in pcf2127_rtc_read_time as they are not needed anyway. Size of local buf variable is kept to allow easy usage of register defines to improve readability of code.
Debug trace line was updated after CTRL1 and CTRL2 are no longer read from the chip. Also replaced magic numbers in buf access with register defines.
--- drivers/rtc/rtc-pcf2127.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)
drivers/rtc/rtc-pcf2127.c +12 -20
@@ -52,20 +52,14 @@ static int pcf2127_rtc_read_time(struct device *dev, struct rtc_time *tm)struct pcf2127 *pcf2127 =dev_get_drvdata (dev);unsigned char buf[10 ];int ret; -int i; -for (i =0 ; i <=PCF2127_REG_CTRL3 ; i++) { - ret =regmap_read (pcf2127->regmap,PCF2127_REG_CTRL1 + i, - (unsigned int *)(buf + i)); -if (ret) { -dev_err (dev,"%s: read error\n" , __func__); -return ret; - } - } - - ret =regmap_bulk_read (pcf2127->regmap,PCF2127_REG_SC , - (buf +PCF2127_REG_SC ), -ARRAY_SIZE (buf) -PCF2127_REG_SC ); +/* +* Avoid reading CTRL2 register as it causes WD_VAL register +* value to reset to 0 which means watchdog is stopped. +*/ + ret =regmap_bulk_read (pcf2127->regmap,PCF2127_REG_CTRL3 , + (buf +PCF2127_REG_CTRL3 ), +ARRAY_SIZE (buf) -PCF2127_REG_CTRL3 );if (ret) {dev_err (dev,"%s: read error\n" , __func__);return ret;
@@ -86,14 +80,12 @@ static int pcf2127_rtc_read_time(struct device *dev, struct rtc_time *tm) }dev_dbg (dev, -"%s: raw data is cr1=%02x, cr2=%02x, cr3=%02x, " -"sec=%02x, min=%02x, hr=%02x, " +"%s: raw data is cr3=%02x, sec=%02x, min=%02x, hr=%02x, " "mday=%02x, wday=%02x, mon=%02x, year=%02x\n" , - __func__, - buf[0 ], buf[1 ], buf[2 ], - buf[3 ], buf[4 ], buf[5 ], - buf[6 ], buf[7 ], buf[8 ], buf[9 ]); - + __func__, buf[PCF2127_REG_CTRL3 ], buf[PCF2127_REG_SC ], + buf[PCF2127_REG_MN ], buf[PCF2127_REG_HR ], + buf[PCF2127_REG_DM ], buf[PCF2127_REG_DW ], + buf[PCF2127_REG_MO ], buf[PCF2127_REG_YR ]); tm->tm_sec =bcd2bin (buf[PCF2127_REG_SC ] &0x7F ); tm->tm_min =bcd2bin (buf[PCF2127_REG_MN ] &0x7F );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 281/343 mips: avoid explicit UB in assignment of mips_io_port_base
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
[ Upstream commit 12051b318bc3ce5b42d6d786191008284b067d83 ]
The code in question is modifying a variable declared const through pointer manipulation. Such code is explicitly undefined behavior, and is the lone issue preventing malta_defconfig from booting when built with Clang:
If an attempt is made to modify an object defined with a const-qualified type through use of an lvalue with non-const-qualified type, the behavior is undefined.
LLVM is removing such assignments. A simple fix is to not declare variables const that you plan on modifying. Limiting the scope would be a better method of preventing unwanted writes to such a variable.
Further, the code in question mentions "compiler bugs" without any links to bug reports, so it is difficult to know if the issue is resolved in GCC. The patch was authored in 2006, which would have been GCC 4.0.3 or 4.1.1. The minimal supported version of GCC in the Linux kernel is currently 4.6.
For what its worth, there was UB before the commit in question, it just added a barrier and got lucky IRT codegen. I don't think there's any actual compiler bugs related, just runtime bugs due to UB.
--- arch/mips/include/asm/io.h | 14 ++------------ arch/mips/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-)
arch/mips/include/asm/io.h +2 -12
@@ -60,21 +60,11 @@* instruction, so the lower 16 bits must be zero. Should be true on * on any sane architecture; generic code does not use this assumption. */ -extern const unsigned long mips_io_port_base; +extern unsigned long mips_io_port_base; -/* -* Gcc will generate code to load the value of mips_io_port_base after each -* function call which may be fairly wasteful in some cases. So we don't -* play quite by the book. We tell gcc mips_io_port_base is a long variable -* which solves the code generation issue. Now we need to violate the -* aliasing rules a little to make initialization possible and finally we -* will need the barrier() to fight side effects of the aliasing chat. -* This trickery will eventually collapse under gcc's optimizer. Oh well. -*/ static inline void set_io_port_base (unsigned long base) { - * (unsigned long *) &mips_io_port_base = base; -barrier (); + mips_io_port_base = base; }/*
arch/mips/kernel/setup.c +1 -1
@@ -75,7 +75,7 @@ static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;* mips_io_port_base is the begin of the address space to which x86 style * I/O ports are mapped. */ -const unsigned long mips_io_port_base =-1 ; +unsigned long mips_io_port_base =-1 ;EXPORT_SYMBOL (mips_io_port_base);static struct resource code_resource = { .name ="Kernel code" , };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 282/343 iommu/mediatek: Fix iova_to_phys PA start for 4GB mode
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit 76ce65464fcd2c21db84391572b7938b716aceb0 ]
In M4U 4GB mode, the physical address is remapped as below:
CPU Physical address:
====================
0 1G 2G 3G 4G 5G |---A---|---B---|---C---|---D---|---E---|
+--I/O--+------------Memory-------------+
IOMMU output physical address:
=============================
4G 5G 6G 7G 8G
|---E---|---B---|---C---|---D---|
+------------Memory-------------+The Region 'A'(I/O) can not be mapped by M4U; For Region 'B'/'C'/'D', the bit32 of the CPU physical address always is needed to set, and for Region 'E', the CPU physical address keep as is. something looks like this:
CPU PA -> M4U OUTPUT PA 0x4000_0000 0x1_4000_0000 (Add bit32) 0x8000_0000 0x1_8000_0000 ... 0xc000_0000 0x1_c000_0000 ... 0x1_0000_0000 0x1_0000_0000 (No change)
Additionally, the iommu consumers always use the CPU phyiscal address.
The PA in the iova_to_phys that is got from v7s always is u32, But from the CPU point of view, PA only need add BIT(32) when PA < 0x4000_0000.
for 4GB mode")
--- drivers/iommu/mtk_iommu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +25 -1
@@ -115,6 +115,30 @@ struct mtk_iommu_domain {static struct iommu_ops mtk_iommu_ops; +/* +* In M4U 4GB mode, the physical address is remapped as below: +* +* CPU Physical address: +* ==================== +* +* 0 1G 2G 3G 4G 5G +* |---A---|---B---|---C---|---D---|---E---| +* +--I/O--+------------Memory-------------+ +* +* IOMMU output physical address: +* ============================= +* +* 4G 5G 6G 7G 8G +* |---E---|---B---|---C---|---D---| +* +------------Memory-------------+ +* +* The Region 'A'(I/O) can NOT be mapped by M4U; For Region 'B'/'C'/'D', the +* bit32 of the CPU physical address always is needed to set, and for Region +* 'E', the CPU physical address keep as is. +* Additionally, The iommu consumers always use the CPU phyiscal address. +*/ +#define MTK_IOMMU_4GB_MODE_REMAP_BASE 0x40000000 +static LIST_HEAD (m4ulist);/* List all the M4U HWs */ #define for_each_m4u (data) list_for_each_entry(data, &m4ulist, list)
@@ -404,7 +428,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, pa = dom->iop->iova_to_phys (dom->iop, iova);spin_unlock_irqrestore (&dom->pgtlock, flags); -if (data->enable_4GB) +if (data->enable_4GB && pa <MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa |=BIT_ULL (32 );return pa;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 283/343 ahci: Do not export local variable ahci_em_messages
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 60fc35f327e0a9e60b955c0f3c3ed623608d1baa ]
The commit ed08d40cdec4
("ahci: Changing two module params with static and __read_mostly")
moved ahci_em_messages to be static while missing the fact of exporting it.
WARNING: "ahci_em_messages" [vmlinux] is a static EXPORT_SYMBOL_GPL
Drop export for the local variable ahci_em_messages.
--- drivers/ata/libahci.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/libahci.c +0 -1
@@ -191,7 +191,6 @@ struct ata_port_operations ahci_pmp_retry_srst_ops = {EXPORT_SYMBOL_GPL (ahci_pmp_retry_srst_ops);static bool ahci_em_messages__read_mostly = true; -EXPORT_SYMBOL_GPL (ahci_em_messages);module_param (ahci_em_messages, bool,0444 );/* add other LED protocol types when they become supported */ MODULE_PARM_DESC(ahci_em_messages,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 284/343 Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit ab9bb6318b0967671e0c9b6537c1537d51ca4f45 ]
Commit dfe2a77fd243 ("kfifo: fix kfifo_alloc() and kfifo_init()") made the kfifo code round the number of elements up. That was good for __kfifo_alloc(), but it's actually wrong for __kfifo_init().
The difference? __kfifo_alloc() will allocate the rounded-up number of elements, but __kfifo_init() uses an allocation done by the caller. We can't just say "use more elements than the caller allocated", and have to round down.
The good news? All the normal cases will be using power-of-two arrays anyway, and most users of kfifo's don't use kfifo_init() at all, but one of the helper macros to declare a KFIFO that enforce the proper power-of-two behavior. But it looks like at least ibmvscsis might be affected.
The bad news? Will Deacon refers to an old thread and points points out that the memory ordering in kfifo's is questionable. See
https://lore.kernel.org/lkml/[email protected]/
for more.
--- lib/kfifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/kfifo.c +2 -1
@@ -82,7 +82,8 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer, { size /= esize; - size =roundup_pow_of_two (size); +if (!is_power_of_2 (size)) + size =rounddown_pow_of_two (size); fifo->in =0 ; fifo->out =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 285/343 hwmon: (lm75) Fix write operations for negative temperatures
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 7d82fcc9d9e81241778aaa22fda7be753e237d86 ]
Writes into limit registers fail if the temperature written is negative. The regmap write operation checks the value range, regmap_write accepts an unsigned int as parameter, and the temperature value passed to regmap_write is kept in a variable declared as long. Negative values are converted large unsigned integers, which fails the range check. Fix by type casting the temperature to u16 when calling regmap_write().
--- drivers/hwmon/lm75.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/lm75.c +1 -1
@@ -165,7 +165,7 @@ static int lm75_write(struct device *dev, enum hwmon_sensor_types type, temp =DIV_ROUND_CLOSEST (temp << (resolution -8 ),1000 ) << (16 - resolution); -return regmap_write (data->regmap, reg, temp); +return regmap_write (data->regmap, reg, (u16 )temp); } static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 286/343 power: supply: Init device wakeup after device_add()
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ]
We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister().
Let's change the order of operations so we don't run into problems here.
--- drivers/power/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/power/supply/power_supply_core.c +5 -5
@@ -891,14 +891,14 @@ __power_supply_register(struct device *parent, }spin_lock_init (&psy->changed_lock); - rc =device_init_wakeup (dev, ws); -if (rc) - goto wakeup_init_failed; - rc =device_add (dev);if (rc) goto device_add_failed; + rc =device_init_wakeup (dev, ws); +if (rc) + goto wakeup_init_failed; + rc =psy_register_thermal (psy);if (rc) goto register_thermal_failed;
@@ -935,8 +935,8 @@ register_cooler_failed:psy_unregister_thermal (psy); register_thermal_failed:device_del (dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed:put_device (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 287/343 x86, perf: Fix the dependency of the x86 insn decoder selftest
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 7720804a2ae46c90265a32c81c45fb6f8d2f4e8b ]
Since x86 instruction decoder is not only for kprobes, it should be tested when the insn.c is compiled. (e.g. perf is enabled but kprobes is disabled)
--- arch/x86/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig.debug +1 -1
@@ -189,7 +189,7 @@ config HAVE_MMIOTRACE_SUPPORT config X86_DECODER_SELFTEST bool "x86 instruction decoder selftest" - depends on DEBUG_KERNEL && KPROBES + depends on DEBUG_KERNEL && INSTRUCTION_DECODER depends on !COMPILE_TEST ---help--- Perform x86 instruction decoder selftests at build time.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 288/343 staging: greybus: light: fix a couple double frees
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 329101244f214952606359d254ae883b7109e1a5 ]
The problem is in gb_lights_request_handler(). If we get a request to change the config then we release the light with gb_lights_light_release() and re-allocated it. However, if the allocation fails part way through then we call gb_lights_light_release() again. This can lead to a couple different double frees where we haven't cleared out the original values:
gb_lights_light_v4l2_unregister(light); ... kfree(light->channels); kfree(light->name);
I also made a small change to how we set "light->channels_count = 0;". The original code handled this part fine and did not cause a use after free but it was sort of complicated to read.
--- drivers/staging/greybus/light.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/greybus/light.c +6 -6
@@ -1103,21 +1103,21 @@ static void gb_lights_channel_release(struct gb_channel *channel)static void gb_lights_light_release (struct gb_light *light) {int i; -int count; light->ready = false; - count = light->channels_count; -if (light->has_flash)gb_lights_light_v4l2_unregister (light); + light->has_flash = false; -for (i =0 ; i < count; i++) { +for (i =0 ; i < light->channels_count; i++)gb_lights_channel_release (&light->channels[i]); - light->channels_count--; - } + light->channels_count =0 ; +kfree (light->channels); + light->channels =NULL ;kfree (light->name); + light->name =NULL ; }static void gb_lights_release (struct gb_lights *glights)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 289/343 irqdomain: Add the missing assignment of domain->fwnode for named fwnode
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit 711419e504ebd68c8f03656616829c8ad7829389 ]
Recently device pass-through stops working for Linux VM running on Hyper-V.
git-bisect shows the regression is caused by the recent commit 467a3bb97432 ("PCI: hv: Allocate a named fwnode ..."), but the root cause is that the commit d59f6617eef0 forgets to set the domain->fwnode for IRQCHIP_FWNODE_NAMED*, and as a result:
1. The domain->fwnode remains to be NULL.
2. irq_find_matching_fwspec() returns NULL since "h->fwnode == fwnode" is false, and pci_set_bus_msi_domain() sets the Hyper-V PCI root bus's msi_domain to NULL.
3. When the device is added onto the root bus, the device's dev->msi_domain is set to NULL in pci_set_msi_domain().
4. When a device driver tries to enable MSI-X, pci_msi_setup_msi_irqs() calls arch_setup_msi_irqs(), which uses the native MSI chip (i.e. arch/x86/kernel/apic/msi.c: pci_msi_controller) to set up the irqs, but actually pci_msi_setup_msi_irqs() is supposed to call msi_domain_alloc_irqs() with the hbus->irq_domain, which is created in hv_pcie_init_irq_domain() and is associated with the Hyper-V chip hv_msi_irq_chip. Consequently, the irq line is not properly set up, and the device driver can not receive any interrupt.
--- kernel/irq/irqdomain.c | 1 + 1 file changed, 1 insertion(+)
kernel/irq/irqdomain.c +1 -0
@@ -147,6 +147,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,switch (fwid->type) {case IRQCHIP_FWNODE_NAMED :case IRQCHIP_FWNODE_NAMED_ID : + domain->fwnode = fwnode; domain->name =kstrdup (fwid->name,GFP_KERNEL );if (!domain->name) {kfree (domain);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 290/343 bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 420c20be08a4597404d272ae9793b642401146eb ]
An earlier commit re-worked the setting of the bitmask and is now assigning v with some bit flags rather than bitwise or-ing them into v, consequently the earlier bit-settings of v are being lost. Fix this by replacing an assignment with the bitwise or instead.
Addresses-Coverity: ("Unused value")
--- drivers/bcma/driver_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bcma/driver_pci.c +2 -2
@@ -78,7 +78,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address) v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_READ ; v |=BCMA_CORE_PCI_MDIODATA_TA ;
@@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device, v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_WRITE ; v |=BCMA_CORE_PCI_MDIODATA_TA ; v |= data;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 291/343 iio: dac: ad5380: fix incorrect assignment to val
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit b1e18768ef1214c0a8048327918a182cabe09f9d ]
Currently the pointer val is being incorrectly incremented instead of the value pointed to by val. Fix this by adding in the missing * indirection operator.
Addresses-Coverity: ("Unused value")
--- drivers/iio/dac/ad5380.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5380.c +1 -1
@@ -221,7 +221,7 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,if (ret)return ret; *val >>= chan->scan_type.shift; - val -= (1 << chan->scan_type.realbits) /2 ; + *val -= (1 << chan->scan_type.realbits) /2 ;return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : *val =2 * st->vref;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 292/343 ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit e1aa1a1db3b01c9890e82cf065cee99962ba1ed9 ]
Fix following lockdep warning disabling bh in
ath_dynack_node_init/ath_dynack_node_deinit
[ 75.955878] --------------------------------
[ 75.955880] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 75.955884] swapper/0/0 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 75.955888] 00000000792a7ee0 (&(&da->qlock)->rlock){+.?.}, at: ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.955905] {SOFTIRQ-ON-W} state was registered at:
[ 75.955912] lock_acquire+0x9a/0x160
[ 75.955917] _raw_spin_lock+0x2c/0x70
[ 75.955927] ath_dynack_node_init+0x2a/0x60 [ath9k_hw]
[ 75.955934] ath9k_sta_state+0xec/0x160 [ath9k]
[ 75.955976] drv_sta_state+0xb2/0x740 [mac80211]
[ 75.956008] sta_info_insert_finish+0x21a/0x420 [mac80211]
[ 75.956039] sta_info_insert_rcu+0x12b/0x2c0 [mac80211]
[ 75.956069] sta_info_insert+0x7/0x70 [mac80211]
[ 75.956093] ieee80211_prep_connection+0x42e/0x730 [mac80211]
[ 75.956120] ieee80211_mgd_auth.cold+0xb9/0x15c [mac80211]
[ 75.956152] cfg80211_mlme_auth+0x143/0x350 [cfg80211]
[ 75.956169] nl80211_authenticate+0x25e/0x2b0 [cfg80211]
[ 75.956172] genl_family_rcv_msg+0x198/0x400
[ 75.956174] genl_rcv_msg+0x42/0x90
[ 75.956176] netlink_rcv_skb+0x35/0xf0
[ 75.956178] genl_rcv+0x1f/0x30
[ 75.956180] netlink_unicast+0x154/0x200
[ 75.956182] netlink_sendmsg+0x1bf/0x3d0
[ 75.956186] ___sys_sendmsg+0x2c2/0x2f0
[ 75.956187] __sys_sendmsg+0x44/0x80
[ 75.956190] do_syscall_64+0x55/0x1a0
[ 75.956192] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 75.956194] irq event stamp: 2357092
[ 75.956196] hardirqs last enabled at (2357092): [<ffffffff818c62de>] _raw_spin_unlock_irqrestore+0x3e/0x50
[ 75.956199] hardirqs last disabled at (2357091): [<ffffffff818c60b1>] _raw_spin_lock_irqsave+0x11/0x80
[ 75.956202] softirqs last enabled at (2357072): [<ffffffff8106dc09>] irq_enter+0x59/0x60
[ 75.956204] softirqs last disabled at (2357073): [<ffffffff8106dcbe>] irq_exit+0xae/0xc0
[ 75.956206]
other info that might help us debug this:
[ 75.956207] Possible unsafe locking scenario:[ 75.956208] CPU0
[ 75.956209] ----
[ 75.956210] lock(&(&da->qlock)->rlock);
[ 75.956213] <Interrupt>
[ 75.956214] lock(&(&da->qlock)->rlock);
[ 75.956216]
*** DEADLOCK ***[ 75.956217] 1 lock held by swapper/0/0:
[ 75.956219] #0: 000000003bb5675c (&(&sc->sc_pcu_lock)->rlock){+.-.}, at: ath9k_tasklet+0x55/0x240 [ath9k]
[ 75.956225]
stack backtrace:
[ 75.956228] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.3.0-rc1-wdn+ #13
[ 75.956229] Hardware name: Dell Inc. Studio XPS 1340/0K183D, BIOS A11 09/08/2009
[ 75.956231] Call Trace:
[ 75.956233] <IRQ>
[ 75.956236] dump_stack+0x67/0x90
[ 75.956239] mark_lock+0x4c1/0x640
[ 75.956242] ? check_usage_backwards+0x130/0x130
[ 75.956245] ? sched_clock_local+0x12/0x80
[ 75.956247] __lock_acquire+0x484/0x7a0
[ 75.956250] ? __lock_acquire+0x3b9/0x7a0
[ 75.956252] lock_acquire+0x9a/0x160
[ 75.956259] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956262] _raw_spin_lock_bh+0x34/0x80
[ 75.956268] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956275] ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956280] ath_rx_tasklet+0xd09/0xe90 [ath9k]
[ 75.956286] ath9k_tasklet+0x102/0x240 [ath9k]
[ 75.956288] tasklet_action_common.isra.0+0x6d/0x170
[ 75.956291] __do_softirq+0xcc/0x425
[ 75.956294] irq_exit+0xae/0xc0
[ 75.956296] do_IRQ+0x8a/0x110
[ 75.956298] common_interrupt+0xf/0xf
[ 75.956300] </IRQ>
[ 75.956303] RIP: 0010:cpuidle_enter_state+0xb2/0x400
[ 75.956308] RSP: 0018:ffffffff82203e70 EFLAGS: 00000202 ORIG_RAX: ffffffffffffffd7
[ 75.956310] RAX: ffffffff82219800 RBX: ffffffff822bd0a0 RCX: 0000000000000000
[ 75.956312] RDX: 0000000000000046 RSI: 0000000000000006 RDI: ffffffff82219800
[ 75.956314] RBP: ffff888155a01c00 R08: 00000011af51aabe R09: 0000000000000000
[ 75.956315] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000002
[ 75.956317] R13: 00000011af51aabe R14: 0000000000000003 R15: ffffffff82219800
[ 75.956321] cpuidle_enter+0x24/0x40
[ 75.956323] do_idle+0x1ac/0x220
[ 75.956326] cpu_startup_entry+0x14/0x20
[ 75.956329] start_kernel+0x482/0x489
[ 75.956332] secondary_startup_64+0xa4/0xb0--- drivers/net/wireless/ath/ath9k/dynack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/dynack.c +4 -4
@@ -300,9 +300,9 @@ void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an) an->ackto = ackto; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_add_tail (&an->list, &da->nodes); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_init);
@@ -316,9 +316,9 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an) {struct ath_dynack *da = &ah->dynack; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_del (&an->list); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_deinit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 293/343 tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
[ Upstream commit 1da17d7cf8e2c4b60163d54300f72c02f510327c ]
When dealing with 32-bit variant of LPUART IP block appropriate I/O helpers have to be used to properly deal with endianness differences. Change all of the offending code to do that.
for lpuart32.")
--- drivers/tty/serial/fsl_lpuart.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/tty/serial/fsl_lpuart.c +14 -14
@@ -532,26 +532,26 @@ static int lpuart32_poll_init(struct uart_port *port)spin_lock_irqsave (&sport->port.lock, flags);/* Disable Rx & Tx */ -writel (0 , sport->port.membase +UARTCTRL ); +lpuart32_write (&sport->port,UARTCTRL ,0 ); - temp =readl (sport->port.membase +UARTFIFO ); + temp =lpuart32_read (&sport->port,UARTFIFO );/* Enable Rx and Tx FIFO */ -writel (temp |UARTFIFO_RXFE |UARTFIFO_TXFE , - sport->port.membase +UARTFIFO ); +lpuart32_write (&sport->port,UARTFIFO , + temp |UARTFIFO_RXFE |UARTFIFO_TXFE );/* flush Tx and Rx FIFO */ -writel (UARTFIFO_TXFLUSH |UARTFIFO_RXFLUSH , - sport->port.membase +UARTFIFO ); +lpuart32_write (&sport->port,UARTFIFO , +UARTFIFO_TXFLUSH |UARTFIFO_RXFLUSH );/* explicitly clear RDRF */ -if (readl (sport->port.membase +UARTSTAT ) &UARTSTAT_RDRF ) { -readl (sport->port.membase +UARTDATA ); -writel (UARTFIFO_RXUF , sport->port.membase +UARTFIFO ); +if (lpuart32_read (&sport->port,UARTSTAT ) &UARTSTAT_RDRF ) { +lpuart32_read (&sport->port,UARTDATA ); +lpuart32_write (&sport->port,UARTFIFO ,UARTFIFO_RXUF ); }/* Enable Rx and Tx */ -writel (UARTCTRL_RE |UARTCTRL_TE , sport->port.membase +UARTCTRL ); +lpuart32_write (&sport->port,UARTCTRL ,UARTCTRL_RE |UARTCTRL_TE );spin_unlock_irqrestore (&sport->port.lock, flags);return 0 ;
@@ -559,18 +559,18 @@ static int lpuart32_poll_init(struct uart_port *port)static void lpuart32_poll_put_char (struct uart_port *port,unsigned char c) { -while (!(readl (port->membase +UARTSTAT ) &UARTSTAT_TDRE )) +while (!(lpuart32_read (port,UARTSTAT ) &UARTSTAT_TDRE ))barrier (); -writel (c, port->membase +UARTDATA ); +lpuart32_write (port,UARTDATA , c); }static int lpuart32_poll_get_char (struct uart_port *port) { -if (!(readl (port->membase +UARTSTAT ) &UARTSTAT_RDRF )) +if (!(lpuart32_read (port,UARTSTAT ) &UARTSTAT_RDRF ))return NO_POLL_CHAR ; -return readl (port->membase +UARTDATA ); +return lpuart32_read (port,UARTDATA ); }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 294/343 net: sonic: return NETDEV_TX_OK if failed to map buffer
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 6e1cdedcf0362fed3aedfe051d46bd7ee2a85fe1 ]
NETDEV_TX_BUSY really should only be used by drivers that call netif_tx_stop_queue() at the wrong moment. If dma_map_single() is failed to map tx DMA buffer, it might trigger an infinite loop. This patch use NETDEV_TX_OK instead of NETDEV_TX_BUSY, and change printk to pr_err_ratelimited.
--- drivers/net/ethernet/natsemi/sonic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/natsemi/sonic.c +2 -2
@@ -221,9 +221,9 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) { -printk (KERN_ERR "%s: failed to map tx DMA buffer.\n" , dev->name); +pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name);dev_kfree_skb (skb); -return NETDEV_TX_BUSY ; +return NETDEV_TX_OK ; }sonic_tda_put (dev, entry,SONIC_TD_STATUS ,0 );/* clear status */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 295/343 scsi: fnic: fix msix interrupt allocation
In reply to Greg Kroah-HartmanFrom: Govindarajulu Varadarajan <[email protected]>
[ Upstream commit 3ec24fb4c035e9cbb2f02a48640a09aa913442a2 ]
pci_alloc_irq_vectors() returns number of vectors allocated. Fix the check for error condition.
--- drivers/scsi/fnic/fnic_isr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/fnic/fnic_isr.c +2 -2
@@ -254,7 +254,7 @@ int fnic_set_intr_mode(struct fnic *fnic)int vecs = n + m + o +1 ;if (pci_alloc_irq_vectors (fnic->pdev, vecs, vecs, -PCI_IRQ_MSIX ) <0 ) { +PCI_IRQ_MSIX ) == vecs) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o;
@@ -280,7 +280,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->wq_copy_count >=1 && fnic->cq_count >=3 && fnic->intr_count >=1 && - pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) < 0) { + pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) == 1) { fnic->rq_count = 1; fnic->raw_wq_count =1 ; fnic->wq_copy_count =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 296/343 Btrfs: fix hang when loading existing inode cache off disk
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 7764d56baa844d7f6206394f21a0e8c1f303c476 ]
If we are able to load an existing inode cache off disk, we set the state of the cache to BTRFS_CACHE_FINISHED, but we don't wake up any one waiting for the cache to be available. This means that anyone waiting for the cache to be available, waiting on the condition that either its state is BTRFS_CACHE_FINISHED or its available free space is greather than zero, can hang forever.
This could be observed running fstests with MOUNT_OPTIONS="-o inode_cache", in particular test case generic/161 triggered it very frequently for me, producing a trace like the following:
[63795.739712] BTRFS info (device sdc): enabling inode map caching [63795.739714] BTRFS info (device sdc): disk space caching is enabled [63795.739716] BTRFS info (device sdc): has skinny extents [64036.653886] INFO: task btrfs-transacti:3917 blocked for more than 120 seconds. [64036.654079] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654143] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654232] btrfs-transacti D 0 3917 2 0x80004000 [64036.654239] Call Trace: [64036.654258] ? __schedule+0x3ae/0x7b0 [64036.654271] schedule+0x3a/0xb0 [64036.654325] btrfs_commit_transaction+0x978/0xae0 [btrfs] [64036.654339] ? remove_wait_queue+0x60/0x60 [64036.654395] transaction_kthread+0x146/0x180 [btrfs] [64036.654450] ? btrfs_cleanup_transaction+0x620/0x620 [btrfs] [64036.654456] kthread+0x103/0x140 [64036.654464] ? kthread_create_worker_on_cpu+0x70/0x70 [64036.654476] ret_from_fork+0x3a/0x50 [64036.654504] INFO: task xfs_io:3919 blocked for more than 120 seconds. [64036.654568] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654617] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654685] xfs_io D 0 3919 3633 0x00000000 [64036.654691] Call Trace: [64036.654703] ? __schedule+0x3ae/0x7b0 [64036.654716] schedule+0x3a/0xb0 [64036.654756] btrfs_find_free_ino+0xa9/0x120 [btrfs] [64036.654764] ? remove_wait_queue+0x60/0x60 [64036.654809] btrfs_create+0x72/0x1f0 [btrfs] [64036.654822] lookup_open+0x6bc/0x790 [64036.654849] path_openat+0x3bc/0xc00 [64036.654854] ? __lock_acquire+0x331/0x1cb0 [64036.654869] do_filp_open+0x99/0x110 [64036.654884] ? __alloc_fd+0xee/0x200 [64036.654895] ? do_raw_spin_unlock+0x49/0xc0 [64036.654909] ? do_sys_open+0x132/0x220 [64036.654913] do_sys_open+0x132/0x220 [64036.654926] do_syscall_64+0x60/0x1d0 [64036.654933] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix this by adding a wake_up() call right after setting the cache state to BTRFS_CACHE_FINISHED, at start_caching(), when we are able to load the cache from disk.
--- fs/btrfs/inode-map.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/inode-map.c +1 -0
@@ -159,6 +159,7 @@ static void start_caching(struct btrfs_root *root)spin_lock (&root->ino_cache_lock); root->ino_cache_state =BTRFS_CACHE_FINISHED ;spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 297/343 Btrfs: fix inode cache waiters hanging on failure to start caching thread
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit a68ebe0790fc88b4314d17984a2cf99ce2361901 ]
If we fail to start the inode caching thread, we print an error message and disable the inode cache, however we never wake up any waiters, so they hang forever waiting for the caching to finish. Fix this by waking them up and have them fallback to a call to btrfs_find_free_objectid().
--- fs/btrfs/inode-map.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
fs/btrfs/inode-map.c +18 -5
@@ -26,6 +26,19 @@#include "inode-map.h" #include "transaction.h" +static void fail_caching_thread (struct btrfs_root *root) +{ +struct btrfs_fs_info *fs_info = root->fs_info; + +btrfs_warn (fs_info,"failed to start inode caching task" ); +btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , +"disabling inode map caching" ); +spin_lock (&root->ino_cache_lock); + root->ino_cache_state =BTRFS_CACHE_ERROR ; +spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait); +} +static int caching_kthread (void *data) {struct btrfs_root *root = data;
@@ -178,11 +191,8 @@ static void start_caching(struct btrfs_root *root) tsk =kthread_run (caching_kthread, root,"btrfs-ino-cache-%llu" , root->root_key.objectid); -if (IS_ERR (tsk)) { -btrfs_warn (fs_info,"failed to start inode caching task" ); -btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , -"disabling inode map caching" ); - } +if (IS_ERR (tsk)) +fail_caching_thread (root); }int btrfs_find_free_ino (struct btrfs_root *root,u64 *objectid)
@@ -200,11 +210,14 @@ again:wait_event (root->ino_cache_wait, root->ino_cache_state ==BTRFS_CACHE_FINISHED || + root->ino_cache_state ==BTRFS_CACHE_ERROR || root->free_ino_ctl->free_space >0 );if (root->ino_cache_state ==BTRFS_CACHE_FINISHED && root->free_ino_ctl->free_space ==0 )return -ENOSPC ; +else if (root->ino_cache_state ==BTRFS_CACHE_ERROR ) +return btrfs_find_free_objectid (root, objectid);else goto again; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 298/343 Btrfs: fix inode cache waiters hanging on path allocation failure
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 9d123a35d7e97bb2139747b16127c9b22b6a593e ]
If the caching thread fails to allocate a path, it returns without waking up any cache waiters, leaving them hang forever. Fix this by following the same approach as when we fail to start the caching thread: print an error message, disable inode caching and make the wakers fallback to non-caching mode behaviour (calling btrfs_find_free_objectid()).
--- fs/btrfs/inode-map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/inode-map.c +3 -1
@@ -55,8 +55,10 @@ static int caching_kthread(void *data)return 0 ; path =btrfs_alloc_path (); -if (!path) +if (!path) { +fail_caching_thread (root);return -ENOMEM ; + }/* Since the commit root is read-only, we can safely skip locking. */ path->skip_locking =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 299/343 btrfs: use correct count in btrfs_file_write_iter()
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit c09767a8960ca0500fb636bf73686723337debf4 ]
generic_write_checks() may modify iov_iter_count(), so we must get the count after the call, not before. Using the wrong one has a couple of consequences:
1. We check a longer range in check_can_nocow() for nowait than we're actually writing.
2. We create extra hole extent maps in btrfs_cont_expand(). As far as I can tell, this is harmless, but I might be missing something.
These issues are pretty minor, but let's fix it before something more important trips on it.
--- fs/btrfs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/file.c +2 -1
@@ -1882,7 +1882,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,bool sync = (file->f_flags &O_DSYNC ) ||IS_SYNC (file->f_mapping->host);ssize_t err;loff_t pos; -size_t count =iov_iter_count (from); +size_t count;loff_t oldsize;int clean_page =0 ;
@@ -1904,6 +1904,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, } pos = iocb->ki_pos; + count =iov_iter_count (from);if (iocb->ki_flags &IOCB_NOWAIT ) {/* * We will allocate space in case nodatacow is not set,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 300/343 ixgbe: sync the first fragment unconditionally
In reply to Greg Kroah-HartmanFrom: Firo Yang <[email protected]>
[ Upstream commit e7ba676c6188d394a0133fc4b9bcd7ee50d54b7f ]
In Xen environment, if Xen-swiotlb is enabled, ixgbe driver could possibly allocate a page, DMA memory buffer, for the first fragment which is not suitable for Xen-swiotlb to do DMA operations. Xen-swiotlb have to internally allocate another page for doing DMA operations. This mechanism requires syncing the data from the internal page to the page which ixgbe sends to upper network stack. However, since commit f3213d932173 ("ixgbe: Update driver to make use of DMA attributes in Rx path"), the unmap operation is performed with DMA_ATTR_SKIP_CPU_SYNC. As a result, the sync is not performed. Since the sync isn't performed, the upper network stack could receive a incomplete network packet. By incomplete, it means the linear data on the first fragment(between skb->head and skb->end) is invalid. So we have to copy the data from the internal xen-swiotlb page to the page which ixgbe sends to upper network stack through the sync operation.
More details from Alexander Duyck:
Specifically since we are mapping the frame with DMA_ATTR_SKIP_CPU_SYNC we have to unmap with that as well. As a result a sync is not performed on an unmap and must be done manually as we skipped it for the first frag. As such we need to always sync before possibly performing a page unmap operation.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +9 -7
@@ -1871,13 +1871,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,static void ixgbe_dma_sync_frag (struct ixgbe_ring *rx_ring,struct sk_buff *skb) { -/* if the page was released unmap it, else just sync our portion */ -if (unlikely (IXGBE_CB (skb)->page_released)) { -dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, -ixgbe_rx_pg_size (rx_ring), -DMA_FROM_DEVICE , -IXGBE_RX_DMA_ATTR ); - }else if (ring_uses_build_skb (rx_ring)) { +if (ring_uses_build_skb (rx_ring)) {unsigned long offset = (unsigned long )(skb->data) & ~PAGE_MASK ; dma_sync_single_range_for_cpu(rx_ring->dev,
@@ -1894,6 +1888,14 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,skb_frag_size (frag), DMA_FROM_DEVICE); } + +/* If the page was released, just unmap it. */ +if (unlikely (IXGBE_CB (skb)->page_released)) { +dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, +ixgbe_rx_pg_size (rx_ring), +DMA_FROM_DEVICE , +IXGBE_RX_DMA_ATTR ); + } }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 301/343 hwmon: (shtc1) fix shtc1 and shtw1 id mask
In reply to Greg Kroah-HartmanFrom: Dan Robertson <[email protected]>
[ Upstream commit fdc7d8e829ec755c5cfb2f5a8d8c0cdfb664f895 ]
Fix an error in the bitmaskfor the shtc1 and shtw1 bitmask used to retrieve the chip ID from the ID register. See section 5.7 of the shtw1 or shtc1 datasheet for details.
--- drivers/hwmon/shtc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/shtc1.c +1 -1
@@ -38,7 +38,7 @@ static const unsigned char shtc1_cmd_read_id_reg[] = { 0xef, 0xc8 };/* constants for reading the ID register */ #define SHTC1_ID 0x07 -#define SHTC1_ID_REG_MASK 0x1f +#define SHTC1_ID_REG_MASK 0x3f/* delays for non-blocking i2c commands, both in us */ #define SHTC1_NONBLOCKING_WAIT_TIME_HPM 14400
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 302/343 net: sonic: replace dev_kfree_skb in sonic_send_packet
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ]
sonic_send_packet will be processed in irq or non-irq context, so it would better use dev_kfree_skb_any instead of dev_kfree_skb.
--- drivers/net/ethernet/natsemi/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/natsemi/sonic.c +1 -1
@@ -222,7 +222,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) {pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name); -dev_kfree_skb (skb); +dev_kfree_skb_any (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 303/343 pinctrl: iproc-gpio: Fix incorrect pinconf configurations
In reply to Greg Kroah-HartmanFrom: Li Jin <[email protected]>
[ Upstream commit 398a1f50e3c731586182fd52b834103b0aa2f826 ]
Fix drive strength for AON/CRMU controller; fix pull-up/down setting for CCM/CDRU controller.
--- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 96 +++++++++++++++++++----- 1 file changed, 77 insertions(+), 19 deletions(-)
drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +77 -19
@@ -54,8 +54,12 @@/* drive strength control for ASIU GPIO */ #define IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET 0x58 -/* drive strength control for CCM/CRMU (AON) GPIO */ -#define IPROC_GPIO_DRV0_CTRL_OFFSET 0x00 +/* pinconf for CCM GPIO */ +#define IPROC_GPIO_PULL_DN_OFFSET 0x10 +#define IPROC_GPIO_PULL_UP_OFFSET 0x14 + +/* pinconf for CRMU(aon) GPIO and CCM GPIO*/ +#define IPROC_GPIO_DRV_CTRL_OFFSET 0x00#define GPIO_BANK_SIZE 0x200#define NGPIOS_PER_BANK 32
@@ -76,6 +80,12 @@ enum iproc_pinconf_param { IPROC_PINCON_MAX, }; +enum iproc_pinconf_ctrl_type { +IOCTRL_TYPE_AON =1 , +IOCTRL_TYPE_CDRU , +IOCTRL_TYPE_INVALID , +}; +/* * Iproc GPIO core *
@@ -100,6 +110,7 @@ struct iproc_gpio {void __iomem *base;void __iomem *io_ctrl; +enum iproc_pinconf_ctrl_type io_ctrl_type;raw_spinlock_t lock;
@@ -461,20 +472,44 @@ static const struct pinctrl_ops iproc_pctrl_ops = {static int iproc_gpio_set_pull (struct iproc_gpio *chip,unsigned gpio,bool disable,bool pull_up) { +void __iomem *base;unsigned long flags; +unsigned int shift; +u32 val_1, val_2;raw_spin_lock_irqsave (&chip->lock, flags); - -if (disable) { -iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, false); +if (chip->io_ctrl_type ==IOCTRL_TYPE_CDRU ) { + base = chip->io_ctrl; + shift =IPROC_GPIO_SHIFT (gpio); + + val_1 =readl (base +IPROC_GPIO_PULL_UP_OFFSET ); + val_2 =readl (base +IPROC_GPIO_PULL_DN_OFFSET ); +if (disable) { +/* no pull-up or pull-down */ + val_1 &= ~BIT (shift); + val_2 &= ~BIT (shift); + }else if (pull_up) { + val_1 |=BIT (shift); + val_2 &= ~BIT (shift); + }else { + val_1 &= ~BIT (shift); + val_2 |=BIT (shift); + } +writel (val_1, base +IPROC_GPIO_PULL_UP_OFFSET ); +writel (val_2, base +IPROC_GPIO_PULL_DN_OFFSET ); }else { -iproc_set_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio, - pull_up); -iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, true); +if (disable) { +iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, + false); + }else { +iproc_set_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio, + pull_up); +iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, + true); + } }raw_spin_unlock_irqrestore (&chip->lock, flags); -dev_dbg (chip->dev,"gpio:%u set pullup:%d\n" , gpio, pull_up);return 0 ;
@@ -483,14 +518,35 @@ static int iproc_gpio_set_pull(struct iproc_gpio *chip, unsigned gpio,static void iproc_gpio_get_pull (struct iproc_gpio *chip,unsigned gpio,bool *disable,bool *pull_up) { +void __iomem *base;unsigned long flags; +unsigned int shift; +u32 val_1, val_2;raw_spin_lock_irqsave (&chip->lock, flags); - *disable = !iproc_get_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio); - *pull_up =iproc_get_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio); +if (chip->io_ctrl_type ==IOCTRL_TYPE_CDRU ) { + base = chip->io_ctrl; + shift =IPROC_GPIO_SHIFT (gpio); + + val_1 =readl (base +IPROC_GPIO_PULL_UP_OFFSET ) &BIT (shift); + val_2 =readl (base +IPROC_GPIO_PULL_DN_OFFSET ) &BIT (shift); + + *pull_up = val_1 ? true : false; + *disable = (val_1 | val_2) ? false : true; + + }else { + *disable = !iproc_get_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio); + *pull_up =iproc_get_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio); + }raw_spin_unlock_irqrestore (&chip->lock, flags); } +#define DRV_STRENGTH_OFFSET (gpio, bit, type) ((type) == IOCTRL_TYPE_AON ? \ + ((2 - (bit)) * 4 + IPROC_GPIO_DRV_CTRL_OFFSET) : \ + ((type) == IOCTRL_TYPE_CDRU) ? \ + ((bit) * 4 + IPROC_GPIO_DRV_CTRL_OFFSET) : \ + ((bit) * 4 + IPROC_GPIO_REG(gpio, IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET))) +static int iproc_gpio_set_strength (struct iproc_gpio *chip,unsigned gpio,unsigned strength) {
@@ -505,11 +561,8 @@ static int iproc_gpio_set_strength(struct iproc_gpio *chip, unsigned gpio,if (chip->io_ctrl) { base = chip->io_ctrl; - offset =IPROC_GPIO_DRV0_CTRL_OFFSET ; }else { base = chip->base; - offset =IPROC_GPIO_REG (gpio, -IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET ); } shift =IPROC_GPIO_SHIFT (gpio);
@@ -520,11 +573,11 @@ static int iproc_gpio_set_strength(struct iproc_gpio *chip, unsigned gpio,raw_spin_lock_irqsave (&chip->lock, flags); strength = (strength /2 ) -1 ;for (i =0 ; i <GPIO_DRV_STRENGTH_BITS ; i++) { + offset =DRV_STRENGTH_OFFSET (gpio, i, chip->io_ctrl_type); val =readl (base + offset); val &= ~BIT (shift); val |= ((strength >> i) &0x1 ) << shift;writel (val, base + offset); - offset +=4 ; }raw_spin_unlock_irqrestore (&chip->lock, flags);
@@ -541,11 +594,8 @@ static int iproc_gpio_get_strength(struct iproc_gpio *chip, unsigned gpio,if (chip->io_ctrl) { base = chip->io_ctrl; - offset =IPROC_GPIO_DRV0_CTRL_OFFSET ; }else { base = chip->base; - offset =IPROC_GPIO_REG (gpio, -IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET ); } shift =IPROC_GPIO_SHIFT (gpio);
@@ -553,10 +603,10 @@ static int iproc_gpio_get_strength(struct iproc_gpio *chip, unsigned gpio,raw_spin_lock_irqsave (&chip->lock, flags); *strength =0 ;for (i =0 ; i <GPIO_DRV_STRENGTH_BITS ; i++) { + offset =DRV_STRENGTH_OFFSET (gpio, i, chip->io_ctrl_type); val =readl (base + offset) &BIT (shift); val >>= shift; *strength += (val << i); - offset +=4 ; }/* convert to mA */
@@ -734,6 +784,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)u32 ngpios, pinconf_disable_mask =0 ;int irq, ret;bool no_pinconf = false; +enum iproc_pinconf_ctrl_type io_ctrl_type =IOCTRL_TYPE_INVALID ;/* NSP does not support drive strength config */ if (of_device_is_compatible (dev->of_node,"brcm,iproc-nsp-gpio" ))
@@ -764,8 +815,15 @@ static int iproc_gpio_probe(struct platform_device *pdev)dev_err (dev,"unable to map I/O memory\n" );return PTR_ERR (chip->io_ctrl); } +if (of_device_is_compatible (dev->of_node, +"brcm,cygnus-ccm-gpio" )) + io_ctrl_type =IOCTRL_TYPE_CDRU ; +else + io_ctrl_type =IOCTRL_TYPE_AON ; } + chip->io_ctrl_type = io_ctrl_type; +if (of_property_read_u32 (dev->of_node,"ngpios" , &ngpios)) {dev_err (&pdev->dev,"missing ngpios DT property\n" );return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 304/343 ath10k: adjust skb length in ath10k_sdio_mbox_rx_packet
In reply to Greg Kroah-HartmanFrom: Nicolas Boichat <[email protected]>
[ Upstream commit b7139960832eb56fa15d390a4b5c8c5739bd0d1a ]
When the FW bundles multiple packets, pkt->act_len may be incorrect as it refers to the first packet only (however, the FW will only bundle packets that fit into the same pkt->alloc_len).
Before this patch, the skb length would be set (incorrectly) to pkt->act_len in ath10k_sdio_mbox_rx_packet, and then later manually adjusted in ath10k_sdio_mbox_rx_process_packet.
The first problem is that ath10k_sdio_mbox_rx_process_packet does not use proper skb_put commands to adjust the length (it directly changes skb->len), so we end up with a mismatch between skb->head + skb->tail and skb->data + skb->len. This is quite serious, and causes corruptions in the TCP stack, as the stack tries to coalesce packets, and relies on skb->tail being correct (that is, skb_tail_pointer must point to the first byte_after_ the data).
Instead of re-adjusting the size in ath10k_sdio_mbox_rx_process_packet, this moves the code to ath10k_sdio_mbox_rx_packet, and also add a bounds check, as skb_put would crash the kernel if not enough space is available.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/sdio.c | 29 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath10k/sdio.c +21 -8
@@ -392,16 +392,11 @@ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,struct ath10k_htc_hdr *htc_hdr = (struct ath10k_htc_hdr *)skb->data;bool trailer_present = htc_hdr->flags &ATH10K_HTC_FLAG_TRAILER_PRESENT ;enum ath10k_htc_ep_id eid; -u16 payload_len;u8 *trailer;int ret; - payload_len =le16_to_cpu (htc_hdr->len); - skb->len = payload_len +sizeof (struct ath10k_htc_hdr ); -if (trailer_present) { - trailer = skb->data +sizeof (*htc_hdr) + - payload_len - htc_hdr->trailer_len; + trailer = skb->data + skb->len - htc_hdr->trailer_len; eid =pipe_id_to_eid (htc_hdr->eid);
@@ -635,13 +630,31 @@ static int ath10k_sdio_mbox_rx_packet(struct ath10k *ar, {struct ath10k_sdio *ar_sdio =ath10k_sdio_priv (ar);struct sk_buff *skb = pkt->skb; +struct ath10k_htc_hdr *htc_hdr;int ret; ret =ath10k_sdio_readsb (ar, ar_sdio->mbox_info.htc_addr, skb->data, pkt->alloc_len); +if (ret) + goto out; + +/* Update actual length. The original length may be incorrect, +* as the FW will bundle multiple packets as long as their sizes +* fit within the same aligned length (pkt->alloc_len). +*/ + htc_hdr = (struct ath10k_htc_hdr *)skb->data; + pkt->act_len =le16_to_cpu (htc_hdr->len) +sizeof (*htc_hdr); +if (pkt->act_len > pkt->alloc_len) { +ath10k_warn (ar,"rx packet too large (%zu > %zu)\n" , + pkt->act_len, pkt->alloc_len); + ret = -EMSGSIZE ; + goto out; + } + +skb_put (skb, pkt->act_len); + +out: pkt->status = ret; -if (!ret) -skb_put (skb, pkt->act_len);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 305/343 RDMA/cma: Fix false error message
In reply to Greg Kroah-HartmanFrom: Håkon Bugge <[email protected]>
[ Upstream commit a6e4d254c19b541a58caced322111084b27a7788 ]
In addr_handler(), assuming status == 0 and the device already has been acquired (id_priv->cma_dev != NULL), we get the following incorrect "error" message:
RDMA CM: ADDR_ERROR: failed to resolve IP. status 0
--- drivers/infiniband/core/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cma.c +1 -1
@@ -2789,7 +2789,7 @@ static void addr_handler(int status, struct sockaddr *src_addr,if (status)pr_debug_ratelimited ("RDMA CM: ADDR_ERROR: failed to acquire device. status %d\n" , status); - }else { + }else if (status) {pr_debug_ratelimited ("RDMA CM: ADDR_ERROR: failed to resolve IP. status %d\n" , status); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 306/343 net/rds: Fix ib_evt_handler_call element in rds_ib_stat_names
In reply to Greg Kroah-HartmanFrom: Gerd Rausch <[email protected]>
[ Upstream commit 05a82481a3024b94db00b8c816bb3d526b5209e0 ]
All entries in 'rds_ib_stat_names' are stringified versions of the corresponding "struct rds_ib_statistics" element without the "s_"-prefix.
Fix entry 'ib_evt_handler_call' to do the same.
--- net/rds/ib_stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rds/ib_stats.c +1 -1
@@ -42,7 +42,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);static const char *const rds_ib_stat_names[] = {"ib_connect_raced" ,"ib_listen_closed_stale" , -"s_ib_evt_handler_call" , +"ib_evt_handler_call" ,"ib_tasklet_call" ,"ib_tx_cq_event" ,"ib_tx_ring_full" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 307/343 iommu/amd: Wait for completion of IOTLB flush in attach_device
In reply to Greg Kroah-HartmanFrom: Filippo Sironi <[email protected]>
[ Upstream commit 0b15e02f0cc4fb34a9160de7ba6db3a4013dc1b7 ]
To make sure the domain tlb flush completes before the function returns, explicitly wait for its completion.
--- drivers/iommu/amd_iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/amd_iommu.c +2 -0
@@ -2160,6 +2160,8 @@ skip_ats_check:*/ domain_flush_tlb_pde (domain); +domain_flush_complete (domain); +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 308/343 net: aquantia: Fix aq_vec_isr_legacy() return value
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 31aefe14bc9f56566041303d733fda511d3a1c3e ]
The irqreturn_t type is an enum or an unsigned int in GCC. That creates to problems because it can't detect if the self->aq_hw_ops->hw_irq_read() call fails and at the end the function always returns IRQ_HANDLED.
drivers/net/ethernet/aquantia/atlantic/aq_vec.c:316 aq_vec_isr_legacy() warn: unsigned 'err' is never less than zero. drivers/net/ethernet/aquantia/atlantic/aq_vec.c:329 aq_vec_isr_legacy() warn: always true condition '(err >= 0) => (0-u32max >= 0)'
--- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +6 -9
@@ -310,15 +310,13 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private) {struct aq_vec_s *self = private;u64 irq_mask =0U ; -irqreturn_t err =0 ; +int err; -if (!self) { - err = -EINVAL ; - goto err_exit; - } +if (!self) +return IRQ_NONE ; err = self->aq_hw_ops->hw_irq_read (self->aq_hw, &irq_mask);if (err <0 ) - goto err_exit; +return IRQ_NONE ;if (irq_mask) { self->aq_hw_ops->hw_irq_disable(self->aq_hw,
@@ -326,11 +324,10 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private)napi_schedule (&self->napi); }else { self->aq_hw_ops->hw_irq_enable (self->aq_hw,1U ); - err =IRQ_NONE ; +return IRQ_NONE ; } -err_exit: -return err >=0 ?IRQ_HANDLED :IRQ_NONE ; +return IRQ_HANDLED ; }cpumask_t *aq_vec_get_affinity_mask (struct aq_vec_s *self)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 309/343 net: hisilicon: Fix signedness bug in hix5hd2_dev_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 002dfe8085255b7bf1e0758c3d195c5412d35be9 ]
The "priv->phy_mode" variable is an enum and in this context GCC will treat it as unsigned to the error handling will never trigger.
--- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -1202,7 +1202,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) goto err_free_mdio; priv->phy_mode =of_get_phy_mode (node); -if (priv->phy_mode <0 ) { +if ((int )priv->phy_mode <0 ) {netdev_err (ndev,"not find phy-mode\n" ); ret = -EINVAL ; goto err_mdiobus;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 310/343 net: broadcom/bcmsysport: Fix signedness in bcm_sysport_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 25a584955f020d6ec499c513923fb220f3112d2b ]
The "priv->phy_interface" variable is an enum and in this context GCC will treat it as unsigned so the error handling will never be triggered.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -2116,7 +2116,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) priv->phy_interface =of_get_phy_mode (dn);/* Default to GMII interface mode */ -if (priv->phy_interface <0 ) +if ((int )priv->phy_interface <0 ) priv->phy_interface =PHY_INTERFACE_MODE_GMII ;/* In the case of a fixed PHY, the DT node associated
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 311/343 net: stmmac: dwmac-meson8b: Fix signedness bug in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit f10210517a2f37feea2edf85eb34c98977265c16 ]
The "dwmac->phy_mode" is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +1 -1
@@ -285,7 +285,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) dwmac->pdev = pdev; dwmac->phy_mode =of_get_phy_mode (pdev->dev.of_node); -if (dwmac->phy_mode <0 ) { +if ((int )dwmac->phy_mode <0 ) {dev_err (&pdev->dev,"missing phy-mode property\n" ); ret = -EINVAL ; goto err_remove_config_dt;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 312/343 net: axienet: fix a signedness bug in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 73e211e11be86715d66bd3c9d38b3c34b05fca9a ]
The "lp->phy_mode" is an enum but in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1 -1
@@ -1574,7 +1574,7 @@ static int axienet_probe(struct platform_device *pdev) } }else { lp->phy_mode =of_get_phy_mode (pdev->dev.of_node); -if (lp->phy_mode <0 ) { +if ((int )lp->phy_mode <0 ) { ret = -EINVAL ; goto free_netdev; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 313/343 of: mdio: Fix a signedness bug in of_phy_get_and_connect()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d7eb651212fdbafa82d485d8e76095ac3b14c193 ]
The "iface" variable is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/of/of_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/of_mdio.c +1 -1
@@ -358,7 +358,7 @@ struct phy_device *of_phy_get_and_connect(struct net_device *dev,struct phy_device *phy; iface =of_get_phy_mode (np); -if (iface <0 ) +if ((int )iface <0 )return NULL ; phy_np =of_parse_phandle (np,"phy-handle" ,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 314/343 net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 231042181dc9d6122c6faba64e99ccb25f13cc6c ]
The "gmac->phy_mode" variable is an enum and in this context GCC will treat it as an unsigned int so the error handling will never be triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +1 -1
@@ -203,7 +203,7 @@ static int ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac)struct device *dev = &gmac->pdev->dev; gmac->phy_mode =of_get_phy_mode (dev->of_node); -if (gmac->phy_mode <0 ) { +if ((int )gmac->phy_mode <0 ) {dev_err (dev,"missing phy mode property\n" );return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 315/343 nvme: retain split access workaround for capability reads
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 3a8ecc935efabdad106b5e06d07b150c394b4465 ]
Commit 7fd8930f26be4
"nvme: add a common helper to read Identify Controller data"
has re-introduced an issue that we have attempted to work around in the past, in commit a310acd7a7ea ("NVMe: use split lo_hi_{read,write}q").
The problem is that some PCIe NVMe controllers do not implement 64-bit outbound accesses correctly, which is why the commit above switched to using lo_hi_[read|write]q for all 64-bit BAR accesses occuring in the code.
In the mean time, the NVMe subsystem has been refactored, and now calls into the PCIe support layer for NVMe via a .reg_read64() method, which fails to use lo_hi_readq(), and thus reintroduces the problem that the workaround above aimed to address.
Given that, at the moment, .reg_read64() is only used to read the capability register [which is known to tolerate split reads], let's switch .reg_read64() to lo_hi_readq() as well.
This fixes a boot issue on some ARM boxes with NVMe behind a Synopsys DesignWare PCIe host controller.
--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -2274,7 +2274,7 @@ static int nvme_pci_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val)static int nvme_pci_reg_read64 (struct nvme_ctrl *ctrl,u32 off,u64 *val) { - *val =readq (to_nvme_dev (ctrl)->bar + off); + *val =lo_hi_readq (to_nvme_dev (ctrl)->bar + off);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 316/343 net: stmmac: gmac4+: Not all Unicast addresses may be available
In reply to Greg Kroah-HartmanFrom: Jose Abreu <[email protected]>
[ Upstream commit 25683bab09a70542b9f8e3e28f79b3369e56701f ]
Some setups may not have all Unicast addresses filters available. Check the number of available filters before trying to setup it.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +1 -1
@@ -438,7 +438,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw, }/* Handle multiple unicast addresses */ -if (netdev_uc_count (dev) >GMAC_MAX_PERFECT_ADDRESSES ) { +if (netdev_uc_count (dev) > hw->unicast_filter_entries) {/* Switch to promiscuous mode if more than 128 addrs * are required */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 317/343 mac80211: accept deauth frames in IBSS mode
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 95697f9907bfe3eab0ef20265a766b22e27dde64 ]
We can process deauth frames and all, but we drop them very early in the RX path today - this could never have worked.
--- net/mac80211/rx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/mac80211/rx.c +10 -1
@@ -3227,9 +3227,18 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)case cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ):/* process for all: mesh, mlme, ibss */ break ; +case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ): +if (is_multicast_ether_addr (mgmt->da) && + !is_broadcast_ether_addr (mgmt->da)) +return RX_DROP_MONITOR ; + +/* process only for station/IBSS */ +if (sdata->vif.type !=NL80211_IFTYPE_STATION && + sdata->vif.type !=NL80211_IFTYPE_ADHOC ) +return RX_DROP_MONITOR ; +break ;case cpu_to_le16 (IEEE80211_STYPE_ASSOC_RESP ):case cpu_to_le16 (IEEE80211_STYPE_REASSOC_RESP ): -case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ):case cpu_to_le16 (IEEE80211_STYPE_DISASSOC ):if (is_multicast_ether_addr (mgmt->da) && !is_broadcast_ether_addr (mgmt->da))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 318/343 llc: fix another potential sk_buff leak in llc_ui_sendmsg()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit fc8d5db10cbe1338a52ebc74e7feab9276721774 ]
All callers of llc_conn_state_process() except llc_build_and_send_pkt() (via llc_ui_sendmsg() -> llc_ui_send_data()) assume that it always consumes a reference to the skb. Fix this caller to do the same.
--- net/llc/af_llc.c | 34 ++++++++++++++++++++-------------- net/llc/llc_conn.c | 2 ++ net/llc/llc_if.c | 12 ++++++++---- 3 files changed, 30 insertions(+), 18 deletions(-)
net/llc/af_llc.c +20 -14
@@ -113,22 +113,26 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)* * Send data via reliable llc2 connection. * Returns 0 upon success, non-zero if action did not succeed. +* +* This function always consumes a reference to the skb. */ static int llc_ui_send_data (struct sock * sk,struct sk_buff *skb,int noblock) {struct llc_sock * llc =llc_sk (sk); -int rc =0 ;if (unlikely (llc_data_accept_state (llc->state) || llc->remote_busy_flag || llc->p_flag)) {long timeout =sock_sndtimeo (sk, noblock); +int rc; rc =llc_ui_wait_for_busy_core (sk, timeout); +if (rc) { +kfree_skb (skb); +return rc; + } } -if (unlikely (!rc)) - rc =llc_build_and_send_pkt (sk, skb); -return rc; +return llc_build_and_send_pkt (sk, skb); }static void llc_ui_sk_init (struct socket *sock,struct sock *sk)
@@ -900,7 +904,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg->msg_name);int flags = msg->msg_flags;int noblock = flags &MSG_DONTWAIT ; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;size_t size =0 ;int rc = -EINVAL , copied =0 , hdrlen;
@@ -909,10 +913,10 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)lock_sock (sk);if (addr) {if (msg->msg_namelen <sizeof (*addr)) - goto release; + goto out; }else {if (llc_ui_addr_null (&llc->addr)) - goto release; + goto out; addr = &llc->addr; }/* must bind connection to sap if user hasn't done it. */
@@ -920,7 +924,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)/* bind to sap with null dev, exclusive. */ rc =llc_ui_autobind (sock, addr);if (rc) - goto release; + goto out; } hdrlen = llc->dev->hard_header_len +llc_ui_header_len (sk, addr); size = hdrlen + len;
@@ -929,12 +933,12 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) copied = size - hdrlen; rc = -EINVAL ;if (copied <0 ) - goto release; + goto out;release_sock (sk); skb =sock_alloc_send_skb (sk, size, noblock, &rc);lock_sock (sk);if (!skb) - goto release; + goto out; skb->dev = llc->dev; skb->protocol =llc_proto_type (addr->sllc_arphrd);skb_reserve (skb, hdrlen);
@@ -944,29 +948,31 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)if (sk->sk_type ==SOCK_DGRAM || addr->sllc_ua) {llc_build_and_send_ui_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_test) {llc_build_and_send_test_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_xid) {llc_build_and_send_xid_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; } rc = -ENOPROTOOPT ;if (!(sk->sk_type ==SOCK_STREAM && !addr->sllc_ua)) goto out; rc =llc_ui_send_data (sk, skb, noblock); + skb =NULL ; out: -if (rc) { -kfree_skb (skb); -release: +kfree_skb (skb); +if (rc)dprintk ("%s: failed sending from %02X to %02X: %d\n" , __func__, llc->laddr.lsap, llc->daddr.lsap, rc); - }release_sock (sk);return rc ? : copied; }
net/llc/llc_conn.c +2 -0
@@ -55,6 +55,8 @@ int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;* (executing it's actions and changing state), upper layer will be * indicated or confirmed, if needed. Returns 0 for success, 1 for * failure. The socket lock has to be held before calling this function. +* +* This function always consumes a reference to the skb. */ int llc_conn_state_process (struct sock *sk,struct sk_buff *skb) {
net/llc/llc_if.c +8 -4
@@ -38,6 +38,8 @@* closed and -EBUSY when sending data is not permitted in this state or * LLC has send an I pdu with p bit set to 1 and is waiting for it's * response. +* +* This function always consumes a reference to the skb. */ int llc_build_and_send_pkt (struct sock *sk,struct sk_buff *skb) {
@@ -46,20 +48,22 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (sk);if (unlikely (llc->state ==LLC_CONN_STATE_ADM )) - goto out; + goto out_free; rc = -EBUSY ;if (unlikely (llc_data_accept_state (llc->state) ||/* data_conn_refuse */ llc->p_flag)) { llc->failed_data_req =1 ; - goto out; + goto out_free; } ev =llc_conn_ev (skb); ev->type =LLC_CONN_EV_TYPE_PRIM ; ev->prim =LLC_DATA_PRIM ; ev->prim_type =LLC_PRIM_TYPE_REQ ; skb->dev = llc->dev; - rc =llc_conn_state_process (sk, skb); -out: +return llc_conn_state_process (sk, skb); + +out_free: +kfree_skb (skb);return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 319/343 llc: fix sk_buff refcounting in llc_conn_state_process()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 36453c852816f19947ca482a595dffdd2efa4965 ]
If llc_conn_state_process() sees that llc_conn_service() put the skb on a list, it will drop one fewer references to it. This is wrong because the current behavior is that llc_conn_service() never consumes a reference to the skb.
The code also makes the number of skb references being dropped conditional on which of ind_prim and cfm_prim are nonzero, yet neither of these affects how many references are *acquired*. So there is extra code that tries to fix this up by sometimes taking another reference.
Remove the unnecessary/broken refcounting logic and instead just add an skb_get() before the only two places where an extra reference is actually consumed.
--- net/llc/llc_conn.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)
net/llc/llc_conn.c +6 -27
@@ -64,12 +64,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (skb->sk);struct llc_conn_state_ev *ev =llc_conn_ev (skb); -/* -* We have to hold the skb, because llc_conn_service will kfree it in -* the sending path and we need to look at the skb->cb, where we encode -* llc_conn_state_ev. -*/ -skb_get (skb); ev->ind_prim = ev->cfm_prim =0 ;/* * Send event to state machine
@@ -77,21 +71,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) rc =llc_conn_service (skb->sk, skb);if (unlikely (rc !=0 )) {printk (KERN_ERR "%s: llc_conn_service failed\n" , __func__); - goto out_kfree_skb; - } - -if (unlikely (!ev->ind_prim && !ev->cfm_prim)) { -/* indicate or confirm not required */ -if (!skb->next) - goto out_kfree_skb; goto out_skb_put; } -if (unlikely (ev->ind_prim && ev->cfm_prim))/* Paranoia */ -skb_get (skb); -switch (ev->ind_prim) {case LLC_DATA_PRIM : +skb_get (skb);llc_save_primitive (sk, skb,LLC_DATA_PRIM );if (unlikely (sock_queue_rcv_skb (sk, skb))) {/*
@@ -108,6 +93,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* skb->sk pointing to the newly created struct sock in * llc_conn_handler. -acme */ +skb_get (skb);skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_state_change (sk);break ;
@@ -123,7 +109,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) sk->sk_state_change (sk); } } -kfree_skb (skb);sock_put (sk);break ;case LLC_RESET_PRIM :
@@ -132,14 +117,11 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* RESET is not being notified to upper layers for now */ printk (KERN_INFO "%s: received a reset ind!\n" , __func__); -kfree_skb (skb);break ;default : -if (ev->ind_prim) { +if (ev->ind_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->ind_prim); -kfree_skb (skb); - }/* No indication */ break ; }
@@ -181,15 +163,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)printk (KERN_INFO "%s: received a reset conf!\n" , __func__);break ;default : -if (ev->cfm_prim) { +if (ev->cfm_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->cfm_prim); -break ; - } - goto out_skb_put;/* No confirmation */ +/* No confirmation */ +break ; } -out_kfree_skb: -kfree_skb (skb); out_skb_put:kfree_skb (skb);return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 320/343 net: stmmac: fix length of PTP clocks name string
In reply to Greg Kroah-HartmanFrom: Antonio Borneo <[email protected]>
[ Upstream commit 5da202c88f8c355ad79bc2e8eb582e6d433060e7 ]
The field "name" in struct ptp_clock_info has a fixed size of 16 chars and is used as zero terminated string by clock_name_show() in drivers/ptp/ptp_sysfs.c
The current initialization value requires 17 chars to fit also the null termination, and this causes overflow to the next bytes in the struct when the string is read as null terminated:
hexdump -C /sys/class/ptp/ptp0/clock_name 00000000 73 74 6d 6d 61 63 5f 70 74 70 5f 63 6c 6f 63 6b |stmmac_ptp_clock| 00000010 a0 ac b9 03 0a |.....|
where the extra 4 bytes (excluding the newline) after the string represent the integer 0x03b9aca0 = 62500000 assigned to the field "max_adj" that follows "name" in the same struct.
There is no strict requirement for the "name" content and in the comment in ptp_clock_kernel.h it's reported it should just be 'A short "friendly name" to identify the clock'.
Replace it with "stmmac ptp".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 -1
@@ -154,7 +154,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp,/* structure describing a PTP hardware clock */ static const struct ptp_clock_info stmmac_ptp_clock_ops = { .owner =THIS_MODULE , - .name ="stmmac_ptp_clock" , + .name ="stmmac ptp" , .max_adj =62500000 , .n_alarm =0 , .n_ext_ts =0 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 321/343 act_mirred: Fix mirred_init_module error handling
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 11c9a7d38af524217efb7a176ad322b97ac2f163 ]
If tcf_register_action failed, mirred_device_notifier should be unregistered.
--- net/sched/act_mirred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sched/act_mirred.c +5 -1
@@ -371,7 +371,11 @@ static int __init mirred_init_module(void)return err;pr_info ("Mirror/redirect action on\n" ); -return tcf_register_action (&act_mirred_ops, &mirred_net_ops); + err =tcf_register_action (&act_mirred_ops, &mirred_net_ops); +if (err) +unregister_netdevice_notifier (&mirred_device_notifier); + +return err; } static void __exit mirred_cleanup_module(void)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 322/343 net: avoid possible false sharing in sk_leave_memory_pressure()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 503978aca46124cd714703e180b9c8292ba50ba7 ]
As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
a C compiler can legally transform :
if (memory_pressure && *memory_pressure)
*memory_pressure = 0;
to :
if (memory_pressure)
*memory_pressure = 0;
--- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/sock.c +2 -2
@@ -2165,8 +2165,8 @@ static void sk_leave_memory_pressure(struct sock *sk) }else {unsigned long *memory_pressure = sk->sk_prot->memory_pressure; -if (memory_pressure && *memory_pressure) - *memory_pressure =0 ; +if (memory_pressure &&READ_ONCE (*memory_pressure)) +WRITE_ONCE (*memory_pressure,0 ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 323/343 net: add {READ|WRITE}_ONCE() annotations on ->rskq_accept_head
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 60b173ca3d1cd1782bd0096dc17298ec242f6fb1 ]
reqsk_queue_empty() is called from inet_csk_listen_poll() while other cpus might write ->rskq_accept_head value.
Use {READ|WRITE}_ONCE() to avoid compiler tricks
and potential KCSAN splats.
--- drivers/xen/pvcalls-back.c | 2 +- include/net/request_sock.h | 4 ++-- net/ipv4/inet_connection_sock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/xen/pvcalls-back.c +1 -1
@@ -792,7 +792,7 @@ static int pvcalls_back_poll(struct xenbus_device *dev, mappass->reqcopy = *req; icsk =inet_csk (mappass->sock->sk); queue = &icsk->icsk_accept_queue; - data = queue->rskq_accept_head !=NULL ; + data =READ_ONCE (queue->rskq_accept_head) !=NULL ;if (data) { mappass->reqcopy.cmd =0 ; ret =0 ;
include/net/request_sock.h +2 -2
@@ -181,7 +181,7 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,static inline bool reqsk_queue_empty (const struct request_sock_queue *queue) { -return queue->rskq_accept_head ==NULL ; +return READ_ONCE (queue->rskq_accept_head) ==NULL ; } static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue *queue,
@@ -193,7 +193,7 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue req = queue->rskq_accept_head;if (req) {sk_acceptq_removed (parent); - queue->rskq_accept_head = req->dl_next; +WRITE_ONCE (queue->rskq_accept_head, req->dl_next);if (queue->rskq_accept_head ==NULL ) queue->rskq_accept_tail =NULL ; }
net/ipv4/inet_connection_sock.c +1 -1
@@ -936,7 +936,7 @@ struct sock *inet_csk_reqsk_queue_add(struct sock *sk, req->sk = child; req->dl_next =NULL ;if (queue->rskq_accept_head ==NULL ) - queue->rskq_accept_head = req; +WRITE_ONCE (queue->rskq_accept_head, req);else queue->rskq_accept_tail->dl_next = req; queue->rskq_accept_tail = req;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 324/343 tcp: annotate lockless access to tcp_memory_pressure
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 1f142c17d19a5618d5a633195a46f2c8be9bf232 ]
tcp_memory_pressure is read without holding any lock, and its value could be changed on other cpus.
Use READ_ONCE() to annotate these lockless reads.
The write side is already using atomic ops.
--- include/net/tcp.h | 2 +- net/ipv4/tcp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/net/tcp.h +1 -1
@@ -289,7 +289,7 @@ static inline bool tcp_under_memory_pressure(const struct sock *sk) mem_cgroup_under_socket_pressure(sk->sk_memcg))return true; -return tcp_memory_pressure; +return READ_ONCE (tcp_memory_pressure); }/* * The next routines deal with comparing 32 bit unsigned ints
net/ipv4/tcp.c +2 -2
@@ -328,7 +328,7 @@ void tcp_enter_memory_pressure(struct sock *sk) {unsigned long val; -if (tcp_memory_pressure) +if (READ_ONCE (tcp_memory_pressure))return ; val = jiffies;
@@ -343,7 +343,7 @@ void tcp_leave_memory_pressure(struct sock *sk) {unsigned long val; -if (!tcp_memory_pressure) +if (!READ_ONCE (tcp_memory_pressure))return ; val =xchg (&tcp_memory_pressure,0 );if (val)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 325/343 drm/msm/dsi: Implement reset correctly
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 78e31c42261779a01bc73472d0f65f15378e9de3 ]
On msm8998, vblank timeouts are observed because the DSI controller is not reset properly, which ends up stalling the MDP. This is because the reset logic is not correct per the hardware documentation.
The documentation states that after asserting reset, software should wait some time (no indication of how long), or poll the status register until it returns 0 before deasserting reset.
wmb() is insufficient for this purpose since it just ensures ordering, not timing between writes. Since asserting and deasserting reset occurs on the same register, ordering is already guaranteed by the architecture, making the wmb extraneous.
Since we would define a timeout for polling the status register to avoid a possible infinite loop, lets just use a static delay of 20 ms, since 16.666 ms is the time available to process one frame at 60 fps.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -2
@@ -34,6 +34,8 @@#include "dsi_cfg.h" #include "msm_kms.h" +#define DSI_RESET_TOGGLE_DELAY_MS 20 +static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {u32 ver;
@@ -906,7 +908,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host)wmb ();/* clocks need to be enabled before reset */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 ); }
@@ -1288,7 +1290,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)/* dsi controller can only be reset while clocks are running */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 );wmb ();/* controller out of reset */ dsi_write (msm_host,REG_DSI_CTRL , data0);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 326/343 dmaengine: imx-sdma: fix size check for sdma script_number
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
[ Upstream commit bd73dfabdda280fc5f05bdec79b6721b4b2f035f ]
Illegal memory will be touch if SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3
(41) exceed the size of structure sdma_script_start_addrs(40), thus cause memory corrupt such as slob block header so that kernel trap into while() loop forever in slob_free(). Please refer to below code piece in imx-sdma.c:
for (i = 0; i < sdma->script_number; i++)
if (addr_arr[i] > 0) saddr_arr[i] = addr_arr[i]; /* memory corrupt here */
That issue was brought by commit a572460be9cf ("dmaengine: imx-sdma: Add support for version 3 firmware") because SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 (38->41 3 scripts added) not align with script number added in sdma_script_start_addrs(2 scripts).
--- drivers/dma/imx-sdma.c | 8 ++++++++ include/linux/platform_data/dma-imx-sdma.h | 3 +++ 2 files changed, 11 insertions(+)
drivers/dma/imx-sdma.c +8 -0
@@ -1441,6 +1441,14 @@ static void sdma_add_scripts(struct sdma_engine *sdma,if (!sdma->script_number) sdma->script_number =SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 ; +if (sdma->script_number >sizeof (struct sdma_script_start_addrs ) + /sizeof (s32)) { +dev_err (sdma->dev, +"SDMA script number %d not match with firmware.\n" , + sdma->script_number); +return ; + } +for (i =0 ; i < sdma->script_number; i++)if (addr_arr[i] >0 ) saddr_arr[i] = addr_arr[i];
include/linux/platform_data/dma-imx-sdma.h +3 -0
@@ -51,7 +51,10 @@ struct sdma_script_start_addrs {/* End of v2 array */ s32 zcanfd_2_mcu_addr;s32 zqspi_2_mcu_addr; +s32 mcu_2_ecspi_addr;/* End of v3 array */ +s32 mcu_2_zqspi_addr; +/* End of v4 array */ };/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 327/343 net: netem: fix error path for corrupted GSO frames
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit a7fa12d15855904aff1716e1fc723c03ba38c5cc ]
To corrupt a GSO frame we first perform segmentation. We then proceed using the first segment instead of the full GSO skb and requeue the rest of the segments as separate packets.
If there are any issues with processing the first segment we still want to process the rest, therefore we jump to the finish_segs label.
Commit 177b8007463c ("net: netem: fix backlog accounting for corrupted GSO frames") started using the pointer to the first segment in the "rest of segments processing", but as mentioned above the first segment may had already been freed at this point.
Backlog corrections for parent qdiscs have to be adjusted.
--- net/sched/sch_netem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/sched/sch_netem.c +6 -3
@@ -504,6 +504,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,if (skb->ip_summed ==CHECKSUM_PARTIAL &&skb_checksum_help (skb)) {qdisc_drop (skb, sch, to_free); + skb =NULL ; goto finish_segs; }
@@ -580,9 +581,10 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, finish_segs:if (segs) {unsigned int len, last_len; -int nb =0 ; +int nb; - len = skb->len; + len = skb ? skb->len :0 ; + nb = skb ?1 :0 ;while (segs) { skb2 = segs->next;
@@ -599,7 +601,8 @@ finish_segs: } segs = skb2; } -qdisc_tree_reduce_backlog (sch, -nb, prev_len - len); +/* Parent qdiscs accounted for 1 skb of size @prev_len */ +qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 328/343 net: netem: correct the parents backlog when corrupted packet was dropped
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e0ad032e144731a5928f2d75e91c2064ba1a764c ]
If packet corruption failed we jump to finish_segs and return NET_XMIT_SUCCESS. Seeing success will make the parent qdisc increment its backlog, that's incorrect - we need to return NET_XMIT_DROP.
--- net/sched/sch_netem.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/sch_netem.c +2 -0
@@ -603,6 +603,8 @@ finish_segs: }/* Parent qdiscs accounted for 1 skb of size @prev_len */ qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); + }else if (!skb) { +return NET_XMIT_DROP ; }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 329/343 net: qca_spi: Move reset_count to struct qcaspi
In reply to Greg Kroah-HartmanFrom: 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
Greg Kroah-Hartman
maintainerPATCH 330/343 afs: Fix large file support
In reply to Greg Kroah-HartmanFrom: 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
@@ -359,6 +359,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; sb->s_xattr = afs_xattr_handlers;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 331/343 MIPS: Loongson: Fix return value of loongson_hwmon_init
In reply to Greg Kroah-HartmanFrom: 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
@@ -158,7 +158,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
Greg Kroah-Hartman
maintainerPATCH 332/343 hv_netvsc: flag software created hash value
In reply to Greg Kroah-HartmanFrom: 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
@@ -282,9 +282,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;
@@ -802,8 +802,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
Greg Kroah-Hartman
maintainerPATCH 333/343 net: neigh: use long type to store jiffies delta
In reply to Greg Kroah-HartmanFrom: 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
@@ -1877,8 +1877,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
Greg Kroah-Hartman
maintainerPATCH 334/343 packet: fix data-race in fanout_flow_is_huge()
In reply to Greg Kroah-HartmanFrom: 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
@@ -1337,15 +1337,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
Greg Kroah-Hartman
maintainerPATCH 335/343 mmc: sdio: fix wl1251 vendor id
In reply to Greg Kroah-HartmanFrom: 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
@@ -67,6 +67,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
Greg Kroah-Hartman
maintainerPATCH 336/343 mmc: core: fix wl1251 sdio quirks
In reply to Greg Kroah-HartmanFrom: 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
Greg Kroah-Hartman
maintainerPATCH 337/343 affs: fix a memory leak in affs_remount
In reply to Greg Kroah-HartmanFrom: 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
@@ -559,14 +559,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);
@@ -577,7 +572,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
Greg Kroah-Hartman
maintainerPATCH 338/343 dmaengine: ti: edma: fix missed failure handling
In reply to Greg Kroah-HartmanFrom: 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/edma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma/edma.c +4 -2
@@ -2340,8 +2340,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
Greg Kroah-Hartman
maintainerPATCH 339/343 drm/radeon: fix bad DMA from INTERRUPT_CNTL2
In reply to Greg Kroah-HartmanFrom: 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
@@ -7012,8 +7012,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 · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 340/343 arm64: dts: juno: Fix UART frequency
In reply to Greg Kroah-HartmanFrom: 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
Greg Kroah-Hartman
maintainerPATCH 341/343 IB/iser: Fix dma_nents type definition
In reply to Greg Kroah-HartmanFrom: 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
Greg Kroah-Hartman
maintainerPATCH 342/343 serial: stm32: fix clearing interrupt error flags
In reply to Greg Kroah-HartmanFrom: 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
@@ -132,8 +132,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++;
@@ -302,7 +302,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
Greg Kroah-Hartman
maintainerPATCH 343/343 m68k: Call timer_interrupt() with interrupts disabled
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 1efdd4bd254311498123a15fa0acd565f454da97 ]
Some platforms execute their timer handler with the interrupt priority level set below 6. That means the handler could be interrupted by another driver and this could lead to re-entry of the timer core.
Avoid this by use of local_irq_save/restore for timer interrupt dispatch. This provides mutual exclusion around the timer interrupt flag access which is needed later in this series for the clocksource conversion.
--- arch/m68k/amiga/cia.c | 9 +++++++++ arch/m68k/atari/ataints.c | 4 ++-- arch/m68k/atari/time.c | 15 ++++++++++++++- arch/m68k/bvme6000/config.c | 20 ++++++++++---------- arch/m68k/hp300/time.c | 10 ++++++++-- arch/m68k/mac/via.c | 17 +++++++++++++++++ arch/m68k/mvme147/config.c | 18 ++++++++++-------- arch/m68k/mvme16x/config.c | 21 +++++++++++---------- arch/m68k/q40/q40ints.c | 19 +++++++++++-------- arch/m68k/sun3/sun3ints.c | 3 +++ arch/m68k/sun3x/time.c | 16 ++++++++++------ 11 files changed, 105 insertions(+), 47 deletions(-)
arch/m68k/amiga/cia.c +9 -0
@@ -88,10 +88,19 @@ static irqreturn_t cia_handler(int irq, void *dev_id)struct ciabase *base = dev_id;int mach_irq;unsigned char ints; +unsigned long flags; +/* Interrupts get disabled while the timer irq flag is cleared and +* the timer interrupt serviced. +*/ mach_irq = base->cia_irq; +local_irq_save (flags); ints =cia_set_irq (base,CIA_ICR_ALL ); amiga_custom.intreq = base->int_mask; +if (ints &1 ) +generic_handle_irq (mach_irq); +local_irq_restore (flags); + mach_irq++, ints >>=1 ;for (; ints; mach_irq++, ints >>=1 ) {if (ints &1 )generic_handle_irq (mach_irq);
arch/m68k/atari/ataints.c +2 -2
@@ -142,7 +142,7 @@ struct mfptimerbase { .name = "MFP Timer D" }; -static irqreturn_t mfptimer_handler (int irq,void *dev_id) +static irqreturn_t mfp_timer_d_handler (int irq,void *dev_id) {struct mfptimerbase *base = dev_id;int mach_irq;
@@ -344,7 +344,7 @@ void __init atari_init_IRQ(void) st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &0xf0 ) |0x6 ;/* request timer D dispatch handler */ -if (request_irq (IRQ_MFP_TIMD , mfptimer_handler,IRQF_SHARED , +if (request_irq (IRQ_MFP_TIMD , mfp_timer_d_handler,IRQF_SHARED , stmfp_base.name, &stmfp_base))pr_err ("Couldn't register %s interrupt\n" , stmfp_base.name);
arch/m68k/atari/time.c +14 -1
@@ -24,6 +24,18 @@DEFINE_SPINLOCK (rtc_lock);EXPORT_SYMBOL_GPL (rtc_lock); +static irqreturn_t mfp_timer_c_handler (int irq,void *dev_id) +{ +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; +} +void __init atari_sched_init (irq_handler_t timer_routine) {
@@ -32,7 +44,8 @@ atari_sched_init(irq_handler_t timer_routine)/* start timer C, div = 1:100 */ st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &15 ) |0x60 ;/* install interrupt service routine for MFP Timer C */ -if (request_irq (IRQ_MFP_TIMC , timer_routine,0 ,"timer" , timer_routine)) +if (request_irq (IRQ_MFP_TIMC , mfp_timer_c_handler,0 ,"timer" , + timer_routine))pr_err ("Couldn't register timer interrupt\n" ); }
arch/m68k/bvme6000/config.c +10 -10
@@ -45,11 +45,6 @@ extern int bvme6000_set_clock_mmss (unsigned long);extern void bvme6000_reset (void );void bvme6000_set_vectors (void ); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/timer/timekeeping.c, called via bvme6000_process_int() */ - -static irq_handler_t tick_handler; -int __init bvme6000_parse_bootinfo (const struct bi_record *bi) {
@@ -159,12 +154,18 @@ irqreturn_t bvme6000_abort_int (int irq, void *dev_id)static irqreturn_t bvme6000_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags;volatile RtcPtr_t rtc = (RtcPtr_t )BVME_RTC_BASE ; -unsigned char msr = rtc->msr &0xc0 ; +unsigned char msr; +local_irq_save (flags); + msr = rtc->msr &0xc0 ; rtc->msr = msr |0x20 ;/* Ack the interrupt */ +timer_routine (0 ,NULL ); +local_irq_restore (flags); -return tick_handler (irq, dev_id); +return IRQ_HANDLED ; }/*
@@ -183,9 +184,8 @@ void bvme6000_sched_init (irq_handler_t timer_routine) rtc->msr =0 ;/* Ensure timer registers accessible */ - tick_handler = timer_routine; -if (request_irq (BVME_IRQ_RTC , bvme6000_timer_int,0 , -"timer" , bvme6000_timer_int)) +if (request_irq (BVME_IRQ_RTC , bvme6000_timer_int,0 ,"timer" , + timer_routine))panic ("Couldn't register timer int" ); rtc->t1cr_omr =0x04 ;/* Mode 2, ext clk */
arch/m68k/hp300/time.c +8 -2
@@ -38,13 +38,19 @@static irqreturn_t hp300_tick (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags;unsigned long tmp; -irq_handler_t vector = dev_id; + +local_irq_save (flags);in_8 (CLOCKBASE +CLKSR ); asmvolatile ("movpw %1@(5),%0" :"=d" (tmp) :"a" (CLOCKBASE )); +timer_routine (0 ,NULL ); +local_irq_restore (flags); +/* Turn off the network and SCSI leds */ blinken_leds (0 ,0xe0 ); -return vector (irq,NULL ); +return IRQ_HANDLED ; }u32 hp300_gettimeoffset (void )
arch/m68k/mac/via.c +17 -0
@@ -398,6 +398,8 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ +#define VIA_TIMER_1_INT BIT(6) +void via1_irq (struct irq_desc *desc) {int irq_num;
@@ -407,6 +409,21 @@ void via1_irq(struct irq_desc *desc)if (!events)return ; + irq_num =IRQ_MAC_TIMER_1 ; + irq_bit =VIA_TIMER_1_INT ; +if (events & irq_bit) { +unsigned long flags; + +local_irq_save (flags); + via1[vIFR] = irq_bit; +generic_handle_irq (irq_num); +local_irq_restore (flags); + + events &= ~irq_bit; +if (!events) +return ; + } + irq_num =VIA1_SOURCE_BASE ; irq_bit =1 ; do {
arch/m68k/mvme147/config.c +10 -8
@@ -46,11 +46,6 @@ extern void mvme147_reset (void);static int bcd2int (unsigned char b); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/time/timekeeping.c, called via mvme147_process_int() */ - -irq_handler_t tick_handler; -int __init mvme147_parse_bootinfo (const struct bi_record *bi) {
@@ -106,16 +101,23 @@ void __init config_mvme147(void)static irqreturn_t mvme147_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); m147_pcc->t1_int_cntrl =PCC_TIMER_INT_CLR ; m147_pcc->t1_int_cntrl =PCC_INT_ENAB |PCC_LEVEL_TIMER1 ; -return tick_handler (irq, dev_id); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; }void mvme147_sched_init (irq_handler_t timer_routine) { - tick_handler = timer_routine; -if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,0 ,"timer 1" ,NULL )) +if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,0 ,"timer 1" , + timer_routine))pr_err ("Couldn't register timer interrupt\n" );/* Init the clock with a value */
arch/m68k/mvme16x/config.c +11 -10
@@ -51,11 +51,6 @@ extern void mvme16x_reset (void);int bcd2int (unsigned char b); -/* Save tick handler routine pointer, will point to xtime_update() in -* kernel/time/timekeeping.c, called via mvme16x_process_int() */ - -static irq_handler_t tick_handler; -unsigned short mvme16x_config;EXPORT_SYMBOL (mvme16x_config);
@@ -354,8 +349,15 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)static irqreturn_t mvme16x_timer_int (int irq,void *dev_id) { - *(volatile unsigned char *)0xfff4201b |=8 ; -return tick_handler (irq, dev_id); +irq_handler_t timer_routine = dev_id; +unsigned long flags; + +local_irq_save (flags); + *(volatile unsigned char *)0xfff4201b |=8 ; +timer_routine (0 ,NULL ); +local_irq_restore (flags); + +return IRQ_HANDLED ; }void mvme16x_sched_init (irq_handler_t timer_routine)
@@ -363,14 +365,13 @@ void mvme16x_sched_init (irq_handler_t timer_routine)uint16_t brdno =be16_to_cpu (mvme_bdid.brdno);int irq; - tick_handler = timer_routine;/* Using PCCchip2 or MC2 chip tick timer 1 */ *(volatile unsigned long *)0xfff42008 =0 ; *(volatile unsigned long *)0xfff42004 =10000 ;/* 10ms */ *(volatile unsigned char *)0xfff42017 |=3 ; *(volatile unsigned char *)0xfff4201b =0x16 ; -if (request_irq (MVME16x_IRQ_TIMER, mvme16x_timer_int,0 , -"timer" , mvme16x_timer_int)) +if (request_irq (MVME16x_IRQ_TIMER, mvme16x_timer_int,0 ,"timer" , + timer_routine))panic ("Couldn't register timer int" );if (brdno ==0x0162 || brdno ==0x172 )
arch/m68k/q40/q40ints.c +11 -8
@@ -127,10 +127,10 @@ void q40_mksound(unsigned int hz, unsigned int ticks) sound_ticks = ticks <<1 ; } -static irq_handler_t q40_timer_routine; - -static irqreturn_t q40_timer_int (int irq,void * dev) +static irqreturn_t q40_timer_int (int irq,void *dev_id) { +irq_handler_t timer_routine = dev_id; + ql_ticks = ql_ticks ?0 :1 ;if (sound_ticks) {unsigned char sval=(sound_ticks &1 ) ?128 -SVOL :128 +SVOL ;
@@ -139,8 +139,13 @@ static irqreturn_t q40_timer_int (int irq, void * dev) *DAC_RIGHT =sval; } -if (!ql_ticks) -q40_timer_routine (irq, dev); +if (!ql_ticks) { +unsigned long flags; + +local_irq_save (flags); +timer_routine (0 ,NULL ); +local_irq_restore (flags); + }return IRQ_HANDLED ; }
@@ -148,11 +153,9 @@ void q40_sched_init (irq_handler_t timer_routine) {int timer_irq; - q40_timer_routine = timer_routine; timer_irq =Q40_IRQ_FRAME ; -if (request_irq (timer_irq, q40_timer_int,0 , -"timer" , q40_timer_int)) +if (request_irq (timer_irq, q40_timer_int,0 ,"timer" , timer_routine))panic ("Couldn't register timer int" );master_outb (-1 ,FRAME_CLEAR_REG );
arch/m68k/sun3/sun3ints.c +3 -0
@@ -61,8 +61,10 @@ static irqreturn_t sun3_int7(int irq, void *dev_id)static irqreturn_t sun3_int5 (int irq,void *dev_id) { +unsigned long flags;unsigned int cnt; +local_irq_save (flags);#ifdef CONFIG_SUN3 intersil_clear ();#endif
@@ -76,6 +78,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id) cnt =kstat_irqs_cpu (irq,0 );if (!(cnt %20 ))sun3_leds (led_pattern[cnt %160 /20 ]); +local_irq_restore (flags);return IRQ_HANDLED ; }
arch/m68k/sun3x/time.c +10 -6
@@ -78,15 +78,19 @@ u32 sun3x_gettimeoffset(void) }#if 0 -static void sun3x_timer_tick (int irq,void *dev_id,struct pt_regs *regs) +static irqreturn_t sun3x_timer_tick (int irq,void *dev_id) { -void (*vector)(int ,void *,struct pt_regs *) = dev_id; +irq_handler_t timer_routine = dev_id; +unsigned long flags; -/* Clear the pending interrupt - pulse the enable line low */ -disable_irq (5 ); -enable_irq (5 ); +local_irq_save (flags); +/* Clear the pending interrupt - pulse the enable line low */ +disable_irq (5 ); +enable_irq (5 ); +timer_routine (0 ,NULL ); +local_irq_restore (flags); -vector (irq,NULL , regs); +return IRQ_HANDLED ; }#endif
Signature · 1 line
2.20.1
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
powerpc:allmodconfig:
arch/powerpc/kernel/kgdb.c: In function 'kgdb_arch_set_breakpoint':arch/powerpc/kernel/kgdb.c:451:8: error: implicit declaration of function 'probe_kernel_address'
Guenter
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
powerpc:allmodconfig:
arch/powerpc/kernel/kgdb.c: In function 'kgdb_arch_set_breakpoint':arch/powerpc/kernel/kgdb.c:451:8: error: implicit declaration of function 'probe_kernel_address'
Ah, nice catch, will go push out a -rc2 with this removed and with Sasha's fixes.
thanks,
greg k-h
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.168-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.14.168-rc1-g44ca37a00ad6
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.168-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.168-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 44ca37a00ad6e970111780ebce3b3b2b127ba3d6
git describe: v4.14.167-344-g44ca37a00ad6
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.167-344-g44ca37a00ad6
No regressions (compared to build v4.14.167)
No fixes (compared to build v4.14.167)
Ran 22734 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* libhugetlbfs
* linux-log-parser
* ltp-containers-tests
* kselftest
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-open-posix-tests
* network-basic-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.168-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.168 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 26 Jan 2020 09:26:30 +0000. Anything received after that time might be too late.
For v4.14.167-342-gc38faa17d730:
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 375 pass: 375 fail: 0
Guenter