misc: mic: SCIF Fix scif_get_new_port() error handling
Subsystems (2)
PATCH 1/62 misc: mic: SCIF Fix scif_get_new_port() error handling
From: Dan Carpenter <[email protected]>
[ Upstream commit a39284ae9d2ad09975c8ae33f1bd0f05fbfbf6ee ]
There are only 2 callers of scif_get_new_port() and both appear to get the error handling wrong. Both treat zero returns as error, but it actually returns negative error codes and >= 0 on success.
--- drivers/misc/mic/scif/scif_api.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/misc/mic/scif/scif_api.c +9 -11
@@ -370,11 +370,10 @@ int scif_bind(scif_epd_t epd, u16 pn) goto scif_bind_exit; } }else { - pn =scif_get_new_port (); -if (!pn) { - ret = -ENOSPC ; + ret =scif_get_new_port (); +if (ret <0 ) goto scif_bind_exit; - } + pn = ret; } ep->state =SCIFEP_BOUND ;
@@ -648,13 +647,12 @@ int __scif_connect(scif_epd_t epd, struct scif_port_id *dst, bool non_block) err = -EISCONN ;break ;case SCIFEP_UNBOUND : - ep->port.port =scif_get_new_port (); -if (!ep->port.port) { - err = -ENOSPC ; - }else { - ep->port.node = scif_info.nodeid; - ep->conn_async_state =ASYNC_CONN_IDLE ; - } + err =scif_get_new_port (); +if (err <0 ) +break ; + ep->port.port = err; + ep->port.node = scif_info.nodeid; + ep->conn_async_state =ASYNC_CONN_IDLE ;/* Fall through */ case SCIFEP_BOUND :/*
Signature · 1 line
2.17.1
PATCH 2/62 ethtool: Remove trailing semicolon for static inline
From: Florian Fainelli <[email protected]>
[ Upstream commit d89d41556141a527030a15233135ba622ba3350d ]
Android's header sanitization tool chokes on static inline functions having a trailing semicolon, leading to an incorrectly parsed header file. While the tool should obviously be fixed, also fix the header files for the two affected
functions: ethtool_get_flow_spec_ring() and ethtool_get_flow_spec_ring_vf().
--- include/uapi/linux/ethtool.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/ethtool.h +2 -2
@@ -882,13 +882,13 @@ struct ethtool_rx_flow_spec {static inline __u64 ethtool_get_flow_spec_ring (__u64 ring_cookie) {return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; -}; +}static inline __u64 ethtool_get_flow_spec_ring_vf (__u64 ring_cookie) {return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >>ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF ; -}; +}/** * struct ethtool_rxnfc - command to get or set RX flow classification rules
Signature · 1 line
2.17.1
PATCH 3/62 Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV
In reply to Sasha LevinFrom: Johan Hedberg <[email protected]>
[ Upstream commit 6c3711ec64fd23a9abc8aaf59a9429569a6282df ]
This driver was recently updated to use serdev, so add the appropriate dependency. Without this one can get compiler warnings like this if CONFIG_SERIAL_DEV_BUS is not enabled:
CC [M] drivers/bluetooth/hci_h5.odrivers/bluetooth/hci_h5.c:934:36: warning: ‘h5_serdev_driver’ defined but not used [-Wunused-variable]
static struct serdev_device_driver h5_serdev_driver = {
^~~~~~~~~~~~~~~~--- drivers/bluetooth/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/Kconfig +1 -0
@@ -125,6 +125,7 @@ config BT_HCIUART_LL config BT_HCIUART_3WIRE bool "Three-wire UART (H5) protocol support" depends on BT_HCIUART + depends on BT_HCIUART_SERDEV help The HCI Three-wire UART Transport Layer makes it possible to user the Bluetooth HCI over a serial port interface. The HCI
Signature · 1 line
2.17.1
PATCH 4/62 gpio: tegra: Move driver registration to subsys_init level
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 40b25bce0adbe641a744d1291bc0e51fb7f3c3d8 ]
There is a bug in regards to deferred probing within the drivers core that causes GPIO-driver to suspend after its users. The bug appears if GPIO-driver probe is getting deferred, which happens after introducing dependency on PINCTRL-driver for the GPIO-driver by defining "gpio-ranges" property in device-tree. The bug in the drivers core is old (more than 4 years now) and is well known, unfortunately there is no easy fix for it. The good news is that we can workaround the deferred probe issue by changing GPIO / PINCTRL drivers registration order and hence by moving PINCTRL driver registration to the arch_init level and GPIO to the subsys_init.
--- drivers/gpio/gpio-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-tegra.c +1 -1
@@ -723,4 +723,4 @@ static int __init tegra_gpio_init(void) {return platform_driver_register (&tegra_gpio_driver); } -postcore_initcall (tegra_gpio_init); +subsys_initcall (tegra_gpio_init);
Signature · 1 line
2.17.1
PATCH 5/62 net: phy: Fix the register offsets in Broadcom iProc mdio mux driver
In reply to Sasha LevinFrom: Arun Parameswaran <[email protected]>
[ Upstream commit 77fefa93bfebe4df44f154f2aa5938e32630d0bf ]
Modify the register offsets in the Broadcom iProc mdio mux to start from the top of the register address space.
Earlier, the base address pointed to the end of the block's register space. The base address will now point to the start of the mdio's address space. The offsets have been fixed to match this.
--- drivers/net/phy/mdio-mux-bcm-iproc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/net/phy/mdio-mux-bcm-iproc.c +15 -5
@@ -22,7 +22,7 @@#include <linux/mdio-mux.h> #include <linux/delay.h> -#define MDIO_PARAM_OFFSET 0x00 +#define MDIO_PARAM_OFFSET 0x23c#define MDIO_PARAM_MIIM_CYCLE 29#define MDIO_PARAM_INTERNAL_SEL 25#define MDIO_PARAM_BUS_ID 22
@@ -30,20 +30,22 @@#define MDIO_PARAM_PHY_ID 16#define MDIO_PARAM_PHY_DATA 0 -#define MDIO_READ_OFFSET 0x04 +#define MDIO_READ_OFFSET 0x240#define MDIO_READ_DATA_MASK 0xffff -#define MDIO_ADDR_OFFSET 0x08 +#define MDIO_ADDR_OFFSET 0x244 -#define MDIO_CTRL_OFFSET 0x0C +#define MDIO_CTRL_OFFSET 0x248#define MDIO_CTRL_WRITE_OP 0x1#define MDIO_CTRL_READ_OP 0x2 -#define MDIO_STAT_OFFSET 0x10 +#define MDIO_STAT_OFFSET 0x24c#define MDIO_STAT_DONE 1#define BUS_MAX_ADDR 32#define EXT_BUS_START_ADDR 16 +#define MDIO_REG_ADDR_SPACE_SIZE 0x250 +struct iproc_mdiomux_desc {void *mux_handle;void __iomem *base;
@@ -169,6 +171,14 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) md->dev = &pdev->dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (res->start &0xfff ) { +/* For backward compatibility in case the +* base address is specified with an offset. +*/ +dev_info (&pdev->dev,"fix base address in dt-blob\n" ); + res->start &= ~0xfff ; + res->end = res->start +MDIO_REG_ADDR_SPACE_SIZE -1 ; + } md->base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (md->base)) {dev_err (&pdev->dev,"failed to ioremap register\n" );
Signature · 1 line
2.17.1
PATCH 6/62 scsi: target: fix __transport_register_session locking
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 6a64f6e1591322beb8ce16e952a53582caf2a15c ]
When __transport_register_session is called from transport_register_session irqs will already have been disabled, so we do not want the unlock irq call to enable them until the higher level has done the final spin_unlock_irqrestore/ spin_unlock_irq.
This has __transport_register_session use the save/restore call.
--- drivers/target/target_core_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/target/target_core_transport.c +3 -2
@@ -316,6 +316,7 @@ void __transport_register_session( {const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;unsigned char buf[PR_REG_ISID_LEN ]; +unsigned long flags; se_sess->se_tpg = se_tpg; se_sess->fabric_sess_ptr = fabric_sess_ptr;
@@ -352,7 +353,7 @@ void __transport_register_session( se_sess->sess_bin_isid =get_unaligned_be64 (&buf[0 ]); } -spin_lock_irq (&se_nacl->nacl_sess_lock); +spin_lock_irqsave (&se_nacl->nacl_sess_lock, flags);/* * The se_nacl->nacl_sess pointer will be set to the * last active I_T Nexus for each struct se_node_acl.
@@ -361,7 +362,7 @@ void __transport_register_session(list_add_tail (&se_sess->sess_acl_list, &se_nacl->acl_sess_list); -spin_unlock_irq (&se_nacl->nacl_sess_lock); +spin_unlock_irqrestore (&se_nacl->nacl_sess_lock, flags); }list_add_tail (&se_sess->sess_list, &se_tpg->tpg_sess_list);
Signature · 1 line
2.17.1
PATCH 7/62 media: usbtv: use irqsave() in USB's complete callback
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 320905baa1dbddd3991c287432176d536e1d5b79 ]
The USB completion callback does not disable interrupts while acquiring the lock. We want to remove the local_irq_disable() invocation from __usb_hcd_giveback_urb() and therefore it is required for the callback handler to disable the interrupts while acquiring the lock. The callback may be invoked either in IRQ or BH context depending on the USB host controller.
Use the _irqsave() variant of the locking primitives.
--- drivers/media/usb/usbtv/usbtv-audio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/usb/usbtv/usbtv-audio.c +3 -2
@@ -126,6 +126,7 @@ static void usbtv_audio_urb_received(struct urb *urb)struct snd_pcm_runtime *runtime = substream->runtime;size_t i, frame_bytes, chunk_length, buffer_pos, period_pos;int period_elapsed; +unsigned long flags;void *urb_current;switch (urb->status) {
@@ -179,12 +180,12 @@ static void usbtv_audio_urb_received(struct urb *urb) } } -snd_pcm_stream_lock (substream); +snd_pcm_stream_lock_irqsave (substream, flags); chip->snd_buffer_pos = buffer_pos; chip->snd_period_pos = period_pos; -snd_pcm_stream_unlock (substream); +snd_pcm_stream_unlock_irqrestore (substream, flags);if (period_elapsed)snd_pcm_period_elapsed (substream);
Signature · 1 line
2.17.1
PATCH 8/62 md/raid5: fix data corruption of replacements after originals dropped
In reply to Sasha LevinFrom: BingJing Chang <[email protected]>
[ Upstream commit d63e2fc804c46e50eee825c5d3a7228e07048b47 ]
During raid5 replacement, the stripes can be marked with R5_NeedReplace flag. Data can be read from being-replaced devices and written to replacing spares without reading all other devices. (It's 'replace' mode. s.replacing = 1) If a being-replaced device is dropped, the replacement progress will be interrupted and resumed with pure recovery mode. However, existing stripes before being interrupted cannot read from the dropped device anymore. It prints lots of WARN_ON messages. And it results in data corruption because existing stripes write problematic data into its replacement device and update the progress.
\# Erase disks (1MB + 2GB)
dd if=/dev/zero of=/dev/sda bs=1MB count=2049
dd if=/dev/zero of=/dev/sdb bs=1MB count=2049
dd if=/dev/zero of=/dev/sdc bs=1MB count=2049
dd if=/dev/zero of=/dev/sdd bs=1MB count=2049
mdadm -C /dev/md0 -amd -R -l5 -n3 -x0 /dev/sd[abc] -z 2097152 \# Ensure array stores non-zero data
dd if=/root/data_4GB.iso of=/dev/md0 bs=1MB
\# Start replacement
mdadm /dev/md0 -a /dev/sdd
mdadm /dev/md0 --replace /dev/sda
Then, Hot-plug out /dev/sda during recovery, and wait for recovery done. echo check > /sys/block/md0/md/sync_action
cat /sys/block/md0/md/mismatch_cnt # it will be greater than 0.
Soon after you hot-plug out /dev/sda, you will see many WARN_ON messages. The replacement recovery will be interrupted shortly. After the recovery finishes, it will result in data corruption.
Actually, it's just an unhandled case of replacement. In commit <f94c0b6658c7> (md/raid5: fix interaction of 'replace' and 'recovery'.), if a NeedReplace device is not UPTODATE then that is an error, the commit just simply print WARN_ON but also mark these corrupted stripes with R5_WantReplace. (it means it's ready for writes.)
To fix this case, we can leverage 'sync and replace' mode mentioned in commit <9a3e1101b827> (md/raid5: detect and handle replacements during recovery.). We can add logics to detect and use 'sync and replace' mode for these stripes.
--- drivers/md/raid5.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/md/raid5.c +6 -0
@@ -4207,6 +4207,12 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) s->failed++;if (rdev && !test_bit (Faulty, &rdev->flags)) do_recovery =1 ; +else if (!rdev) { + rdev =rcu_dereference ( + conf->disks[i].replacement); +if (rdev && !test_bit (Faulty, &rdev->flags)) + do_recovery =1 ; + } } }if (test_bit (STRIPE_SYNCING , &sh->state)) {
Signature · 1 line
2.17.1
PATCH 9/62 timers: Clear timer_base::must_forward_clk with timer_base::lock held
In reply to Sasha LevinFrom: Gaurav Kohli <[email protected]>
[ Upstream commit 363e934d8811d799c88faffc5bfca782fd728334 ]
timer_base::must_forward_clock is indicating that the base clock might be stale due to a long idle sleep.
The forwarding of the base clock takes place in the timer softirq or when a timer is enqueued to a base which is idle. If the enqueue of timer to an idle base happens from a remote CPU, then the following race can happen:
CPU0 CPU1
run_timer_softirq mod_timer
base = lock_timer_base(timer); base->must_forward_clk = false if (base->must_forward_clk) forward(base); -> skipped enqueue_timer(base, timer, idx); -> idx is calculated high due to stale base unlock_timer_base(timer);
base = lock_timer_base(timer);
forward(base);
The root cause is that timer_base::must_forward_clk is cleared outside the timer_base::lock held region, so the remote queuing CPU observes it as cleared, but the base clock is still stale. This can cause large granularity values for timers, i.e. the accuracy of the expiry time suffers.
Prevent this by clearing the flag with timer_base::lock held, so that the forwarding takes place before the cleared flag is observable by a remote CPU.
--- kernel/time/timer.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
kernel/time/timer.c +16 -13
@@ -1649,6 +1649,22 @@ static inline void __run_timers(struct timer_base *base)spin_lock_irq (&base->lock); +/* +* timer_base::must_forward_clk must be cleared before running +* timers so that any timer functions that call mod_timer() will +* not try to forward the base. Idle tracking / clock forwarding +* logic is only used with BASE_STD timers. +* +* The must_forward_clk flag is cleared unconditionally also for +* the deferrable base. The deferrable base is not affected by idle +* tracking and never forwarded, so clearing the flag is a NOOP. +* +* The fact that the deferrable base is never forwarded can cause +* large variations in granularity for deferrable timers, but they +* can be deferred for long periods due to idle anyway. +*/ + base->must_forward_clk = false; +while (time_after_eq (jiffies, base->clk)) { levels =collect_expired_timers (base, heads);
@@ -1668,19 +1684,6 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h) {struct timer_base *base =this_cpu_ptr (&timer_bases[BASE_STD ]); -/* -* must_forward_clk must be cleared before running timers so that any -* timer functions that call mod_timer will not try to forward the -* base. idle trcking / clock forwarding logic is only used with -* BASE_STD timers. -* -* The deferrable base does not do idle tracking at all, so we do -* not forward it. This can result in very large variations in -* granularity for deferrable timers, but they can be deferred for -* long periods due to idle. -*/ - base->must_forward_clk = false; -__run_timers (base);if (IS_ENABLED (CONFIG_NO_HZ_COMMON ))__run_timers (this_cpu_ptr (&timer_bases[BASE_DEF ]));
Signature · 1 line
2.17.1
PATCH 10/62 misc: ti-st: Fix memory leak in the error path of probe()
In reply to Sasha LevinFrom: Anton Vasilyev <[email protected]>
[ Upstream commit 81ae962d7f180c0092859440c82996cccb254976 ]
Free resources instead of direct return of the error code if kim_probe fails.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/misc/ti-st/st_kim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/ti-st/st_kim.c +2 -2
@@ -756,14 +756,14 @@ static int kim_probe(struct platform_device *pdev) err =gpio_request (kim_gdata->nshutdown,"kim" );if (unlikely (err)) {pr_err (" gpio %d request failed " , kim_gdata->nshutdown); -return err; + goto err_sysfs_group; }/* Configure nShutdown GPIO as output=0 */ err =gpio_direction_output (kim_gdata->nshutdown,0 );if (unlikely (err)) {pr_err (" unable to configure gpio %d" , kim_gdata->nshutdown); -return err; + goto err_sysfs_group; }/* get reference of pdev for request_firmware */
Signature · 1 line
2.17.1