4.9.203-stable review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 78/222 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ]
dtc has new checks for SPI buses. The rk3036 dts file has a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings.
arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus
--- arch/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
@@ -744,7 +744,7 @@ /* no rts / cts for uart2 */ }; - spi { + spi-pins { spi_txd:spi-txd { rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 1/222 ax88172a: fix information leak on short answers
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit a9a51bd727d141a67b589f375fe69d0e54c4fe22 ]
If a malicious device gives a short MAC it can elicit up to 5 bytes of leaked memory out of the driver. We need to check for ETH_ALEN instead.
--- drivers/net/usb/ax88172a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/ax88172a.c +1 -1
@@ -215,7 +215,7 @@ static int ax88172a_bind(struct usbnet */* Get the MAC address */ ret =asix_read_cmd (dev,AX_CMD_READ_NODE_ID ,0 ,0 ,ETH_ALEN , buf,0 ); -if (ret <0 ) { +if (ret <ETH_ALEN ) {netdev_err (dev->net,"Failed to read MAC address: %d\n" , ret); goto free; }
Greg Kroah-Hartman
maintainerPATCH 10/222 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit e72b9dd6a5f17d0fb51f16f8685f3004361e83d0 upstream.
lower_dentry can't go from positive to negative (we have it pinned), but it *can* go from negative to positive. So fetching ->d_inode into a local variable, doing a blocking allocation, checking that now ->d_inode is non-NULL and feeding the value we'd fetched earlier to a function that won't accept NULL is not a good idea.
--- fs/ecryptfs/inode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/ecryptfs/inode.c +10 -2
@@ -326,7 +326,7 @@ static int ecryptfs_i_size_read(struct dstatic struct dentry *ecryptfs_lookup_interpose (struct dentry *dentry,struct dentry *lower_dentry) { -struct inode *inode, *lower_inode =d_inode (lower_dentry); +struct inode *inode, *lower_inode;struct ecryptfs_dentry_info *dentry_info;struct vfsmount *lower_mnt;int rc =0 ;
@@ -349,7 +349,15 @@ static struct dentry *ecryptfs_lookup_in dentry_info->lower_path.mnt = lower_mnt; dentry_info->lower_path.dentry = lower_dentry; -if (d_really_is_negative (lower_dentry)) { +/* +* negative dentry can go positive under us here - its parent is not +* locked. That's OK and that could happen just as we return from +* ecryptfs_lookup() anyway. Just need to be careful and fetch +* ->d_inode only once - it's not stable here. +*/ + lower_inode =READ_ONCE (lower_dentry->d_inode); + +if (!lower_inode) {/* We want to add because we couldn't find in lower */ d_add (dentry,NULL );return NULL ;
Greg Kroah-Hartman
maintainerPATCH 11/222 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 762c69685ff7ad5ad7fee0656671e20a0c9c864d upstream.
We need to get the underlying dentry of parent; sure, absent the races it is the parent of underlying dentry, but there's nothing to prevent losing a timeslice to preemtion in the middle of evaluation of lower_dentry->d_parent->d_inode, having another process move lower_dentry around and have its (ex)parent not pinned anymore and freed on memory pressure. Then we regain CPU and try to fetch ->d_inode from memory that is freed by that point.
dentry->d_parent *is* stable here - it's an argument of ->lookup() and we are guaranteed that it won't be moved anywhere until we feed it to d_add/d_splice_alias. So we safely go that way to get to its underlying dentry.
--- fs/ecryptfs/inode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/ecryptfs/inode.c +3 -4
@@ -326,9 +326,9 @@ static int ecryptfs_i_size_read(struct dstatic struct dentry *ecryptfs_lookup_interpose (struct dentry *dentry,struct dentry *lower_dentry) { +struct path *path =ecryptfs_dentry_to_lower_path (dentry->d_parent);struct inode *inode, *lower_inode;struct ecryptfs_dentry_info *dentry_info; -struct vfsmount *lower_mnt;int rc =0 ; dentry_info =kmem_cache_alloc (ecryptfs_dentry_info_cache,GFP_KERNEL );
@@ -340,13 +340,12 @@ static struct dentry *ecryptfs_lookup_inreturn ERR_PTR (-ENOMEM ); } - lower_mnt =mntget (ecryptfs_dentry_to_lower_mnt (dentry->d_parent));fsstack_copy_attr_atime (d_inode (dentry->d_parent), -d_inode (lower_dentry->d_parent)); +d_inode (path->dentry));BUG_ON (!d_count (lower_dentry));ecryptfs_set_dentry_private (dentry, dentry_info); - dentry_info->lower_path.mnt = lower_mnt; + dentry_info->lower_path.mnt =mntget (path->mnt); dentry_info->lower_path.dentry = lower_dentry;/*
Greg Kroah-Hartman
maintainerPATCH 12/222 iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros
In reply to Greg Kroah-HartmanFrom: Eric Auger <[email protected]>
commit 4e7120d79edb31e4ee68e6f8421448e4603be1e9 upstream.
For both PASID-based-Device-TLB Invalidate Descriptor and Device-TLB Invalidate Descriptor, the Physical Function Source-ID value is split according to this layout:
PFSID[3:0] is set at offset 12 and PFSID[15:4] is put at offset 52. Fix the part laid out at offset 52.
--- include/linux/intel-iommu.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/intel-iommu.h +4 -2
@@ -295,7 +295,8 @@ enum {#define QI_DEV_IOTLB_SID (sid) ((u64)((sid) & 0xffff) << 32)#define QI_DEV_IOTLB_QDEP (qdep) (((qdep) & 0x1f) << 16)#define QI_DEV_IOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK) -#define QI_DEV_IOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) +#define QI_DEV_IOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \ + ((u64)((pfsid >> 4) & 0xfff) << 52))#define QI_DEV_IOTLB_SIZE 1#define QI_DEV_IOTLB_MAX_INVS 32
@@ -320,7 +321,8 @@ enum {#define QI_DEV_EIOTLB_PASID (p) (((u64)p) << 32)#define QI_DEV_EIOTLB_SID (sid) ((u64)((sid) & 0xffff) << 16)#define QI_DEV_EIOTLB_QDEP (qd) ((u64)((qd) & 0x1f) << 4) -#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) +#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \ + ((u64)((pfsid >> 4) & 0xfff) << 52))#define QI_DEV_EIOTLB_MAX_INVS 32#define QI_PGRP_IDX (idx) (((u64)(idx)) << 55)
Greg Kroah-Hartman
maintainerPATCH 13/222 mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm()
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit 00d484f354d85845991b40141d40ba9e5eb60faf upstream.
We've encountered a rcu stall in get_mem_cgroup_from_mm():
rcu: INFO: rcu_sched self-detected stall on CPU rcu: 33-....: (21000 ticks this GP) idle=6c6/1/0x4000000000000002 softirq=35441/35441 fqs=5017 (t=21031 jiffies g=324821 q=95837) NMI backtrace for cpu 33 <...> RIP: 0010:get_mem_cgroup_from_mm+0x2f/0x90 <...> __memcg_kmem_charge+0x55/0x140 __alloc_pages_nodemask+0x267/0x320 pipe_write+0x1ad/0x400 new_sync_write+0x127/0x1c0 __kernel_write+0x4f/0xf0 dump_emit+0x91/0xc0 writenote+0xa0/0xc0 elf_core_dump+0x11af/0x1430 do_coredump+0xc65/0xee0 get_signal+0x132/0x7c0 do_signal+0x36/0x640 exit_to_usermode_loop+0x61/0xd0 do_syscall_64+0xd4/0x100 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The problem is caused by an exiting task which is associated with an offline memcg. We're iterating over and over in the do {} while (!css_tryget_online()) loop, but obviously the memcg won't become online and the exiting task won't be migrated to a live memcg.
Let's fix it by switching from css_tryget_online() to css_tryget().
As css_tryget_online() cannot guarantee that the memcg won't go offline, the check is usually useless, except some rare cases when for example it determines if something should be presented to a user.
A similar problem is described by commit 18fa84a2db0e ("cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()").
Johannes:
: The bug aside, it doesn't matter whether the cgroup is online for the : callers. It used to matter when offlining needed to evacuate all charges : from the memcg, and so needed to prevent new ones from showing up, but we : don't care now.
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol.c +1 -1
@@ -741,7 +741,7 @@ static struct mem_cgroup *get_mem_cgroupif (unlikely (!memcg)) memcg = root_mem_cgroup; } - }while (!css_tryget_online (&memcg->css)); + }while (!css_tryget (&memcg->css));rcu_read_unlock ();return memcg; }
Greg Kroah-Hartman
maintainerPATCH 14/222 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup()
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit 0362f326d86c645b5e96b7dbc3ee515986ed019d upstream.
An exiting task might belong to an offline cgroup. In this case an attempt to grab a cgroup reference from the task can end up with an infinite loop in hugetlb_cgroup_charge_cgroup(), because neither the cgroup will become online, neither the task will be migrated to a live cgroup.
Fix this by switching over to css_tryget(). As css_tryget_online() can't guarantee that the cgroup won't go offline, in most cases the check doesn't make sense. In this particular case users of hugetlb_cgroup_charge_cgroup() are not affected by this change.
A similar problem is described by commit 18fa84a2db0e ("cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()").
--- mm/hugetlb_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hugetlb_cgroup.c +1 -1
@@ -196,7 +196,7 @@ int hugetlb_cgroup_charge_cgroup(int idx again:rcu_read_lock (); h_cg =hugetlb_cgroup_from_task (current); -if (!css_tryget_online (&h_cg->css)) { +if (!css_tryget (&h_cg->css)) {rcu_read_unlock (); goto again; }
Greg Kroah-Hartman
maintainerPATCH 15/222 mmc: sdhci-of-at91: fix quirk2 overwrite
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit fed23c5829ecab4ddc712d7b0046e59610ca3ba4 upstream.
The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver.
The driver needs to enable just this flag, not rewrite the whole quirk set.
--- drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-at91.c +1 -1
@@ -318,7 +318,7 @@ static int sdhci_at91_probe(struct platfpm_runtime_use_autosuspend (&pdev->dev);/* HS200 is broken at this moment */ - host->quirks2 =SDHCI_QUIRK2_BROKEN_HS200 ; + host->quirks2 |=SDHCI_QUIRK2_BROKEN_HS200 ; ret =sdhci_add_host (host);if (ret)
Greg Kroah-Hartman
maintainerPATCH 17/222 iio: dac: mcp4922: fix error handling in mcp4922_write_raw
In reply to Greg Kroah-HartmanFrom: Marcus Folkesson <[email protected]>
[ Upstream commit 0833627fc3f757a0dca11e2a9c46c96335a900ee ]
Do not try to write negative values and make sure that the write goes well.
--- drivers/iio/dac/mcp4922.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/iio/dac/mcp4922.c +8 -3
@@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev, long mask) {struct mcp4922_state *state =iio_priv (indio_dev); +int ret;if (val2 !=0 )return -EINVAL ;switch (mask) {case IIO_CHAN_INFO_RAW : -if (val >GENMASK (chan->scan_type.realbits-1 ,0 )) +if (val <0 || val >GENMASK (chan->scan_type.realbits -1 ,0 ))return -EINVAL ; val <<= chan->scan_type.shift; - state->value[chan->channel] = val; -return mcp4922_spi_write (state, chan->channel, val); + + ret =mcp4922_spi_write (state, chan->channel, val); +if (!ret) + state->value[chan->channel] = val; +return ret; +default :return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/222 ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6f128fa41f310e1f39ebcea9621d2905549ecf52 ]
The "frames" variable is unsigned so the error handling doesn't work properly.
--- sound/core/oss/pcm_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/oss/pcm_plugin.c +2 -2
@@ -111,7 +111,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->next) {if (plugin->dst_frames) frames = plugin->dst_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->next; err =snd_pcm_plugin_alloc (plugin, frames);
@@ -123,7 +123,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->prev) {if (plugin->src_frames) frames = plugin->src_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->prev; err =snd_pcm_plugin_alloc (plugin, frames);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/222 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
In reply to Greg Kroah-HartmanFrom: Aapo Vienamo <[email protected]>
[ Upstream commit 6ff7705da8806de45ca1490194f0b4eb07725804 ]
On p2180 sdmmc4 is powered from a fixed 1.8 V regulator.
--- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -0
@@ -281,6 +281,7 @@ status = "okay"; bus-width = <8>; non-removable; + vqmmc-supply = <&vdd_1v8>; }; clocks {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/222 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
In reply to Greg Kroah-HartmanFrom: Jay Foster <[email protected]>
[ Upstream commit 10af10db8c76fa5b9bf1f52a895c1cb2c0ac24da ]
Fix a typo. No functional change made by this patch.
--- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91sam9g45.dtsi +1 -1
@@ -546,7 +546,7 @@ }; }; - uart1 { + usart1 { pinctrl_usart1: usart1-0 { atmel,pins = <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/222 ALSA: usb-audio: Fix missing error check at mixer resolution test
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 167beb1756791e0806365a3f86a0da10d7a327ee upstream.
A check of the return value from get_cur_mix_raw() is missing at the resolution test code in get_min_max_with_quirks(), which may leave the variable untouched, leading to a random uninitialized value, as detected by syzkaller fuzzer.
Add the missing return error check for fixing that.
--- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -1
@@ -1046,7 +1046,8 @@ static int get_min_max_with_quirks(strucif (cval->min + cval->res < cval->max) {int last_valid_res = cval->res;int saved, test, check; -get_cur_mix_raw (cval, minchn, &saved); +if (get_cur_mix_raw (cval, minchn, &saved) <0 ) + goto no_res_check;for (;;) { test = saved;if (test < cval->max)
@@ -1066,6 +1067,7 @@ static int get_min_max_with_quirks(strucsnd_usb_set_cur_mix_value (cval, minchn,0 , saved); } +no_res_check: cval->initialized =1 ; }
Greg Kroah-Hartman
maintainerPATCH 5/222 Input: ff-memless - kill timer in destroy()
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit fa3a5a1880c91bb92594ad42dfe9eedad7996b86 upstream.
No timer must be left running when the device goes away.
--- drivers/input/ff-memless.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/input/ff-memless.c +9 -0
@@ -501,6 +501,15 @@ static void ml_ff_destroy(struct ff_devi {struct ml_device *ml = ff->private; +/* +* Even though we stop all playing effects when tearing down +* an input device (via input_device_flush() that calls into +* input_ff_flush() that stops and erases all effects), we +* do not actually stop the timer, and therefore we should +* do it here. +*/ +del_timer_sync (&ml->timer); +kfree (ml->private); }
Greg Kroah-Hartman
maintainerPATCH 6/222 Input: synaptics-rmi4 - fix video buffer size
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 003f01c780020daa9a06dea1db495b553a868c29 upstream.
The video buffer used by the queue is a vb2_v4l2_buffer, not a plain vb2_buffer. Using the wrong type causes the allocation of the buffer storage to be too small, causing a out of bounds write when __init_vb2_v4l2_buffer initializes the buffer.
--- drivers/input/rmi4/rmi_f54.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/rmi4/rmi_f54.c +1 -1
@@ -364,7 +364,7 @@ static const struct vb2_ops rmi_f54_queustatic const struct vb2_queue rmi_f54_queue = { .type =V4L2_BUF_TYPE_VIDEO_CAPTURE , .io_modes =VB2_MMAP |VB2_USERPTR |VB2_DMABUF |VB2_READ , - .buf_struct_size =sizeof (struct vb2_buffer ), + .buf_struct_size =sizeof (struct vb2_v4l2_buffer ), .ops = &rmi_f54_queue_ops, .mem_ops = &vb2_vmalloc_memops, .timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ,
Greg Kroah-Hartman
maintainerPATCH 7/222 Input: synaptics-rmi4 - clear IRQ enables for F54
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 549766ac2ac1f6c8bb85906bbcea759541bb19a2 upstream.
The driver for F54 just polls the status and doesn't even have a IRQ handler registered. Make sure to disable all F54 IRQs, so we don't crash the kernel on a nonexistent handler.
--- drivers/input/rmi4/rmi_f54.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/rmi4/rmi_f54.c +1 -1
@@ -617,7 +617,7 @@ static int rmi_f54_config(struct rmi_fun {struct rmi_driver *drv = fn->rmi_dev->driver; - drv->set_irq_bits (fn->rmi_dev, fn->irq_mask); + drv->clear_irq_bits (fn->rmi_dev, fn->irq_mask);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 8/222 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
commit ba60cf9f78f0d7c8e73c7390608f7f818ee68aa0 upstream.
The driver forgets to destroy workqueue in remove() similarly to what is done when probe() fails. Add a call to destroy_workqueue() to fix it.
Since unregistration will wait for the work to finish, we do not need to cancel/flush the work instance in remove().
--- drivers/input/rmi4/rmi_f54.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/rmi4/rmi_f54.c +1 -0
@@ -744,6 +744,7 @@ static void rmi_f54_remove(struct rmi_fuvideo_unregister_device (&f54->vdev);v4l2_device_unregister (&f54->v4l2); +destroy_workqueue (f54->workqueue); }struct rmi_function_handler rmi_f54_handler = {
Greg Kroah-Hartman
maintainerPATCH 9/222 IB/hfi1: Ensure full Gen3 speed in a Gen4 system
In reply to Greg Kroah-HartmanFrom: James Erwin <[email protected]>
commit a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 upstream.
If an hfi1 card is inserted in a Gen4 systems, the driver will avoid the gen3 speed bump and the card will operate at half speed.
This is because the driver avoids the gen3 speed bump when the parent bus speed isn't identical to gen3, 8.0GT/s. This is not compatible with gen4 and newer speeds.
Fix by relaxing the test to explicitly look for the lower capability speeds which inherently allows for gen4 and all future speeds.
--- drivers/infiniband/hw/hfi1/pcie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/pcie.c +3 -1
@@ -377,7 +377,9 @@ int pcie_speeds(struct hfi1_devdata *dd)/* * bus->max_bus_speed is set from the bridge's linkcap Max Link Speed */ -if (parent && dd->pcidev->bus->max_bus_speed !=PCIE_SPEED_8_0GT ) { +if (parent && + (dd->pcidev->bus->max_bus_speed ==PCIE_SPEED_2_5GT || + dd->pcidev->bus->max_bus_speed ==PCIE_SPEED_5_0GT )) {dd_dev_info (dd,"Parent PCIe bridge does not support Gen3\n" ); dd->link_gen3_capable =0 ; }
Greg Kroah-Hartman
maintainercover 4.9.203-stable review
This is the start of the stable review cycle for the 4.9.203 release. There are 222 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, 24 Nov 2019 09:59:19 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.203-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.203-rc1
Pavel Tatashin <[email protected]>
arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault
Roger Quadros <[email protected]>
ARM: dts: omap5: Fix dual-role mode on Super-Speed port
Huibin Hong <[email protected]>
spi: rockchip: initialize dma_slave_config properly
Felix Fietkau <[email protected]>
mac80211: minstrel: fix CCK rate group streams value
zhong jiang <[email protected]>
misc: cxl: Fix possible null pointer dereference
Nicolin Chen <[email protected]>
hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros
Thierry Reding <[email protected]>
hwmon: (pwm-fan) Silence error on probe deferral
Colin Ian King <[email protected]>
orangefs: rate limit the client not running info message
Timothy E Baldwin <[email protected]>
ARM: 8802/1: Call syscall_trace_exit even when system call skipped
Trent Piepho <[email protected]>
spi: spidev: Fix OF tree warning logic
Marek Vasut <[email protected]>
gpio: syscon: Fix possible NULL ptr usage
Bjorn Helgaas <[email protected]>
x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error
Colin Ian King <[email protected]>
media: cx231xx: fix potential sign-extension overflow on large shift
Tim Smith <[email protected]>
GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads
Wenwen Wang <[email protected]>
media: isif: fix a NULL pointer dereference bug
He Zhe <[email protected]>
printk: Give error on attempt to set log buffer length to over 2G
Vignesh R <[email protected]>
mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable
Nathan Chancellor <[email protected]>
backlight: lm3639: Unconditionally call led_classdev_unregister
Borislav Petkov <[email protected]>
proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted()
Vasily Gorbik <[email protected]>
s390/kasan: avoid vdso instrumentation
Shenghui Wang <[email protected]>
bcache: recal cached_dev_sectors on detach
Geert Uytterhoeven <[email protected]>
reset: Fix potential use-after-free in __of_reset_control_get()
Dan Carpenter <[email protected]>
fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper()
Dan Carpenter <[email protected]>
fbdev: sbuslib: use checked version of put_user()
Sara Sharon <[email protected]>
iwlwifi: mvm: don't send keys when entering D3
Ronald Tschalär <[email protected]>
ACPI / SBS: Fix rare oops when removing modules
Radu Solea <[email protected]>
crypto: mxs-dcp - Fix AES issues
Radu Solea <[email protected]>
crypto: mxs-dcp - Fix SHA null hashes and output length
Borislav Petkov <[email protected]>
x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
Julian Sax <[email protected]>
Input: silead - try firmware reload after unsuccessful resume
Martin Kepplinger <[email protected]>
Input: st1232 - set INPUT_PROP_DIRECT property
Rami Rosen <[email protected]>
dmaengine: ioat: fix prototype of ioat_enumerate_channels
Olga Kornievskaia <[email protected]>
NFSv4.x: fix lock recovery during delegation recall
Florian Fainelli <[email protected]>
i2c: brcmstb: Allow enabling the driver on DSL SoCs
Marek Szyprowski <[email protected]>
clk: samsung: Use clk_hw API for calling clk framework from clk notifiers
Chung-Hsien Hsu <[email protected]>
brcmfmac: fix full timeout waiting for action frame on-channel tx
Chung-Hsien Hsu <[email protected]>
brcmfmac: reduce timeout for action frame scan
Borislav Petkov <[email protected]>
cpu/SMT: State SMT is disabled even with nosmt and without "=force"
Ricardo Ribalda Delgado <[email protected]>
mtd: physmap_of: Release resources on error
Johan Hovold <[email protected]>
USB: serial: cypress_m8: fix interrupt-out transfer length
Cameron Kaiser <[email protected]>
KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR
Michael Pobega <[email protected]>
ALSA: hda/sigmatel - Disable automute for Elo VuPoint
Nathan Chancellor <[email protected]>
media: pxa_camera: Fix check for pdev->dev.of_node
Nathan Chancellor <[email protected]>
ata: ep93xx: Use proper enums for directions
Bob Moore <[email protected]>
ACPICA: Never run _REG on system_memory and system_IO
Nathan Chancellor <[email protected]>
IB/mlx4: Avoid implicit enumerated type conversion
Wei Yongjun <[email protected]>
IB/mthca: Fix error return code in __mthca_init_one()
Radoslaw Tyl <[email protected]>
ixgbe: Fix crash with VFs and flow director on interface flap
Nathan Chancellor <[email protected]>
mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer
Naveen N. Rao <[email protected]>
powerpc/pseries: Fix how we iterate over the DTL entries
Naveen N. Rao <[email protected]>
powerpc/pseries: Fix DTL buffer registration
Nathan Chancellor <[email protected]>
cxgb4: Use proper enum in IEEE_FAUX_SYNC
Nathan Chancellor <[email protected]>
cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update
Dan Carpenter <[email protected]>
mei: samples: fix a signedness bug in amt_host_if_call()
Nathan Chancellor <[email protected]>
dmaengine: timb_dma: Use proper enum in td_prep_slave_sg
Nathan Chancellor <[email protected]>
dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction
Andrew Zaborowski <[email protected]>
nl80211: Fix a GET_KEY reply attribute
Jia-Ju Bai <[email protected]>
usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status()
Simon Wunderlich <[email protected]>
ath9k: fix reporting calculated new FFT upper max
Florian Fainelli <[email protected]>
ata: ahci_brcm: Allow using driver or DSL SoCs
Ben Greear <[email protected]>
ath10k: fix vdev-start timeout on error
Anshuman Khandual <[email protected]>
arm64/numa: Report correct memblock range for the dummy node
Suzuki K Poulose <[email protected]>
kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table
Trond Myklebust <[email protected]>
SUNRPC: Fix priority queue fairness
Jaegeuk Kim <[email protected]>
f2fs: return correct errno in f2fs_gc
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap5: enable OTG role for DWC3 controller
YueHaibing <[email protected]>
net: xen-netback: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: ovs: fix return type of ndo_start_xmit function
Jens Axboe <[email protected]>
libata: have ata_scsi_rw_xlat() fail invalid passthrough requests
Christoph Hellwig <[email protected]>
block: introduce blk_rq_is_passthrough
Daniel Vetter <[email protected]>
fbdev: Ditch fb_edid_add_monspecs
Masami Hiramatsu <[email protected]>
uprobes/x86: Prohibit probing on MOV SS instruction
Masami Hiramatsu <[email protected]>
kprobes/x86: Prohibit probing on exception masking instructions
Peter Zijlstra <[email protected]>
x86/atomic: Fix smp_mb__{before,after}_atomic()Dan Carpenter <[email protected]>
net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size()
Jouni Hogander <[email protected]>
slcan: Fix memory leak in error path
zhong jiang <[email protected]>
memfd: Use radix_tree_deref_slot_protected to avoid the warning.
Israel Rukshin <[email protected]>
IB/iser: Fix possible NULL deref at iser_inv_desc()
Kirill Tkhai <[email protected]>
fuse: use READ_ONCE on congestion_threshold and max_background
Chunfeng Yun <[email protected]>
usb: xhci-mtk: fix ISOC error when interval is zero
Rob Herring <[email protected]>
ARM: dts: lpc32xx: Fix SPI controller node names
Rob Herring <[email protected]>
arm64: dts: lg: Fix SPI controller node names
Rob Herring <[email protected]>
arm64: dts: amd: Fix SPI bus warnings
Finn Thain <[email protected]>
scsi: NCR5380: Handle BUS FREE during reselection
Finn Thain <[email protected]>
scsi: NCR5380: Don't call dsprintk() following reselection interrupt
Finn Thain <[email protected]>
scsi: NCR5380: Don't clear busy flag when abort fails
Finn Thain <[email protected]>
scsi: NCR5380: Check for invalid reselection target
Finn Thain <[email protected]>
scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data
Hannes Reinecke <[email protected]>
scsi: NCR5380: Clear all unissued commands on host reset
Dan Aloni <[email protected]>
crypto: fix a memory leak in rsa-kcs1pad's encryption mode
Christoph Manszewski <[email protected]>
crypto: s5p-sss: Fix Fix argument list alignment
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS
Rob Herring <[email protected]>
ARM: dts: realview: Fix SPI controller node names
Justin Ernst <[email protected]>
EDAC: Raise the maximum number of memory controllers
YueHaibing <[email protected]>
net: smsc: fix return type of ndo_start_xmit function
Marc Dietrich <[email protected]>
ARM: dts: paz00: fix wakeup gpio keycode
Marcel Ziswiler <[email protected]>
ARM: tegra: apalis_t30: fix mmc1 cmd pull-up
Marcel Ziswiler <[email protected]>
ARM: dts: tegra30: fix xcvr-setup-use-fuses
Jason Yan <[email protected]>
scsi: libsas: always unregister the old device if going to discover new
Alex Williamson <[email protected]>
vfio/pci: Mask buggy SR-IOV VF INTx support
Li Qiang <[email protected]>
vfio/pci: Fix potential memory leak in vfio_msi_cap_len
zhong jiang <[email protected]>
misc: genwqe: should return proper error value.
Laura Abbott <[email protected]>
misc: kgdbts: Fix restrict error
Leo Yan <[email protected]>
coresight: tmc: Fix byte-address alignment for RRP
Tomasz Nowicki <[email protected]>
coresight: etm4x: Configure EL2 exception level when kernel is running in HYP
Suzuki K Poulose <[email protected]>
coresight: Fix handling of sinks
Laurent Pinchart <[email protected]>
usb: gadget: uvc: Only halt video streaming endpoint in bulk mode
Laurent Pinchart <[email protected]>
usb: gadget: uvc: Factor out video USB request queueing
Andreas Kemnade <[email protected]>
phy: phy-twl4030-usb: fix denied runtime access
Joel Pepper <[email protected]>
usb: gadget: uvc: configfs: Prevent format changes after linking header
Laurent Pinchart <[email protected]>
usb: gadget: uvc: configfs: Drop leaked references to config items
Nathan Chancellor <[email protected]>
media: davinci: Fix implicit enum conversion warning
Brad Love <[email protected]>
media: au0828: Fix incorrect error messages
Jia-Ju Bai <[email protected]>
media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init()
Dengcheng Zhu <[email protected]>
MIPS: kexec: Relax memory restriction
Matthew Whitehead <[email protected]>
x86/CPU: Use correct macros for Cyrix calls
YueHaibing <[email protected]>
net: micrel: fix return type of ndo_start_xmit function
Shahed Shaikh <[email protected]>
bnx2x: Ignore bandwidth attention in single function mode
Rob Herring <[email protected]>
ARM: dts: marvell: Fix SPI and I2C bus warnings
Stefan Agner <[email protected]>
cpufeature: avoid warning when compiling with clang
Nathan Chancellor <[email protected]>
spi: pic32: Use proper enum in dmaengine_prep_slave_rg
Rob Herring <[email protected]>
ARM: dts: ste: Fix SPI controller node names
Linus Walleij <[email protected]>
ARM: dts: ux500: Fix LCDA clock line muxing
Geert Uytterhoeven <[email protected]>
ARM: dts: ux500: Correct SCU unit address
Chao Yu <[email protected]>
f2fs: fix to recover inode's uid/gid during POR
Grygorii Strashko <[email protected]>
ARM: dts: am335x-evm: fix number of cpsw
Petr Machata <[email protected]>
mlxsw: spectrum: Init shaper for TCs 8..15
Loic Poulain <[email protected]>
usb: chipidea: Fix otg event handler
Nicolas Adell <[email protected]>
usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
YueHaibing <[email protected]>
net: amd: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: broadcom: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: xilinx: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: toshiba: fix return type of ndo_start_xmit function
Andreas Kemnade <[email protected]>
power: supply: twl4030_charger: disable eoc interrupt on linear charge
Andreas Kemnade <[email protected]>
power: supply: twl4030_charger: fix charging current out-of-bounds
Rob Herring <[email protected]>
libfdt: Ensure INT_MAX is defined in libfdt_env.h
Håkon Bugge <[email protected]>
RDMA/i40iw: Fix incorrect iterator type
Nathan Fontenot <[email protected]>
powerpc/pseries: Disable CPU hotplug across migrations
Nicholas Piggin <[email protected]>
powerpc/64s/hash: Fix stab_rr off by one initialization
Breno Leitao <[email protected]>
powerpc/iommu: Avoid derefence before pointer check
Anton Vasilyev <[email protected]>
serial: mxs-auart: Fix potential infinite loop
Sinan Kaya <[email protected]>
PCI/ACPI: Correct error message for ASPM disabling
Julian Wiedmann <[email protected]>
s390/qeth: invoke softirqs after napi_schedule()
Dan Carpenter <[email protected]>
ath9k: Fix a locking bug in ath9k_add_interface()
Rob Herring <[email protected]>
ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
Haishuang Yan <[email protected]>
ip_gre: fix parsing gre header in ipgre_err
Bernd Edlinger <[email protected]>
kernfs: Fix range checks in kernfs_get_target_path
Banajit Goswami <[email protected]>
component: fix loop condition to call unbind() if bind() fails
Tomasz Figa <[email protected]>
power: supply: max8998-charger: Fix platform data retrieval
Claudiu Beznea <[email protected]>
power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
Dan Carpenter <[email protected]>
power: supply: ab8500_fg: silence uninitialized variable warnings
Ganesh Goudar <[email protected]>
cxgb4: Fix endianness issue in t4_fwcache()
Ludovic Desroches <[email protected]>
pinctrl: at91: don't use the same irqchip with multiple gpiochips
Dinh Nguyen <[email protected]>
ARM: dts: socfpga: Fix I2C bus unit-address error
Alan Modra <[email protected]>
powerpc/vdso: Correct call frame information
Christian Lamparter <[email protected]>
ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value
Cong Wang <[email protected]>
llc: avoid blocking in llc_sap_close()
Dan Carpenter <[email protected]>
pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
Takashi Iwai <[email protected]>
ALSA: intel8x0m: Register irq handler after register initializations
Arnd Bergmann <[email protected]>
media: dvb: fix compat ioctl translation
Lao Wei <[email protected]>
media: fix: media: pci: meye: validate offset to avoid arbitrary access
Srinivas Kandagatla <[email protected]>
nvmem: core: return error code instead of NULL from nvmem_device_get
Masami Hiramatsu <[email protected]>
kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
Deepak Ukey <[email protected]>
scsi: pm80xx: Fixed system hang issue during kexec boot
Deepak Ukey <[email protected]>
scsi: pm80xx: Corrected dma_unmap_sg() parameter
Oleksij Rempel <[email protected]>
ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
George Kennedy <[email protected]>
scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
Chao Yu <[email protected]>
f2fs: fix memory leak of percpu counter in fill_super()
Eric W. Biederman <[email protected]>
signal: Properly deliver SIGSEGV from x86 uprobes
Eric W. Biederman <[email protected]>
signal: Properly deliver SIGILL from uprobes
Eric W. Biederman <[email protected]>
signal: Always ignore SIGKILL and SIGSTOP sent to the global init
Felix Fietkau <[email protected]>
ath9k: add back support for using active monitor interfaces for tx99
Daniel Silsby <[email protected]>
dmaengine: dma-jz4780: Further residue status fix
Paul Cercueil <[email protected]>
dmaengine: dma-jz4780: Don't depend on MACH_JZ4780
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: keep vpll2 always on
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: fix touchscreen tsc2007
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: tvout: enable as display1 alias
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: fixes for tvout / venc
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
Rob Herring <[email protected]>
of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
Yong Zhi <[email protected]>
ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
Ding Xiang <[email protected]>
mips: txx9: fix iounmap related issue
Erik Stromdahl <[email protected]>
ath10k: wmi: disable softirq's while calling ieee80211_rx
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Disable pull control for S5M8767 PMIC
Colin Ian King <[email protected]>
ASoC: sgtl5000: avoid division by zero if lo_vag is zero
Stefan Wahren <[email protected]>
net: lan78xx: Bail out if lan78xx_get_endpoints fails
Larry Finger <[email protected]>
rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument
Marcel Ziswiler <[email protected]>
ARM: dts: pxa: fix power i2c base address
Sara Sharon <[email protected]>
iwlwifi: mvm: avoid sending too many BARs
Vijay Immanuel <[email protected]>
IB/rxe: fixes for rdma read retry
Patryk Małek <[email protected]>
i40e: Prevent deleting MAC address from VF when set by PF
Patryk Małek <[email protected]>
i40e: hold the rtnl lock on clearing interrupt scheme
Mitch Williams <[email protected]>
i40e: use correct length for strncpy
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
Tuomas Tynkkynen <[email protected]>
MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
Charles Keepax <[email protected]>
ASoC: dpcm: Properly initialise hw->rate_max
Bob Peterson <[email protected]>
gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated
Felix Fietkau <[email protected]>
ath9k: fix tx99 with monitor mode interface
Takashi Iwai <[email protected]>
ALSA: seq: Do error checks at creating system ports
Rajeev Kumar Sirasanagandla <[email protected]>
cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
Jay Foster <[email protected]>
ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
Aapo Vienamo <[email protected]>
arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
Dan Carpenter <[email protected]>
ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
Marcus Folkesson <[email protected]>
iio: dac: mcp4922: fix error handling in mcp4922_write_raw
Tamizh chelvam <[email protected]>
ath10k: fix kernel panic by moving pci flush after napi_disable
Eugen Hristev <[email protected]>
mmc: sdhci-of-at91: fix quirk2 overwrite
Roman Gushchin <[email protected]>
mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup()
Roman Gushchin <[email protected]>
mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm()
Eric Auger <[email protected]>
iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros
Al Viro <[email protected]>
ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either
Al Viro <[email protected]>
ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
James Erwin <[email protected]>
IB/hfi1: Ensure full Gen3 speed in a Gen4 system
Chuhong Yuan <[email protected]>
Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
Lucas Stach <[email protected]>
Input: synaptics-rmi4 - clear IRQ enables for F54
Lucas Stach <[email protected]>
Input: synaptics-rmi4 - fix video buffer size
Oliver Neukum <[email protected]>
Input: ff-memless - kill timer in destroy()
Henry Lin <[email protected]>
ALSA: usb-audio: not submit urb for stopped endpoint
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix missing error check at mixer resolution test
Jouni Hogander <[email protected]>
slip: Fix memory leak in slip_open error path
Oliver Neukum <[email protected]>
ax88172a: fix information leak on short answers
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/compressed/libfdt_env.h | 2 + arch/arm/boot/dts/am335x-evm.dts | 12 +-- arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- arch/arm/boot/dts/dove-cubox.dts | 2 +- arch/arm/boot/dts/dove.dtsi | 6 +- arch/arm/boot/dts/exynos5250-arndale.dts | 9 ++ arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++ arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 + arch/arm/boot/dts/lpc32xx.dtsi | 4 +- arch/arm/boot/dts/omap3-gta04.dtsi | 49 ++++++--- arch/arm/boot/dts/omap5-board-common.dtsi | 5 + arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- arch/arm/boot/dts/pxa27x.dtsi | 2 +- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 +- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- arch/arm/boot/dts/tegra20-paz00.dts | 6 +- arch/arm/boot/dts/tegra30-apalis.dtsi | 6 +- arch/arm/boot/dts/tegra30.dtsi | 6 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- arch/arm/kernel/entry-common.S | 9 +- arch/arm/kvm/mmu.c | 3 +- arch/arm/mach-imx/pm-imx6.c | 25 +++++ arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 +- arch/arm64/boot/dts/lg/lg1312.dtsi | 4 +- arch/arm64/boot/dts/lg/lg1313.dtsi | 4 +- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + arch/arm64/lib/clear_user.S | 2 + arch/arm64/lib/copy_from_user.S | 2 + arch/arm64/lib/copy_in_user.S | 2 + arch/arm64/lib/copy_to_user.S | 2 + arch/arm64/mm/numa.c | 2 +- arch/mips/bcm47xx/workarounds.c | 8 +- arch/mips/include/asm/kexec.h | 6 +- arch/mips/txx9/generic/setup.c | 5 +- arch/powerpc/boot/libfdt_env.h | 2 + arch/powerpc/kernel/iommu.c | 2 +- arch/powerpc/kernel/rtas.c | 2 + arch/powerpc/kernel/vdso32/datapage.S | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + arch/powerpc/kernel/vdso64/datapage.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + arch/powerpc/kvm/book3s.c | 3 + arch/powerpc/mm/slb.c | 2 +- arch/powerpc/platforms/pseries/dtl.c | 4 +- arch/s390/kernel/vdso32/Makefile | 3 +- arch/s390/kernel/vdso64/Makefile | 3 +- arch/x86/Kconfig | 3 +- arch/x86/include/asm/atomic.h | 8 +- arch/x86/include/asm/atomic64_64.h | 8 +- arch/x86/include/asm/barrier.h | 4 +- arch/x86/include/asm/insn.h | 18 ++++ arch/x86/include/asm/kexec.h | 2 +- arch/x86/kernel/cpu/cyrix.c | 2 +- arch/x86/kernel/kprobes/core.c | 4 + arch/x86/kernel/uprobes.c | 6 +- crypto/rsa-pkcs1pad.c | 9 -- drivers/acpi/acpica/acevents.h | 2 + drivers/acpi/acpica/aclocal.h | 2 +- drivers/acpi/acpica/evregion.c | 17 +++- drivers/acpi/acpica/evrgnini.c | 6 +- drivers/acpi/acpica/evxfregn.c | 1 - drivers/acpi/osl.c | 1 + drivers/acpi/pci_root.c | 5 +- drivers/acpi/sbshc.c | 2 + drivers/ata/Kconfig | 3 +- drivers/ata/libata-scsi.c | 21 ++++ drivers/ata/pata_ep93xx.c | 8 +- drivers/base/component.c | 6 +- drivers/clk/samsung/clk-cpu.c | 6 +- drivers/clk/samsung/clk-cpu.h | 2 +- drivers/crypto/mxs-dcp.c | 80 ++++++++++++--- drivers/crypto/s5p-sss.c | 4 +- drivers/dma/Kconfig | 2 +- drivers/dma/dma-jz4780.c | 2 +- drivers/dma/ioat/init.c | 7 +- drivers/dma/timb_dma.c | 2 +- drivers/gpio/gpio-syscon.c | 2 +- drivers/hwmon/ina3221.c | 6 +- drivers/hwmon/pwm-fan.c | 8 +- drivers/hwtracing/coresight/coresight-etm4x.c | 40 ++++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- drivers/hwtracing/coresight/coresight.c | 22 +++-- drivers/i2c/busses/Kconfig | 7 +- drivers/iio/dac/mcp4922.c | 11 ++- drivers/infiniband/hw/hfi1/pcie.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- drivers/infiniband/hw/mthca/mthca_main.c | 3 +- drivers/infiniband/sw/rxe/rxe_comp.c | 21 +++- drivers/infiniband/sw/rxe/rxe_req.c | 15 +-- drivers/infiniband/ulp/iser/iser_initiator.c | 18 +++- drivers/input/ff-memless.c | 9 ++ drivers/input/rmi4/rmi_f54.c | 5 +- drivers/input/touchscreen/silead.c | 13 +++ drivers/input/touchscreen/st1232.c | 1 + drivers/md/bcache/super.c | 1 + drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- drivers/media/pci/meye/meye.c | 2 +- drivers/media/platform/davinci/isif.c | 3 +- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/pxa_camera.c | 2 +- drivers/media/usb/au0828/au0828-core.c | 4 +- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- drivers/mfd/ti_am335x_tscadc.c | 13 +++ drivers/misc/cxl/guest.c | 2 - drivers/misc/genwqe/card_utils.c | 13 +-- drivers/misc/kgdbts.c | 16 ++- drivers/mmc/host/sdhci-of-at91.c | 2 +- drivers/mtd/maps/physmap_of.c | 27 +---- drivers/mtd/nand/sh_flctl.c | 4 +- drivers/net/can/slcan.c | 1 + drivers/net/ethernet/amd/am79c961a.c | 2 +- drivers/net/ethernet/amd/atarilance.c | 6 +- drivers/net/ethernet/amd/declance.c | 2 +- drivers/net/ethernet/amd/sun3lance.c | 6 +- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 ++ drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 ++ drivers/net/ethernet/micrel/ks8695net.c | 2 +- drivers/net/ethernet/micrel/ks8851_mll.c | 4 +- drivers/net/ethernet/smsc/smc911x.c | 3 +- drivers/net/ethernet/smsc/smc91x.c | 3 +- drivers/net/ethernet/smsc/smsc911x.c | 3 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/ethernet/toshiba/tc35815.c | 6 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 9 +- drivers/net/slip/slip.c | 1 + drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/cdc_ncm.c | 2 +- drivers/net/usb/lan78xx.c | 5 + drivers/net/wireless/ath/ath10k/ahb.c | 4 +- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 2 +- drivers/net/wireless/ath/ath10k/pci.c | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 22 ++++- drivers/net/wireless/ath/ath10k/wmi.h | 8 +- drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 1 - drivers/net/wireless/ath/ath9k/tx99.c | 10 +- .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 26 +++-- .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 8 ++ .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- drivers/net/xen-netback/interface.c | 3 +- drivers/nvmem/core.c | 2 +- drivers/of/base.c | 2 +- drivers/phy/phy-twl4030-usb.c | 29 ++++++ drivers/pinctrl/pinctrl-at91-pio4.c | 8 +- drivers/pinctrl/pinctrl-at91.c | 28 +++--- drivers/power/reset/at91-sama5d2_shdwc.c | 3 + drivers/power/supply/ab8500_fg.c | 31 +++--- drivers/power/supply/max8998_charger.c | 2 +- drivers/power/supply/twl4030_charger.c | 30 +++++- drivers/reset/core.c | 15 +-- drivers/s390/net/qeth_l2_main.c | 3 + drivers/s390/net/qeth_l3_main.c | 3 + drivers/scsi/NCR5380.c | 42 +++++--- drivers/scsi/libsas/sas_expander.c | 13 +-- drivers/scsi/pm8001/pm8001_hwi.c | 6 ++ drivers/scsi/pm8001/pm8001_sas.c | 9 +- drivers/scsi/pm8001/pm8001_sas.h | 1 + drivers/scsi/pm8001/pm80xx_hwi.c | 80 +++++++++++++-- drivers/scsi/pm8001/pm80xx_hwi.h | 3 + drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 ++- drivers/spi/spi-pic32.c | 4 +- drivers/spi/spi-rockchip.c | 3 + drivers/spi/spidev.c | 8 +- drivers/tty/serial/mxs-auart.c | 3 +- drivers/usb/chipidea/otg.c | 9 +- drivers/usb/chipidea/usbmisc_imx.c | 2 + drivers/usb/gadget/function/uvc_configfs.c | 7 ++ drivers/usb/gadget/function/uvc_video.c | 32 ++++-- drivers/usb/gadget/udc/fotg210-udc.c | 2 +- drivers/usb/host/xhci-mtk-sch.c | 4 +- drivers/usb/serial/cypress_m8.c | 2 +- drivers/vfio/pci/vfio_pci.c | 8 +- drivers/vfio/pci/vfio_pci_config.c | 31 +++++- drivers/video/backlight/lm3639_bl.c | 6 +- drivers/video/fbdev/core/fbmon.c | 95 ------------------ drivers/video/fbdev/core/modedb.c | 57 ----------- drivers/video/fbdev/sbuslib.c | 28 +++--- fs/compat_ioctl.c | 10 +- fs/ecryptfs/inode.c | 19 ++-- fs/f2fs/gc.c | 2 +- fs/f2fs/recovery.c | 2 + fs/f2fs/super.c | 6 +- fs/fuse/control.c | 4 +- fs/gfs2/rgrp.c | 2 +- fs/gfs2/super.c | 2 +- fs/kernfs/symlink.c | 5 +- fs/nfs/delegation.c | 6 +- fs/orangefs/orangefs-sysfs.c | 2 +- fs/proc/vmcore.c | 10 ++ include/linux/blkdev.h | 9 +- include/linux/cpufeature.h | 2 +- include/linux/edac.h | 3 +- include/linux/fb.h | 3 - include/linux/intel-iommu.h | 6 +- include/linux/libfdt_env.h | 1 + include/linux/platform_data/dma-ep93xx.h | 2 +- include/linux/sunrpc/sched.h | 2 - include/net/llc.h | 1 + include/rdma/ib_verbs.h | 2 +- kernel/cpu.c | 1 + kernel/events/uprobes.c | 4 +- kernel/kprobes.c | 8 +- kernel/printk/printk.c | 18 ++-- kernel/signal.c | 4 + mm/hugetlb_cgroup.c | 2 +- mm/memcontrol.c | 2 +- mm/shmem.c | 2 +- net/bluetooth/l2cap_core.c | 10 ++ net/ipv4/gre_demux.c | 7 +- net/ipv4/ip_gre.c | 9 +- net/llc/llc_core.c | 4 +- net/mac80211/rc80211_minstrel_ht.c | 2 +- net/openvswitch/vport-internal_dev.c | 5 +- net/sunrpc/sched.c | 109 ++++++++++----------- net/wireless/nl80211.c | 2 +- net/wireless/reg.c | 46 +++++++++ samples/mei/mei-amt-version.c | 2 +- sound/core/oss/pcm_plugin.c | 4 +- sound/core/seq/seq_system.c | 18 +++- sound/pci/hda/patch_sigmatel.c | 20 ++++ sound/pci/intel8x0m.c | 20 ++-- sound/soc/codecs/hdac_hdmi.c | 6 ++ sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/soc-pcm.c | 2 +- sound/usb/endpoint.c | 3 + sound/usb/mixer.c | 4 +- 256 files changed, 1341 insertions(+), 746 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 22/222 ALSA: seq: Do error checks at creating system ports
From: Takashi Iwai <[email protected]>
[ Upstream commit b8e131542b47b81236ecf6768c923128e1f5db6e ]
snd_seq_system_client_init() doesn't check the errors returned from its port creations. Let's do it properly and handle the error paths.
--- sound/core/seq/seq_system.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
sound/core/seq/seq_system.c +15 -3
@@ -123,6 +123,7 @@ int __init snd_seq_system_client_init(void) {struct snd_seq_port_callback pcallbacks;struct snd_seq_port_info *port; +int err; port =kzalloc (sizeof (*port),GFP_KERNEL );if (!port)
@@ -144,7 +145,10 @@ int __init snd_seq_system_client_init(void) port->flags =SNDRV_SEQ_PORT_FLG_GIVEN_PORT ; port->addr.client = sysclient; port->addr.port =SNDRV_SEQ_PORT_SYSTEM_TIMER ; -snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , port); + err =snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , + port); +if (err <0 ) + goto error_port;/* register announcement port */ strcpy (port->name,"Announce" );
@@ -154,16 +158,24 @@ int __init snd_seq_system_client_init(void) port->flags =SNDRV_SEQ_PORT_FLG_GIVEN_PORT ; port->addr.client = sysclient; port->addr.port =SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE ; -snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , port); + err =snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , + port); +if (err <0 ) + goto error_port; announce_port = port->addr.port;kfree (port);return 0 ; + + error_port: +snd_seq_system_client_done (); +kfree (port); +return err; }/* unregister our internal client */ -void __exit snd_seq_system_client_done(void) +void snd_seq_system_client_done (void ) {int oldsysclient = sysclient;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/222 i40e: Prevent deleting MAC address from VF when set by PF
In reply to Greg Kroah-HartmanFrom: Patryk Małek <[email protected]>
[ Upstream commit 5907cf6c5bbe78be2ed18b875b316c6028b20634 ]
To prevent VF from deleting MAC address that was assigned by the PF we need to check for that scenario when we try to delete a MAC address from a VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +10 -0
@@ -2000,6 +2000,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) ret =I40E_ERR_INVALID_MAC_ADDR ; goto error_param; } + +if (vf->pf_set_mac && +ether_addr_equal (al->list[i].addr, + vf->default_lan_addr.addr)) { +dev_err (&pf->pdev->dev, +"MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n" , + vf->default_lan_addr.addr, vf->vf_id); + ret =I40E_ERR_PARAM ; + goto error_param; + } } vsi = pf->vsi[vf->lan_vsi_idx];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/222 IB/rxe: fixes for rdma read retry
In reply to Greg Kroah-HartmanFrom: Vijay Immanuel <[email protected]>
[ Upstream commit 030e46e495af855a13964a0aab9753ea82a96edc ]
When a read request is retried for the remaining partial data, the response may restart from read response first or read response only. So support those cases.
Do not advance the comp psn beyond the current wqe's last_psn as that could skip over an entire read wqe and will cause the req_retry() logic to set an incorrect req psn.
An example sequence is as follows:
Write PSN 40 -- this is the current WQE.
Read request PSN 41
Write PSN 42
Receive ACK PSN 42 -- this will complete the current WQE for PSN 40, and set the comp psn to 42 which is a problem because the read request at PSN 41 has been skipped over. So when req_retry() tries to retransmit the read request, it sets the req psn to 42 which is incorrect.
When retrying a read request, calculate the number of psns completed based on the dma resid instead of the wqe first_psn. The wqe first_psn could have moved if the read request was retried multiple times.
Set the reth length to the dma resid to handle read retries for the remaining partial data.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 21 ++++++++++++++++----- drivers/infiniband/sw/rxe/rxe_req.c | 15 +++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +16 -5
@@ -250,6 +250,17 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE :if (pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE && pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST ) { +/* read retries of partial data may restart from +* read response first or response only. +*/ +if ((pkt->psn == wqe->first_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST ) || + (wqe->first_psn == wqe->last_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY )) +break ; +return COMPST_ERROR ; }break ;
@@ -486,11 +497,11 @@ static inline enum comp_state complete_wqe(struct rxe_qp *qp, struct rxe_pkt_info *pkt, struct rxe_send_wqe *wqe) { - qp->comp.opcode = -1; - -if (pkt) { -if (psn_compare (pkt->psn, qp->comp.psn) >=0 ) - qp->comp.psn = (pkt->psn +1 ) &BTH_PSN_MASK ; +if (pkt && wqe->state == wqe_state_pending) { +if (psn_compare (wqe->last_psn, qp->comp.psn) >=0 ) { + qp->comp.psn = (wqe->last_psn +1 ) &BTH_PSN_MASK ; + qp->comp.opcode =-1 ; + }if (qp->req.wait_psn) { qp->req.wait_psn =0 ;
drivers/infiniband/sw/rxe/rxe_req.c +9 -6
@@ -72,9 +72,6 @@ static void req_retry(struct rxe_qp *qp)int npsn;int first =1 ; - wqe =queue_head (qp->sq.queue); - npsn = (qp->comp.psn - wqe->first_psn) &BTH_PSN_MASK ; - qp->req.wqe_index =consumer_index (qp->sq.queue); qp->req.psn = qp->comp.psn; qp->req.opcode =-1 ;
@@ -106,11 +103,17 @@ static void req_retry(struct rxe_qp *qp)if (first) { first =0 ; -if (mask &WR_WRITE_OR_SEND_MASK ) +if (mask &WR_WRITE_OR_SEND_MASK ) { + npsn = (qp->comp.psn - wqe->first_psn) & +BTH_PSN_MASK ;retry_first_write_send (qp, wqe, mask, npsn); + } -if (mask &WR_READ_MASK ) +if (mask &WR_READ_MASK ) { + npsn = (wqe->dma.length - wqe->dma.resid) / + qp->mtu; wqe->iova += npsn * qp->mtu; + } } wqe->state = wqe_state_posted;
@@ -439,7 +442,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,if (pkt->mask &RXE_RETH_MASK ) {reth_set_rkey (pkt, ibwr->wr.rdma.rkey);reth_set_va (pkt, wqe->iova); -reth_set_len (pkt, wqe->dma.length); +reth_set_len (pkt, wqe->dma.resid); }if (pkt->mask &RXE_IMMDT_MASK )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/222 rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit 199ba9faca909e77ac533449ecd1248123ce89e7 ]
In gcc8, when the 3rd argument (size) of a call to strncpy() matches the length of the first argument, the compiler warns of the possibility of an unterminated string. Using strlcpy() forces a null at the end.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c +1 -1
@@ -146,7 +146,7 @@ static int rtl8187_register_led(struct ieee80211_hw *dev, led->dev = dev; led->ledpin = ledpin; led->is_radio = is_radio; -strncpy (led->name, name,sizeof (led->name)); +strlcpy (led->name, name,sizeof (led->name)); led->led_dev.name = led->name; led->led_dev.default_trigger = default_trigger;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/222 iwlwifi: mvm: avoid sending too many BARs
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 1a19c139be18ed4d6d681049cc48586fae070120 ]
When we receive TX response, we may release a few packets due to a hole that was closed in the transmission window.
However, if that frame failed, we will mark all the released frames as failed and will send multiple BARs.
This affects statistics badly, and cause unnecessary frames transmission.
Instead, mark all the following packets as success, with the desired result of sending a bar for the failed frame only.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +8 -0
@@ -1303,6 +1303,14 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,break ; } +/* +* If we are freeing multiple frames, mark all the frames +* but the first one as acked, since they were acknowledged +* before +* */ +if (skb_freed >1 ) + info->flags |=IEEE80211_TX_STAT_ACK ; +iwl_mvm_tx_status_check_trigger (mvm, status); info->status.rates[0 ].count = tx_resp->failure_frame +1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/222 ASoC: sgtl5000: avoid division by zero if lo_vag is zero
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 9ab708aef61f5620113269a9d1bdb1543d1207d0 ]
In the case where lo_vag <= SGTL5000_LINE_OUT_GND_BASE, lo_vag is set to zero and later vol_quot is computed by dividing by lo_vag causing a division by zero error. Fix this by avoiding a zero division and set vol_quot to zero in this specific case so that the lowest setting for i is correctly set.
--- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/sgtl5000.c +1 -1
@@ -1217,7 +1217,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)* Searching for a suitable index solving this formula: * idx = 40 * log10(vag_val / lo_cagcntrl) + 15 */ - vol_quot = (vag *100 ) / lo_vag; + vol_quot = lo_vag ? (vag *100 ) / lo_vag :0 ; lo_vol =0 ;for (i =0 ; i <ARRAY_SIZE (vol_quot_table); i++) {if (vol_quot >= vol_quot_table[i])
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/222 ARM: dts: exynos: Disable pull control for S5M8767 PMIC
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ]
S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has external pull-up resistors, so disable any pull control for it in in controller node. This fixes support for S5M8767 interrupts and enables operation of wakeup from S5M8767 RTC alarm.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/exynos5250-arndale.dts +9 -0
@@ -170,6 +170,8 @@ reg = <0x66>; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&s5m8767_irq>; vinb1-supply = <&main_dc_reg>; vinb2-supply = <&main_dc_reg>;
@@ -547,6 +549,13 @@ cap-sd-highspeed; }; +&pinctrl_0 { + s5m8767_irq: s5m8767-irq { + samsung,pins = "gpx3-2"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; +}; + &rtc { status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/222 ath10k: wmi: disable softirqs while calling ieee80211_rx
In reply to Greg Kroah-HartmanFrom: Erik Stromdahl <[email protected]>
[ Upstream commit 37f62c0d5822f631b786b29a1b1069ab714d1a28 ]
This is done in order not to trig the below warning in ieee80211_rx_napi:
WARN_ON_ONCE(softirq_count() == 0);
ieee80211_rx_napi requires that softirq's are disabled during execution.
The High latency bus drivers (SDIO and USB) sometimes call the wmi ep_rx_complete callback from non softirq context, resulting in a trigger of the above warning.
Calling ieee80211_rx_ni with softirq's already disabled (e.g., from softirq context) should be safe as the local_bh_disable and local_bh_enable functions (called from ieee80211_rx_ni) are fully reentrant.
--- drivers/net/wireless/ath/ath10k/wmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.c +2 -1
@@ -2384,7 +2384,8 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) status->freq, status->band, status->signal, status->rate_idx); -ieee80211_rx (ar->hw, skb); +ieee80211_rx_ni (ar->hw, skb); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/222 mips: txx9: fix iounmap related issue
In reply to Greg Kroah-HartmanFrom: Ding Xiang <[email protected]>
[ Upstream commit c6e1241a82e6e74d1ae5cc34581dab2ffd6022d0 ]
if device_register return error, iounmap should be called, also iounmap need to call before put_device.
Patchwork: https://patchwork.linux-mips.org/patch/20476/
--- arch/mips/txx9/generic/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/mips/txx9/generic/setup.c +2 -3
@@ -959,12 +959,11 @@ void __init txx9_sramc_init(struct resource *r) goto exit_put; err =sysfs_create_bin_file (&dev->dev.kobj, &dev->bindata_attr);if (err) { -device_unregister (&dev->dev);iounmap (dev->base); -kfree (dev); +device_unregister (&dev->dev); }return ; exit_put: +iounmap (dev->base);put_device (&dev->dev); -return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/222 ath9k: fix tx99 with monitor mode interface
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit d9c52fd17cb483bd8a470398afcb79f86c1b77c8 ]
Tx99 is typically configured via a monitor mode interface, which does not get added to the driver as a vif. Since the code currently expects a configured virtual interface for tx99, enabling tx99 via debugfs fails. Since the vif is not needed anyway, remove all checks for it.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/main.c | 12 +++--------- drivers/net/wireless/ath/ath9k/tx99.c | 9 --------- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 4 files changed, 4 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -1
@@ -1033,7 +1033,6 @@ struct ath_softc {struct ath_spec_scan_priv spec_priv; -struct ieee80211_vif *tx99_vif;struct sk_buff *tx99_skb;bool tx99_state;s16 tx99_power;
drivers/net/wireless/ath/ath9k/main.c +3 -9
@@ -1249,15 +1249,10 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; -mutex_lock (&sc->mutex); +if (IS_ENABLED (CONFIG_ATH9K_TX99 )) +return -EOPNOTSUPP ; -if (IS_ENABLED (CONFIG_ATH9K_TX99 )) { -if (sc->cur_chan->nvifs >=1 ) { -mutex_unlock (&sc->mutex); -return -EOPNOTSUPP ; - } - sc->tx99_vif = vif; - } +mutex_lock (&sc->mutex);ath_dbg (common,CONFIG ,"Attach a VIF of type: %d\n" , vif->type); sc->cur_chan->nvifs++;
@@ -1340,7 +1335,6 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,ath9k_p2p_remove_vif (sc, vif); sc->cur_chan->nvifs--; - sc->tx99_vif =NULL ;if (!ath9k_is_chanctx_enabled ())list_del (&avp->list);
drivers/net/wireless/ath/ath9k/tx99.c +0 -9
@@ -54,12 +54,6 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)struct ieee80211_hdr *hdr;struct ieee80211_tx_info *tx_info;struct sk_buff *skb; -struct ath_vif *avp; - -if (!sc->tx99_vif) -return NULL ; - - avp = (struct ath_vif *)sc->tx99_vif->drv_priv; skb =alloc_skb (len,GFP_KERNEL );if (!skb)
@@ -77,14 +71,11 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)memcpy (hdr->addr2, hw->wiphy->perm_addr,ETH_ALEN );memcpy (hdr->addr3, hw->wiphy->perm_addr,ETH_ALEN ); - hdr->seq_ctrl |=cpu_to_le16 (avp->seq_no); - tx_info =IEEE80211_SKB_CB (skb);memset (tx_info,0 ,sizeof (*tx_info)); rate = &tx_info->control.rates[0 ]; tx_info->band = sc->cur_chan->chandef.chan->band; tx_info->flags =IEEE80211_TX_CTL_NO_ACK ; - tx_info->control.vif = sc->tx99_vif; rate->count =1 ;if (ah->curchan &&IS_CHAN_HT (ah->curchan)) { rate->flags |=IEEE80211_TX_RC_MCS ;
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2970,7 +2970,7 @@ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,return -EINVAL ; } -ath_set_rates (sc->tx99_vif,NULL , bf); +ath_set_rates (NULL ,NULL , bf);ath9k_hw_set_desc_link (sc->sc_ah, bf->bf_desc, bf->bf_daddr);ath9k_hw_tx99_start (sc->sc_ah, txctl->txq->axq_qnum);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/222 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
In reply to Greg Kroah-HartmanFrom: Yong Zhi <[email protected]>
[ Upstream commit 3b857472f34faa7d11001afa5e158833812c98d7 ]
Playback of 44.1Khz contents with HDMI plugged returns "Invalid pipe config" because HDMI paths in the FW topology are configured to operate at 48Khz.
This patch filters out sampling rates not supported at hdac_hdmi_create_dais() to let user space SRC to do the converting.
--- sound/soc/codecs/hdac_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/codecs/hdac_hdmi.c +6 -0
@@ -1267,6 +1267,12 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdac,if (ret)return ret; +/* Filter out 44.1, 88.2 and 176.4Khz */ + rates &= ~(SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_88200 | +SNDRV_PCM_RATE_176400 ); +if (!rates) +return -EINVAL ; +sprintf (dai_name,"intel-hdmi-hifi%d" , i+1 ); hdmi_dais[i].name =devm_kstrdup (&hdac->dev, dai_name,GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/222 of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ]
Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that.
--- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/base.c +1 -1
@@ -2281,7 +2281,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)/* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes. */ -if (!strcmp (np->type,"cpu" )) +if (IS_ENABLED (CONFIG_PPC_PMAC ) && !strcmp (np->type,"cpu" ))for_each_child_of_node (np, child)if (!strcmp (child->type,"cache" ))return child;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/222 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit fa0d7dc355c890725b6178dab0cc11b194203afa ]
needed for device variants based on GTA04 board but with different display panel (driver).
--- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -70,7 +70,7 @@ #sound-dai-cells = <0>; }; - spi_lcd { + spi_lcd: spi_lcd { compatible = "spi-gpio"; #address-cells = <0x1>; #size-cells = <0x0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/222 ARM: dts: omap3-gta04: fixes for tvout / venc
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit f6591391373dbff2c0200e1055d4ff86191578d2 ]
* fix connector compatibility (composite)
* add comment for gpio1 23
* add proper #address-cells
* we use only one venc_out channel for composite
--- arch/arm/boot/dts/omap3-gta04.dtsi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +7 -3
@@ -122,7 +122,7 @@ }; tv0: connector { - compatible = "svideo-connector"; + compatible = "composite-video-connector"; label = "tv"; port {
@@ -134,7 +134,7 @@ tv_amp: opa362 { compatible = "ti,opa362"; - enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; /* GPIO_23 to enable video out amplifier */ ports { #address-cells = <1>;
@@ -539,10 +539,14 @@ vdda-supply = <&vdac>; + #address-cells = <1>; + #size-cells = <0>; + port { + reg = <0>; venc_out: endpoint { remote-endpoint = <&opa_in>; - ti,channels = <2>; + ti,channels = <1>; ti,invert-polarity; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/222 ARM: dts: omap3-gta04: tvout: enable as display1 alias
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 8905592b6e50cec905e6c6035bbd36201a3bfac1 ]
The omap dss susbystem takes the display aliases to find out which displays exist. To enable tv-out we must define an alias.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -0
@@ -28,6 +28,7 @@ aliases { display0 = &lcd; + display1 = &tv0; }; gpio-keys {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/222 ARM: dts: omap3-gta04: fix touchscreen tsc2007
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 7384a24248eda140a234d356b6c840701ee9f055 ]
we fix penirq polarity, add penirq pinmux and touchscreen properties.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +17 -1
@@ -274,6 +274,13 @@ OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */ >; }; + + penirq_pins: pinmux_penirq_pins { + pinctrl-single,pins = < + /* here we could enable to wakeup the cpu from suspend by a pen touch */ + OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio160 */ + >; + }; }; &omap3_pmx_core2 {
@@ -411,10 +418,19 @@ tsc2007@48 { compatible = "ti,tsc2007"; reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&penirq_pins>; interrupt-parent = <&gpio6>; interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */ - gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* GPIO_160 */ ti,x-plate-ohms = <600>; + touchscreen-size-x = <480>; + touchscreen-size-y = <640>; + touchscreen-max-pressure = <1000>; + touchscreen-fuzz-x = <3>; + touchscreen-fuzz-y = <8>; + touchscreen-fuzz-pressure = <10>; + touchscreen-inverted-y; }; /* RFID EEPROM */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/222 ARM: dts: omap3-gta04: keep vpll2 always on
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 1ae00833e30c9b4af5cbfda65d75b1de12f74013 ]
This is needed to make the display and venc work properly. Compare to omap3-beagle.dts.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap3-gta04.dtsi +6 -0
@@ -536,6 +536,12 @@ regulator-max-microvolt = <3150000>; }; +/* Needed to power the DPI pins */ + +&vpll2 { + regulator-always-on; +}; + &dss { pinctrl-names = "default"; pinctrl-0 = < &dss_dpi_pins >;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/222 dmaengine: dma-jz4780: Dont depend on MACH_JZ4780
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit c558ecd21c852c97ff98dc6c61f715ba420ec251 ]
If we make this driver depend on MACH_JZ4780, that means it can be enabled only if we're building a kernel specially crafted for a JZ4780-based board, while most GNU/Linux distributions will want one generic MIPS kernel that works on multiple boards.
--- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig +1 -1
@@ -120,7 +120,7 @@ config DMA_JZ4740 config DMA_JZ4780 tristate "JZ4780 DMA support" - depends on MACH_JZ4780 || COMPILE_TEST + depends on MIPS || COMPILE_TEST select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/222 dmaengine: dma-jz4780: Further residue status fix
In reply to Greg Kroah-HartmanFrom: Daniel Silsby <[email protected]>
[ Upstream commit 83ef4fb7556b6a673f755da670cbacab7e2c7f1b ]
Func jz4780_dma_desc_residue() expects the index to the next hw descriptor as its last parameter. Caller func jz4780_dma_tx_status(), however, applied modulus before passing it. When the current hw descriptor was last in the list, the index passed became zero.
The resulting excess of reported residue especially caused problems with cyclic DMA transfer clients, i.e. ALSA AIC audio output, which rely on this for determining current DMA location within buffer.
Combined with the recent and related residue-reporting fixes, spurious ALSA audio underruns on jz4770 hardware are now fixed.
--- drivers/dma/dma-jz4780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dma-jz4780.c +1 -1
@@ -580,7 +580,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, to_jz4780_dma_desc(vdesc), 0); }else if (cookie == jzchan->desc->vdesc.tx.cookie) { txstate->residue =jz4780_dma_desc_residue (jzchan, jzchan->desc, - (jzchan->curr_hwdesc +1 ) % jzchan->desc->count); + jzchan->curr_hwdesc +1 ); }else txstate->residue =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/222 gfs2: Dont set GFS2_RDF_UPTODATE when the lvb is updated
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit 4f36cb36c9d14340bb200d2ad9117b03ce992cfe ]
The GFS2_RDF_UPTODATE flag in the rgrp is used to determine when a rgrp buffer is valid. It's cleared when the glock is invalidated, signifying that the buffer data is now invalid. But before this patch, function update_rgrp_lvb was setting the flag when it determined it had a valid lvb. But that's an invalid assumption:
just because you have a valid lvb doesn't mean you have valid buffers. After all, another node may have made the lvb valid, and this node just fetched it from the glock via dlm.
Consider this scenario:
1. The file system is mounted with RGRPLVB option.
2. In gfs2_inplace_reserve it locks the rgrp glock EX, but thanks to GL_SKIP, it skips the gfs2_rgrp_bh_get.
3. Since loops == 0 and the allocation target (ap->target) is bigger than the largest known chunk of blocks in the rgrp (rs->rs_rbm.rgd->rd_extfail_pt) it skips that rgrp and bypasses the call to gfs2_rgrp_bh_get there as well.
4. update_rgrp_lvb sees the lvb MAGIC number is valid, so bypasses gfs2_rgrp_bh_get, but it still sets sets GFS2_RDF_UPTODATE due to this invalid assumption.
5. The next time update_rgrp_lvb is called, it sees the bit is set and just returns 0, assuming both the lvb and rgrp are both uptodate. But since this is a smaller allocation, or space has been freed by another node, thus adjusting the lvb values, it decides to use the rgrp for allocations, with invalid rd_free due to the fact it was never updated.
This patch changes update_rgrp_lvb so it doesn't set the UPTODATE flag anymore. That way, it has no choice but to fetch the latest values.
--- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/rgrp.c +1 -1
@@ -1211,7 +1211,7 @@ static int update_rgrp_lvb(struct gfs2_rgrpd *rgd) rl_flags =be32_to_cpu (rgd->rd_rgl->rl_flags); rl_flags &= ~GFS2_RDF_MASK ; rgd->rd_flags &=GFS2_RDF_MASK ; - rgd->rd_flags |= (rl_flags |GFS2_RDF_UPTODATE |GFS2_RDF_CHECK ); + rgd->rd_flags |= (rl_flags |GFS2_RDF_CHECK );if (rgd->rd_rgl->rl_unlinked ==0 ) rgd->rd_flags &= ~GFS2_RDF_CHECK ; rgd->rd_free =be32_to_cpu (rgd->rd_rgl->rl_free);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/222 signal: Always ignore SIGKILL and SIGSTOP sent to the global init
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 86989c41b5ea08776c450cb759592532314a4ed6 ]
If the first process started (aka /sbin/init) receives a SIGKILL it will panic the system if it is delivered. Making the system unusable and undebugable. It isn't much better if the first process started receives SIGSTOP.
So always ignore SIGSTOP and SIGKILL sent to init.
This is done in a separate clause in sig_task_ignored as force_sig_info can clear SIG_UNKILLABLE and this protection should work even then.
--- kernel/signal.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/signal.c +4 -0
@@ -71,6 +71,10 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force) handler =sig_handler (t, sig); +/* SIGKILL and SIGSTOP may not be sent to the global init */ +if (unlikely (is_global_init (t) &&sig_kernel_only (sig))) +return true; +if (unlikely (t->signal->flags &SIGNAL_UNKILLABLE ) && handler ==SIG_DFL && !(force &&sig_kernel_only (sig)))return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/222 signal: Properly deliver SIGILL from uprobes
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 55a3235fc71bf34303e34a95eeee235b2d2a35dd ]
For userspace to tell the difference between a random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGILL is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGILL, SEND_SIG_FORCE, current) with force_sig(SIG_ILL, current) which gets this right and is shorter and easier to type.
--- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/uprobes.c +2 -2
@@ -1846,7 +1846,7 @@ static void handle_trampoline(struct pt_regs *regs) sigill:uprobe_warn (current,"handle uretprobe, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); }
@@ -1962,7 +1962,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)if (unlikely (err)) {uprobe_warn (current,"execute the probed insn, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/222 signal: Properly deliver SIGSEGV from x86 uprobes
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 4a63c1ffd384ebdce40aac9c997dab68379137be ]
For userspace to tell the difference between an random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGSEGV is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGSEGV, SEND_SIG_FORCE, current) with force_sig(SIG_SEGV, current) which gets this right and is shorter and easier to type.
--- arch/x86/kernel/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/uprobes.c +1 -1
@@ -983,7 +983,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regspr_err ("uprobe: return address clobbered: pid=%d, %%sp=%#lx, " "%%ip=%#lx\n" , current->pid, regs->sp, regs->ip); -force_sig_info (SIGSEGV ,SEND_SIG_FORCED , current); +force_sig (SIGSEGV , current); }return -1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/222 f2fs: fix memory leak of percpu counter in fill_super()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 4a70e255449c9a13eed7a6eeecc85a1ea63cef76 ]
In fill_super -> init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak.
--- fs/f2fs/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/super.c +5 -1
@@ -1650,8 +1650,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)if (err)return err; -return percpu_counter_init (&sbi->total_valid_inode_count,0 , + err =percpu_counter_init (&sbi->total_valid_inode_count,0 ,GFP_KERNEL ); +if (err) +percpu_counter_destroy (&sbi->alloc_valid_block_count); + +return err; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/222 scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
[ Upstream commit 288315e95264b6355e26609e9dec5dc4563d4ab0 ]
sym_int_sir() in sym_hipd.c does not check the command pointer for NULL before using it in debug message prints.
--- drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/scsi/sym53c8xx_2/sym_hipd.c +11 -4
@@ -4371,6 +4371,13 @@ static void sym_nego_rejected(struct sym_hcb *np, struct sym_tcb *tp, struct symOUTB (np,HS_PRT ,HS_BUSY ); } +#define sym_printk(lvl, tp, cp, fmt, v...) do { \ + if (cp) \ + scmd_printk(lvl, cp->cmd, fmt, ##v); \ + else \ + starget_printk(lvl, tp->starget, fmt, ##v); \ +} while (0) +/* * chip exception handler for programmed interrupts. */
@@ -4416,7 +4423,7 @@ static void sym_int_sir(struct sym_hcb *np)* been selected with ATN. We do not want to handle that. */ case SIR_SEL_ATN_NO_MSG_OUT : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG OUT phase after selection with ATN\n" ); goto out_stuck;/*
@@ -4424,7 +4431,7 @@ static void sym_int_sir(struct sym_hcb *np)* having reselected the initiator. */ case SIR_RESEL_NO_MSG_IN : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG IN phase after reselection\n" ); goto out_stuck;/*
@@ -4432,7 +4439,7 @@ static void sym_int_sir(struct sym_hcb *np)* an IDENTIFY. */ case SIR_RESEL_NO_IDENTIFY : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No IDENTIFY after reselection\n" ); goto out_stuck;/*
@@ -4461,7 +4468,7 @@ static void sym_int_sir(struct sym_hcb *np)case SIR_RESEL_ABORTED : np->lastmsg = np->msgout[0 ]; np->msgout[0 ] =M_NOOP ; -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"message %x sent on bad reselection\n" , np->lastmsg); goto out;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/222 ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 8148d2136002da2e2887caf6a07bbd9c033f14f3 ]
One of the Freescale recommended sequences for power off with external PMIC is the following:
...
3. SoC is programming PMIC for power off when standby is asserted.
4. In CCM STOP mode, Standby is asserted, PMIC gates SoC supplies.
See:
http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6DQRM.pdf
page 5083
This patch implements step 4. of this sequence.
--- arch/arm/mach-imx/pm-imx6.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/mach-imx/pm-imx6.c +25 -0
@@ -602,6 +602,28 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata IMX6Q_GPR1_GINT); } +static void imx6_pm_stby_poweroff (void ) +{ +imx6_set_lpm (STOP_POWER_OFF ); +imx6q_suspend_finish (0 ); + +mdelay (1000 ); + +pr_emerg ("Unable to poweroff system\n" ); +} + +static int imx6_pm_stby_poweroff_probe (void ) +{ +if (pm_power_off) { +pr_warn ("%s: pm_power_off already claimed %p %pf!\n" , + __func__, pm_power_off, pm_power_off); +return -EBUSY ; + } + + pm_power_off = imx6_pm_stby_poweroff; +return 0 ; +} +void __init imx6_pm_ccm_init (const char *ccm_compat) {struct device_node *np;
@@ -618,6 +640,9 @@ void __init imx6_pm_ccm_init(const char *ccm_compat) val =readl_relaxed (ccm_base +CLPCR ); val &= ~BM_CLPCR_LPM ;writel_relaxed (val, ccm_base +CLPCR ); + +if (of_property_read_bool (np,"fsl,pmic-stby-poweroff" )) +imx6_pm_stby_poweroff_probe (); }void __init imx6q_pm_init (void )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/222 scsi: pm80xx: Corrected dma_unmap_sg() parameter
In reply to Greg Kroah-HartmanFrom: Deepak Ukey <[email protected]>
[ Upstream commit 76cb25b058034d37244be6aca97a2ad52a5fbcad ]
For the function dma_unmap_sg(), the <nents> parameter should be number of elements in the scatter list prior to the mapping, not after the mapping.
--- drivers/scsi/pm8001/pm8001_sas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_sas.c +1 -1
@@ -466,7 +466,7 @@ err_out:dev_printk (KERN_ERR , pm8001_ha->dev,"pm8001 exec failed[%d]!\n" , rc);if (!sas_protocol_ata (t->task_proto))if (n_elem) -dma_unmap_sg (pm8001_ha->dev, t->scatter, n_elem, +dma_unmap_sg (pm8001_ha->dev, t->scatter, t->num_scatter, t->data_dir); out_done:spin_unlock_irqrestore (&pm8001_ha->lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/222 scsi: pm80xx: Fixed system hang issue during kexec boot
In reply to Greg Kroah-HartmanFrom: Deepak Ukey <[email protected]>
[ Upstream commit 72349b62a571effd6faadd0600b8e657dd87afbf ]
When the firmware is not responding, execution of kexec boot causes a system hang. When firmware assertion happened, driver get notified with interrupt vector updated in MPI configuration table. Then, the driver will read scratchpad register and set controller_fatal_error flag to true.
--- drivers/scsi/pm8001/pm8001_hwi.c | 6 +++ drivers/scsi/pm8001/pm8001_sas.c | 7 +++ drivers/scsi/pm8001/pm8001_sas.h | 1 + drivers/scsi/pm8001/pm80xx_hwi.c | 80 +++++++++++++++++++++++++++++--- drivers/scsi/pm8001/pm80xx_hwi.h | 3 ++ 5 files changed, 91 insertions(+), 6 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +6 -0
@@ -1479,6 +1479,12 @@ u32 pm8001_mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, }else {u32 producer_index;void *pi_virt = circularQ->pi_virt; +/* spurious interrupt during setup if +* kexec-ing and driver doing a doorbell access +* with the pre-kexec oq interrupt setup +*/ +if (!pi_virt) +break ;/* Update the producer index from SPC */ producer_index =pm8001_read_32 (pi_virt); circularQ->producer_index =cpu_to_le32 (producer_index);
drivers/scsi/pm8001/pm8001_sas.c +7 -0
@@ -374,6 +374,13 @@ static int pm8001_task_exec(struct sas_task *task,return 0 ; } pm8001_ha =pm8001_find_ha_by_dev (task->dev); +if (pm8001_ha->controller_fatal_error) { +struct task_status_struct *ts = &t->task_status; + + ts->resp =SAS_TASK_UNDELIVERED ; + t->task_done (t); +return 0 ; + }PM8001_IO_DBG (pm8001_ha,pm8001_printk ("pm8001_task_exec device \n " ));spin_lock_irqsave (&pm8001_ha->lock, flags); do {
drivers/scsi/pm8001/pm8001_sas.h +1 -0
@@ -531,6 +531,7 @@ struct pm8001_hba_info {u32 logging_level;u32 fw_status;u32 smp_exp_mode; +bool controller_fatal_error;const struct firmware *fw_image;struct isr_param irq_vector[PM8001_MAX_MSIX_VEC ]; };
drivers/scsi/pm8001/pm80xx_hwi.c +74 -6
115 lines not on this page · raw message
drivers/scsi/pm8001/pm80xx_hwi.h +3 -0
@@ -1288,6 +1288,9 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;#define SCRATCH_PAD_BOOT_LOAD_SUCCESS 0x0#define SCRATCH_PAD_IOP0_READY 0xC00#define SCRATCH_PAD_IOP1_READY 0x3000 +#define SCRATCH_PAD_MIPSALL_READY (SCRATCH_PAD_IOP1_READY | \ + SCRATCH_PAD_IOP0_READY | \ + SCRATCH_PAD_RAAE_READY)/* boot loader state */ #define SCRATCH_PAD1_BOOTSTATE_MASK 0x70/* Bit 4-6 */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/222 ASoC: dpcm: Properly initialise hw->rate_max
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit e33ffbd9cd39da09831ce62c11025d830bf78d9e ]
If the CPU DAI does not initialise rate_max, say if using using KNOT or CONTINUOUS, then the rate_max field will be initialised to 0. A value of zero in the rate_max field of the hardware runtime will cause the sound card to support no sample rates at all. Obviously this is not desired, just a different mechanism is being used to apply the constraints. As such update the setting of rate_max in dpcm_init_runtime_hw to be consistent with the non-DPCM cases and set rate_max to UINT_MAX if nothing is defined on the CPU DAI.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -1592,7 +1592,7 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime, u64 formats) { runtime->hw.rate_min = stream->rate_min; - runtime->hw.rate_max = stream->rate_max; + runtime->hw.rate_max =min_not_zero (stream->rate_max,UINT_MAX ); runtime->hw.channels_min = stream->channels_min; runtime->hw.channels_max = stream->channels_max;if (runtime->hw.formats)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/222 nvmem: core: return error code instead of NULL from nvmem_device_get
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ]
nvmem_device_get() should return ERR_PTR() on error or valid pointer on success, but one of the code path seems to return NULL, so fix it.
--- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/core.c +1 -1
@@ -609,7 +609,7 @@ static struct nvmem_device *nvmem_find(const char *name) d =bus_find_device (&nvmem_bus_type,NULL , (void *)name, nvmem_match);if (!d) -return NULL ; +return ERR_PTR (-ENOENT );return to_nvmem_device (d); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/222 media: fix: media: pci: meye: validate offset to avoid arbitrary access
In reply to Greg Kroah-HartmanFrom: Lao Wei <[email protected]>
[ Upstream commit eac7230fdb4672c2cb56f6a01a1744f562c01f80 ]
Motion eye video4linux driver for Sony Vaio PictureBook desn't validate user-controlled parameter 'vma->vm_pgoff', a malicious process might access all of kernel memory from user space by trying pass different arbitrary address.
Discussion: http://www.openwall.com/lists/oss-security/2018/07/06/1
--- drivers/media/pci/meye/meye.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/meye/meye.c +1 -1
@@ -1469,7 +1469,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma)unsigned long page, pos;mutex_lock (&meye.lock); -if (size > gbuffers * gbufsize) { +if (size > gbuffers * gbufsize || offset > gbuffers * gbufsize - size) {mutex_unlock (&meye.lock);return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/222 media: dvb: fix compat ioctl translation
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1ccbeeb888ac33627d91f1ccf0b84ef3bcadef24 ]
The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong.
Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully.
I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything.
--- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/compat_ioctl.c +6 -4
@@ -160,6 +160,7 @@ struct compat_video_event {unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event)static int do_video_get_event (struct file *file,unsigned int cmd,struct compat_video_event __user *up)
@@ -171,7 +172,7 @@ static int do_video_get_event(struct file *file,if (kevent ==NULL )return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long )kevent); + err =do_ioctl (file,VIDEO_GET_EVENT , (unsigned long )kevent);if (!err) { err =convert_in_user (&kevent->type, &up->type); err |=convert_in_user (&kevent->timestamp, &up->timestamp);
@@ -190,6 +191,7 @@ struct compat_video_still_picture {compat_uptr_t iFrame;int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture)static int do_video_stillpicture (struct file *file,unsigned int cmd,struct compat_video_still_picture __user *up)
@@ -212,7 +214,7 @@ static int do_video_stillpicture(struct file *file,if (err)return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long ) up_native); + err =do_ioctl (file,VIDEO_STILLPICTURE , (unsigned long ) up_native);return err; }
@@ -1484,9 +1486,9 @@ static long do_ioctl_trans(unsigned int cmd,return rtc_ioctl (file, cmd, argp);/* dvb */ -case VIDEO_GET_EVENT : +case VIDEO_GET_EVENT32 :return do_video_get_event (file, cmd, argp); -case VIDEO_STILLPICTURE : +case VIDEO_STILLPICTURE32 :return do_video_stillpicture (file, cmd, argp);case VIDEO_SET_SPU_PALETTE :return do_video_set_spu_palette (file, cmd, argp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/222 ALSA: intel8x0m: Register irq handler after register initializations
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7064f376d4a10686f51c879401a569bb4babf9c6 ]
The interrupt handler has to be acquired after the other resource initialization when allocated with IRQF_SHARED. Otherwise it's triggered before the resource gets ready, and may lead to unpleasant behavior.
--- sound/pci/intel8x0m.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/pci/intel8x0m.c +10 -10
@@ -1171,16 +1171,6 @@ static int snd_intel8x0m_create(struct snd_card *card, } port_inited: -if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , -KBUILD_MODNAME , chip)) { -dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); -snd_intel8x0m_free (chip); -return -EBUSY ; - } - chip->irq = pci->irq; -pci_set_master (pci); -synchronize_irq (chip->irq); -/* initialize offsets */ chip->bdbars_count =2 ; tbl = intel_regs;
@@ -1224,11 +1214,21 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->int_sta_reg =ICH_REG_GLOB_STA ; chip->int_sta_mask = int_sta_masks; +pci_set_master (pci); +if ((err =snd_intel8x0m_chip_init (chip,1 )) <0 ) {snd_intel8x0m_free (chip);return err; } +if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , +KBUILD_MODNAME , chip)) { +dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); +snd_intel8x0m_free (chip); +return -EBUSY ; + } + chip->irq = pci->irq; +if ((err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops)) <0 ) {snd_intel8x0m_free (chip);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/222 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b97760ae8e3dc8bb91881c13425a0bff55f2bd85 ]
Smatch complains about this condition:
if (has_config && num_pins >= 1)
The "has_config" variable is either uninitialized or true. The "num_pins" variable is unsigned and we verified that it is non-zero on the lines before so we know "num_pines >= 1" is true. Really, we could just check "num_configs" directly and remove the "has_config" variable.
--- drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -6
@@ -479,7 +479,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,unsigned num_pins, num_configs, reserve;unsigned long *configs;struct property *pins; -bool has_config;u32 pinfunc;int ret, i;
@@ -495,9 +494,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,return ret; } -if (num_configs) - has_config = true; - num_pins = pins->length /sizeof (u32);if (!num_pins) { dev_err(pctldev->dev, "no pins found in node %s\n",
@@ -511,7 +507,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,* map for each pin. */ reserve =1 ; -if (has_config && num_pins >=1 ) +if (num_configs) reserve++; reserve *= num_pins; ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
@@ -534,7 +530,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,pinctrl_utils_add_map_mux (pctldev, map, reserved_maps, num_maps, group, func); -if (has_config) { +if (num_configs) { ret = pinctrl_utils_add_map_configs(pctldev, map, reserved_maps, num_maps, group, configs, num_configs,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/222 llc: avoid blocking in llc_sap_close()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 9708d2b5b7c648e8e0a40d11e8cea12f6277f33c ]
llc_sap_close() is called by llc_sap_put() which could be called in BH context in llc_rcv(). We can't block in BH.
There is no reason to block it here, kfree_rcu() should be sufficient.
--- include/net/llc.h | 1 + net/llc/llc_core.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
include/net/llc.h +1 -0
@@ -66,6 +66,7 @@ struct llc_sap {int sk_count;struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES ];struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES ]; +struct rcu_head rcu; }; static inline
net/llc/llc_core.c +1 -3
@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap)list_del_rcu (&sap->node);spin_unlock_bh (&llc_sap_list_lock); -synchronize_rcu (); - -kfree (sap); +kfree_rcu (sap, rcu); }static struct packet_type llc_packet_type__read_mostly = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/222 ARM: dts: qcom: ipq4019: fix cpu0s qcom,saw2 reg value
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit bd73a3dd257fb838bd456a18eeee0ef0224b7a40 ]
while compiling an ipq4019 target, dtc will complain:
regulator@b089000 unit address format error, expected "2089000"
The saw0 regulator reg value seems to be
copied and pasted from qcom-ipq8064.dtsi.
This patch fixes the reg value to match that of the unit address which in turn silences the warning. (There is no driver for qcom,saw2 right now. So this went unnoticed)
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +1 -1
@@ -211,7 +211,7 @@ saw0: regulator@b089000 { compatible = "qcom,saw2"; - reg = <0x02089000 0x1000>, <0x0b009000 0x1000>; + reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>; regulator; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/222 powerpc/vdso: Correct call frame information
In reply to Greg Kroah-HartmanFrom: Alan Modra <[email protected]>
[ Upstream commit 56d20861c027498b5a1112b4f9f05b56d906fdda ]
Call Frame Information is used by gdb for back-traces and inserting breakpoints on function return for the "finish" command. This failed when inside __kernel_clock_gettime. More concerning than difficulty debugging is that CFI is also used by stack frame unwinding code to implement exceptions. If you have an app that needs to handle asynchronous exceptions for some reason, and you are unlucky enough to get one inside the VDSO time functions, your app will crash.
What's wrong: There is control flow in __kernel_clock_gettime that reaches label 99 without saving lr in r12. CFI info however is interpreted by the unwinder without reference to control flow: It's a simple matter of "Execute all the CFI opcodes up to the current address". That means the unwinder thinks r12 contains the return address at label 99. Disabuse it of that notion by resetting CFI for the return address at label 99.
Note that the ".cfi_restore lr" could have gone anywhere from the "mtlr r12" a few instructions earlier to the instruction at label 99. I put the CFI as late as possible, because in general that's best practice (and if possible grouped with other CFI in order to reduce the number of CFI opcodes executed when unwinding). Using r12 as the return address is perfectly fine after the "mtlr r12" since r12 on that code path still contains the return address.
__get_datapage also has a CFI error. That function temporarily saves lr in r0, and reflects that fact with ".cfi_register lr,r0". A later use of r0 means the CFI at that point isn't correct, as r0 no longer contains the return address. Fix that too.
--- arch/powerpc/kernel/vdso32/datapage.S | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + arch/powerpc/kernel/vdso64/datapage.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + 4 files changed, 4 insertions(+)
arch/powerpc/kernel/vdso32/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso32/gettimeofday.S +1 -0
@@ -139,6 +139,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
arch/powerpc/kernel/vdso64/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -0
@@ -124,6 +124,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/222 MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
In reply to Greg Kroah-HartmanFrom: Tuomas Tynkkynen <[email protected]>
[ Upstream commit feef7918667b84f9d5653c501542dd8d84ae32af ]
Setting GPIO 21 high seems to be required to enable power to USB ports on the WNDR3400v3. As there is already similar code for WNR3500L, make the existing USB power GPIO code generic and use that.
Patchwork: https://patchwork.linux-mips.org/patch/20259/
--- arch/mips/bcm47xx/workarounds.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/mips/bcm47xx/workarounds.c +5 -3
@@ -4,9 +4,8 @@#include <bcm47xx_board.h> #include <bcm47xx.h> -static void __init bcm47xx_workarounds_netgear_wnr3500l (void ) +static void __init bcm47xx_workarounds_enable_usb_power (int usb_power) { -const int usb_power =12 ;int err; err =gpio_request_one (usb_power,GPIOF_OUT_INIT_HIGH ,"usb_power" );
@@ -22,7 +21,10 @@ void __init bcm47xx_workarounds(void)switch (board) {case BCM47XX_BOARD_NETGEAR_WNR3500L : -bcm47xx_workarounds_netgear_wnr3500l (); +bcm47xx_workarounds_enable_usb_power (12 ); +break ; +case BCM47XX_BOARD_NETGEAR_WNDR3400_V3 : +bcm47xx_workarounds_enable_usb_power (21 );break ;default :/* No workaround(s) needed */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/222 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 64858773d78e820003a94e5a7179d368213655d6 ]
This patch adds missing properties to the CODEC and sound nodes, so the audio will work also on Snow rev5 Chromebook. This patch is an extension to the commit e9eefc3f8ce0 ("ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook")
and commit 6ab569936d60 ("ARM: dts: exynos: Enable HDMI audio on Snow Chromebook"). It has been reported that such changes work fine on the rev5 board too.
--- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/exynos5250-snow-rev5.dts +11 -0
@@ -23,6 +23,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; };
@@ -34,6 +42,9 @@ interrupt-parent = <&gpx0>; pinctrl-names = "default"; pinctrl-0 = <&max98090_irq>; + clocks = <&pmu_system_controller 0>; + clock-names = "mclk"; + #sound-dai-cells = <1>; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/222 ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit f8f3b7fc21b1cb59385b780acd9b9a26d04cb7b2 ]
Regulators, which are marked as 'on-in-suspend' seems to be critical for board operation, thus they must not be disabled anytime. This can be only assured by marking them as 'always-on', because otherwise some actions of their clients might result in turning them off. This patch restores suspend/resume operation on Peach-Pit Chromebook board. It partially reverts 'always-on' property removal done by the commit mentioned in the Fixes tag.
--- arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +++ arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +++ 2 files changed, 6 insertions(+)
arch/arm/boot/dts/exynos5420-peach-pit.dts +3 -0
@@ -302,6 +302,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -323,6 +324,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -333,6 +335,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
arch/arm/boot/dts/exynos5800-peach-pi.dts +3 -0
@@ -302,6 +302,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -323,6 +324,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -333,6 +335,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/222 i40e: use correct length for strncpy
In reply to Greg Kroah-HartmanFrom: Mitch Williams <[email protected]>
[ Upstream commit 7eb74ff891b4e94b8bac48f648a21e4b94ddee64 ]
Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2 -1
@@ -604,7 +604,8 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf->ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ; pf->ptp_caps.n_ext_ts =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/222 i40e: hold the rtnl lock on clearing interrupt scheme
In reply to Greg Kroah-HartmanFrom: Patryk Małek <[email protected]>
[ Upstream commit 5cba17b14182696d6bb0ec83a1d087933f252241 ]
Hold the rtnl lock when we're clearing interrupt scheme in i40e_shutdown and in i40e_remove.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -0
@@ -11360,6 +11360,7 @@ static void i40e_remove(struct pci_dev *pdev)mutex_destroy (&hw->aq.asq_mutex);/* Clear all dynamic memory lists of rings, q_vectors, and VSIs */ +rtnl_lock ();i40e_clear_interrupt_scheme (pf);for (i =0 ; i < pf->num_alloc_vsi; i++) {if (pf->vsi[i]) {
@@ -11368,6 +11369,7 @@ static void i40e_remove(struct pci_dev *pdev) pf->vsi[i] =NULL ; } } +rtnl_unlock ();for (i =0 ; i <I40E_MAX_VEB ; i++) {kfree (pf->veb[i]);
@@ -11513,7 +11515,13 @@ static void i40e_shutdown(struct pci_dev *pdev)wr32 (hw,I40E_PFPM_WUFC , (pf->wol_en ?I40E_PFPM_WUFC_MAG_MASK :0 )); +/* Since we're going to destroy queues during the +* i40e_clear_interrupt_scheme() we should hold the RTNL lock for this +* whole section +*/ +rtnl_lock ();i40e_clear_interrupt_scheme (pf); +rtnl_unlock ();if (system_state ==SYSTEM_POWER_OFF ) {pci_wake_from_d3 (pdev, pf->wol_en);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/222 ath9k: Fix a locking bug in ath9k_add_interface()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 461cf036057477805a8a391e5fd0f5264a5e56a8 ]
We tried to revert commit d9c52fd17cb4 ("ath9k: fix tx99 with monitor mode interface") but accidentally missed part of the locking change.
The lock has to be held earlier so that we're holding it when we do "sc->tx99_vif = vif;" and also there in the current code there is a stray unlock before we have taken the lock.
--- drivers/net/wireless/ath/ath9k/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +1 -2
@@ -1249,6 +1249,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; +mutex_lock (&sc->mutex);if (IS_ENABLED (CONFIG_ATH9K_TX99 )) {if (sc->cur_chan->nvifs >=1 ) {mutex_unlock (&sc->mutex);
@@ -1257,8 +1258,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, sc->tx99_vif = vif; } -mutex_lock (&sc->mutex); -ath_dbg (common,CONFIG ,"Attach a VIF of type: %d\n" , vif->type); sc->cur_chan->nvifs++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/222 pinctrl: at91: dont use the same irqchip with multiple gpiochips
In reply to Greg Kroah-HartmanFrom: Ludovic Desroches <[email protected]>
[ Upstream commit 0c3dfa176912b5f87732545598200fb55e9c1978 ]
Sharing the same irqchip with multiple gpiochips is not a good practice. For instance, when installing hooks, we change the state of the irqchip. The initial state of the irqchip for the second gpiochip to register is then disrupted.
--- drivers/pinctrl/pinctrl-at91.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/pinctrl/pinctrl-at91.c +14 -14
@@ -1545,16 +1545,6 @@ void at91_pinctrl_gpio_resume(void)#define gpio_irq_set_wake NULL#endif /* CONFIG_PM */ -static struct irq_chip gpio_irqchip = { - .name ="GPIO" , - .irq_ack = gpio_irq_ack, - .irq_disable = gpio_irq_mask, - .irq_mask = gpio_irq_mask, - .irq_unmask = gpio_irq_unmask, -/* .irq_set_type is set dynamically */ - .irq_set_wake = gpio_irq_set_wake, -}; -static void gpio_irq_handler (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
@@ -1595,12 +1585,22 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,struct gpio_chip *gpiochip_prev =NULL ;struct at91_gpio_chip *prev =NULL ;struct irq_data *d =irq_get_irq_data (at91_gpio->pioc_virq); +struct irq_chip *gpio_irqchip;int ret, i; + gpio_irqchip =devm_kzalloc (&pdev->dev,sizeof (*gpio_irqchip),GFP_KERNEL ); +if (!gpio_irqchip) +return -ENOMEM ; + at91_gpio->pioc_hwirq =irqd_to_hwirq (d); -/* Setup proper .irq_set_type function */ - gpio_irqchip.irq_set_type = at91_gpio->ops->irq_type; + gpio_irqchip->name ="GPIO" ; + gpio_irqchip->irq_ack = gpio_irq_ack; + gpio_irqchip->irq_disable = gpio_irq_mask; + gpio_irqchip->irq_mask = gpio_irq_mask; + gpio_irqchip->irq_unmask = gpio_irq_unmask; + gpio_irqchip->irq_set_wake = gpio_irq_set_wake, + gpio_irqchip->irq_set_type = at91_gpio->ops->irq_type;/* Disable irqs of this PIO controller */ writel_relaxed (~0 , at91_gpio->regbase +PIO_IDR );
@@ -1611,7 +1611,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,* interrupt. */ ret =gpiochip_irqchip_add (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip,0 , handle_edge_irq,IRQ_TYPE_NONE );
@@ -1629,7 +1629,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,if (!gpiochip_prev) {/* Then register the chain on the parent IRQ */ gpiochip_set_chained_irqchip (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip, at91_gpio->pioc_virq, gpio_irq_handler);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/222 s390/qeth: invoke softirqs after napi_schedule()
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 4d19db777a2f32c9b76f6fd517ed8960576cb43e ]
Calling napi_schedule() from process context does not ensure that the NET_RX softirq is run in a timely fashion. So trigger it manually.
This is no big issue with current code. A call to ndo_open() is usually followed by a ndo_set_rx_mode() call, and for qeth this contains a spin_unlock_bh(). Except for OSN, where qeth_l2_set_rx_mode() bails out early.
Nevertheless it's best to not depend on this behaviour, and just fix the issue at its source like all other drivers do. For instance see commit 83a0c6e58901 ("i40e: Invoke softirqs after napi_reschedule").
--- drivers/s390/net/qeth_l2_main.c | 3 +++ drivers/s390/net/qeth_l3_main.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/s390/net/qeth_l2_main.c +3 -0
@@ -991,7 +991,10 @@ static int __qeth_l2_open(struct net_device *dev)if (qdio_stop_irq (card->data.ccwdev,0 ) >=0 ) {napi_enable (&card->napi); +local_bh_disable ();napi_schedule (&card->napi); +/* kick-start the NAPI softirq: */ +local_bh_enable (); }else rc = -EIO ;return rc;
drivers/s390/net/qeth_l3_main.c +3 -0
@@ -3005,7 +3005,10 @@ static int __qeth_l3_open(struct net_device *dev)if (qdio_stop_irq (card->data.ccwdev,0 ) >=0 ) {napi_enable (&card->napi); +local_bh_disable ();napi_schedule (&card->napi); +/* kick-start the NAPI softirq: */ +local_bh_enable (); }else rc = -EIO ;return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/222 PCI/ACPI: Correct error message for ASPM disabling
In reply to Greg Kroah-HartmanFrom: Sinan Kaya <[email protected]>
[ Upstream commit 1ad61b612b95980a4d970c52022aa01dfc0f6068 ]
If _OSC execution fails today for platforms without an _OSC entry, code is printing a misleading message saying disabling ASPM as follows:
acpi PNP0A03:00: _OSC failed (AE_NOT_FOUND); disabling ASPM
We need to ensure that platform supports ASPM to begin with.
--- drivers/acpi/pci_root.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/acpi/pci_root.c +3 -2
@@ -454,8 +454,9 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm)decode_osc_support (root,"OS supports" , support); status =acpi_pci_osc_support (root, support);if (ACPI_FAILURE (status)) { -dev_info (&device->dev,"_OSC failed (%s); disabling ASPM\n" , -acpi_format_exception (status)); +dev_info (&device->dev,"_OSC failed (%s)%s\n" , +acpi_format_exception (status), +pcie_aspm_support_enabled () ?"; disabling ASPM" :"" ); *no_aspm =1 ;return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/222 serial: mxs-auart: Fix potential infinite loop
In reply to Greg Kroah-HartmanFrom: Anton Vasilyev <[email protected]>
[ Upstream commit 5963e8a3122471cadfe0eba41c4ceaeaa5c8bb4d ]
On the error path of mxs_auart_request_gpio_irq() is performed backward iterating with index i of enum type. Underline enum type may be unsigned char. In this case check (--i >= 0) will be always true and error handling goes into infinite loop.
The patch changes the check so that it is valid for signed and unsigned types.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/tty/serial/mxs-auart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/mxs-auart.c +2 -1
@@ -1635,8 +1635,9 @@ static int mxs_auart_request_gpio_irq(struct mxs_auart_port *s)/* * If something went wrong, rollback. +* Be careful: i may be unsigned. */ -while (err && (--i >=0 )) +while (err && (i-- >0 ))if (irq[i] >=0 )free_irq (irq[i], s);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/222 powerpc/64s/hash: Fix stab_rr off by one initialization
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 09b4438db13fa83b6219aee5993711a2aa2a0c64 ]
This causes SLB alloation to start 1 beyond the start of the SLB. There is no real problem because after it wraps it stats behaving properly, it's just surprisig to see when looking at SLB traces.
--- arch/powerpc/mm/slb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/slb.c +1 -1
@@ -321,7 +321,7 @@ void slb_initialize(void)#endif } -get_paca ()->stab_rr =SLB_NUM_BOLTED ; +get_paca ()->stab_rr =SLB_NUM_BOLTED -1 ; lflags =SLB_VSID_KERNEL | linear_llp; vflags =SLB_VSID_KERNEL | vmalloc_llp;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/222 powerpc/pseries: Disable CPU hotplug across migrations
In reply to Greg Kroah-HartmanFrom: Nathan Fontenot <[email protected]>
[ Upstream commit 85a88cabad57d26d826dd94ea34d3a785824d802 ]
When performing partition migrations all present CPUs must be online as all present CPUs must make the H_JOIN call as part of the migration process. Once all present CPUs make the H_JOIN call, one CPU is returned to make the rtas call to perform the migration to the destination system.
During testing of migration and changing the SMT state we have found instances where CPUs are offlined, as part of the SMT state change, before they make the H_JOIN call. This results in a hung system where every CPU is either in H_JOIN or offline.
To prevent this this patch disables CPU hotplug during the migration process.
--- arch/powerpc/kernel/rtas.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/kernel/rtas.c +2 -0
@@ -984,6 +984,7 @@ int rtas_ibm_suspend_me(u64 handle) goto out; } +cpu_hotplug_disable ();stop_topology_update ();/* Call function on all CPUs. One of us will make the
@@ -998,6 +999,7 @@ int rtas_ibm_suspend_me(u64 handle)printk (KERN_ERR "Error doing global join\n" );start_topology_update (); +cpu_hotplug_enable ();/* Take down CPUs not online prior to suspend */ cpuret =rtas_offline_cpus_mask (offline_mask);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/222 RDMA/i40iw: Fix incorrect iterator type
In reply to Greg Kroah-HartmanFrom: Håkon Bugge <[email protected]>
[ Upstream commit 802fa45cd320de319e86c93bca72abec028ba059 ]
Commit f27b4746f378 ("i40iw: add connection management code") uses an incorrect rcu iterator, whilst holding the rtnl_lock. Since the critical region invokes i40iw_manage_qhash(), which is a sleeping function, the rcu locking and traversal cannot be used.
--- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/i40iw/i40iw_cm.c +1 -1
@@ -1652,7 +1652,7 @@ static enum i40iw_status_code i40iw_add_mqh_6(struct i40iw_device *iwdev,unsigned long flags;rtnl_lock (); -for_each_netdev_rcu (&init_net, ip_dev) { +for_each_netdev (&init_net, ip_dev) {if ((((rdma_vlan_dev_vlan_id (ip_dev) <I40IW_NO_VLAN ) && (rdma_vlan_dev_real_dev (ip_dev) == iwdev->netdev)) || (ip_dev == iwdev->netdev)) && (ip_dev->flags &IFF_UP )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/222 libfdt: Ensure INT_MAX is defined in libfdt_env.h
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ]
The next update of libfdt has a new dependency on INT_MAX. Update the instances of libfdt_env.h in the kernel to either include the necessary header with the definition or define it locally.
--- arch/arm/boot/compressed/libfdt_env.h | 2 ++ arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 1 + 3 files changed, 5 insertions(+)
arch/arm/boot/compressed/libfdt_env.h +2 -0
@@ -5,6 +5,8 @@#include <linux/string.h> #include <asm/byteorder.h> +#define INT_MAX ((int)(~0U>>1)) +typedef __be16 fdt16_t ;typedef __be32 fdt32_t ;typedef __be64 fdt64_t ;
arch/powerpc/boot/libfdt_env.h +2 -0
@@ -4,6 +4,8 @@#include <types.h> #include <string.h> +#define INT_MAX ((int)(~0U>>1)) +#include "of.h" typedef u32 uint32_t ;
include/linux/libfdt_env.h +1 -0
@@ -1,6 +1,7 @@#ifndef _LIBFDT_ENV_H#define _LIBFDT_ENV_H +#include <linux/kernel.h> /* For INT_MAX */ #include <linux/string.h> #include <asm/byteorder.h>
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 88/222 power: supply: twl4030_charger: fix charging current out-of-bounds
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 8314c212f995bc0d06b54ad02ef0ab4089781540 ]
the charging current uses unsigned int variables, if we step back if the current is still low, we would run into negative which means setting the target to a huge value.
Better add checks here.
--- drivers/power/supply/twl4030_charger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/twl4030_charger.c +2 -1
@@ -449,7 +449,8 @@ static void twl4030_current_worker(struct work_struct *data)if (v <USB_MIN_VOLT ) {/* Back up and stop adjusting. */ - bci->usb_cur -=USB_CUR_STEP ; +if (bci->usb_cur >=USB_CUR_STEP ) + bci->usb_cur -=USB_CUR_STEP ; bci->usb_cur_target = bci->usb_cur; }else if (bci->usb_cur >= bci->usb_cur_target || bci->usb_cur +USB_CUR_STEP >USB_MAX_CURRENT ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/222 cxgb4: Fix endianness issue in t4_fwcache()
In reply to Greg Kroah-HartmanFrom: Ganesh Goudar <[email protected]>
[ Upstream commit 0dc235afc59a226d951352b0adf4a89b532a9d13 ]
Do not put host-endian 0 or 1 into big endian feild.
--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +1 -1
@@ -3541,7 +3541,7 @@ int t4_fwcache(struct adapter *adap, enum fw_params_param_dev_fwcache op) c.param[0 ].mnem =cpu_to_be32 (FW_PARAMS_MNEM_V (FW_PARAMS_MNEM_DEV ) |FW_PARAMS_PARAM_X_V (FW_PARAMS_PARAM_DEV_FWCACHE )); - c.param[0 ].val = (__force __be32 )op; + c.param[0 ].val =cpu_to_be32 (op);return t4_wr_mbox (adap, adap->mbox, &c,sizeof (c),NULL ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/222 net: toshiba: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit bacade822524e02f662d88f784d2ae821a5546fb ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 ++-- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 ++-- drivers/net/ethernet/toshiba/tc35815.c | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-)
drivers/net/ethernet/toshiba/ps3_gelic_net.c +2 -2
@@ -845,9 +845,9 @@ static int gelic_card_kick_txdma(struct gelic_card *card,* @skb: packet to send out * @netdev: interface device structure * -* returns 0 on success, <0 on failure +* returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure */ -int gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev) +netdev_tx_t gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev) {struct gelic_card *card =netdev_card (netdev);struct gelic_descr *descr;
drivers/net/ethernet/toshiba/ps3_gelic_net.h +1 -1
@@ -370,7 +370,7 @@ void gelic_card_up(struct gelic_card *card);void gelic_card_down (struct gelic_card *card);int gelic_net_open (struct net_device *netdev);int gelic_net_stop (struct net_device *netdev); -int gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev); +netdev_tx_t gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev);void gelic_net_set_multi (struct net_device *netdev);void gelic_net_tx_timeout (struct net_device *netdev);int gelic_net_change_mtu (struct net_device *netdev,int new_mtu);
drivers/net/ethernet/toshiba/spider_net.c +2 -2
@@ -880,9 +880,9 @@ out:* @skb: packet to send out * @netdev: interface device structure * -* returns 0 on success, !0 on failure +* returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure */ -static int +static netdev_tx_t spider_net_xmit (struct sk_buff *skb,struct net_device *netdev) {int cnt;
drivers/net/ethernet/toshiba/tc35815.c +4 -2
@@ -474,7 +474,8 @@ static void free_rxbuf_skb(struct pci_dev *hwdev, struct sk_buff *skb, dma_addr_/* Index to functions, as function prototypes. */ static int tc35815_open (struct net_device *dev); -static int tc35815_send_packet (struct sk_buff *skb,struct net_device *dev); +static netdev_tx_t tc35815_send_packet (struct sk_buff *skb, +struct net_device *dev);static irqreturn_t tc35815_interrupt (int irq,void *dev_id);static int tc35815_rx (struct net_device *dev,int limit);static int tc35815_poll (struct napi_struct *napi,int budget);
@@ -1249,7 +1250,8 @@ tc35815_open(struct net_device *dev)* invariant will hold if you make sure that the netif_*_queue() * calls are done at the proper times. */ -static int tc35815_send_packet (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +tc35815_send_packet (struct sk_buff *skb,struct net_device *dev) {struct tc35815_local *lp =netdev_priv (dev);struct TxFD *txfd;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/222 power: supply: twl4030_charger: disable eoc interrupt on linear charge
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 079cdff3d0a09c5da10ae1be35def7a116776328 ]
This avoids getting woken up from suspend after power interruptions when the bci wrongly thinks the battery is full just because of input current going low because of low input power
--- drivers/power/supply/twl4030_charger.c | 27 +++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/power/supply/twl4030_charger.c +26 -1
@@ -469,6 +469,7 @@ static void twl4030_current_worker(struct work_struct *data)static int twl4030_charger_enable_usb (struct twl4030_bci *bci,bool enable) {int ret; +u32 reg;if (bci->usb_mode ==CHARGE_OFF ) enable = false;
@@ -482,14 +483,38 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable) bci->usb_enabled =1 ; } -if (bci->usb_mode ==CHARGE_AUTO ) +if (bci->usb_mode ==CHARGE_AUTO ) { +/* Enable interrupts now. */ + reg = ~(u32)(TWL4030_ICHGLOW |TWL4030_ICHGEOC | +TWL4030_TBATOR2 |TWL4030_TBATOR1 | +TWL4030_BATSTS ); + ret =twl_i2c_write_u8 (TWL4030_MODULE_INTERRUPTS , reg, +TWL4030_INTERRUPTS_BCIIMR1A ); +if (ret <0 ) { +dev_err (bci->dev, +"failed to unmask interrupts: %d\n" , + ret); +return ret; + }/* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */ ret =twl4030_clear_set_boot_bci (0 ,TWL4030_BCIAUTOUSB ); + }/* forcing USBFASTMCHG(BCIMFSTS4[2]) to 1 */ ret =twl4030_clear_set (TWL_MODULE_MAIN_CHARGE ,0 ,TWL4030_USBFASTMCHG ,TWL4030_BCIMFSTS4 );if (bci->usb_mode ==CHARGE_LINEAR ) { +/* Enable interrupts now. */ + reg = ~(u32)(TWL4030_ICHGLOW |TWL4030_TBATOR2 | +TWL4030_TBATOR1 |TWL4030_BATSTS ); + ret =twl_i2c_write_u8 (TWL4030_MODULE_INTERRUPTS , reg, +TWL4030_INTERRUPTS_BCIIMR1A ); +if (ret <0 ) { +dev_err (bci->dev, +"failed to unmask interrupts: %d\n" , + ret); +return ret; + }twl4030_clear_set_boot_bci (TWL4030_BCIAUTOAC |TWL4030_CVENAC ,0 );/* Watch dog key: WOVF acknowledge */ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x33,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/222 net: broadcom: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 0c13b8d1aee87c35a2fbc1d85a1f766227cf54b5 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +++-- drivers/net/ethernet/broadcom/sb1250-mac.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bcm63xx_enet.c +3 -2
@@ -571,12 +571,13 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id)/* * tx request callback */ -static int bcm_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +bcm_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct bcm_enet_priv *priv;struct bcm_enet_desc *desc;u32 len_stat; -int ret; +netdev_tx_t ret; priv =netdev_priv (dev);
drivers/net/ethernet/broadcom/sb1250-mac.c +2 -2
@@ -299,7 +299,7 @@ static enum sbmac_state sbmac_set_channel_state(struct sbmac_softc *,static void sbmac_promiscuous_mode (struct sbmac_softc *sc,int onoff);static uint64_t sbmac_addr2reg (unsigned char *ptr);static irqreturn_t sbmac_intr (int irq,void *dev_instance); -static int sbmac_start_tx (struct sk_buff *skb,struct net_device *dev); +static netdev_tx_t sbmac_start_tx (struct sk_buff *skb,struct net_device *dev);static void sbmac_setmulti (struct sbmac_softc *sc);static int sbmac_init (struct platform_device *pldev,long long base);static int sbmac_set_speed (struct sbmac_softc *s,enum sbmac_speed speed);
@@ -2032,7 +2032,7 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance)* Return value: * nothing ********************************************************************* */ -static int sbmac_start_tx (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t sbmac_start_tx (struct sk_buff *skb,struct net_device *dev) {struct sbmac_softc *sc =netdev_priv (dev);unsigned long flags;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/222 usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
In reply to Greg Kroah-HartmanFrom: Nicolas Adell <[email protected]>
[ Upstream commit 1dedbdf2bbb1ede8d96f35f9845ecae179dc1988 ]
When initializing the USB subsystem before starting the kernel, OTG overcurrent detection is disabled. In case the OTG polarity of overcurrent is low active, the overcurrent detection is never enabled again and events cannot be reported as expected. Because imx usb overcurrent polarity is low active by default, only detection needs to be enable in usbmisc init function.
--- drivers/usb/chipidea/usbmisc_imx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/chipidea/usbmisc_imx.c +2 -0
@@ -273,6 +273,8 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data) }else if (data->oc_polarity ==1 ) {/* High active */ reg &= ~(MX6_BM_OVER_CUR_DIS |MX6_BM_OVER_CUR_POLARITY ); + }else { + reg &= ~(MX6_BM_OVER_CUR_DIS ); }writel (reg, usbmisc->base + data->index *4 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/222 usb: chipidea: Fix otg event handler
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ]
At OTG work running time, it's possible that several events need to be addressed (e.g. ID and VBUS events). The current implementation handles only one event at a time which leads to ignoring the other one. Fix it.
--- drivers/usb/chipidea/otg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/chipidea/otg.c +6 -3
@@ -206,14 +206,17 @@ static void ci_otg_work(struct work_struct *work) }pm_runtime_get_sync (ci->dev); +if (ci->id_event) { ci->id_event = false;ci_handle_id_switch (ci); - }else if (ci->b_sess_valid_event) { + } + +if (ci->b_sess_valid_event) { ci->b_sess_valid_event = false;ci_handle_vbus_change (ci); - }else -dev_err (ci->dev,"unexpected event occurs at %s\n" , __func__); + } +pm_runtime_put_sync (ci->dev);enable_irq (ci->irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/222 mlxsw: spectrum: Init shaper for TCs 8..15
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit a9f36656b519a9a21309793c306941a3cd0eeb8f ]
With introduction of MC-aware mode to mlxsw, it became necessary to configure TCs above 7 as well. There is now code in mlxsw to disable ETS for these higher classes, but disablement of max shaper was neglected.
By default, max shaper is currently disabled to begin with, so the problem is just cosmetic. However, for symmetry, do like we do for ETS configuration, and call mlxsw_sp_port_ets_maxrate_set() for both TC i and i + 8.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +7 -0
@@ -2191,6 +2191,13 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port) MLXSW_REG_QEEC_MAS_DIS);if (err)return err; + + err =mlxsw_sp_port_ets_maxrate_set (mlxsw_sp_port, +MLXSW_REG_QEEC_HIERARCY_TC , + i +8 , i, +MLXSW_REG_QEEC_MAS_DIS ); +if (err) +return err; }/* Map all priorities to traffic class 0. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/222 ARM: dts: am335x-evm: fix number of cpsw
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ]
am335x-evm has only one CPSW external port physically wired, but DT defines 2 ext. ports. As result, PHY connection failure reported for the second ext. port.
Update DT to reflect am335x-evm board HW configuration, and, while here, switch to use phy-handle instead of phy_id.
--- arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am335x-evm.dts +6 -6
@@ -701,6 +701,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio {
@@ -708,15 +709,14 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; -}; -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "rgmii-txid"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/222 power: supply: ab8500_fg: silence uninitialized variable warnings
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 54baff8d4e5dce2cef61953b1dc22079cda1ddb1 ]
If kstrtoul() fails then we print "charge_full" when it's uninitialized. The debug printk doesn't add anything so I deleted it and cleaned these two functions up a bit.
--- drivers/power/supply/ab8500_fg.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/power/supply/ab8500_fg.c +12 -19
@@ -2437,17 +2437,14 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_full; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_full); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_full %lu" , ret, charge_full); - -if (!ret) { - di->bat_cap.max_mah = (int ) charge_full; - ret = count; - } -return ret; + di->bat_cap.max_mah = (int ) charge_full; +return count; }static ssize_t charge_now_show (struct ab8500_fg *di,char *buf)
@@ -2459,20 +2456,16 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_now; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_now); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_now %lu was %d" , - ret, charge_now, di->bat_cap.prev_mah); - -if (!ret) { - di->bat_cap.user_mah = (int ) charge_now; - di->flags.user_cap = true; - ret = count; -queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); - } -return ret; + di->bat_cap.user_mah = (int ) charge_now; + di->flags.user_cap = true; +queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); +return count; } static struct ab8500_fg_sysfs_entry charge_full_attr =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/222 ARM: dts: ste: Fix SPI controller node names
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 2f967f9e9fa076affb711da1a8389b5d33814fc6 ]
SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks.
--- arch/arm/boot/dts/ste-dbx5x0.dtsi | 4 ++-- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/ste-dbx5x0.dtsi +2 -2
@@ -864,7 +864,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80002000 { + spi@80002000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80002000 0x1000>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -878,7 +878,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80003000 { + spi@80003000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80003000 0x1000>; interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/ste-hrefprev60.dtsi +1 -1
@@ -57,7 +57,7 @@ }; }; - ssp@80002000 { + spi@80002000 { /* * On the first generation boards, this SSP/SPI port was connected * to the AB8500.
arch/arm/boot/dts/ste-snowball.dts +1 -1
@@ -386,7 +386,7 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; - ssp@80002000 { + spi@80002000 { pinctrl-names = "default"; pinctrl-0 = <&ssp0_snowball_mode>; };
arch/arm/boot/dts/ste-u300.dts +1 -1
@@ -441,7 +441,7 @@ dma-names = "rx"; }; - spi: ssp@c0006000 { + spi: spi@c0006000 { compatible = "arm,pl022", "arm,primecell"; reg = <0xc0006000 0x1000>; interrupt-parent = <&vica>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/222 spi: pic32: Use proper enum in dmaengine_prep_slave_rg
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 8cfde7847d5ed0bb77bace41519572963e43cd17 ]
Clang warns when one enumerated type is converted implicitly to another:
drivers/spi/spi-pic32.c:323:8: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
DMA_FROM_DEVICE,
^~~~~~~~~~~~~~~
drivers/spi/spi-pic32.c:333:8: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
DMA_TO_DEVICE,
^~~~~~~~~~~~~2 warnings generated.
Use the proper enums from dma_transfer_direction (DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2, DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1) to satify Clang.
--- drivers/spi/spi-pic32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-pic32.c +2 -2
@@ -320,7 +320,7 @@ static int pic32_spi_dma_transfer(struct pic32_spi *pic32s, desc_rx =dmaengine_prep_slave_sg (master->dma_rx, xfer->rx_sg.sgl, xfer->rx_sg.nents, -DMA_FROM_DEVICE , +DMA_DEV_TO_MEM ,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!desc_rx) { ret = -EINVAL ;
@@ -330,7 +330,7 @@ static int pic32_spi_dma_transfer(struct pic32_spi *pic32s, desc_tx =dmaengine_prep_slave_sg (master->dma_tx, xfer->tx_sg.sgl, xfer->tx_sg.nents, -DMA_TO_DEVICE , +DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!desc_tx) { ret = -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/222 cpufeature: avoid warning when compiling with clang
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit c785896b21dd8e156326ff660050b0074d3431df ]
The table id (second) argument to MODULE_DEVICE_TABLE is often referenced otherwise. This is not the case for CPU features. This leads to warnings when building the kernel with Clang:
arch/arm/crypto/aes-ce-glue.c:450:1: warning: variable
'cpu_feature_match_AES' is not needed and will not be emitted [-Wunneeded-internal-declaration]
module_cpu_feature_match(AES, aes_init);
^
Avoid warnings by using __maybe_unused, similar to commit 1f318a8bafcf ("modules: mark __inittest/__exittest as __maybe_unused").
--- include/linux/cpufeature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/cpufeature.h +1 -1
@@ -45,7 +45,7 @@* 'asm/cpufeature.h' of your favorite architecture. */ #define module_cpu_feature_match (x, __initfunc) \ -static struct cpu_feature const cpu_feature_match_ ## x[] = \ +static struct cpu_feature const __maybe_unused cpu_feature_match_ ## x[] = \ { { .feature = cpu_feature(x) }, { } }; \ MODULE_DEVICE_TABLE(cpu, cpu_feature_match_ ## x); \ \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/222 ARM: dts: marvell: Fix SPI and I2C bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit cf680cc5251487b9a39919c3cda31a108af19cf8 ]
dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
arch/arm/boot/dts/dove-cubox.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox-es.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-cubox-es.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-dove-db.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@14600: node name for SPI buses should be 'spi' arch/arm/boot/dts/orion5x-kuroboxpro.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lschl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lsgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lswtgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32"
--- arch/arm/boot/dts/dove-cubox.dts | 2 +- arch/arm/boot/dts/dove.dtsi | 6 +++--- arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/dove-cubox.dts +1 -1
@@ -86,7 +86,7 @@ status = "okay"; clock-frequency = <100000>; - si5351: clock-generator { + si5351: clock-generator@60 { compatible = "silabs,si5351a-msop"; reg = <0x60>; #address-cells = <1>;
arch/arm/boot/dts/dove.dtsi +3 -3
@@ -152,7 +152,7 @@ 0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */ 0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */ - spi0: spi-ctrl@10600 { + spi0: spi@10600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>;
@@ -165,7 +165,7 @@ status = "disabled"; }; - i2c: i2c-ctrl@11000 { + i2c: i2c@11000 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11000 0x20>; #address-cells = <1>;
@@ -215,7 +215,7 @@ status = "disabled"; }; - spi1: spi-ctrl@14600 { + spi1: spi@14600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/orion5x-linkstation.dtsi +1 -1
@@ -156,7 +156,7 @@ &i2c { status = "okay"; - rtc { + rtc@32 { compatible = "ricoh,rs5c372a"; reg = <0x32>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/222 net: micrel: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 2b49117a5abee8478b0470cba46ac74f93b4a479 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/micrel/ks8695net.c | 2 +- drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/micrel/ks8695net.c +1 -1
@@ -1156,7 +1156,7 @@ ks8695_timeout(struct net_device *ndev)* sk_buff and adds it to the TX ring. It then kicks the TX DMA * engine to ensure transmission begins. */ -static int +static netdev_tx_t ks8695_start_xmit (struct sk_buff *skb,struct net_device *ndev) {struct ks8695_priv *ksp =netdev_priv (ndev);
drivers/net/ethernet/micrel/ks8851_mll.c +2 -2
@@ -1020,9 +1020,9 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len)* spin_lock_irqsave is required because tx and rx should be mutual exclusive. * So while tx is in-progress, prevent IRQ interrupt from happenning. */ -static int ks_start_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t ks_start_xmit (struct sk_buff *skb,struct net_device *netdev) { -int retv =NETDEV_TX_OK ; +netdev_tx_t retv =NETDEV_TX_OK ;struct ks_net *ks =netdev_priv (netdev);disable_irq (netdev->irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/222 bnx2x: Ignore bandwidth attention in single function mode
In reply to Greg Kroah-HartmanFrom: Shahed Shaikh <[email protected]>
[ Upstream commit 75a110a1783ef8324ffd763b24f4ac268253cbca ]
This is a workaround for FW bug -
MFW generates bandwidth attention in single function mode, which is only expected to be generated in multi function mode. This undesired attention in SF mode results in incorrect HW configuration and resulting into Tx timeout.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +10 -0
@@ -3540,6 +3540,16 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)*/ static void bnx2x_config_mf_bw (struct bnx2x *bp) { +/* Workaround for MFW bug. +* MFW is not supposed to generate BW attention in +* single function mode. +*/ +if (!IS_MF (bp)) { +DP (BNX2X_MSG_MCP , +"Ignoring MF BW config in single function mode\n" ); +return ; + } +if (bp->link_vars.link_up) {bnx2x_cmng_fns_init (bp, true,CMNG_FNS_MINMAX );bnx2x_link_sync_notify (bp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/222 x86/CPU: Use correct macros for Cyrix calls
In reply to Greg Kroah-HartmanFrom: Matthew Whitehead <[email protected]>
[ Upstream commit 03b099bdcdf7125d4a63dc9ddeefdd454e05123d ]
There are comments in processor-cyrix.h advising you to _not_ make calls using the deprecated macros in this style:
setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80);
This is because it expands the macro into a non-functioning calling sequence. The calling order must be:
outb(CX86_CCR2, 0x22); inb(0x23);
Quoted 1 line
From the comments:
* When using the old macros a line like
* setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
* gets expanded to:
* do {
* outb((CX86_CCR2), 0x22);
* outb((({
* outb((CX86_CCR2), 0x22);
* inb(0x23);
* }) | 0x88), 0x23);
* } while (0);
The new macros fix this problem, so use them instead.
--- arch/x86/kernel/cpu/cyrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/cyrix.c +1 -1
@@ -434,7 +434,7 @@ static void cyrix_identify(struct cpuinfo_x86 *c)/* enable MAPEN */ setCx86 (CX86_CCR3 , (ccr3 &0x0f ) |0x10 );/* enable cpuid */ -setCx86_old (CX86_CCR4 ,getCx86_old (CX86_CCR4 ) |0x80 ); +setCx86 (CX86_CCR4 ,getCx86 (CX86_CCR4 ) |0x80 );/* disable MAPEN */ setCx86 (CX86_CCR3 , ccr3);local_irq_restore (flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/222 MIPS: kexec: Relax memory restriction
In reply to Greg Kroah-HartmanFrom: Dengcheng Zhu <[email protected]>
[ Upstream commit a6da4d6fdf8bd512c98d3ac7f1d16bc4bb282919 ]
We can rely on the system kernel and the dump capture kernel themselves in memory usage.
Being restrictive with 512MB limit may cause kexec tool failure on some platforms.
Patchwork: https://patchwork.linux-mips.org/patch/20568/
--- arch/mips/include/asm/kexec.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mips/include/asm/kexec.h +3 -3
@@ -12,11 +12,11 @@#include <asm/stacktrace.h> /* Maximum physical address we can use pages from */ -#define KEXEC_SOURCE_MEMORY_LIMIT (0x20000000) +#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)/* Maximum address we can reach in physical address mode */ -#define KEXEC_DESTINATION_MEMORY_LIMIT (0x20000000) +#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)/* Maximum address we can use for the control code buffer */ -#define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000) +#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)/* Reserve 3*4096 bytes for board-specific info */ #define KEXEC_CONTROL_PAGE_SIZE (4096 + 3*4096)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/222 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 9f1e44774be578fb92776add95f1fcaf8284d692 ]
There should be only one instance of struct shdwc in the system. This is referenced through at91_shdwc. Return in probe if at91_shdwc is already allocated.
--- drivers/power/reset/at91-sama5d2_shdwc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/power/reset/at91-sama5d2_shdwc.c +3 -0
@@ -246,6 +246,9 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)if (!pdev->dev.of_node)return -ENODEV ; +if (at91_shdwc) +return -EBUSY ; + at91_shdwc =devm_kzalloc (&pdev->dev,sizeof (*at91_shdwc),GFP_KERNEL );if (!at91_shdwc)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/222 media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 8d11eb847de7d89c2754988c944d51a4f63e219b ]
The driver may sleep in a interrupt handler.
The function call paths (from bottom to top) in Linux-4.16 are:
[FUNC] kzalloc(GFP_KERNEL) drivers/media/pci/ivtv/ivtv-yuv.c, 938:
kzalloc in ivtv_yuv_initdrivers/media/pci/ivtv/ivtv-yuv.c, 960:
ivtv_yuv_init in ivtv_yuv_next_freedrivers/media/pci/ivtv/ivtv-yuv.c, 1126:
ivtv_yuv_next_free in ivtv_yuv_setup_stream_framedrivers/media/pci/ivtv/ivtv-irq.c, 827:
ivtv_yuv_setup_stream_frame in ivtv_irq_dec_data_reqdrivers/media/pci/ivtv/ivtv-irq.c, 1013:
ivtv_irq_dec_data_req in ivtv_irq_handler
To fix this bug, GFP_KERNEL is replaced with GFP_ATOMIC.
This bug is found by my static analysis tool DSAC.
--- drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/ivtv/ivtv-yuv.c +1 -1
@@ -935,7 +935,7 @@ static void ivtv_yuv_init(struct ivtv *itv) }/* We need a buffer for blanking when Y plane is offset - non-fatal if we can't get one */ - yi->blanking_ptr =kzalloc (720 *16 ,GFP_KERNEL |__GFP_NOWARN); + yi->blanking_ptr =kzalloc (720 *16 ,GFP_ATOMIC |__GFP_NOWARN);if (yi->blanking_ptr) { yi->blanking_dmaptr =pci_map_single (itv->pdev, yi->blanking_ptr,720 *16 ,PCI_DMA_TODEVICE ); }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/222 media: au0828: Fix incorrect error messages
In reply to Greg Kroah-HartmanFrom: Brad Love <[email protected]>
[ Upstream commit f347596f2bf114a3af3d80201c6e6bef538d884f ]
Correcting red herring error messages.
Where appropriate, replaces au0282_dev_register with:
- au0828_analog_register
- au0828_dvb_register
--- drivers/media/usb/au0828/au0828-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/au0828/au0828-core.c +2 -2
@@ -639,7 +639,7 @@ static int au0828_usb_probe(struct usb_interface *interface,/* Analog TV */ retval =au0828_analog_register (dev, interface);if (retval) { -pr_err ("%s() au0282_dev_register failed to register on V4L2\n" , +pr_err ("%s() au0828_analog_register failed to register on V4L2\n" , __func__); goto done; }
@@ -647,7 +647,7 @@ static int au0828_usb_probe(struct usb_interface *interface,/* Digital TV */ retval =au0828_dvb_register (dev);if (retval) -pr_err ("%s() au0282_dev_register failed\n" , +pr_err ("%s() au0828_dvb_register failed\n" , __func__);/* Remote controller */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/222 usb: gadget: uvc: configfs: Drop leaked references to config items
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 86f3daed59bceb4fa7981d85e89f63ebbae1d561 ]
Some of the .allow_link() and .drop_link() operations implementations call config_group_find_item() and then leak the reference to the returned item. Fix this by dropping those references where needed.
--- drivers/usb/gadget/function/uvc_configfs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/gadget/function/uvc_configfs.c +4 -0
@@ -543,6 +543,7 @@ static int uvcg_control_class_allow_link(struct config_item *src, unlock:mutex_unlock (&opts->lock); out: +config_item_put (header);mutex_unlock (su_mutex);return ret; }
@@ -584,6 +585,7 @@ static int uvcg_control_class_drop_link(struct config_item *src, unlock:mutex_unlock (&opts->lock); out: +config_item_put (header);mutex_unlock (su_mutex);return ret; }
@@ -2047,6 +2049,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src, unlock:mutex_unlock (&opts->lock); out: +config_item_put (header);mutex_unlock (su_mutex);return ret; }
@@ -2091,6 +2094,7 @@ static int uvcg_streaming_class_drop_link(struct config_item *src, unlock:mutex_unlock (&opts->lock); out: +config_item_put (header);mutex_unlock (su_mutex);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/222 media: davinci: Fix implicit enum conversion warning
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 4158757395b300b6eb308fc20b96d1d231484413 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/media/platform/davinci/vpbe_display.c:524:24: warning: implicit conversion from enumeration type 'enum osd_v_exp_ratio' to different enumeration type 'enum osd_h_exp_ratio' [-Wenum-conversion]
layer_info->h_exp = V_EXP_6_OVER_5;
~ ^~~~~~~~~~~~~~1 warning generated.
This appears to be a copy and paste error judging from the couple of lines directly above this statement and the way that height is handled in the if block above this one.
--- drivers/media/platform/davinci/vpbe_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/davinci/vpbe_display.c +1 -1
@@ -518,7 +518,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,else if (v_scale ==4 ) layer_info->v_zoom =ZOOM_X4 ;if (v_exp) - layer_info->h_exp =V_EXP_6_OVER_5 ; + layer_info->v_exp =V_EXP_6_OVER_5 ; }else {/* no scaling, only cropping. Set display area to crop area */ cfg->ysize = expected_ysize;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/222 phy: phy-twl4030-usb: fix denied runtime access
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 6c7103aa026094a4ee2c2708ec6977a6dfc5331d ]
When runtime is not enabled, pm_runtime_get_sync() returns -EACCESS, the counter will be incremented but the resume callback not called, so enumeration and charging will not start properly.
To avoid that happen, disable irq on suspend and recheck on resume.
Practically this happens when the device is woken up from suspend by plugging in usb.
--- drivers/phy/phy-twl4030-usb.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/phy/phy-twl4030-usb.c +29 -0
@@ -144,6 +144,7 @@#define PMBR1 0x0D#define GPIO_USB_4PIN_ULPI_2430C (3 << 0) +static irqreturn_t twl4030_usb_irq (int irq,void *_twl);/* * If VBUS is valid or ID is ground, then we know a * cable is present and we need to be runtime-enabled
@@ -392,6 +393,33 @@ static void __twl4030_phy_power(struct twl4030_usb *twl, int on)WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); } +static int __maybe_unused twl4030_usb_suspend (struct device *dev) +{ +struct twl4030_usb *twl =dev_get_drvdata (dev); + +/* +* we need enabled runtime on resume, +* so turn irq off here, so we do not get it early +* note: wakeup on usb plug works independently of this +*/ +dev_dbg (twl->dev,"%s\n" , __func__); +disable_irq (twl->irq); + +return 0 ; +} + +static int __maybe_unused twl4030_usb_resume (struct device *dev) +{ +struct twl4030_usb *twl =dev_get_drvdata (dev); + +dev_dbg (twl->dev,"%s\n" , __func__); +enable_irq (twl->irq); +/* check whether cable status changed */ +twl4030_usb_irq (0 , twl); + +return 0 ; +} +static int __maybe_unused twl4030_usb_runtime_suspend (struct device *dev) {struct twl4030_usb *twl =dev_get_drvdata (dev);
@@ -652,6 +680,7 @@ static const struct phy_ops ops = {static const struct dev_pm_ops twl4030_usb_pm_ops = { SET_RUNTIME_PM_OPS(twl4030_usb_runtime_suspend, twl4030_usb_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (twl4030_usb_suspend, twl4030_usb_resume) };static int twl4030_usb_probe (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/222 usb: gadget: uvc: Factor out video USB request queueing
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 9d1ff5dcb3cd3390b1e56f1c24ae42c72257c4a3 ]
USB requests for video data are queued from two different locations in the driver, with the same code block occurring twice. Factor it out to a function.
--- drivers/usb/gadget/function/uvc_video.c | 30 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-)
drivers/usb/gadget/function/uvc_video.c +20 -10
@@ -129,6 +129,19 @@ uvc_video_encode_isoc(struct usb_request *req, struct uvc_video *video,* Request handling */ +static int uvcg_video_ep_queue (struct uvc_video *video,struct usb_request *req) +{ +int ret; + + ret =usb_ep_queue (video->ep, req,GFP_ATOMIC ); +if (ret <0 ) { +printk (KERN_INFO "Failed to queue request (%d).\n" , ret); +usb_ep_set_halt (video->ep); + } + +return ret; +} +/* * I somehow feel that synchronisation won't be easy to achieve here. We have * three events that control USB requests submission:
@@ -193,14 +206,13 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req) video->encode (req, video, buf); -if ((ret =usb_ep_queue (ep, req,GFP_ATOMIC )) <0 ) { -printk (KERN_INFO "Failed to queue request (%d).\n" , ret); -usb_ep_set_halt (ep); -spin_unlock_irqrestore (&video->queue.irqlock, flags); + ret =uvcg_video_ep_queue (video, req); +spin_unlock_irqrestore (&video->queue.irqlock, flags); + +if (ret <0 ) {uvcg_queue_cancel (queue,0 ); goto requeue; } -spin_unlock_irqrestore (&video->queue.irqlock, flags);return ;
@@ -320,15 +332,13 @@ int uvcg_video_pump(struct uvc_video *video) video->encode (req, video, buf);/* Queue the USB request */ - ret =usb_ep_queue (video->ep, req,GFP_ATOMIC ); + ret =uvcg_video_ep_queue (video, req); +spin_unlock_irqrestore (&queue->irqlock, flags); +if (ret <0 ) { -printk (KERN_INFO "Failed to queue request (%d)\n" , ret); -usb_ep_set_halt (video->ep); -spin_unlock_irqrestore (&queue->irqlock, flags);uvcg_queue_cancel (queue,0 );break ; } -spin_unlock_irqrestore (&queue->irqlock, flags); }spin_lock_irqsave (&video->req_lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/222 power: supply: max8998-charger: Fix platform data retrieval
In reply to Greg Kroah-HartmanFrom: Tomasz Figa <[email protected]>
[ Upstream commit cb90a2c6f77fe9b43d1e3f759bb2f13fe7fa1811 ]
Since the max8998 MFD driver supports instantiation by DT, platform data retrieval is handled in MFD probe and cell drivers should get use the pdata field of max8998_dev struct to obtain them.
--- drivers/power/supply/max8998_charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/max8998_charger.c +1 -1
@@ -85,7 +85,7 @@ static const struct power_supply_desc max8998_battery_desc = {static int max8998_battery_probe (struct platform_device *pdev) {struct max8998_dev *iodev =dev_get_drvdata (pdev->dev.parent); -struct max8998_platform_data *pdata =dev_get_platdata (iodev->dev); +struct max8998_platform_data *pdata = iodev->pdata;struct power_supply_config psy_cfg = {};struct max8998_battery_data *max8998;struct i2c_client *i2c;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/222 kernfs: Fix range checks in kernfs_get_target_path
In reply to Greg Kroah-HartmanFrom: Bernd Edlinger <[email protected]>
[ Upstream commit a75e78f21f9ad4b810868c89dbbabcc3931591ca ]
The terminating NUL byte is only there because the buffer is allocated with kzalloc(PAGE_SIZE, GFP_KERNEL), but since the range-check is off-by-one, and PAGE_SIZE==PATH_MAX, the returned string may not be zero-terminated if it is exactly PATH_MAX characters long. Furthermore also the initial loop may theoretically exceed PATH_MAX and cause a fault.
--- fs/kernfs/symlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/kernfs/symlink.c +4 -1
@@ -63,6 +63,9 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (base == kn)break ; +if ((s - path) +3 >=PATH_MAX ) +return -ENAMETOOLONG ; +strcpy (s,"../" ); s +=3 ; base = base->parent;
@@ -79,7 +82,7 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (len <2 )return -EINVAL ; len--; -if ((s - path) + len >PATH_MAX ) +if ((s - path) + len >=PATH_MAX )return -ENAMETOOLONG ;/* reverse fillup of target string from target to base */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/222 component: fix loop condition to call unbind() if bind() fails
In reply to Greg Kroah-HartmanFrom: Banajit Goswami <[email protected]>
[ Upstream commit bdae566d5d9733b6e32b378668b84eadf28a94d4 ]
During component_bind_all(), if bind() fails for any particular component associated with a master, unbind() should be called for all previous components in that master's match array, whose bind() might have completed successfully. As per the current logic, if bind() fails for the component at position 'n' in the master's match array, it would start calling unbind() from component in 'n'th position itself and work backwards, and will always skip calling unbind() for component in 0th position in the master's match array.
Fix this by updating the loop condition, and the logic to refer to the components in master's match array, so that unbind() is called for all components starting from 'n-1'st position in the array, until (and including) component in 0th position.
--- drivers/base/component.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/component.c +3 -3
@@ -461,9 +461,9 @@ int component_bind_all(struct device *master_dev, void *data) }if (ret !=0 ) { -for (; i--; ) -if (!master->match->compare[i].duplicate) { - c = master->match->compare[i].component; +for (; i >0 ; i--) +if (!master->match->compare[i -1 ].duplicate) { + c = master->match->compare[i -1 ].component;component_unbind (c, master, data); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/222 ip_gre: fix parsing gre header in ipgre_err
In reply to Greg Kroah-HartmanFrom: Haishuang Yan <[email protected]>
[ Upstream commit b0350d51f001e6edc13ee4f253b98b50b05dd401 ]
gre_parse_header stops parsing when csum_err is encountered, which means tpi->key is undefined and ip_tunnel_lookup will return NULL improperly.
This patch introduce a NULL pointer as csum_err parameter. Even when csum_err is encountered, it won't return error and continue parsing gre header as expected.
--- net/ipv4/gre_demux.c | 7 ++++--- net/ipv4/ip_gre.c | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-)
net/ipv4/gre_demux.c +4 -3
@@ -86,13 +86,14 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh +1 );if (greh->flags &GRE_CSUM ) { -if (skb_checksum_simple_validate (skb)) { +if (!skb_checksum_simple_validate (skb)) { +skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , + null_compute_pseudo); + }else if (csum_err) { *csum_err = true;return -EINVAL ; } -skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , - null_compute_pseudo); options++; }
net/ipv4/ip_gre.c +3 -6
@@ -224,13 +224,10 @@ static void gre_err(struct sk_buff *skb, u32 info)const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code;struct tnl_ptk_info tpi; -bool csum_err = false; -if (gre_parse_header (skb, &tpi, &csum_err,htons (ETH_P_IP ), - iph->ihl *4 ) <0 ) { -if (!csum_err)/* ignore csum errors. */ -return ; - } +if (gre_parse_header (skb, &tpi,NULL ,htons (ETH_P_IP ), + iph->ihl *4 ) <0 ) +return ;if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) { ipv4_update_pmtu(skb, dev_net(skb->dev), info,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/222 ARM: dts: socfpga: Fix I2C bus unit-address error
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
[ Upstream commit cbbc488ed85061a765cf370c3e41f383c1e0add6 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb: Warning (i2c_bus_reg): /soc/i2c@ffc04000/adxl345@0: I2C bus unit address format error, expected "53"
--- arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -1
@@ -88,7 +88,7 @@ status = "okay"; speed-mode = <0>; - adxl345: adxl345@0 { + adxl345: adxl345@53 { compatible = "adi,adxl345"; reg = <0x53>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/222 coresight: Fix handling of sinks
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit c71369de02b285d9da526a526d8f2affc7b17c59 ]
The coresight components could be operated either in sysfs mode or in perf mode. For some of the components, the mode of operation doesn't matter as they simply relay the data to the next component in the trace path. But for sinks, they need to be able to provide the trace data back to the user. Thus we need to make sure that "mode" is handled appropriately. e.g, the sysfs mode could have multiple sources driving the trace data, while perf mode doesn't allow sharing the sink.
The coresight_enable_sink() however doesn't really allow this check to trigger as it skips the "enable_sink" callback if the component is already enabled, irrespective of the mode. This could cause mixing of data from different modes or even same mode (in perf), if the sources are different. Also, if we fail to enable the sink while enabling a path (where sink is the first component enabled), we could end up in disabling the components in the "entire" path which were not enabled in this trial, causing disruptions in the existing trace paths.
--- drivers/hwtracing/coresight/coresight.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/hwtracing/coresight/coresight.c +15 -7
@@ -132,12 +132,14 @@ static int coresight_enable_sink(struct coresight_device *csdev, u32 mode) {int ret; -if (!csdev->enable) { -if (sink_ops (csdev)->enable) { - ret =sink_ops (csdev)->enable (csdev, mode); -if (ret) -return ret; - } +/* +* We need to make sure the "new" session is compatible with the +* existing "mode" of operation. +*/ +if (sink_ops (csdev)->enable) { + ret =sink_ops (csdev)->enable (csdev, mode); +if (ret) +return ret; csdev->enable = true; }
@@ -331,8 +333,14 @@ int coresight_enable_path(struct list_head *path, u32 mode)switch (type) {case CORESIGHT_DEV_TYPE_SINK : ret =coresight_enable_sink (csdev, mode); +/* +* Sink is the first component turned on. If we +* failed to enable the sink, there are no components +* that need disabling. Disabling the path here +* would mean we could disrupt an existing session. +*/ if (ret) - goto err; + goto out;break ;case CORESIGHT_DEV_TYPE_SOURCE :/* sources are enabled from either sysFS or Perf */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/222 ARM: tegra: apalis_t30: fix mmc1 cmd pull-up
In reply to Greg Kroah-HartmanFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit 1c997fe4becdc6fcbc06e23982ceb65621e6572a ]
Fix MMC1 cmd pin pull-up causing issues on carrier boards without external pull-up.
--- arch/arm/boot/dts/tegra30-apalis.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra30-apalis.dtsi +3 -3
@@ -147,14 +147,14 @@ /* Apalis MMC1 */ sdmmc3_clk_pa6 { - nvidia,pins = "sdmmc3_clk_pa6", - "sdmmc3_cmd_pa7"; + nvidia,pins = "sdmmc3_clk_pa6"; nvidia,function = "sdmmc3"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; }; sdmmc3_dat0_pb7 { - nvidia,pins = "sdmmc3_dat0_pb7", + nvidia,pins = "sdmmc3_cmd_pa7", + "sdmmc3_dat0_pb7", "sdmmc3_dat1_pb6", "sdmmc3_dat2_pb5", "sdmmc3_dat3_pb4",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/222 ARM: dts: paz00: fix wakeup gpio keycode
In reply to Greg Kroah-HartmanFrom: Marc Dietrich <[email protected]>
[ Upstream commit ebea2a43fdafdbce918bd7e200b709d6c33b9f3b ]
The power key is controlled solely by the EC, which only tiggeres this gpio after wakeup.
Fixes immediately return to suspend after wake from LP1.
--- arch/arm/boot/dts/tegra20-paz00.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-paz00.dts +3 -3
@@ -521,10 +521,10 @@ gpio-keys { compatible = "gpio-keys"; - power { - label = "Power"; + wakeup { + label = "Wakeup"; gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; - linux,code = <KEY_POWER>; + linux,code = <KEY_WAKEUP>; wakeup-source; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/222 EDAC: Raise the maximum number of memory controllers
In reply to Greg Kroah-HartmanFrom: Justin Ernst <[email protected]>
[ Upstream commit 6b58859419554fb824e09cfdd73151a195473cbc ]
We observe an oops in the skx_edac module during boot:
EDAC MC0: Giving out device to module skx_edac controller Skylake Socket#0 IMC#0 EDAC MC1: Giving out device to module skx_edac controller Skylake Socket#0 IMC#1 EDAC MC2: Giving out device to module skx_edac controller Skylake Socket#1 IMC#0
...
EDAC MC13: Giving out device to module skx_edac controller Skylake Socket#0 IMC#1 EDAC MC14: Giving out device to module skx_edac controller Skylake Socket#1 IMC#0 EDAC MC15: Giving out device to module skx_edac controller Skylake Socket#1 IMC#1 Too many memory controllers: 16
EDAC MC: Removed device 0 for skx_edac Skylake Socket#0 IMC#0
We observe there are two memory controllers per socket, with a limit of 16. Raise the maximum number of memory controllers from 16 to 2 * MAX_NUMNODES (1024).
[ bp: This is just a band-aid fix until we've sorted out the whole issue
with the bus_type association and handling in EDAC and can get rid of this arbitrary limit. ]
--- include/linux/edac.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/edac.h +2 -1
@@ -17,6 +17,7 @@#include <linux/completion.h> #include <linux/workqueue.h> #include <linux/debugfs.h> +#include <linux/numa.h> struct device ;
@@ -778,6 +779,6 @@ struct mem_ctl_info {/* * Maximum number of memory controllers in the coherent fabric. */ -#define EDAC_MAX_MCS 16 +#define EDAC_MAX_MCS 2 * MAX_NUMNODES#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/222 ARM: dts: realview: Fix SPI controller node names
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 016add12977bcc30f77d7e48fc9a3a024cb46645 ]
SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks.
--- arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/arm-realview-eb.dtsi +1 -1
@@ -334,7 +334,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>;
arch/arm/boot/dts/arm-realview-pb1176.dts +1 -1
@@ -343,7 +343,7 @@ clock-names = "apb_pclk"; }; - pb1176_ssp: ssp@1010b000 { + pb1176_ssp: spi@1010b000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1010b000 0x1000>; interrupt-parent = <&intc_dc1176>;
arch/arm/boot/dts/arm-realview-pb11mp.dts +1 -1
@@ -480,7 +480,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp@1000d000 { + spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; interrupt-parent = <&intc_pb11mp>;
arch/arm/boot/dts/arm-realview-pbx.dtsi +1 -1
@@ -318,7 +318,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>;
arch/arm/boot/dts/versatile-ab.dts +1 -1
@@ -303,7 +303,7 @@ clock-names = "apb_pclk"; }; - ssp@101f4000 { + spi@101f4000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x101f4000 0x1000>; interrupts = <11>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/222 Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit a5c3021bb62b970713550db3f7fd08aa70665d7e ]
If the remote is not able to fully utilize the MPS choosen recalculate the credits based on the actual amount it is sending that way it can still send packets of MTU size without credits dropping to 0.
--- net/bluetooth/l2cap_core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/bluetooth/l2cap_core.c +10 -0
@@ -6811,6 +6811,16 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb) chan->sdu_len = sdu_len; chan->sdu_last_frag = skb; +/* Detect if remote is not able to use the selected MPS */ +if (skb->len +L2CAP_SDULEN_SIZE < chan->mps) { +u16 mps_len = skb->len +L2CAP_SDULEN_SIZE ; + +/* Adjust the number of credits */ +BT_DBG ("chan->mps %u -> %u" , chan->mps, mps_len); + chan->mps = mps_len; +l2cap_chan_le_send_credits (chan); + } +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/222 crypto: fix a memory leak in rsa-kcs1pads encryption mode
In reply to Greg Kroah-HartmanFrom: Dan Aloni <[email protected]>
[ Upstream commit 3944f139d5592790b70bc64f197162e643a8512b ]
The encryption mode of pkcs1pad never uses out_sg and out_buf, so there's no need to allocate the buffer, which presently is not even being freed.
--- crypto/rsa-pkcs1pad.c | 9 --------- 1 file changed, 9 deletions(-)
crypto/rsa-pkcs1pad.c +0 -9
@@ -267,15 +267,6 @@ static int pkcs1pad_encrypt(struct akcipher_request *req)pkcs1pad_sg_set_buf (req_ctx->in_sg, req_ctx->in_buf, ctx->key_size -1 - req->src_len, req->src); - req_ctx->out_buf =kmalloc (ctx->key_size,GFP_KERNEL ); -if (!req_ctx->out_buf) { -kfree (req_ctx->in_buf); -return -ENOMEM ; - } - -pkcs1pad_sg_set_buf (req_ctx->out_sg, req_ctx->out_buf, - ctx->key_size,NULL ); -akcipher_request_set_tfm (&req_ctx->child_req, ctx->child);akcipher_request_set_callback (&req_ctx->child_req, req->base.flags, pkcs1pad_encrypt_sign_complete_cb, req);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/222 scsi: NCR5380: Clear all unissued commands on host reset
In reply to Greg Kroah-HartmanFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 1aeeeed7f03c576f096eede7b0384f99a98f588c ]
When doing a host reset we should be clearing all outstanding commands, not just the command triggering the reset.
[mkp: adjusted Hannes' SoB address]
--- drivers/scsi/NCR5380.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/NCR5380.c +5 -2
@@ -2392,7 +2392,7 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)spin_lock_irqsave (&hostdata->lock, flags);#if (NDEBUG &NDEBUG_ANY ) -scmd_printk (KERN_INFO , cmd, __func__); +shost_printk (KERN_INFO , instance, __func__);#endif NCR5380_dprint (NDEBUG_ANY , instance);NCR5380_dprint_phase (NDEBUG_ANY , instance);
@@ -2410,10 +2410,13 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)* commands! */ -if (list_del_cmd (&hostdata->unissued, cmd)) { +list_for_each_entry (ncmd, &hostdata->unissued, list) { +struct scsi_cmnd *cmd =NCR5380_to_scmd (ncmd); + cmd->result =DID_RESET <<16 ; cmd->scsi_done (cmd); } +INIT_LIST_HEAD (&hostdata->unissued);if (hostdata->selecting) { hostdata->selecting->result =DID_RESET <<16 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/222 scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 070356513963be6196142acff56acc8359069fa1 ]
When sense data is valid, call set_driver_byte(cmd, DRIVER_SENSE). Otherwise some callers of scsi_execute() will ignore sense data. Don't set DID_ERROR or DID_RESET just because sense data is missing.
--- drivers/scsi/NCR5380.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/NCR5380.c +4 -5
@@ -617,11 +617,12 @@ static void complete_cmd(struct Scsi_Host *instance,if (hostdata->sensing == cmd) {/* Autosense processing ends here */ -if ((cmd->result &0xff ) !=SAM_STAT_GOOD ) { +if (status_byte (cmd->result) !=GOOD ) {scsi_eh_restore_cmnd (cmd, &hostdata->ses); -set_host_byte (cmd,DID_ERROR ); - }else + }else {scsi_eh_restore_cmnd (cmd, &hostdata->ses); +set_driver_byte (cmd,DRIVER_SENSE ); + } hostdata->sensing =NULL ; }
@@ -2356,7 +2357,6 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)if (list_del_cmd (&hostdata->autosense, cmd)) {dsprintk (NDEBUG_ABORT , instance,"abort: removed %p from sense queue\n" , cmd); -set_host_byte (cmd,DID_ERROR );complete_cmd (instance, cmd); }
@@ -2435,7 +2435,6 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)list_for_each_entry (ncmd, &hostdata->autosense, list) {struct scsi_cmnd *cmd =NCR5380_to_scmd (ncmd); -set_host_byte (cmd,DID_RESET ); cmd->scsi_done (cmd); }INIT_LIST_HEAD (&hostdata->autosense);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/222 coresight: etm4x: Configure EL2 exception level when kernel is running in HYP
In reply to Greg Kroah-HartmanFrom: Tomasz Nowicki <[email protected]>
[ Upstream commit b860801e3237ec4c74cf8de0be4816996757ae5c ]
For non-VHE systems host kernel runs at EL1 and jumps to EL2 whenever hypervisor code should be executed. In this case ETM4x driver must restrict configuration to EL1 when it setups kernel tracing. However, there is no separate hypervisor privilege level when VHE is enabled, the host kernel runs at EL2.
This patch fixes configuration of TRCACATRn register for VHE systems so that ETM_EXLEVEL_NS_HYP bit is used instead of ETM_EXLEVEL_NS_OS to on/off kernel tracing. At the same time, it moves common code to new helper.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x.c +20 -20
@@ -35,6 +35,7 @@#include <linux/pm_runtime.h> #include <asm/sections.h> #include <asm/local.h> +#include <asm/virt.h> #include "coresight-etm4x.h" #include "coresight-etm-perf.h"
@@ -615,7 +616,7 @@ static void etm4_set_default_config(struct etmv4_config *config) config->vinst_ctrl |=BIT (0 ); } -static u64 etm4_get_access_type (struct etmv4_config *config) +static u64 etm4_get_ns_access_type (struct etmv4_config *config) {u64 access_type =0 ;
@@ -626,17 +627,26 @@ static u64 etm4_get_access_type(struct etmv4_config *config)* Bit[13] Exception level 1 - OS * Bit[14] Exception level 2 - Hypervisor * Bit[15] Never implemented -* -* Always stay away from hypervisor mode. */ - access_type =ETM_EXLEVEL_NS_HYP ; - -if (config->mode &ETM_MODE_EXCL_KERN ) - access_type |=ETM_EXLEVEL_NS_OS ; +if (!is_kernel_in_hyp_mode ()) { +/* Stay away from hypervisor mode for non-VHE */ + access_type =ETM_EXLEVEL_NS_HYP ; +if (config->mode &ETM_MODE_EXCL_KERN ) + access_type |=ETM_EXLEVEL_NS_OS ; + }else if (config->mode &ETM_MODE_EXCL_KERN ) { + access_type =ETM_EXLEVEL_NS_HYP ; + }if (config->mode &ETM_MODE_EXCL_USER ) access_type |=ETM_EXLEVEL_NS_APP ; +return access_type; +} + +static u64 etm4_get_access_type (struct etmv4_config *config) +{ +u64 access_type =etm4_get_ns_access_type (config); +/* * EXLEVEL_S, bits[11:8], don't trace anything happening * in secure state.
@@ -890,20 +900,10 @@ void etm4_config_trace_mode(struct etmv4_config *config) addr_acc = config->addr_acc[ETM_DEFAULT_ADDR_COMP ];/* clear default config */ - addr_acc &= ~(ETM_EXLEVEL_NS_APP |ETM_EXLEVEL_NS_OS ); + addr_acc &= ~(ETM_EXLEVEL_NS_APP |ETM_EXLEVEL_NS_OS | +ETM_EXLEVEL_NS_HYP ); -/* -* EXLEVEL_NS, bits[15:12] -* The Exception levels are: -* Bit[12] Exception level 0 - Application -* Bit[13] Exception level 1 - OS -* Bit[14] Exception level 2 - Hypervisor -* Bit[15] Never implemented -*/ -if (mode &ETM_MODE_EXCL_KERN ) - addr_acc |=ETM_EXLEVEL_NS_OS ; -else - addr_acc |=ETM_EXLEVEL_NS_APP ; + addr_acc |=etm4_get_ns_access_type (config); config->addr_acc[ETM_DEFAULT_ADDR_COMP ] = addr_acc; config->addr_acc[ETM_DEFAULT_ADDR_COMP +1 ] = addr_acc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/222 scsi: NCR5380: Check for invalid reselection target
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 7ef55f6744c45e3d7c85a3f74ada39b67ac741dd ]
The X3T9.2 specification (draft) says, under "6.1.4.1 RESELECTION", that "the initiator shall not respond to a RESELECTION phase if other than two SCSI ID bits are on the DATA BUS." This issue (too many bits set) has been observed in the wild, so add a check.
--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/NCR5380.c +5 -0
@@ -2102,6 +2102,11 @@ static void NCR5380_reselect(struct Scsi_Host *instance)NCR5380_write (MODE_REG ,MR_BASE ); target_mask =NCR5380_read (CURRENT_SCSI_DATA_REG ) & ~(hostdata->id_mask); +if (!target_mask || target_mask & (target_mask -1 )) { +shost_printk (KERN_WARNING , instance, +"reselect: bad target_mask 0x%02x\n" , target_mask); +return ; + }dsprintk (NDEBUG_RESELECTION , instance,"reselect\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/222 scsi: NCR5380: Dont clear busy flag when abort fails
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit 45ddc1b24806cc8f1a09f23dd4e7b6e4a8ae36e1 ]
When NCR5380_abort() returns FAILED, the driver forgets that the target is still busy. Hence, further commands may be sent to the target, which may fail during selection and produce the error message, "reselection after won arbitration?". Prevent this by leaving the busy flag set when NCR5380_abort() fails.
--- drivers/scsi/NCR5380.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/NCR5380.c +10 -4
@@ -626,8 +626,6 @@ static void complete_cmd(struct Scsi_Host *instance, hostdata->sensing =NULL ; } - hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun); - cmd->scsi_done (cmd); }
@@ -1799,6 +1797,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) cmd->result =DID_ERROR <<16 ;complete_cmd (instance, cmd); hostdata->connected =NULL ; + hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun);return ;#endif case PHASE_DATAIN :
@@ -1881,6 +1880,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) cmd, scmd_id(cmd), cmd->device->lun); hostdata->connected =NULL ; + hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun); cmd->result &= ~0xffff ; cmd->result |= cmd->SCp.Status;
@@ -2040,6 +2040,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)NCR5380_transfer_pio (instance, &phase, &len, &data);if (msgout ==ABORT ) { hostdata->connected =NULL ; + hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun); cmd->result =DID_ERROR <<16 ;complete_cmd (instance, cmd);maybe_release_dma_irq (instance);
@@ -2194,13 +2195,16 @@ static void NCR5380_reselect(struct Scsi_Host *instance)dsprintk (NDEBUG_RESELECTION |NDEBUG_QUEUES , instance,"reselect: removed %p from disconnected queue\n" , tmp); }else { +int target =ffs (target_mask) -1 ; +shost_printk (KERN_ERR , instance,"target bitmask 0x%02x lun %d not in disconnected queue.\n" , target_mask, lun);/* * Since we have an established nexus that we can't do anything * with, we must abort it. */ -do_abort (instance); +if (do_abort (instance) ==0 ) + hostdata->busy[target] &= ~(1 << lun);return ; }
@@ -2368,8 +2372,10 @@ static int NCR5380_abort(struct scsi_cmnd *cmd) out:if (result ==FAILED )dsprintk (NDEBUG_ABORT , instance,"abort: failed to abort %p\n" , cmd); -else +else { + hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun);dsprintk (NDEBUG_ABORT , instance,"abort: successfully aborted %p\n" , cmd); + }queue_work (hostdata->work_q, &hostdata->main_task);maybe_release_dma_irq (instance);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/222 scsi: NCR5380: Handle BUS FREE during reselection
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
[ Upstream commit ca694afad707cb3ae2fdef3b28454444d9ac726e ]
The X3T9.2 specification (draft) says, under "6.1.4.2 RESELECTION time-out procedure", that a target may assert RST or go to BUS FREE phase if the initiator does not respond within 200 us. Something like this has been observed with AztecMonster II target. When it happens, all we can do is wait for the target to try again.
--- drivers/scsi/NCR5380.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/NCR5380.c +3 -0
@@ -2133,6 +2133,9 @@ static void NCR5380_reselect(struct Scsi_Host *instance)if (NCR5380_poll_politely (instance,STATUS_REG ,SR_REQ ,SR_REQ ,2 *HZ ) <0 ) { +if ((NCR5380_read (STATUS_REG ) & (SR_BSY |SR_SEL )) ==0 ) +/* BUS FREE phase */ +return ;shost_printk (KERN_ERR , instance,"reselect: REQ timeout\n" );do_abort (instance);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/222 ARM: dts: lpc32xx: Fix SPI controller node names
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 11236ef582b8d66290bb3b3710e03ca1d85d8ad8 ]
SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks.
--- arch/arm/boot/dts/lpc32xx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/lpc32xx.dtsi +2 -2
@@ -179,7 +179,7 @@ * ssp0 and spi1 are shared pins; * enable one in your board dts, as needed. */ - ssp0: ssp@20084000 { + ssp0: spi@20084000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x20084000 0x1000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
@@ -199,7 +199,7 @@ * ssp1 and spi2 are shared pins; * enable one in your board dts, as needed. */ - ssp1: ssp@2008c000 { + ssp1: spi@2008c000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x2008c000 0x1000>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/222 usb: xhci-mtk: fix ISOC error when interval is zero
In reply to Greg Kroah-HartmanFrom: Chunfeng Yun <[email protected]>
[ Upstream commit 87173acc0d8f0987bda8827da35fff67f52ad15d ]
If the interval equal zero, needn't round up to power of two for the number of packets in each ESIT, so fix it.
--- drivers/usb/host/xhci-mtk-sch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-mtk-sch.c +3 -1
@@ -122,7 +122,9 @@ static void setup_sch_info(struct usb_device *udev, }if (ep_type ==ISOC_IN_EP || ep_type ==ISOC_OUT_EP ) { -if (esit_pkts <= sch_ep->esit) +if (sch_ep->esit ==1 ) + sch_ep->pkts = esit_pkts; +else if (esit_pkts <= sch_ep->esit) sch_ep->pkts =1 ;else sch_ep->pkts =roundup_pow_of_two (esit_pkts)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/222 fuse: use READ_ONCE on congestion_threshold and max_background
In reply to Greg Kroah-HartmanFrom: Kirill Tkhai <[email protected]>
[ Upstream commit 2a23f2b8adbe4bd584f936f7ac17a99750eed9d7 ]
Since they are of unsigned int type, it's allowed to read them unlocked during reporting to userspace. Let's underline this fact with READ_ONCE() macroses.
--- fs/fuse/control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/fuse/control.c +2 -2
@@ -107,7 +107,7 @@ static ssize_t fuse_conn_max_background_read(struct file *file,if (!fc)return 0 ; - val = fc->max_background; + val =READ_ONCE (fc->max_background);fuse_conn_put (fc);return fuse_conn_limit_read (file, buf, len, ppos, val);
@@ -144,7 +144,7 @@ static ssize_t fuse_conn_congestion_threshold_read(struct file *file,if (!fc)return 0 ; - val = fc->congestion_threshold; + val =READ_ONCE (fc->congestion_threshold);fuse_conn_put (fc);return fuse_conn_limit_read (file, buf, len, ppos, val);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/222 coresight: tmc: Fix byte-address alignment for RRP
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit e7753f3937610633a540f2be81be87531f96ff04 ]
Quoted 1 line
From the comment in the code, it claims the requirement for byte-address
alignment for RRP register: 'for 32-bit, 64-bit and 128-bit wide trace memory, the four LSBs must be 0s. For 256-bit wide trace memory, the five LSBs must be 0s'. This isn't consistent with the program, the program sets five LSBs as zeros for 32/64/128-bit wide trace memory and set six LSBs zeros for 256-bit wide trace memory.
After checking with the CoreSight Trace Memory Controller technical reference manual (ARM DDI 0461B, section 3.3.4 RAM Read Pointer Register), it proves the comment is right and the program does wrong setting.
This patch fixes byte-address alignment for RRP by following correct definition in the technical reference manual.
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +2 -2
@@ -425,10 +425,10 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev,case TMC_MEM_INTF_WIDTH_32BITS :case TMC_MEM_INTF_WIDTH_64BITS :case TMC_MEM_INTF_WIDTH_128BITS : - mask =GENMASK (31 ,5 ); + mask =GENMASK (31 ,4 );break ;case TMC_MEM_INTF_WIDTH_256BITS : - mask =GENMASK (31 ,6 ); + mask =GENMASK (31 ,5 );break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/222 memfd: Use radix_tree_deref_slot_protected to avoid the warning.
In reply to Greg Kroah-HartmanFrom: zhong jiang <[email protected]>
The commit 3ce6b467b9b2 ("memfd: Fix locking when tagging pins") introduces the following warning messages.
*WARNING: suspicious RCU usage in memfd_wait_for_pins*
It is because we still use radix_tree_deref_slot without read_rcu_lock. We should use radix_tree_deref_slot_protected instead in the case.
--- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/shmem.c +1 -1
@@ -2464,7 +2464,7 @@ static void shmem_tag_pins(struct addresspin_lock_irq (&mapping->tree_lock);radix_tree_for_each_slot (slot, &mapping->page_tree, &iter, start) { - page =radix_tree_deref_slot (slot); + page =radix_tree_deref_slot_protected (slot, &mapping->tree_lock);if (!page ||radix_tree_exception (page)) {if (radix_tree_deref_retry (page)) { slot =radix_tree_iter_retry (&iter);
Greg Kroah-Hartman
maintainerPATCH 148/222 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit a56dcc6b455830776899ce3686735f1172e12243 upstream.
This code is supposed to test for negative error codes and partial reads, but because sizeof() is size_t (unsigned) type then negative error codes are type promoted to high positive values and the condition doesn't work as expected.
--- drivers/net/usb/cdc_ncm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/cdc_ncm.c +1 -1
@@ -577,7 +577,7 @@ static void cdc_ncm_set_dgram_size(struc err =usbnet_read_cmd (dev,USB_CDC_GET_MAX_DATAGRAM_SIZE ,USB_TYPE_CLASS |USB_DIR_IN |USB_RECIP_INTERFACE ,0 , iface_no, &max_datagram_size,sizeof (max_datagram_size)); -if (err <sizeof (max_datagram_size)) { +if (err !=sizeof (max_datagram_size)) {dev_dbg (&dev->intf->dev,"GET_MAX_DATAGRAM_SIZE failed\n" ); goto out; }
Greg Kroah-Hartman
maintainerPATCH 149/222 x86/atomic: Fix smp_mb__{before,after}_atomic()
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
commit 69d927bba39517d0980462efc051875b7f4db185 upstream.
Recent probing at the Linux Kernel Memory Model uncovered a 'surprise'. Strongly ordered architectures where the atomic RmW primitive implies full memory ordering and smp_mb__{before,after}_atomic() are a simple barrier() (such as x86) fail for:
*x = 1; atomic_inc(u); smp_mb__after_atomic(); r0 = *y;
Because, while the atomic_inc() implies memory order, it (surprisingly) does not provide a compiler barrier. This then allows the compiler to re-order like so:
atomic_inc(u); *x = 1; smp_mb__after_atomic(); r0 = *y;
Which the CPU is then allowed to re-order (under TSO rules) like:
atomic_inc(u); r0 = *y; *x = 1;
And this very much was not intended. Therefore strengthen the atomic RmW ops to include a compiler barrier.
NOTE: atomic_{or,and,xor} and the bitops already had the compiler barrier.
--- arch/x86/include/asm/atomic.h | 8 ++++---- arch/x86/include/asm/atomic64_64.h | 8 ++++---- arch/x86/include/asm/barrier.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/include/asm/atomic.h +4 -4
@@ -49,7 +49,7 @@ static __always_inline void atomic_add(i { asmvolatile (LOCK_PREFIX "addl %1,%0" :"+m" (v->counter) - :"ir" (i)); + :"ir" (i) :"memory" ); }/**
@@ -63,7 +63,7 @@ static __always_inline void atomic_sub(i { asmvolatile (LOCK_PREFIX "subl %1,%0" :"+m" (v->counter) - :"ir" (i)); + :"ir" (i) :"memory" ); }/**
@@ -89,7 +89,7 @@ static __always_inline bool atomic_sub_a static __always_inline void atomic_inc(atomic_t *v) { asmvolatile (LOCK_PREFIX "incl %0" - :"+m" (v->counter)); + :"+m" (v->counter) ::"memory" ); }/**
@@ -101,7 +101,7 @@ static __always_inline void atomic_inc(a static __always_inline void atomic_dec(atomic_t *v) { asmvolatile (LOCK_PREFIX "decl %0" - :"+m" (v->counter)); + :"+m" (v->counter) ::"memory" ); }/**
arch/x86/include/asm/atomic64_64.h +4 -4
@@ -44,7 +44,7 @@ static __always_inline void atomic64_add { asmvolatile (LOCK_PREFIX "addq %1,%0" :"=m" (v->counter) - :"er" (i),"m" (v->counter)); + :"er" (i),"m" (v->counter) :"memory" ); }/**
@@ -58,7 +58,7 @@ static inline void atomic64_sub(long i, { asmvolatile (LOCK_PREFIX "subq %1,%0" :"=m" (v->counter) - :"er" (i),"m" (v->counter)); + :"er" (i),"m" (v->counter) :"memory" ); }/**
@@ -85,7 +85,7 @@ static __always_inline void atomic64_inc { asmvolatile (LOCK_PREFIX "incq %0" :"=m" (v->counter) - :"m" (v->counter)); + :"m" (v->counter) :"memory" ); }/**
@@ -98,7 +98,7 @@ static __always_inline void atomic64_dec { asmvolatile (LOCK_PREFIX "decq %0" :"=m" (v->counter) - :"m" (v->counter)); + :"m" (v->counter) :"memory" ); }/**
arch/x86/include/asm/barrier.h +2 -2
@@ -105,8 +105,8 @@ do { \#endif /* Atomic operations are already serializing on x86 */ -#define __smp_mb__before_atomic () barrier() -#define __smp_mb__after_atomic () barrier() +#define __smp_mb__before_atomic () do { } while (0) +#define __smp_mb__after_atomic () do { } while (0)#include <asm-generic/barrier.h>
Greg Kroah-Hartman
maintainerPATCH 153/222 block: introduce blk_rq_is_passthrough
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit 57292b58ddb58689e8c3b4c6eadbef10d9ca44dd upstream.
This can be used to check for fs vs non-fs requests and basically removes all knowledge of BLOCK_PC specific from the block layer, as well as preparing for removing the cmd_type field in struct request.
[only take the blkdev.h changes as we only want the function for backported patches - gregkh]
--- include/linux/blkdev.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
include/linux/blkdev.h +7 -2
@@ -212,6 +212,11 @@ struct request { (req)->cmd_flags |= flags; \ }while (0 ) +static inline bool blk_rq_is_passthrough(struct request *rq) +{ +return rq->cmd_type !=REQ_TYPE_FS ; +} +static inline unsigned short req_get_ioprio (struct request *req) {return req->ioprio;
@@ -663,7 +668,7 @@ static inline void blk_clear_rl_full(strstatic inline bool rq_mergeable (struct request *rq) { -if (rq->cmd_type !=REQ_TYPE_FS ) +if (blk_rq_is_passthrough (rq))return false;if (req_op (rq) ==REQ_OP_FLUSH )
@@ -910,7 +915,7 @@ static inline unsigned int blk_rq_get_ma {struct request_queue *q = rq->q; -if (unlikely (rq->cmd_type !=REQ_TYPE_FS )) +if (blk_rq_is_passthrough (rq))return q->limits.max_hw_sectors; if (!q->limits.chunk_sectors ||
Greg Kroah-Hartman
maintainerPATCH 155/222 net: ovs: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit eddf11e18dff0e8671e06ce54e64cfc843303ab9 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- net/openvswitch/vport-internal_dev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/openvswitch/vport-internal_dev.c +3 -2
@@ -44,7 +44,8 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev) }/* Called with rcu_read_lock_bh. */ -static int internal_dev_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t +internal_dev_xmit (struct sk_buff *skb,struct net_device *netdev) {int len, err;
@@ -63,7 +64,7 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) }else { netdev->stats.tx_errors++; } -return 0 ; +return NETDEV_TX_OK ; }static int internal_dev_open (struct net_device *netdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/222 misc: kgdbts: Fix restrict error
In reply to Greg Kroah-HartmanFrom: Laura Abbott <[email protected]>
[ Upstream commit fa0218ef733e6f247a1a3986e3eb12460064ac77 ]
kgdbts current fails when compiled with restrict:
drivers/misc/kgdbts.c: In function ‘configure_kgdbts’:drivers/misc/kgdbts.c:1070:2: error: ‘strcpy’ source argument is the same as destination [-Werror=restrict]
strcpy(config, opt);
^~~~~~~~~~~~~~~~~~~
As the error says, config is being used in both the source and destination. Refactor the code to avoid the extra copy and put the parsing closer to the actual location.
--- drivers/misc/kgdbts.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/misc/kgdbts.c +6 -10
@@ -979,6 +979,12 @@ static void kgdbts_run_tests(void)int nmi_sleep =0 ;int i; + verbose =0 ; +if (strstr (config,"V1" )) + verbose =1 ; +if (strstr (config,"V2" )) + verbose =2 ; + ptr =strchr (config,'F' );if (ptr) fork_test =simple_strtol (ptr +1 ,NULL ,10 );
@@ -1062,13 +1068,6 @@ static int kgdbts_option_setup(char *opt)return -ENOSPC ; }strcpy (config, opt); - - verbose =0 ; -if (strstr (config,"V1" )) - verbose =1 ; -if (strstr (config,"V2" )) - verbose =2 ; -return 0 ; }
@@ -1080,9 +1079,6 @@ static int configure_kgdbts(void)if (!strlen (config) ||isspace (config[0 ])) goto noconfig; - err =kgdbts_option_setup (config); -if (err) - goto noconfig; final_ack =0 ;run_plant_and_detach_test (1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/222 net: xen-netback: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit a9ca7f17c6d240e269a24cbcd76abf9a940309dd ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/xen-netback/interface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/xen-netback/interface.c +2 -1
@@ -171,7 +171,8 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,return vif->hash.mapping[skb_get_hash_raw (skb) % size]; } -static int xenvif_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +xenvif_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct xenvif *vif =netdev_priv (dev);struct xenvif_queue *queue =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/222 ARM: dts: omap5: enable OTG role for DWC3 controller
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 656c1a65ab555ee5c7cd0d6aee8ab82ca3c1795f ]
Since SMPS10 and OTG cable detection extcon are described here, and work to enable OTG power when an OTG cable is plugged in, we can define OTG mode in the controller (which is disabled by default in omap5.dtsi).
Tested on OMAP5EVM and Pyra.
--- arch/arm/boot/dts/omap5-board-common.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/omap5-board-common.dtsi +4 -0
@@ -694,6 +694,10 @@ vbus-supply = <&smps10_out1_reg>; }; +&dwc3 { + dr_mode = "otg"; +}; + &mcspi1 { };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/222 f2fs: return correct errno in f2fs_gc
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 61f7725aa148ee870436a29d3a24d5c00ab7e9af ]
This fixes overriding error number in f2fs_gc.
--- fs/f2fs/gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/gc.c +1 -1
@@ -985,7 +985,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync)put_gc_inode (&gc_list); -if (sync) +if (sync && !ret) ret = sec_freed ?0 : -EAGAIN ;return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/222 SUNRPC: Fix priority queue fairness
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit f42f7c283078ce3c1e8368b140e270755b1ae313 ]
Fix up the priority queue to not batch by owner, but by queue, so that we allow '1 << priority' elements to be dequeued before switching to the next priority queue.
The owner field is still used to wake up requests in round robin order by owner to avoid single processes hogging the RPC layer by loading the queues.
--- include/linux/sunrpc/sched.h | 2 - net/sunrpc/sched.c | 109 +++++++++++++++++------------------ 2 files changed, 54 insertions(+), 57 deletions(-)
include/linux/sunrpc/sched.h +0 -2
@@ -185,7 +185,6 @@ struct rpc_timer {struct rpc_wait_queue {spinlock_t lock;struct list_head tasks[RPC_NR_PRIORITY ];/* task queue for each priority level */ -pid_t owner;/* process id of last task serviced */ unsigned char maxpriority;/* maximum priority (0 if queue is not a priority queue) */ unsigned char priority;/* current priority */ unsigned char nr;/* # tasks remaining for cookie */
@@ -201,7 +200,6 @@ struct rpc_wait_queue {* from a single cookie. The aim is to improve * performance of NFS operations such as read/write. */ -#define RPC_BATCH_COUNT 16#define RPC_IS_PRIORITY (q) ((q)->maxpriority > 0)/*
net/sunrpc/sched.c +54 -55
170 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/222 kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit d2db7773ba864df6b4e19643dfc54838550d8049 ]
So far we have only supported 3 level page table with fixed IPA of 40bits, where PUD is folded. With 4 level page tables, we need to check if the PUD entry is valid or not. Fix stage2_flush_memslot() to do this check, before walking down the table.
--- arch/arm/kvm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/kvm/mmu.c +2 -1
@@ -366,7 +366,8 @@ static void stage2_flush_memslot(struct kvm *kvm, pgd = kvm->arch.pgd +stage2_pgd_index (addr);do { next =stage2_pgd_addr_end (addr, end); -stage2_flush_puds (kvm, pgd, addr, next); +if (!stage2_pgd_none (*pgd)) +stage2_flush_puds (kvm, pgd, addr, next); }while (pgd++, addr = next, addr != end); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/222 arm64/numa: Report correct memblock range for the dummy node
In reply to Greg Kroah-HartmanFrom: Anshuman Khandual <[email protected]>
[ Upstream commit 77cfe950901e5c13aca2df6437a05f39dd9a929b ]
The dummy node ID is marked into all memory ranges on the system. So the dummy node really extends the entire memblock.memory. Hence report correct extent information for the dummy node using memblock range helper functions instead of the range [0LLU, PFN_PHYS(max_pfn) - 1)].
--- arch/arm64/mm/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/mm/numa.c +1 -1
@@ -424,7 +424,7 @@ static int __init dummy_numa_init(void)if (numa_off)pr_info ("NUMA disabled\n" );/* Forced off on command line. */ pr_info ("Faking a node at [mem %#018Lx-%#018Lx]\n" , -0LLU ,PFN_PHYS (max_pfn) -1 ); +memblock_start_of_DRAM (),memblock_end_of_DRAM () -1 );for_each_memblock (memory, mblk) { ret =numa_add_memblk (0 , mblk->base, mblk->base + mblk->size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/222 ath10k: fix vdev-start timeout on error
In reply to Greg Kroah-HartmanFrom: Ben Greear <[email protected]>
[ Upstream commit 833fd34d743c728afe6d127ef7bee67e7d9199a8 ]
The vdev-start-response message should cause the completion to fire, even in the error case. Otherwise, the user still gets no useful information and everything is blocked until the timeout period.
Add some warning text to print out the invalid status code to aid debugging, and propagate failure code.
--- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 19 ++++++++++++++++--- drivers/net/wireless/ath/ath10k/wmi.h | 8 +++++++- 4 files changed, 25 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +1 -0
@@ -811,6 +811,7 @@ struct ath10k {struct completion install_key_done; +int last_wmi_vdev_start_status;struct completion vdev_setup_done;struct workqueue_struct *workqueue;
drivers/net/wireless/ath/ath10k/mac.c +1 -1
@@ -947,7 +947,7 @@ static inline int ath10k_vdev_setup_sync(struct ath10k *ar)if (time_left ==0 )return -ETIMEDOUT ; -return 0 ; +return ar->last_wmi_vdev_start_status; }static int ath10k_monitor_vdev_start (struct ath10k *ar,int vdev_id)
drivers/net/wireless/ath/ath10k/wmi.c +16 -3
@@ -3103,18 +3103,31 @@ void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar, struct sk_buff *skb) {struct wmi_vdev_start_ev_arg arg = {};int ret; +u32 status;ath10k_dbg (ar,ATH10K_DBG_WMI ,"WMI_VDEV_START_RESP_EVENTID\n" ); + ar->last_wmi_vdev_start_status =0 ; + ret =ath10k_wmi_pull_vdev_start (ar, skb, &arg);if (ret) {ath10k_warn (ar,"failed to parse vdev start event: %d\n" , ret); -return ; + ar->last_wmi_vdev_start_status = ret; + goto out; } -if (WARN_ON (__le32_to_cpu (arg.status))) -return ; + status =__le32_to_cpu (arg.status); +if (WARN_ON_ONCE (status)) { +ath10k_warn (ar,"vdev-start-response reports status error: %d (%s)\n" , + status, (status ==WMI_VDEV_START_CHAN_INVALID ) ? +"chan-invalid" :"unknown" ); +/* Setup is done one way or another though, so we should still +* do the completion, so don't return here. +*/ + ar->last_wmi_vdev_start_status = -EINVAL ; + } +out:complete (&ar->vdev_setup_done); }
drivers/net/wireless/ath/ath10k/wmi.h +7 -1
@@ -6248,11 +6248,17 @@ struct wmi_ch_info_ev_arg {__le32 rx_frame_count; }; +/* From 10.4 firmware, not sure all have the same values. */ +enum wmi_vdev_start_status { +WMI_VDEV_START_OK =0 , +WMI_VDEV_START_CHAN_INVALID , +}; +struct wmi_vdev_start_ev_arg {__le32 vdev_id;__le32 req_id;__le32 resp_type;/* %WMI_VDEV_RESP_ */ -__le32 status; +__le32 status;/* See wmi_vdev_start_status enum above */ };struct wmi_peer_kick_ev_arg {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/222 vfio/pci: Fix potential memory leak in vfio_msi_cap_len
In reply to Greg Kroah-HartmanFrom: Li Qiang <[email protected]>
[ Upstream commit 30ea32ab1951c80c6113f300fce2c70cd12659e4 ]
Free allocated vdev->msi_perm in error path.
--- drivers/vfio/pci/vfio_pci_config.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_config.c +3 -1
@@ -1182,8 +1182,10 @@ static int vfio_msi_cap_len(struct vfio_pci_device *vdev, u8 pos)return -ENOMEM ; ret =init_pci_cap_msi_perm (vdev->msi_perm, len, flags); -if (ret) +if (ret) { +kfree (vdev->msi_perm);return ret; + }return len; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/222 vfio/pci: Mask buggy SR-IOV VF INTx support
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
[ Upstream commit db04264fe9bc0f2b62e036629f9afb530324b693 ]
The SR-IOV spec requires that VFs must report zero for the INTx pin register as VFs are precluded from INTx support. It's much easier for the host kernel to understand whether a device is a VF and therefore whether a non-zero pin register value is bogus than it is to do the same in userspace. Override the INTx count for such devices and virtualize the pin register to provide a consistent view of the device to the user.
As this is clearly a spec violation, warn about it to support hardware validation, but also provide a known whitelist as it doesn't do much good to continue complaining if the hardware vendor doesn't plan to fix it.
Known devices with this issue: 8086:270c
--- drivers/vfio/pci/vfio_pci.c | 8 ++++++-- drivers/vfio/pci/vfio_pci_config.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-)
drivers/vfio/pci/vfio_pci.c +6 -2
@@ -426,10 +426,14 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type) {if (irq_type ==VFIO_PCI_INTX_IRQ_INDEX ) {u8 pin; + +if (!IS_ENABLED (CONFIG_VFIO_PCI_INTX ) || + vdev->nointx || vdev->pdev->is_virtfn) +return 0 ; +pci_read_config_byte (vdev->pdev,PCI_INTERRUPT_PIN , &pin); -if (IS_ENABLED (CONFIG_VFIO_PCI_INTX ) && !vdev->nointx && pin) -return 1 ; +return pin ?1 :0 ; }else if (irq_type ==VFIO_PCI_MSI_IRQ_INDEX ) {u8 pos;u16 flags;
drivers/vfio/pci/vfio_pci_config.c +27 -0
@@ -1608,6 +1608,15 @@ static int vfio_ecap_init(struct vfio_pci_device *vdev)return 0 ; } +/* +* Nag about hardware bugs, hopefully to have vendors fix them, but at least +* to collect a list of dependencies for the VF INTx pin quirk below. +*/ +static const struct pci_device_id known_bogus_vf_intx_pin[] = { + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x270c ) }, + {} +}; +/* * For each device we allocate a pci_config_map that indicates the * capability occupying each dword and thus the struct perm_bits we
@@ -1673,6 +1682,24 @@ int vfio_config_init(struct vfio_pci_device *vdev)if (pdev->is_virtfn) { *(__le16 *)&vconfig[PCI_VENDOR_ID ] =cpu_to_le16 (pdev->vendor); *(__le16 *)&vconfig[PCI_DEVICE_ID ] =cpu_to_le16 (pdev->device); + +/* +* Per SR-IOV spec rev 1.1, 3.4.1.18 the interrupt pin register +* does not apply to VFs and VFs must implement this register +* as read-only with value zero. Userspace is not readily able +* to identify whether a device is a VF and thus that the pin +* definition on the device is bogus should it violate this +* requirement. We already virtualize the pin register for +* other purposes, so we simply need to replace the bogus value +* and consider VFs when we determine INTx IRQ count. +*/ +if (vconfig[PCI_INTERRUPT_PIN ] && + !pci_match_id (known_bogus_vf_intx_pin, pdev)) +pci_warn (pdev, +"Hardware bug: VF reports bogus INTx pin %d\n" , + vconfig[PCI_INTERRUPT_PIN ]); + + vconfig[PCI_INTERRUPT_PIN ] =0 ;/* Gratuitous for good VFs */ }if (!IS_ENABLED (CONFIG_VFIO_PCI_INTX ) || vdev->nointx)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/222 scsi: libsas: always unregister the old device if going to discover new
In reply to Greg Kroah-HartmanFrom: Jason Yan <[email protected]>
[ Upstream commit 32c850bf587f993b2620b91e5af8a64a7813f504 ]
If we went into sas_rediscover_dev() the attached_sas_addr was already insured not to be zero. So it's unnecessary to check if the attached_sas_addr is zero.
And although if the sas address is not changed, we always have to unregister the old device when we are going to register a new one. We cannot just leave the device there and bring up the new.
--- drivers/scsi/libsas/sas_expander.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/scsi/libsas/sas_expander.c +5 -8
@@ -2049,14 +2049,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)return res; } -/* delete the old link */ -if (SAS_ADDR (phy->attached_sas_addr) && -SAS_ADDR (sas_addr) !=SAS_ADDR (phy->attached_sas_addr)) { -SAS_DPRINTK ("ex %016llx phy 0x%x replace %016llx\n" , -SAS_ADDR (dev->sas_addr), phy_id, -SAS_ADDR (phy->attached_sas_addr)); -sas_unregister_devs_sas_addr (dev, phy_id, last); - } +/* we always have to delete the old device when we went here */ +SAS_DPRINTK ("ex %016llx phy 0x%x replace %016llx\n" , +SAS_ADDR (dev->sas_addr), phy_id, +SAS_ADDR (phy->attached_sas_addr)); +sas_unregister_devs_sas_addr (dev, phy_id, last);return sas_discover_new (dev, phy_id); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/222 ARM: dts: tegra30: fix xcvr-setup-use-fuses
In reply to Greg Kroah-HartmanFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit 564706f65cda3de52b09e51feb423a43940fe661 ]
There was a dot instead of a comma. Fix this.
--- arch/arm/boot/dts/tegra30.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra30.dtsi +3 -3
@@ -823,7 +823,7 @@ nvidia,elastic-limit = <16>; nvidia,term-range-adj = <6>; nvidia,xcvr-setup = <51>; - nvidia.xcvr-setup-use-fuses; + nvidia,xcvr-setup-use-fuses; nvidia,xcvr-lsfslew = <1>; nvidia,xcvr-lsrslew = <1>; nvidia,xcvr-hsslew = <32>;
@@ -860,7 +860,7 @@ nvidia,elastic-limit = <16>; nvidia,term-range-adj = <6>; nvidia,xcvr-setup = <51>; - nvidia.xcvr-setup-use-fuses; + nvidia,xcvr-setup-use-fuses; nvidia,xcvr-lsfslew = <2>; nvidia,xcvr-lsrslew = <2>; nvidia,xcvr-hsslew = <32>;
@@ -896,7 +896,7 @@ nvidia,elastic-limit = <16>; nvidia,term-range-adj = <6>; nvidia,xcvr-setup = <51>; - nvidia.xcvr-setup-use-fuses; + nvidia,xcvr-setup-use-fuses; nvidia,xcvr-lsfslew = <2>; nvidia,xcvr-lsrslew = <2>; nvidia,xcvr-hsslew = <32>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/222 usb: gadget: uvc: Only halt video streaming endpoint in bulk mode
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 8dbf9c7abefd5c1434a956d5c6b25e11183061a3 ]
When USB requests for video data fail to be submitted, the driver signals a problem to the host by halting the video streaming endpoint. This is only valid in bulk mode, as isochronous transfers have no handshake phase and can't thus report a stall. The usb_ep_set_halt() call returns an error when using isochronous endpoints, which we happily ignore, but some UDCs complain in the kernel log. Fix this by only trying to halt the endpoint in bulk mode.
--- drivers/usb/gadget/function/uvc_video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/uvc_video.c +3 -1
@@ -136,7 +136,9 @@ static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req) ret =usb_ep_queue (video->ep, req,GFP_ATOMIC );if (ret <0 ) {printk (KERN_INFO "Failed to queue request (%d).\n" , ret); -usb_ep_set_halt (video->ep); +/* Isochronous endpoints can't be halted. */ +if (usb_endpoint_xfer_bulk (video->ep->desc)) +usb_ep_set_halt (video->ep); }return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/222 ath9k: fix reporting calculated new FFT upper max
In reply to Greg Kroah-HartmanFrom: Simon Wunderlich <[email protected]>
[ Upstream commit 4fb5837ac2bd46a85620b297002c704e9958f64d ]
Since the debug print code is outside of the loop, it shouldn't use the loop iterator anymore but instead print the found maximum index.
--- drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/common-spectral.c +1 -1
@@ -411,7 +411,7 @@ ath_cmn_process_ht20_40_fft(struct ath_rx_status *rs,ath_dbg (common,SPECTRAL_SCAN ,"Calculated new upper max 0x%X at %i\n" , - tmp_mag, i); + tmp_mag, fft_sample_40.upper_max_index); }else for (i = dc_pos; i <SPECTRAL_HT20_40_NUM_BINS ; i++) {if (fft_sample_40.data[i] == (upper_mag >> max_exp))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/222 powerpc/pseries: Fix how we iterate over the DTL entries
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 9258227e9dd1da8feddb07ad9702845546a581c9 ]
When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set, we look up dtl_idx in the lppaca to determine the number of entries in the buffer. Since lppaca is in big endian, we need to do an endian conversion before using this in our calculation to determine the number of entries in the buffer. Without this, we do not iterate over the existing entries in the DTL buffer properly.
--- arch/powerpc/platforms/pseries/dtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/dtl.c +1 -1
@@ -185,7 +185,7 @@ static void dtl_stop(struct dtl *dtl)static u64 dtl_current_index (struct dtl *dtl) { -return lppaca_of (dtl->cpu).dtl_idx; +return be64_to_cpu (lppaca_of (dtl->cpu).dtl_idx); }#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/222 mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e2bfa4ca23d9b5a7bdfcf21319fad9b59e38a05c ]
Clang warns when one enumerated type is converted implicitly to another:
drivers/mtd/nand/raw/sh_flctl.c:483:46: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~drivers/mtd/nand/raw/sh_flctl.c:542:46: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
2 warnings generated.
Use the proper enums from dma_data_direction to satisfy Clang.
DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2
--- drivers/mtd/nand/sh_flctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/sh_flctl.c +2 -2
@@ -480,7 +480,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset)/* initiate DMA transfer */ if (flctl->chan_fifo0_rx && rlen >=32 && -flctl_dma_fifo0_transfer (flctl, buf, rlen,DMA_DEV_TO_MEM ) >0 ) +flctl_dma_fifo0_transfer (flctl, buf, rlen,DMA_FROM_DEVICE ) >0 ) goto convert;/* DMA success */ /* do polling transfer */
@@ -539,7 +539,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen,/* initiate DMA transfer */ if (flctl->chan_fifo0_tx && rlen >=32 && -flctl_dma_fifo0_transfer (flctl, buf, rlen,DMA_MEM_TO_DEV ) >0 ) +flctl_dma_fifo0_transfer (flctl, buf, rlen,DMA_TO_DEVICE ) >0 )return ;/* DMA success */ /* do polling transfer */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/222 ixgbe: Fix crash with VFs and flow director on interface flap
In reply to Greg Kroah-HartmanFrom: Radoslaw Tyl <[email protected]>
[ Upstream commit 5d826d209164b0752c883607be4cdbbcf7cab494 ]
This patch fix crash when we have restore flow director filters after reset adapter. In ixgbe_fdir_filter_restore() filter->action is outside of the rx_ring array, as it has a VF identifier in the upper 32 bits.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8 -2
@@ -4804,6 +4804,7 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;struct hlist_node *node2;struct ixgbe_fdir_filter *filter; +u64 action;spin_lock (&adapter->fdir_perfect_lock);
@@ -4812,12 +4813,17 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)hlist_for_each_entry_safe (filter, node2, &adapter->fdir_filter_list, fdir_node) { + action = filter->action; +if (action !=IXGBE_FDIR_DROP_QUEUE && action !=0 ) + action = + (action >>ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF ) -1 ; +ixgbe_fdir_write_perfect_filter_82599 (hw, &filter->filter, filter->sw_idx, - (filter->action ==IXGBE_FDIR_DROP_QUEUE ) ? + (action ==IXGBE_FDIR_DROP_QUEUE ) ?IXGBE_FDIR_DROP_QUEUE : - adapter->rx_ring[filter->action]->reg_idx); + adapter->rx_ring[action]->reg_idx); }spin_unlock (&adapter->fdir_perfect_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/222 IB/mthca: Fix error return code in __mthca_init_one()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit 39f2495618c5e980d2873ea3f2d1877dd253e07a ]
Fix to return a negative error code from the mthca_cmd_init() error handling case instead of 0, as done elsewhere in this function.
--- drivers/infiniband/hw/mthca/mthca_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mthca/mthca_main.c +2 -1
@@ -989,7 +989,8 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type) goto err_free_dev; } -if (mthca_cmd_init (mdev)) { + err =mthca_cmd_init (mdev); +if (err) {mthca_err (mdev,"Failed to init command interface, aborting.\n" ); goto err_free_dev; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/222 IB/mlx4: Avoid implicit enumerated type conversion
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b56511c15713ba6c7572e77a41f7ddba9c1053ec ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/infiniband/hw/mlx4/mad.c:1811:41: warning: implicit conversion from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration type 'enum ib_qp_create_flags' [-Wenum-conversion]
qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_TUNNEL_QP;
~ ^~~~~~~~~~~~~~~~~~~~~~~drivers/infiniband/hw/mlx4/mad.c:1819:41: warning: implicit conversion from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration type 'enum ib_qp_create_flags' [-Wenum-conversion]
qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_SQP;
~ ^~~~~~~~~~~~~~~~~The type mlx4_ib_qp_flags explicitly provides supplemental values to the type ib_qp_create_flags. Make that clear to Clang by changing the create_flags type to u32.
--- include/rdma/ib_verbs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/rdma/ib_verbs.h +1 -1
@@ -1026,7 +1026,7 @@ struct ib_qp_init_attr {struct ib_qp_cap cap;enum ib_sig_type sq_sig_type;enum ib_qp_type qp_type; -enum ib_qp_create_flags create_flags; +u32 create_flags;/* * Only needed for special QP types, or when using the RW API.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/222 ACPICA: Never run _REG on system_memory and system_IO
In reply to Greg Kroah-HartmanFrom: Bob Moore <[email protected]>
[ Upstream commit 8b1cafdcb4b75c5027c52f1e82b47ebe727ad7ed ]
These address spaces are defined by the ACPI spec to be "always available", and thus _REG should never be run on them. Provides compatibility with other ACPI implementations.
--- drivers/acpi/acpica/acevents.h | 2 ++ drivers/acpi/acpica/aclocal.h | 2 +- drivers/acpi/acpica/evregion.c | 17 +++++++++++++++-- drivers/acpi/acpica/evrgnini.c | 6 +----- drivers/acpi/acpica/evxfregn.c | 1 - 5 files changed, 19 insertions(+), 9 deletions(-)
drivers/acpi/acpica/acevents.h +2 -0
@@ -247,6 +247,8 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj, u8 acpi_ns_locked); +u8 acpi_ev_is_pci_root_bridge (struct acpi_namespace_node *node); +/* * evsci - SCI (System Control Interrupt) handling/dispatch */
drivers/acpi/acpica/aclocal.h +1 -1
@@ -428,9 +428,9 @@ struct acpi_simple_repair_info {/* Info for running the _REG methods */ struct acpi_reg_walk_info { -acpi_adr_space_type space_id;u32 function;u32 reg_run_count; +acpi_adr_space_type space_id; };/*****************************************************************************
drivers/acpi/acpica/evregion.c +15 -2
@@ -677,6 +677,19 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,ACPI_FUNCTION_TRACE (ev_execute_reg_methods); +/* +* These address spaces do not need a call to _REG, since the ACPI +* specification defines them as: "must always be accessible". Since +* they never change state (never become unavailable), no need to ever +* call _REG on them. Also, a data_table is not a "real" address space, +* so do not call _REG. September 2018. +*/ +if ((space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) || + (space_id ==ACPI_ADR_SPACE_SYSTEM_IO ) || + (space_id ==ACPI_ADR_SPACE_DATA_TABLE )) { + return_VOID; + } + info.space_id = space_id; info.function = function; info.reg_run_count =0 ;
@@ -738,8 +751,8 @@ acpi_ev_reg_run(acpi_handle obj_handle, }/* -* We only care about regions.and objects that are allowed to have address -* space handlers +* We only care about regions and objects that are allowed to have +* address space handlers */ if ((node->type !=ACPI_TYPE_REGION ) && (node != acpi_gbl_root_node)) {return (AE_OK );
drivers/acpi/acpica/evrgnini.c +1 -5
@@ -50,9 +50,6 @@#define _COMPONENT ACPI_EVENTSACPI_MODULE_NAME ("evrgnini" ) -/* Local prototypes */ -static u8 acpi_ev_is_pci_root_bridge (struct acpi_namespace_node *node); -/******************************************************************************* * * FUNCTION: acpi_ev_system_memory_region_setup
@@ -67,7 +64,6 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node);* DESCRIPTION: Setup a system_memory operation region * ******************************************************************************/ - acpi_status acpi_ev_system_memory_region_setup(acpi_handle handle, u32 function,
@@ -347,7 +343,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,* ******************************************************************************/ -static u8 acpi_ev_is_pci_root_bridge (struct acpi_namespace_node *node) +u8 acpi_ev_is_pci_root_bridge (struct acpi_namespace_node *node) {acpi_status status;struct acpi_pnp_device_id *hid;
drivers/acpi/acpica/evxfregn.c +0 -1
@@ -227,7 +227,6 @@ acpi_remove_address_space_handler(acpi_handle device,*/ region_obj = handler_obj->address_space.region_list; - }/* Remove this Handler object from the list */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/222 media: pxa_camera: Fix check for pdev->dev.of_node
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 44d7f1a77d8c84f8e42789b5475b74ae0e6d4758 ]
Clang warns that the address of a pointer will always evaluated as true in a boolean context.
drivers/media/platform/pxa_camera.c:2400:17: warning: address of 'pdev->dev.of_node' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (&pdev->dev.of_node && !pcdev->pdata) {
~~~~~~~~~~^~~~~~~ ~~1 warning generated.
Judging from the rest of the kernel, it seems like this was an error and just the value of of_node should be checked rather than the address.
--- drivers/media/platform/pxa_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/pxa_camera.c +1 -1
@@ -2334,7 +2334,7 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->res = res; pcdev->pdata = pdev->dev.platform_data; -if (&pdev->dev.of_node && !pcdev->pdata) { +if (pdev->dev.of_node && !pcdev->pdata) { err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev, &pcdev->asd); }else { pcdev->platform_flags = pcdev->pdata->flags;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/222 ata: ep93xx: Use proper enums for directions
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 6adde4a36f1b6a562a1057fbb1065007851050e7 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/ata/pata_ep93xx.c:662:36: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
drv_data->dma_rx_data.direction = DMA_FROM_DEVICE;
~ ^~~~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:670:36: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
drv_data->dma_tx_data.direction = DMA_TO_DEVICE;
~ ^~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:681:19: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
conf.direction = DMA_FROM_DEVICE;
~ ^~~~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:692:19: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
conf.direction = DMA_TO_DEVICE;
~ ^~~~~~~~~~~~~Use the equivalent valued enums from the expected type so that Clang no longer warns about a conversion.
DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2
--- drivers/ata/pata_ep93xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/ata/pata_ep93xx.c +4 -4
@@ -659,7 +659,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data)* start of new transfer. */ drv_data->dma_rx_data.port =EP93XX_DMA_IDE ; - drv_data->dma_rx_data.direction =DMA_FROM_DEVICE ; + drv_data->dma_rx_data.direction =DMA_DEV_TO_MEM ; drv_data->dma_rx_data.name ="ep93xx-pata-rx" ; drv_data->dma_rx_channel =dma_request_channel (mask, ep93xx_pata_dma_filter, &drv_data->dma_rx_data);
@@ -667,7 +667,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data)return ; drv_data->dma_tx_data.port =EP93XX_DMA_IDE ; - drv_data->dma_tx_data.direction =DMA_TO_DEVICE ; + drv_data->dma_tx_data.direction =DMA_MEM_TO_DEV ; drv_data->dma_tx_data.name ="ep93xx-pata-tx" ; drv_data->dma_tx_channel =dma_request_channel (mask, ep93xx_pata_dma_filter, &drv_data->dma_tx_data);
@@ -678,7 +678,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data)/* Configure receive channel direction and source address */ memset (&conf,0 ,sizeof (conf)); - conf.direction =DMA_FROM_DEVICE ; + conf.direction =DMA_DEV_TO_MEM ; conf.src_addr = drv_data->udma_in_phys; conf.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ;if (dmaengine_slave_config (drv_data->dma_rx_channel, &conf)) {
@@ -689,7 +689,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data)/* Configure transmit channel direction and destination address */ memset (&conf,0 ,sizeof (conf)); - conf.direction =DMA_TO_DEVICE ; + conf.direction =DMA_MEM_TO_DEV ; conf.dst_addr = drv_data->udma_out_phys; conf.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ;if (dmaengine_slave_config (drv_data->dma_tx_channel, &conf)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/222 ALSA: hda/sigmatel - Disable automute for Elo VuPoint
In reply to Greg Kroah-HartmanFrom: Michael Pobega <[email protected]>
[ Upstream commit d153135e93a50cdb6f1b52e238909e9965b56056 ]
The Elo VuPoint 15MX has two headphone jacks of which neither work by default. Disabling automute allows ALSA to work normally with the speakers & left headphone jack.
Future pin configuration changes may be required in the future to get the right headphone jack working in tandem.
--- sound/pci/hda/patch_sigmatel.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
sound/pci/hda/patch_sigmatel.c +20 -0
@@ -77,6 +77,7 @@ enum {STAC_DELL_M6_BOTH ,STAC_DELL_EQ ,STAC_ALIENWARE_M17X , +STAC_ELO_VUPOINT_15MX ,STAC_92HD89XX_HP_FRONT_JACK ,STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK , STAC_92HD73XX_ASUS_MOBO,
@@ -1875,6 +1876,18 @@ static void stac92hd73xx_fixup_no_jd(struct hda_codec *codec, codec->no_jack_detect =1 ; } + +static void stac92hd73xx_disable_automute (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct sigmatel_spec *spec = codec->spec; + +if (action !=HDA_FIXUP_ACT_PRE_PROBE ) +return ; + + spec->gen.suppress_auto_mute =1 ; +} +static const struct hda_fixup stac92hd73xx_fixups[] = { [STAC_92HD73XX_REF ] = { .type =HDA_FIXUP_FUNC ,
@@ -1900,6 +1913,10 @@ static const struct hda_fixup stac92hd73xx_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = stac92hd73xx_fixup_alienware_m17x, }, + [STAC_ELO_VUPOINT_15MX] = { + .type = HDA_FIXUP_FUNC, + .v.func = stac92hd73xx_disable_automute, + }, [STAC_92HD73XX_INTEL] = { .type = HDA_FIXUP_PINS, .v.pins = intel_dg45id_pin_configs,
@@ -1938,6 +1955,7 @@ static const struct hda_model_fixup stac92hd73xx_models[] = { { .id = STAC_DELL_M6_BOTH, .name = "dell-m6" }, { .id = STAC_DELL_EQ, .name = "dell-eq" }, { .id = STAC_ALIENWARE_M17X, .name = "alienware" }, + { .id = STAC_ELO_VUPOINT_15MX, .name = "elo-vupoint-15mx" }, { .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" }, {} };
@@ -1987,6 +2005,8 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { "Alienware M17x", STAC_ALIENWARE_M17X),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0490 ,"Alienware M17x R3" ,STAC_DELL_EQ ), +SND_PCI_QUIRK (0x1059 ,0x1011 , +"ELO VuPoint 15MX" ,STAC_ELO_VUPOINT_15MX ),SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x1927 ,"HP Z1 G2" ,STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK ), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/222 usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 2337a77c1cc86bc4e504ecf3799f947659c86026 ]
The driver may sleep in an interrupt handler.
The function call path (from bottom to top) in Linux-4.17 is:
[FUNC] fotg210_ep_queue(GFP_KERNEL)drivers/usb/gadget/udc/fotg210-udc.c, 744:
fotg210_ep_queue in fotg210_get_status
drivers/usb/gadget/udc/fotg210-udc.c, 768:
fotg210_get_status in fotg210_setup_packetdrivers/usb/gadget/udc/fotg210-udc.c, 949:
fotg210_setup_packet in fotg210_irq (interrupt handler)
To fix this bug, GFP_KERNEL is replaced with GFP_ATOMIC. If possible, spin_unlock() and spin_lock() around fotg210_ep_queue() can be also removed.
This bug is found by my static analysis tool DSAC.
--- drivers/usb/gadget/udc/fotg210-udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/udc/fotg210-udc.c +1 -1
@@ -744,7 +744,7 @@ static void fotg210_get_status(struct fotg210_udc *fotg210, fotg210->ep0_req->length =2 ;spin_unlock (&fotg210->lock); -fotg210_ep_queue (fotg210->gadget.ep0, fotg210->ep0_req,GFP_KERNEL ); +fotg210_ep_queue (fotg210->gadget.ep0, fotg210->ep0_req,GFP_ATOMIC );spin_lock (&fotg210->lock); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/222 USB: serial: cypress_m8: fix interrupt-out transfer length
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 56445eef55cb5904096fed7a73cf87b755dfffc7 ]
Fix interrupt-out transfer length which was being set to the transfer-buffer length rather than the size of the outgoing packet.
Note that no slab data was leaked as the whole transfer buffer is always cleared before each transfer.
--- drivers/usb/serial/cypress_m8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/cypress_m8.c +1 -1
@@ -773,7 +773,7 @@ static void cypress_send(struct usb_serial_port *port)usb_fill_int_urb (port->interrupt_out_urb, port->serial->dev,usb_sndintpipe (port->serial->dev, port->interrupt_out_endpointAddress), - port->interrupt_out_buffer, port->interrupt_out_size, + port->interrupt_out_buffer, actual_size, cypress_write_int_callback, port, priv->write_urb_interval); result =usb_submit_urb (port->interrupt_out_urb,GFP_ATOMIC );if (result) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/222 cpu/SMT: State SMT is disabled even with nosmt and without "=force"
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit d0e7d14455d41163126afecd0fcce935463cc512 ]
When booting with "nosmt=force" a message is issued into dmesg to confirm that SMT has been force-disabled but such a message is not issued when only "nosmt" is on the kernel command line.
Fix that.
--- kernel/cpu.c | 1 + 1 file changed, 1 insertion(+)
kernel/cpu.c +1 -0
@@ -379,6 +379,7 @@ void __init cpu_smt_disable(bool force)pr_info ("SMT: Force disabled\n" ); cpu_smt_control =CPU_SMT_FORCE_DISABLED ; }else { +pr_info ("SMT: disabled\n" ); cpu_smt_control =CPU_SMT_DISABLED ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/222 mtd: physmap_of: Release resources on error
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit ef0de747f7ad179c7698a5b0e28db05f18ecbf57 ]
During probe, if there was an error the memory region and the memory map were not properly released.This can lead a system unusable if deferred probe is in use.
Replace mem_request and map with devm_ioremap_resource
--- drivers/mtd/maps/physmap_of.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -22
@@ -29,7 +29,6 @@struct of_flash_list {struct mtd_info *mtd;struct map_info map; -struct resource *res; };struct of_flash {
@@ -54,18 +53,10 @@ static int of_flash_remove(struct platform_device *dev)mtd_concat_destroy (info->cmtd); } -for (i =0 ; i < info->list_size; i++) { +for (i =0 ; i < info->list_size; i++)if (info->list[i].mtd)map_destroy (info->list[i].mtd); -if (info->list[i].map.virt) -iounmap (info->list[i].map.virt); - -if (info->list[i].res) { -release_resource (info->list[i].res); -kfree (info->list[i].res); - } - }return 0 ; }
@@ -223,10 +214,11 @@ static int of_flash_probe(struct platform_device *dev) err = -EBUSY ; res_size =resource_size (&res); - info->list[i].res =request_mem_region (res.start, res_size, -dev_name (&dev->dev)); -if (!info->list[i].res) + info->list[i].map.virt =devm_ioremap_resource (&dev->dev, &res); +if (IS_ERR (info->list[i].map.virt)) { + err =PTR_ERR (info->list[i].map.virt); goto err_out; + } err = -ENXIO ; width =of_get_property (dp,"bank-width" ,NULL );
@@ -247,15 +239,6 @@ static int of_flash_probe(struct platform_device *dev)return err; } - err = -ENOMEM ; - info->list[i].map.virt =ioremap (info->list[i].map.phys, - info->list[i].map.size); -if (!info->list[i].map.virt) { -dev_err (&dev->dev,"Failed to ioremap() flash" -" region\n" ); - goto err_out; - } -simple_map_init (&info->list[i].map);/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/222 brcmfmac: reduce timeout for action frame scan
In reply to Greg Kroah-HartmanFrom: Chung-Hsien Hsu <[email protected]>
[ Upstream commit edb6d6885bef82d1eac432dbeca9fbf4ec349d7e ]
Finding a common channel to send an action frame out is required for some action types. Since a loop with several scan retry is used to find the channel, a short wait time could be considered for each attempt. This patch reduces the wait time from 1500 to 450 msec for each action frame scan.
This patch fixes the WFA p2p certification 5.1.20 failure caused by the long action frame send time.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +4 -5
@@ -74,7 +74,7 @@#define P2P_AF_MAX_WAIT_TIME msecs_to_jiffies(2000)#define P2P_INVALID_CHANNEL -1#define P2P_CHANNEL_SYNC_RETRY 5 -#define P2P_AF_FRM_SCAN_MAX_WAIT msecs_to_jiffies(1500) +#define P2P_AF_FRM_SCAN_MAX_WAIT msecs_to_jiffies(450)#define P2P_DEFAULT_SLEEP_TIME_VSDB 200/* WiFi P2P Public Action Frame OUI Subtypes */
@@ -1139,7 +1139,6 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) {struct afx_hdl *afx_hdl = &p2p->afx_hdl;struct brcmf_cfg80211_vif *pri_vif; -unsigned long duration;s32 retry;brcmf_dbg (TRACE ,"Enter\n" );
@@ -1155,7 +1154,6 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p)* pending action frame tx is cancelled. */ retry =0 ; - duration =msecs_to_jiffies (P2P_AF_FRM_SCAN_MAX_WAIT );while ((retry <P2P_CHANNEL_SYNC_RETRY ) && (afx_hdl->peer_chan ==P2P_INVALID_CHANNEL )) { afx_hdl->is_listen = false;
@@ -1163,7 +1161,8 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) retry);/* search peer on peer's listen channel */ schedule_work (&afx_hdl->afx_work); -wait_for_completion_timeout (&afx_hdl->act_frm_scan, duration); +wait_for_completion_timeout (&afx_hdl->act_frm_scan, +P2P_AF_FRM_SCAN_MAX_WAIT );if ((afx_hdl->peer_chan !=P2P_INVALID_CHANNEL ) || (!test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , &p2p->status)))
@@ -1176,7 +1175,7 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) afx_hdl->is_listen = true;schedule_work (&afx_hdl->afx_work);wait_for_completion_timeout (&afx_hdl->act_frm_scan, - duration); +P2P_AF_FRM_SCAN_MAX_WAIT ); } if ((afx_hdl->peer_chan != P2P_INVALID_CHANNEL) || (!test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/222 clk: samsung: Use clk_hw API for calling clk framework from clk notifiers
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 1da220e3a5d22fccda0bc8542997abc1d1741268 ]
clk_notifier_register() documentation states, that the provided notifier callbacks associated with the notifier must not re-enter into the clk framework by calling any top-level clk APIs. Fix this by replacing clk_get_rate() calls with clk_hw_get_rate(), which is safe in this context.
--- drivers/clk/samsung/clk-cpu.c | 6 +++--- drivers/clk/samsung/clk-cpu.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/clk/samsung/clk-cpu.c +3 -3
@@ -152,7 +152,7 @@ static int exynos_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, struct exynos_cpuclk *cpuclk, void __iomem *base) { const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; -unsigned long alt_prate =clk_get_rate (cpuclk->alt_parent); +unsigned long alt_prate =clk_hw_get_rate (cpuclk->alt_parent);unsigned long alt_div =0 , alt_div_mask =DIV_MASK ;unsigned long div0, div1 =0 , mux_reg;unsigned long flags;
@@ -280,7 +280,7 @@ static int exynos5433_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, struct exynos_cpuclk *cpuclk, void __iomem *base) { const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; -unsigned long alt_prate =clk_get_rate (cpuclk->alt_parent); +unsigned long alt_prate =clk_hw_get_rate (cpuclk->alt_parent);unsigned long alt_div =0 , alt_div_mask =DIV_MASK ;unsigned long div0, div1 =0 , mux_reg;unsigned long flags;
@@ -432,7 +432,7 @@ int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx,else cpuclk->clk_nb.notifier_call = exynos_cpuclk_notifier_cb; - cpuclk->alt_parent =__clk_lookup (alt_parent); + cpuclk->alt_parent =__clk_get_hw (__clk_lookup (alt_parent));if (!cpuclk->alt_parent) {pr_err ("%s: could not lookup alternate parent %s\n" , __func__, alt_parent);
drivers/clk/samsung/clk-cpu.h +1 -1
@@ -49,7 +49,7 @@ struct exynos_cpuclk_cfg_data {*/ struct exynos_cpuclk {struct clk_hw hw; -struct clk *alt_parent; +struct clk_hw *alt_parent;void __iomem *ctrl_base;spinlock_t *lock;const struct exynos_cpuclk_cfg_data *cfg;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/222 i2c: brcmstb: Allow enabling the driver on DSL SoCs
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit e1eba2ea54a2de0e4c58d87270d25706bb77b844 ]
ARCH_BCM_63XX which is used by ARM-based DSL SoCs from Broadcom uses the same controller, make it possible to select the STB driver and update the Kconfig and help text a bit.
--- drivers/i2c/busses/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/i2c/busses/Kconfig +4 -3
@@ -397,12 +397,13 @@ config I2C_BCM_KONA If you do not need KONA I2C interface, say N. config I2C_BRCMSTB - tristate "BRCM Settop I2C controller" - depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST + tristate "BRCM Settop/DSL I2C controller" + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_63XX || \ + COMPILE_TEST default y help If you say yes to this option, support will be included for the - I2C interface on the Broadcom Settop SoCs. + I2C interface on the Broadcom Settop/DSL SoCs. If you do not need I2C interface, say N.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/222 NFSv4.x: fix lock recovery during delegation recall
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit 44f411c353bf6d98d5a34f8f1b8605d43b2e50b8 ]
Running "./nfstest_delegation --runtest recall26" uncovers that client doesn't recover the lock when we have an appending open, where the initial open got a write delegation.
Instead of checking for the passed in open context against the file lock's open context. Check that the state is the same.
--- fs/nfs/delegation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfs/delegation.c +3 -3
@@ -101,7 +101,7 @@ int nfs4_check_delegation(struct inode *inode, fmode_t flags)return nfs4_do_check_delegation (inode, flags, false); } -static int nfs_delegation_claim_locks (struct nfs_open_context *ctx,struct nfs4_state *state,const nfs4_stateid *stateid) +static int nfs_delegation_claim_locks (struct nfs4_state *state,const nfs4_stateid *stateid) {struct inode *inode = state->inode;struct file_lock *fl;
@@ -116,7 +116,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_spin_lock (&flctx->flc_lock); restart:list_for_each_entry (fl, list, fl_list) { -if (nfs_file_open_context (fl->fl_file) != ctx) +if (nfs_file_open_context (fl->fl_file)->state != state)continue ;spin_unlock (&flctx->flc_lock); status =nfs4_lock_delegation_recall (fl, state, stateid);
@@ -163,7 +163,7 @@ static int nfs_delegation_claim_opens(struct inode *inode, seq =raw_seqcount_begin (&sp->so_reclaim_seqcount); err =nfs4_open_delegation_recall (ctx, state, stateid, type);if (!err) - err =nfs_delegation_claim_locks (ctx, state, stateid); + err =nfs_delegation_claim_locks (state, stateid);if (!err &&read_seqcount_retry (&sp->so_reclaim_seqcount, seq)) err = -EAGAIN ;mutex_unlock (&sp->so_delegreturn_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/222 dmaengine: ioat: fix prototype of ioat_enumerate_channels
In reply to Greg Kroah-HartmanFrom: Rami Rosen <[email protected]>
[ Upstream commit f4d34aa8c887a8a2d23ef546da0efa10e3f77241 ]
--- drivers/dma/ioat/init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/dma/ioat/init.c +3 -4
@@ -129,7 +129,7 @@ static void ioat_init_channel(struct ioatdma_device *ioat_dma, struct ioatdma_chan *ioat_chan, int idx);static void ioat_intr_quirk (struct ioatdma_device *ioat_dma); -static int ioat_enumerate_channels (struct ioatdma_device *ioat_dma); +static void ioat_enumerate_channels (struct ioatdma_device *ioat_dma);static int ioat3_dma_self_test (struct ioatdma_device *ioat_dma);static int ioat_dca_enabled =1 ;
@@ -573,7 +573,7 @@ static void ioat_dma_remove(struct ioatdma_device *ioat_dma)* ioat_enumerate_channels - find and initialize the device's channels * @ioat_dma: the ioat dma device to be enumerated */ -static int ioat_enumerate_channels (struct ioatdma_device *ioat_dma) +static void ioat_enumerate_channels (struct ioatdma_device *ioat_dma) {struct ioatdma_chan *ioat_chan;struct device *dev = &ioat_dma->pdev->dev;
@@ -592,7 +592,7 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) xfercap_log =readb (ioat_dma->reg_base +IOAT_XFERCAP_OFFSET ); xfercap_log &=0x1f ;/* bits [4:0] valid */ if (xfercap_log ==0 ) -return 0 ; +return ;dev_dbg (dev,"%s: xfercap = %d\n" , __func__,1 << xfercap_log);for (i =0 ; i < dma->chancnt; i++) {
@@ -609,7 +609,6 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) } } dma->chancnt = i; -return i; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/222 Input: st1232 - set INPUT_PROP_DIRECT property
In reply to Greg Kroah-HartmanFrom: Martin Kepplinger <[email protected]>
[ Upstream commit 20bbb312079494a406c10c90932e3c80837c9d94 ]
This is how userspace checks for touchscreen devices most reliably.
--- drivers/input/touchscreen/st1232.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/touchscreen/st1232.c +1 -0
@@ -203,6 +203,7 @@ static int st1232_ts_probe(struct i2c_client *client, input_dev->id.bustype =BUS_I2C ; input_dev->dev.parent = &client->dev; +__set_bit (INPUT_PROP_DIRECT , input_dev->propbit);__set_bit (EV_SYN , input_dev->evbit);__set_bit (EV_KEY , input_dev->evbit);__set_bit (EV_ABS , input_dev->evbit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/222 nl80211: Fix a GET_KEY reply attribute
In reply to Greg Kroah-HartmanFrom: Andrew Zaborowski <[email protected]>
[ Upstream commit efdfce7270de85a8706d1ea051bef3a7486809ff ]
Use the NL80211_KEY_IDX attribute inside the NL80211_ATTR_KEY in NL80211_CMD_GET_KEY responses to comply with nl80211_key_policy. This is unlikely to affect existing userspace.
--- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/nl80211.c +1 -1
@@ -3058,7 +3058,7 @@ static void get_key_callback(void *c, struct key_params *params) params->cipher))) goto nla_put_failure; -if (nla_put_u8 (cookie->msg,NL80211_ATTR_KEY_IDX , cookie->idx)) +if (nla_put_u8 (cookie->msg,NL80211_KEY_IDX , cookie->idx)) goto nla_put_failure;nla_nest_end (cookie->msg, key);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/222 x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 ]
When building a 32-bit config which has the above MFD item as module but OLPC_XO1_PM is enabled =y - which is bool, btw - the kernel fails building with:
ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_remove':
/home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:159: undefined reference to `mfd_cell_disable'
ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_probe':
/home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:133: undefined reference to `mfd_cell_enable'
make: *** [Makefile:1030: vmlinux] Error 1
Force MFD_CS5535 to y if OLPC_XO1_PM is enabled.
--- arch/x86/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/Kconfig +1 -2
@@ -2614,8 +2614,7 @@ config OLPC config OLPC_XO1_PM bool "OLPC XO-1 Power Management" - depends on OLPC && MFD_CS5535 && PM_SLEEP - select MFD_CORE + depends on OLPC && MFD_CS5535=y && PM_SLEEP ---help--- Add support for poweroff and suspend of the OLPC XO-1 laptop.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/222 crypto: mxs-dcp - Fix SHA null hashes and output length
In reply to Greg Kroah-HartmanFrom: Radu Solea <[email protected]>
[ Upstream commit c709eebaf5c5faa8a0f140355f9cfe67e8f7afb1 ]
DCP writes at least 32 bytes in the output buffer instead of hash length as documented. Add intermediate buffer to prevent write out of bounds.
When requested to produce null hashes DCP fails to produce valid output. Add software workaround to bypass hardware and return valid output.
--- drivers/crypto/mxs-dcp.c | 47 +++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 10 deletions(-)
drivers/crypto/mxs-dcp.c +37 -10
@@ -28,9 +28,24 @@#define DCP_MAX_CHANS 4#define DCP_BUF_SZ PAGE_SIZE +#define DCP_SHA_PAY_SZ 64#define DCP_ALIGNMENT 64 +/* +* Null hashes to align with hw behavior on imx6sl and ull +* these are flipped for consistency with hw output +*/ +const uint8_t sha1_null_hash[] = +"\x09\x07\xd8\xaf\x90\x18\x60\x95\xef\xbf" +"\x55\x32\x0d\x4b\x6b\x5e\xee\xa3\x39\xda" ; + +const uint8_t sha256_null_hash[] = +"\x55\xb8\x52\x78\x1b\x99\x95\xa4" +"\x4c\x93\x9b\x64\xe4\x41\xae\x27" +"\x24\xb9\x6f\x99\xc8\xf4\xfb\x9a" +"\x14\x1c\xfc\x98\x42\xc4\xb0\xe3" ; +/* DCP DMA descriptor. */ struct dcp_dma_desc {uint32_t next_cmd_addr;
@@ -48,6 +63,7 @@ struct dcp_coherent_block {uint8_t aes_in_buf[DCP_BUF_SZ ];uint8_t aes_out_buf[DCP_BUF_SZ ];uint8_t sha_in_buf[DCP_BUF_SZ ]; +uint8_t sha_out_buf[DCP_SHA_PAY_SZ ];uint8_t aes_key[2 *AES_KEYSIZE_128 ];
@@ -513,8 +529,6 @@ static int mxs_dcp_run_sha(struct ahash_request *req)struct crypto_ahash *tfm =crypto_ahash_reqtfm (req);struct dcp_async_ctx *actx =crypto_ahash_ctx (tfm);struct dcp_sha_req_ctx *rctx =ahash_request_ctx (req); -struct hash_alg_common *halg =crypto_hash_alg_common (tfm); -struct dcp_dma_desc *desc = &sdcp->coh->desc[actx->chan];dma_addr_t digest_phys =0 ;
@@ -536,10 +550,23 @@ static int mxs_dcp_run_sha(struct ahash_request *req) desc->payload =0 ; desc->status =0 ; +/* +* Align driver with hw behavior when generating null hashes +*/ +if (rctx->init && rctx->fini && desc->size ==0 ) { +struct hash_alg_common *halg =crypto_hash_alg_common (tfm); +const uint8_t *sha_buf = + (actx->alg ==MXS_DCP_CONTROL1_HASH_SELECT_SHA1 ) ? + sha1_null_hash : sha256_null_hash; +memcpy (sdcp->coh->sha_out_buf, sha_buf, halg->digestsize); + ret =0 ; + goto done_run; + } +/* Set HASH_TERM bit for last transfer block. */ if (rctx->fini) { - digest_phys =dma_map_single (sdcp->dev, req->result, - halg->digestsize,DMA_FROM_DEVICE ); + digest_phys =dma_map_single (sdcp->dev, sdcp->coh->sha_out_buf, +DCP_SHA_PAY_SZ ,DMA_FROM_DEVICE ); desc->control0 |=MXS_DCP_CONTROL0_HASH_TERM ; desc->payload = digest_phys; }
@@ -547,9 +574,10 @@ static int mxs_dcp_run_sha(struct ahash_request *req) ret =mxs_dcp_start_dma (actx);if (rctx->fini) -dma_unmap_single (sdcp->dev, digest_phys, halg->digestsize, +dma_unmap_single (sdcp->dev, digest_phys,DCP_SHA_PAY_SZ ,DMA_FROM_DEVICE ); +done_run:dma_unmap_single (sdcp->dev, buf_phys,DCP_BUF_SZ ,DMA_TO_DEVICE );return ret;
@@ -567,6 +595,7 @@ static int dcp_sha_req_to_buf(struct crypto_async_request *arq)const int nents =sg_nents (req->src);uint8_t *in_buf = sdcp->coh->sha_in_buf; +uint8_t *out_buf = sdcp->coh->sha_out_buf;uint8_t *src_buf;
@@ -621,11 +650,9 @@ static int dcp_sha_req_to_buf(struct crypto_async_request *arq) actx->fill =0 ; -/* For some reason, the result is flipped. */ -for (i =0 ; i < halg->digestsize /2 ; i++) { -swap (req->result[i], - req->result[halg->digestsize - i -1 ]); - } +/* For some reason the result is flipped */ +for (i =0 ; i < halg->digestsize; i++) + req->result[i] = out_buf[halg->digestsize - i -1 ]; }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/222 crypto: mxs-dcp - Fix AES issues
In reply to Greg Kroah-HartmanFrom: Radu Solea <[email protected]>
[ Upstream commit fadd7a6e616b89c7f4f7bfa7b824f290bab32c3c ]
The DCP driver does not obey cryptlen, when doing android CTS this results in passing to hardware input stream lengths which are not multiple of block size.
Add a check to prevent future erroneous stream lengths from reaching the hardware and adjust the scatterlist walking code to obey cryptlen.
Also properly copy-out the IV for chaining.
--- drivers/crypto/mxs-dcp.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/crypto/mxs-dcp.c +31 -2
@@ -225,6 +225,12 @@ static int mxs_dcp_run_aes(struct dcp_async_ctx *actx,dma_addr_t dst_phys =dma_map_single (sdcp->dev, sdcp->coh->aes_out_buf,DCP_BUF_SZ ,DMA_FROM_DEVICE ); +if (actx->fill %AES_BLOCK_SIZE ) { +dev_err (sdcp->dev,"Invalid block size!\n" ); + ret = -EINVAL ; + goto aes_done_run; + } +/* Fill in the DMA descriptor. */ desc->control0 =MXS_DCP_CONTROL0_DECR_SEMAPHORE | MXS_DCP_CONTROL0_INTERRUPT |
@@ -254,6 +260,7 @@ static int mxs_dcp_run_aes(struct dcp_async_ctx *actx, ret =mxs_dcp_start_dma (actx); +aes_done_run:dma_unmap_single (sdcp->dev, key_phys,2 *AES_KEYSIZE_128 ,DMA_TO_DEVICE );dma_unmap_single (sdcp->dev, src_phys,DCP_BUF_SZ ,DMA_TO_DEVICE );
@@ -280,13 +287,15 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)uint8_t *out_tmp, *src_buf, *dst_buf =NULL ;uint32_t dst_off =0 ; +uint32_t last_out_len =0 ;uint8_t *key = sdcp->coh->aes_key;int ret =0 ;int split =0 ; -unsigned int i, len, clen, rem =0 ; +unsigned int i, len, clen, rem =0 , tlen =0 ;int init =0 ; +bool limit_hit = false; actx->fill =0 ;
@@ -305,6 +314,11 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)for_each_sg (req->src, src, nents, i) { src_buf =sg_virt (src); len =sg_dma_len (src); + tlen += len; + limit_hit = tlen > req->nbytes; + +if (limit_hit) + len = req->nbytes - (tlen - len); do { if (actx->fill + len > out_off)
@@ -321,13 +335,15 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)* If we filled the buffer or this is the last SG, * submit the buffer. */ -if (actx->fill == out_off ||sg_is_last (src)) { +if (actx->fill == out_off ||sg_is_last (src) || + limit_hit) { ret =mxs_dcp_run_aes (actx, req, init);if (ret)return ret; init =0 ; out_tmp = out_buf; + last_out_len = actx->fill;while (dst && actx->fill) {if (!split) { dst_buf =sg_virt (dst);
@@ -350,6 +366,19 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq) } } }while (len); + +if (limit_hit) +break ; + } + +/* Copy the IV for CBC for chaining */ +if (!rctx->ecb) { +if (rctx->enc) +memcpy (req->info, out_buf+(last_out_len-AES_BLOCK_SIZE ), +AES_BLOCK_SIZE ); +else +memcpy (req->info, in_buf+(last_out_len-AES_BLOCK_SIZE ), +AES_BLOCK_SIZE ); }return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/222 fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e5017716adb8aa5c01c52386c1b7470101ffe9c5 ]
The "index + count" addition can overflow. Both come directly from the user. This bug leads to an information leak.
--- drivers/video/fbdev/sbuslib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/sbuslib.c +1 -1
@@ -170,7 +170,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, get_user(ublue, &c->blue))return -EFAULT ; -if (index + count > cmap->len) +if (index > cmap->len || count > cmap->len - index)return -EINVAL ;for (i =0 ; i < count; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/222 reset: Fix potential use-after-free in __of_reset_control_get()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit b790c8ea5593d6dc3580adfad8e117eeb56af874 ]
Calling of_node_put() decreases the reference count of a device tree object, and may free some data.
However, the of_phandle_args structure embedding it is passed to reset_controller_dev.of_xlate() after that, so it may still be accessed.
Move the call to of_node_put() down to fix this.
--- drivers/reset/core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/reset/core.c +8 -7
@@ -324,28 +324,29 @@ struct reset_control *__of_reset_control_get(struct device_node *node,break ; } } -of_node_put (args.np);if (!rcdev) { -mutex_unlock (&reset_list_mutex); -return ERR_PTR (-EPROBE_DEFER ); + rstc =ERR_PTR (-EPROBE_DEFER ); + goto out; }if (WARN_ON (args.args_count != rcdev->of_reset_n_cells)) { -mutex_unlock (&reset_list_mutex); -return ERR_PTR (-EINVAL ); + rstc =ERR_PTR (-EINVAL ); + goto out; } rstc_id = rcdev->of_xlate (rcdev, &args);if (rstc_id <0 ) { -mutex_unlock (&reset_list_mutex); -return ERR_PTR (rstc_id); + rstc =ERR_PTR (rstc_id); + goto out; }/* reset_list_mutex also protects the rcdev's reset_control list */ rstc =__reset_control_get_internal (rcdev, rstc_id, shared); +out:mutex_unlock (&reset_list_mutex); +of_node_put (args.np);return rstc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/222 proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted()
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit cf089611f4c446285046fcd426d90c18f37d2905 ]
Lianbo reported a build error with a particular 32-bit config, see Link below for details.
Provide a weak copy_oldmem_page_encrypted() function which architectures can override, in the same manner other functionality in that file is supplied.
--- fs/proc/vmcore.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/proc/vmcore.c +10 -0
@@ -164,6 +164,16 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,return remap_pfn_range (vma, from, pfn, size, prot); } +/* +* Architectures which support memory encryption override this. +*/ +ssize_t __weak +copy_oldmem_page_encrypted (unsigned long pfn,char *buf,size_t csize, +unsigned long offset,int userbuf) +{ +return copy_oldmem_page (pfn, buf, csize, offset, userbuf); +} +/* * Copy to either kernel or user space */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/222 printk: Give error on attempt to set log buffer length to over 2G
In reply to Greg Kroah-HartmanFrom: He Zhe <[email protected]>
[ Upstream commit e6fe3e5b7d16e8f146a4ae7fe481bc6e97acde1e ]
The current printk() is ready to handle log buffer size up to 2G. Give an explicit error for users who want to use larger log buffer.
Also fix printk formatting to show the 2G as a positive number.
--- kernel/printk/printk.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
kernel/printk/printk.c +12 -6
@@ -383,6 +383,7 @@ static u32 clear_idx;/* record buffer */ #define LOG_ALIGN __alignof__(struct printk_log)#define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) +#define LOG_BUF_LEN_MAX (u32)(1 << 31)static char __log_buf[__LOG_BUF_LEN]__aligned(LOG_ALIGN) ;static char *log_buf = __log_buf;static u32 log_buf_len = __LOG_BUF_LEN;
@@ -983,18 +984,23 @@ void log_buf_kexec_setup(void)static unsigned long __initdata new_log_buf_len;/* we practice scaling the ring buffer by powers of 2 */ -static void __init log_buf_len_update (unsigned size) +static void __init log_buf_len_update (u64 size) { +if (size > (u64 )LOG_BUF_LEN_MAX ) { + size = (u64 )LOG_BUF_LEN_MAX ; +pr_err ("log_buf over 2G is not supported.\n" ); + } +if (size) size =roundup_pow_of_two (size);if (size > log_buf_len) - new_log_buf_len = size; + new_log_buf_len = (unsigned long )size; }/* save requested log_buf_len since it's too early to process it */ static int __init log_buf_len_setup (char *str) { -unsigned int size; +u64 size;if (!str)return -EINVAL ;
@@ -1064,7 +1070,7 @@ void __init setup_log_buf(int early) }if (unlikely (!new_log_buf)) { -pr_err ("log_buf_len: %ld bytes not available\n" , +pr_err ("log_buf_len: %lu bytes not available\n" , new_log_buf_len);return ; }
@@ -1077,8 +1083,8 @@ void __init setup_log_buf(int early)memcpy (log_buf, __log_buf, __LOG_BUF_LEN);raw_spin_unlock_irqrestore (&logbuf_lock, flags); -pr_info ("log_buf_len: %d bytes\n" , log_buf_len); -pr_info ("early log buf free: %d(%d%%)\n" , +pr_info ("log_buf_len: %u bytes\n" , log_buf_len); +pr_info ("early log buf free: %u(%u%%)\n" , free, (free *100 ) / __LOG_BUF_LEN); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 208/222 media: isif: fix a NULL pointer dereference bug
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit a26ac6c1bed951b2066cc4b2257facd919e35c0b ]
In isif_probe(), there is a while loop to get the ISIF base address and linearization table0 and table1 address. In the loop body, the function platform_get_resource() is called to get the resource. If platform_get_resource() returns NULL, the loop is terminated and the execution goes to 'fail_nobase_res'. Suppose the loop is terminated at the first iteration because platform_get_resource() returns NULL and the execution goes to 'fail_nobase_res'. Given that there is another while loop at 'fail_nobase_res' and i equals to 0, one iteration of the second while loop will be executed. However, the second while loop does not check the return value of platform_get_resource(). This can cause a NULL pointer dereference bug if the return value is a NULL pointer.
This patch avoids the above issue by adding a check in the second while loop after the call to platform_get_resource().
--- drivers/media/platform/davinci/isif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/davinci/isif.c +2 -1
@@ -1106,7 +1106,8 @@ static int isif_probe(struct platform_device *pdev)while (i >=0 ) { res =platform_get_resource (pdev,IORESOURCE_MEM , i); -release_mem_region (res->start,resource_size (res)); +if (res) +release_mem_region (res->start,resource_size (res)); i--; }vpfe_unregister_ccdc_device (&isif_hw_dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/222 GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads
In reply to Greg Kroah-HartmanFrom: Tim Smith <[email protected]>
[ Upstream commit 1eb8d7387908022951792a46fa040ad3942b3b08 ]
Flushing the workqueue can cause operations to happen which might call gfs2_log_reserve(), or get stuck waiting for locks taken by such operations. gfs2_log_reserve() can io_schedule(). If this happens, it will never wake because the only thing which can wake it is gfs2_logd() which was already stopped.
This causes umount of a gfs2 filesystem to wedge permanently if, for example, the umount immediately follows a large delete operation.
When this occured, the following stack trace was obtained from the umount command
[<ffffffff81087968>] flush_workqueue+0x1c8/0x520 [<ffffffffa0666e29>] gfs2_make_fs_ro+0x69/0x160 [gfs2] [<ffffffffa0667279>] gfs2_put_super+0xa9/0x1c0 [gfs2] [<ffffffff811b7edf>] generic_shutdown_super+0x6f/0x100 [<ffffffff811b7ff7>] kill_block_super+0x27/0x70 [<ffffffffa0656a71>] gfs2_kill_sb+0x71/0x80 [gfs2] [<ffffffff811b792b>] deactivate_locked_super+0x3b/0x70 [<ffffffff811b79b9>] deactivate_super+0x59/0x60 [<ffffffff811d2998>] cleanup_mnt+0x58/0x80 [<ffffffff811d2a12>] __cleanup_mnt+0x12/0x20 [<ffffffff8108c87d>] task_work_run+0x7d/0xa0 [<ffffffff8106d7d9>] exit_to_usermode_loop+0x73/0x98 [<ffffffff81003961>] syscall_return_slowpath+0x41/0x50 [<ffffffff815a594c>] int_ret_from_sys_call+0x25/0x8f
[<ffffffffffffffff>] 0xffffffffffffffff
--- fs/gfs2/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/super.c +1 -1
@@ -844,10 +844,10 @@ static int gfs2_make_fs_ro(struct gfs2_sbd *sdp)if (error && !test_bit (SDF_SHUTDOWN , &sdp->sd_flags))return error; +flush_workqueue (gfs2_delete_workqueue);kthread_stop (sdp->sd_quotad_process);kthread_stop (sdp->sd_logd_process); -flush_workqueue (gfs2_delete_workqueue);gfs2_quota_sync (sdp->sd_vfs,0 );gfs2_statfs_sync (sdp->sd_vfs,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/222 mei: samples: fix a signedness bug in amt_host_if_call()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 185647813cac080453cb73a2e034a8821049f2a7 ]
"out_buf_sz" needs to be signed for the error handling to work.
--- samples/mei/mei-amt-version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/mei/mei-amt-version.c +1 -1
@@ -370,7 +370,7 @@ static uint32_t amt_host_if_call(struct amt_host_if *acmd, unsigned int expected_sz) {uint32_t in_buf_sz; -uint32_t out_buf_sz; +ssize_t out_buf_sz;ssize_t written;uint32_t status;struct amt_host_if_resp_header *msg_hdr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/222 cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 3b0b8f0d9a259f6a428af63e7a77547325f8e081 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:303:7: warning: implicit conversion from enumeration type 'enum cxgb4_dcb_state' to different enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion]
? CXGB4_DCB_STATE_FW_ALLSYNCED
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:304:7: warning: implicit
conversion from enumeration type 'enum cxgb4_dcb_state' to different
enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion]
: CXGB4_DCB_STATE_FW_INCOMPLETE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~2 warnings generated.
Use the equivalent value of the expected type to silence Clang while resulting in no functional change.
CXGB4_DCB_STATE_FW_INCOMPLETE = CXGB4_DCB_INPUT_FW_INCOMPLETE = 2 CXGB4_DCB_STATE_FW_ALLSYNCED = CXGB4_DCB_INPUT_FW_ALLSYNCED = 3
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c +2 -2
@@ -266,8 +266,8 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap,enum cxgb4_dcb_state_input input = ((pcmd->u.dcb.control.all_syncd_pkd &FW_PORT_CMD_ALL_SYNCD_F ) - ?CXGB4_DCB_STATE_FW_ALLSYNCED - :CXGB4_DCB_STATE_FW_INCOMPLETE ); + ?CXGB4_DCB_INPUT_FW_ALLSYNCED + :CXGB4_DCB_INPUT_FW_INCOMPLETE );if (dcb->dcb_version !=FW_PORT_DCB_VER_UNKNOWN ) { dcb_running_version = FW_PORT_CMD_DCB_VERSION_G(
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/222 cxgb4: Use proper enum in IEEE_FAUX_SYNC
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 258b6d141878530ba1f8fc44db683822389de914 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:390:4: warning: implicit conversion from enumeration type 'enum cxgb4_dcb_state' to different enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion]
IEEE_FAUX_SYNC(dev, dcb);
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h:70:10: note: expanded
from macro 'IEEE_FAUX_SYNC'
CXGB4_DCB_STATE_FW_ALLSYNCED);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~Use the equivalent value of the expected type to silence Clang while resulting in no functional change.
CXGB4_DCB_STATE_FW_ALLSYNCED = CXGB4_DCB_INPUT_FW_ALLSYNCED = 3
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h +1 -1
@@ -67,7 +67,7 @@do { \if ((__dcb)->dcb_version ==FW_PORT_DCB_VER_IEEE ) \cxgb4_dcb_state_fsm ((__dev), \ -CXGB4_DCB_STATE_FW_ALLSYNCED ); \ +CXGB4_DCB_INPUT_FW_ALLSYNCED ); \ }while (0 )/* States we can be in for a port's Data Center Bridging.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/222 powerpc/pseries: Fix DTL buffer registration
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit db787af1b8a6b4be428ee2ea7d409dafcaa4a43c ]
When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set, we register the DTL buffer for a cpu when the associated file under powerpc/dtl in debugfs is opened. When doing so, we need to set the size of the buffer being registered in the second u32 word of the buffer. This needs to be in big endian, but we are not doing the conversion resulting in the below error showing up in dmesg:
dtl_start: DTL registration for cpu 0 (hw 0) failed with -4
Fix this in the obvious manner.
--- arch/powerpc/platforms/pseries/dtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/dtl.c +1 -1
@@ -150,7 +150,7 @@ static int dtl_start(struct dtl *dtl)/* Register our dtl buffer with the hypervisor. The HV expects the * buffer size to be passed in the second word of the buffer */ - ((u32 *)dtl->buf)[1 ] =DISPATCH_LOG_BYTES ; + ((u32 *)dtl->buf)[1 ] =cpu_to_be32 (DISPATCH_LOG_BYTES ); hwcpu =get_hard_smp_processor_id (dtl->cpu); addr =__pa (dtl->buf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/222 x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error
In reply to Greg Kroah-HartmanFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit 51fbf14f2528a8c6401290e37f1c893a2412f1d3 ]
The only use of KEXEC_BACKUP_SRC_END is as an argument to walk_system_ram_res():
int crash_load_segments(struct kimage *image)
{
...
walk_system_ram_res(KEXEC_BACKUP_SRC_START, KEXEC_BACKUP_SRC_END,
image, determine_backup_region);walk_system_ram_res() expects "start, end" arguments that are inclusive, i.e., the range to be walked includes both the start and end addresses.
KEXEC_BACKUP_SRC_END was previously defined as (640 * 1024UL), which is the first address *past* the desired 0-640KB range.
Define KEXEC_BACKUP_SRC_END as (640 * 1024UL - 1) so the KEXEC_BACKUP_SRC region is [0-0x9ffff], not [0-0xa0000].
--- arch/x86/include/asm/kexec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/kexec.h +1 -1
@@ -66,7 +66,7 @@ struct kimage;/* Memory to backup during crash kdump */ #define KEXEC_BACKUP_SRC_START (0UL) -#define KEXEC_BACKUP_SRC_END (640 * 1024UL)/* 640K */ +#define KEXEC_BACKUP_SRC_END (640 * 1024UL - 1)/* 640K */ /* * CPU does not save ss and sp on stack if execution is already
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 220/222 spi: rockchip: initialize dma_slave_config properly
In reply to Greg Kroah-HartmanFrom: Huibin Hong <[email protected]>
[ Upstream commit dd8fd2cbc73f8650f651da71fc61a6e4f30c1566 ]
The rxconf and txconf structs are allocated on the stack, so make sure we zero them before filling out the relevant fields.
--- drivers/spi/spi-rockchip.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-rockchip.c +3 -0
@@ -443,6 +443,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)struct dma_slave_config rxconf, txconf;struct dma_async_tx_descriptor *rxdesc, *txdesc; +memset (&rxconf,0 ,sizeof (rxconf)); +memset (&txconf,0 ,sizeof (txconf)); +spin_lock_irqsave (&rs->lock, flags); rs->state &= ~RXBUSY ; rs->state &= ~TXBUSY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/222 ata: ahci_brcm: Allow using driver or DSL SoCs
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 7fb44929cb0e5cdcde143e1ca3ca57b5b8247db0 ]
The Broadcom STB AHCI controller is the same as the one found on DSL SoCs, so we will utilize the same driver on these systems as well.
--- drivers/ata/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ata/Kconfig +2 -1
@@ -100,7 +100,8 @@ config SATA_AHCI_PLATFORM config AHCI_BRCM tristate "Broadcom AHCI SATA support" - depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \ + ARCH_BCM_63XX help This option enables support for the AHCI SATA3 controller found on Broadcom SoC's.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 222/222 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault
In reply to Greg Kroah-HartmanFrom: Pavel Tatashin <[email protected]>
commit 94bb804e1e6f0a9a77acf20d7c70ea141c6c821e upstream.
A number of our uaccess routines ('__arch_clear_user()' and '__arch_copy_{in,from,to}_user()') fail to re-enable PAN if they encounter an unhandled fault whilst accessing userspace.
For CPUs implementing both hardware PAN and UAO, this bug has no effect when both extensions are in use by the kernel.
For CPUs implementing hardware PAN but not UAO, this means that a kernel using hardware PAN may execute portions of code with PAN inadvertently disabled, opening us up to potential security vulnerabilities that rely on userspace access from within the kernel which would usually be prevented by this mechanism. In other words, parts of the kernel run the same way as they would on a CPU without PAN implemented/emulated at all.
For CPUs not implementing hardware PAN and instead relying on software emulation via 'CONFIG_ARM64_SW_TTBR0_PAN=y', the impact is unfortunately much worse. Calling 'schedule()' with software PAN disabled means that the next task will execute in the kernel using the page-table and ASID of the previous process even after 'switch_mm()', since the actual hardware switch is deferred until return to userspace. At this point, or if there is a intermediate call to 'uaccess_enable()', the page-table and ASID of the new process are installed. Sadly, due to the changes introduced by KPTI, this is not an atomic operation and there is a very small window (two instructions) where the CPU is configured with the page-table of the old task and the ASID of the new task; a speculative access in this state is disastrous because it would corrupt the TLB entries for the new task with mappings from the previous address space.
As Pavel explains:
| I was able to reproduce memory corruption problem on Broadcom's SoC
| ARMv8-A like this:
|
| Enable software perf-events with PERF_SAMPLE_CALLCHAIN so userland's
| stack is accessed and copied.
|
| The test program performed the following on every CPU and forking
| many processes:
|
| unsigned long *map = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE,
| MAP_SHARED | MAP_ANONYMOUS, -1, 0);
| map[0] = getpid();
| sched_yield();
| if (map[0] != getpid()) {
| fprintf(stderr, "Corruption detected!");
| }
| munmap(map, PAGE_SIZE);
|
| From time to time I was getting map[0] to contain pid for a
| different process.Ensure that PAN is re-enabled when returning after an unhandled user fault from our uaccess routines.
--- arch/arm64/lib/clear_user.S | 2 ++ arch/arm64/lib/copy_from_user.S | 2 ++ arch/arm64/lib/copy_in_user.S | 2 ++ arch/arm64/lib/copy_to_user.S | 2 ++ 4 files changed, 8 insertions(+)
arch/arm64/lib/clear_user.S +2 -0
@@ -62,5 +62,7 @@ ENDPROC(__arch_clear_user) .section .fixup,"ax" .align 2 9: mov x0, x2 // return the original size +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \ + CONFIG_ARM64_PAN) ret .previous
arch/arm64/lib/copy_from_user.S +2 -0
@@ -80,5 +80,7 @@ ENDPROC(__arch_copy_from_user) .section .fixup,"ax" .align 2 9998: sub x0, end, dst // bytes not copied +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \ + CONFIG_ARM64_PAN) ret .previous
arch/arm64/lib/copy_in_user.S +2 -0
@@ -81,5 +81,7 @@ ENDPROC(__arch_copy_in_user) .section .fixup,"ax" .align 2 9998: sub x0, end, dst // bytes not copied +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \ + CONFIG_ARM64_PAN) ret .previous
arch/arm64/lib/copy_to_user.S +2 -0
@@ -79,5 +79,7 @@ ENDPROC(__arch_copy_to_user) .section .fixup,"ax" .align 2 9998: sub x0, end, dst // bytes not copied +ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \ + CONFIG_ARM64_PAN) ret .previous
Greg Kroah-Hartman
maintainerPATCH 213/222 spi: spidev: Fix OF tree warning logic
In reply to Greg Kroah-HartmanFrom: Trent Piepho <[email protected]>
[ Upstream commit 605b3bec73cbd74b4ac937b580cd0b47d1300484 ]
spidev will make a big fuss if a device tree node binds a device by using "spidev" as the node's compatible property.
However, the logic for this isn't looking for "spidev" in the compatible, but rather checking that the device is NOT compatible with spidev's list of devices.
This causes a false positive if a device not named "rohm,dh2228fv", etc. binds to spidev, even if a means other than putting "spidev" in the device tree was used. E.g., the sysfs driver_override attribute.
--- drivers/spi/spidev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/spi/spidev.c +3 -5
@@ -751,11 +751,9 @@ static int spidev_probe(struct spi_device *spi)* compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ -if (spi->dev.of_node && !of_match_device (spidev_dt_ids, &spi->dev)) { -dev_err (&spi->dev,"buggy DT: spidev listed directly in DT\n" ); -WARN_ON (spi->dev.of_node && - !of_match_device (spidev_dt_ids, &spi->dev)); - } +WARN (spi->dev.of_node && +of_device_is_compatible (spi->dev.of_node,"spidev" ), +"%pOF: buggy DT: spidev listed directly in DT\n" , spi->dev.of_node);spidev_probe_acpi (spi);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 221/222 ARM: dts: omap5: Fix dual-role mode on Super-Speed port
In reply to Greg Kroah-HartmanFrom: Roger Quadros <[email protected]>
[ Upstream commit a763ecc15d0e37c3a15ff6825183061209832685 ]
OMAP5's Super-Speed USB port has a software mailbox register that needs to be fed with VBUS and ID events from an external VBUS/ID comparator.
Without this, Host role will not work correctly.
--- arch/arm/boot/dts/omap5-board-common.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap5-board-common.dtsi +1 -0
@@ -695,6 +695,7 @@ }; &dwc3 { + extcon = <&extcon_usb3>; dr_mode = "otg"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 215/222 orangefs: rate limit the client not running info message
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 2978d873471005577e7b68a528b4f256a529b030 ]
Currently accessing various /sys/fs/orangefs files will spam the kernel log with the following info message when the client is not running:
[ 491.489284] sysfs_service_op_show: Client not running :-5:
Rate limit this info message to make it less spammy.
--- fs/orangefs/orangefs-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/orangefs/orangefs-sysfs.c +1 -1
@@ -315,7 +315,7 @@ static ssize_t sysfs_service_op_show(struct kobject *kobj,/* Can't do a service_operation if the client is not running... */ rc =is_daemon_in_service ();if (rc) { -pr_info ("%s: Client not running :%d:\n" , +pr_info_ratelimited ("%s: Client not running :%d:\n" , __func__,is_daemon_in_service ()); goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 214/222 ARM: 8802/1: Call syscall_trace_exit even when system call skipped
In reply to Greg Kroah-HartmanFrom: Timothy E Baldwin <[email protected]>
[ Upstream commit f18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 ]
On at least x86 and ARM64, and as documented in the ptrace man page a skipped system call will still cause a syscall exit ptrace stop.
Previous to this commit 32-bit ARM did not, resulting in strace being confused when seccomp skips system calls.
This change also impacts programs that use ptrace to skip system calls.
--- arch/arm/kernel/entry-common.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/kernel/entry-common.S +4 -5
@@ -263,16 +263,15 @@ __sys_trace: cmp scno, #-1 @ skip the syscall? bne 2b add sp, sp, #S_OFF @ restore stack - b ret_slow_syscall -__sys_trace_return: - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 +__sys_trace_return_nosave: + enable_irq_notrace mov r0, sp bl syscall_trace_exit b ret_slow_syscall -__sys_trace_return_nosave: - enable_irq_notrace +__sys_trace_return: + str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit b ret_slow_syscall
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/222 hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros
In reply to Greg Kroah-HartmanFrom: Nicolin Chen <[email protected]>
[ Upstream commit 791ebc9d34e9d212fc03742c31654b017d385926 ]
The three INA3221_CONFIG_MODE macros are not correctly defined here. The MODE3-1 bits are located at BIT 2-0 according to the datasheet.
So this patch just fixes them by shifting all of them with a correct offset. However, this isn't a crital bug fix as the driver does not use any of them at this point.
--- drivers/hwmon/ina3221.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/ina3221.c +3 -3
@@ -38,9 +38,9 @@#define INA3221_WARN3 0x0c#define INA3221_MASK_ENABLE 0x0f -#define INA3221_CONFIG_MODE_SHUNT BIT(1) -#define INA3221_CONFIG_MODE_BUS BIT(2) -#define INA3221_CONFIG_MODE_CONTINUOUS BIT(3) +#define INA3221_CONFIG_MODE_SHUNT BIT(0) +#define INA3221_CONFIG_MODE_BUS BIT(1) +#define INA3221_CONFIG_MODE_CONTINUOUS BIT(2)#define INA3221_RSHUNT_DEFAULT 10000
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 218/222 misc: cxl: Fix possible null pointer dereference
In reply to Greg Kroah-HartmanFrom: zhong jiang <[email protected]>
[ Upstream commit 3dac3583bf1a61db6aaf31dfd752c677a4400afd ]
It is not safe to dereference an object before a null test. It is not needed and just remove them. Ftrace can be used instead.
--- drivers/misc/cxl/guest.c | 2 -- 1 file changed, 2 deletions(-)
drivers/misc/cxl/guest.c +0 -2
@@ -1026,8 +1026,6 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_nvoid cxl_guest_remove_afu (struct cxl_afu *afu) { -pr_devel ("in %s - AFU(%d)\n" , __func__, afu->slice); -if (!afu)return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 219/222 mac80211: minstrel: fix CCK rate group streams value
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 80df9be67c44cb636bbc92caeddad8caf334c53c ]
Fixes a harmless underflow issue when CCK rates are actively being used
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -128,7 +128,7 @@#define CCK_GROUP \ [MINSTREL_CCK_GROUP] = { \ - .streams = 0, \ + .streams = 1, \ .flags = 0, \ .duration = { \ CCK_DURATION_LIST(false), \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/222 media: cx231xx: fix potential sign-extension overflow on large shift
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 32ae592036d7aeaabcccb2b1715373a68639a768 ]
Shifting the u8 value[3] by an int can lead to sign-extension overflow. For example, if value[3] is 0xff and the shift is 24 then it is promoted to int and then the top bit is sign-extended so that all upper 32 bits are set. Fix this by casting value[3] to a u32 before the shift.
Detected by CoverityScan, CID#1016522 ("Unintended sign extension")
--- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/cx231xx/cx231xx-video.c +1 -1
@@ -1389,7 +1389,7 @@ int cx231xx_g_register(struct file *file, void *priv, ret =cx231xx_read_ctrl_reg (dev,VRT_GET_REGISTER , (u16 )reg->reg, value,4 ); reg->val = value[0 ] | value[1 ] <<8 | - value[2 ] <<16 | value[3 ] <<24 ; + value[2 ] <<16 | (u32 )value[3 ] <<24 ; reg->size =4 ;break ;case 1 :/* AFE - read byte */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 216/222 hwmon: (pwm-fan) Silence error on probe deferral
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 9f67f7583e77fe5dc57aab3a6159c2642544eaad ]
Probe deferrals aren't actual errors, so silence the error message in case the PWM cannot yet be acquired.
--- drivers/hwmon/pwm-fan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwmon/pwm-fan.c +6 -2
@@ -231,8 +231,12 @@ static int pwm_fan_probe(struct platform_device *pdev) ctx->pwm =devm_of_pwm_get (&pdev->dev, pdev->dev.of_node,NULL );if (IS_ERR (ctx->pwm)) { -dev_err (&pdev->dev,"Could not get PWM\n" ); -return PTR_ERR (ctx->pwm); + ret =PTR_ERR (ctx->pwm); + +if (ret != -EPROBE_DEFER ) +dev_err (&pdev->dev,"Could not get PWM: %d\n" , ret); + +return ret; }platform_set_drvdata (pdev, ctx);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 212/222 gpio: syscon: Fix possible NULL ptr usage
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 70728c29465bc4bfa7a8c14304771eab77e923c7 ]
The priv->data->set can be NULL while flags contains GPIO_SYSCON_FEAT_OUT and chip->set is valid pointer. This happens in case the controller uses the default GPIO setter. Always use chip->set to access the setter to avoid possible NULL pointer dereferencing.
--- drivers/gpio/gpio-syscon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-syscon.c +1 -1
@@ -122,7 +122,7 @@ static int syscon_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int val) BIT(offs % SYSCON_REG_BITS)); } - priv->data->set (chip, offset, val); + chip->set (chip, offset, val);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/222 dmaengine: timb_dma: Use proper enum in td_prep_slave_sg
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 5e621f5d538985f010035c6f3e28c22829d36db1 ]
Clang warns when implicitly converting from one enumerated type to another. Avoid this by using the equivalent value from the expected type.
drivers/dma/timb_dma.c:548:27: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
td_desc->desc_list_len, DMA_MEM_TO_DEV);
^~~~~~~~~~~~~~1 warning generated.
--- drivers/dma/timb_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/timb_dma.c +1 -1
@@ -545,7 +545,7 @@ static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan, }dma_sync_single_for_device (chan2dmadev (chan), td_desc->txd.phys, - td_desc->desc_list_len,DMA_MEM_TO_DEV ); + td_desc->desc_list_len,DMA_TO_DEVICE );return &td_desc->txd; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/222 mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable
In reply to Greg Kroah-HartmanFrom: Vignesh R <[email protected]>
[ Upstream commit c974ac771479327b5424f60d58845e31daddadea ]
If a child device like touchscreen is wakeup capable, then keep ADC interface on, so that a touching resistive screen will generate wakeup event to the system.
--- drivers/mfd/ti_am335x_tscadc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/mfd/ti_am335x_tscadc.c +13 -0
@@ -295,11 +295,24 @@ static int ti_tscadc_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused ti_tscadc_can_wakeup (struct device *dev,void *data) +{ +return device_may_wakeup (dev); +} +static int __maybe_unused tscadc_suspend (struct device *dev) {struct ti_tscadc_dev *tscadc =dev_get_drvdata (dev);regmap_write (tscadc->regmap,REG_SE ,0x00 ); +if (device_for_each_child (dev,NULL , ti_tscadc_can_wakeup)) { +u32 ctrl; + +regmap_read (tscadc->regmap,REG_CTRL , &ctrl); + ctrl &= ~(CNTRLREG_POWERDOWN ); + ctrl |=CNTRLREG_TSCSSENB ; +regmap_write (tscadc->regmap,REG_CTRL , ctrl); + }pm_runtime_put_sync (dev);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 205/222 backlight: lm3639: Unconditionally call led_classdev_unregister
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 7cea645ae9c5a54aa7904fddb2cdf250acd63a6c ]
Clang warns that the address of a pointer will always evaluated as true in a boolean context.
drivers/video/backlight/lm3639_bl.c:403:14: warning: address of 'pchip->cdev_torch' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (&pchip->cdev_torch)
~~ ~~~~~~~^~~~~~~~~~
drivers/video/backlight/lm3639_bl.c:405:14: warning: address of
'pchip->cdev_flash' will always evaluate to 'true'
[-Wpointer-bool-conversion]
if (&pchip->cdev_flash)
~~ ~~~~~~~^~~~~~~~~~2 warnings generated.
These statements have been present since 2012, introduced by commit 0f59858d5119 ("backlight: add new lm3639 backlight driver"). Given that they have been called unconditionally since then presumably without any issues, removing the always true if statements to fix the warnings without any real world changes.
--- drivers/video/backlight/lm3639_bl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/video/backlight/lm3639_bl.c +2 -4
@@ -400,10 +400,8 @@ static int lm3639_remove(struct i2c_client *client)regmap_write (pchip->regmap,REG_ENABLE ,0x00 ); -if (&pchip->cdev_torch) -led_classdev_unregister (&pchip->cdev_torch); -if (&pchip->cdev_flash) -led_classdev_unregister (&pchip->cdev_flash); +led_classdev_unregister (&pchip->cdev_torch); +led_classdev_unregister (&pchip->cdev_flash);if (pchip->bled)device_remove_file (&(pchip->bled->dev), &dev_attr_bled_mode);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/222 s390/kasan: avoid vdso instrumentation
In reply to Greg Kroah-HartmanFrom: Vasily Gorbik <[email protected]>
[ Upstream commit 348498458505e202df41b6b9a78da448d39298b7 ]
vdso is mapped into user space processes, which won't have kasan shodow mapped.
--- arch/s390/kernel/vdso32/Makefile | 3 ++- arch/s390/kernel/vdso64/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/s390/kernel/vdso32/Makefile +2 -1
@@ -24,9 +24,10 @@ obj-y += vdso32_wrapper.o extra-y += vdso32.lds CPPFLAGS_vdso32.lds += -P -C -U$(ARCH) -# Disable gcov profiling and ubsan for VDSO code +# Disable gcov profiling, ubsan and kasan for VDSO code GCOV_PROFILE := n UBSAN_SANITIZE := n +KASAN_SANITIZE := n # Force dependency (incbin is bad) $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
arch/s390/kernel/vdso64/Makefile +2 -1
@@ -24,9 +24,10 @@ obj-y += vdso64_wrapper.o extra-y += vdso64.lds CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) -# Disable gcov profiling and ubsan for VDSO code +# Disable gcov profiling, ubsan and kasan for VDSO code GCOV_PROFILE := n UBSAN_SANITIZE := n +KASAN_SANITIZE := n # Force dependency (incbin is bad) $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/222 dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 9524d6b265f9b2b9a61fceb2ee2ce1c2a83e39ca ]
Clang warns when implicitly converting from one enumerated type to another. Avoid this by using the equivalent value from the expected type.
In file included from drivers/dma/ep93xx_dma.c:30:./include/linux/platform_data/dma-ep93xx.h:88:10: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion]
return DMA_NONE;
~~~~~~ ^~~~~~~~1 warning generated.
--- include/linux/platform_data/dma-ep93xx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/platform_data/dma-ep93xx.h +1 -1
@@ -84,7 +84,7 @@ static inline enum dma_transfer_direction ep93xx_dma_chan_direction(struct dma_chan *chan) {if (!ep93xx_dma_chan_is_m2p (chan)) -return DMA_NONE ; +return DMA_TRANS_NONE ;/* even channels are for TX, odd for RX */ return (chan->chan_id %2 ==0 ) ?DMA_MEM_TO_DEV :DMA_DEV_TO_MEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/222 bcache: recal cached_dev_sectors on detach
In reply to Greg Kroah-HartmanFrom: Shenghui Wang <[email protected]>
[ Upstream commit 46010141da6677b81cc77f9b47f8ac62bd1cbfd3 ]
Recal cached_dev_sectors on cached_dev detached, as recal done on cached_dev attached.
Update the cached_dev_sectors before bcache_device_detach called as bcache_device_detach will set bcache_device->c to NULL.
--- drivers/md/bcache/super.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/bcache/super.c +1 -0
@@ -904,6 +904,7 @@ static void cached_dev_detach_finish(struct work_struct *w)bch_write_bdev_super (dc, &cl);closure_sync (&cl); +calc_cached_dev_sectors (dc->disk.c);bcache_device_detach (&dc->disk);list_move (&dc->list, &uncached_devices);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/222 fbdev: sbuslib: use checked version of put_user()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d8bad911e5e55e228d59c0606ff7e6b8131ca7bf ]
I'm not sure why the code assumes that only the first put_user() needs an access_ok() check. I have made all the put_user() and get_user() calls checked.
--- drivers/video/fbdev/sbuslib.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/video/fbdev/sbuslib.c +13 -13
@@ -105,11 +105,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,struct fbtype __user *f = (struct fbtype __user *) arg;if (put_user (type, &f->fb_type) || -__put_user (info->var.yres, &f->fb_height) || -__put_user (info->var.xres, &f->fb_width) || -__put_user (fb_depth, &f->fb_depth) || -__put_user (0 , &f->fb_cmsize) || -__put_user (fb_size, &f->fb_cmsize)) +put_user (info->var.yres, &f->fb_height) || +put_user (info->var.xres, &f->fb_width) || +put_user (fb_depth, &f->fb_depth) || +put_user (0 , &f->fb_cmsize) || +put_user (fb_size, &f->fb_cmsize))return -EFAULT ;return 0 ; }
@@ -124,10 +124,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,unsigned int index, count, i;if (get_user (index, &c->index) || -__get_user (count, &c->count) || -__get_user (ured, &c->red) || -__get_user (ugreen, &c->green) || -__get_user (ublue, &c->blue)) +get_user (count, &c->count) || +get_user (ured, &c->red) || +get_user (ugreen, &c->green) || +get_user (ublue, &c->blue))return -EFAULT ; cmap.len =1 ;
@@ -164,10 +164,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,u8 red, green, blue;if (get_user (index, &c->index) || -__get_user (count, &c->count) || -__get_user (ured, &c->red) || -__get_user (ugreen, &c->green) || -__get_user (ublue, &c->blue)) +get_user (count, &c->count) || +get_user (ured, &c->red) || +get_user (ugreen, &c->green) || +get_user (ublue, &c->blue))return -EFAULT ;if (index + count > cmap->len)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/222 ACPI / SBS: Fix rare oops when removing modules
In reply to Greg Kroah-HartmanFrom: Ronald Tschalär <[email protected]>
[ Upstream commit 757c968c442397f1249bb775a7c8c03842e3e0c7 ]
There was a small race when removing the sbshc module where smbus_alarm() had queued acpi_smbus_callback() for deferred execution but it hadn't been run yet, so that when it did run hc had been freed and the module unloaded, resulting in an invalid paging request.
A similar race existed when removing the sbs module with regards to acpi_sbs_callback() (which is called from acpi_smbus_callback()).
We therefore need to ensure no callbacks are pending or executing before the cleanups are done and the modules are removed.
--- drivers/acpi/osl.c | 1 + drivers/acpi/sbshc.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/acpi/osl.c +1 -0
@@ -1126,6 +1126,7 @@ void acpi_os_wait_events_complete(void)flush_workqueue (kacpid_wq);flush_workqueue (kacpi_notify_wq); } +EXPORT_SYMBOL (acpi_os_wait_events_complete);struct acpi_hp_work {struct work_struct work;
drivers/acpi/sbshc.c +2 -0
@@ -196,6 +196,7 @@ int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc) hc->callback =NULL ; hc->context =NULL ;mutex_unlock (&hc->lock); +acpi_os_wait_events_complete ();return 0 ; }
@@ -292,6 +293,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device) hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit); +acpi_os_wait_events_complete ();kfree (hc); device->driver_data =NULL ;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/222 iwlwifi: mvm: dont send keys when entering D3
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 8c7fd6a365eb5b2647b2c01918730d0a485b9f85 ]
In the past, we needed to program the keys when entering D3. This was since we replaced the image. However, now that there is a single image, this is no longer needed. Note that RSC is sent separately in a new command. This solves issues with newer devices that support PN offload. Since driver re-sent the keys, the PN got zeroed and the receiver dropped the next packets, until PN caught up again.
--- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +3 -1
@@ -935,8 +935,10 @@ int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, {struct iwl_wowlan_kek_kck_material_cmd kek_kck_cmd = {};struct iwl_wowlan_tkip_params_cmd tkip_cmd = {}; +bool unified =fw_has_capa (&mvm->fw->ucode_capa, +IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG );struct wowlan_key_data key_data = { - .configure_keys = !d0i3, + .configure_keys = !d0i3 && !unified, .use_rsc_tsc = false, .tkip = &tkip_cmd, .use_tkip = false,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/222 Input: silead - try firmware reload after unsuccessful resume
In reply to Greg Kroah-HartmanFrom: Julian Sax <[email protected]>
[ Upstream commit dde27443211062e841806feaf690674b7c3a599f ]
A certain silead controller (Chip ID: 0x56810000) loses its firmware after suspend, causing the resume to fail. This patch tries to load the firmware, should a resume error occur and retries the resuming.
--- drivers/input/touchscreen/silead.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/input/touchscreen/silead.c +13 -0
@@ -504,20 +504,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev)static int __maybe_unused silead_ts_resume (struct device *dev) {struct i2c_client *client =to_i2c_client (dev); +bool second_try = false;int error, status;silead_ts_set_power (client,SILEAD_POWER_ON ); + retry: error =silead_ts_reset (client);if (error)return error; +if (second_try) { + error =silead_ts_load_fw (client); +if (error) +return error; + } + error =silead_ts_startup (client);if (error)return error; status =silead_ts_get_status (client);if (status !=SILEAD_STATUS_OK ) { +if (!second_try) { + second_try = true; +dev_dbg (dev,"Reloading firmware after unsuccessful resume\n" ); + goto retry; + }dev_err (dev,"Resume error, status: 0x%02x\n" , status);return -ENODEV ; }
Signature · 1 line
2.20.1