drm/bufs: Fix Spectre v1 vulnerability
Subsystems (49)
Sasha Levin
maintainerPATCH 1/258 drm/bufs: Fix Spectre v1 vulnerability
From: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit a37805098900a6e73a55b3a43b7d3bcd987bb3f4 ]
idx can be indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
This issue was detected with the help of Smatch:
drivers/gpu/drm/drm_bufs.c:1420 drm_legacy_freebufs() warn: potential spectre issue 'dma->buflist' [r] (local cap)
Fix this by sanitizing idx before using it to index dma->buflist
Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1].
[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2
--- drivers/gpu/drm/drm_bufs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_bufs.c +3 -0
@@ -36,6 +36,8 @@#include <drm/drmP.h> #include "drm_legacy.h" +#include <linux/nospec.h> +static struct drm_map_list *drm_find_matching_map (struct drm_device *dev,struct drm_local_map *map) {
@@ -1417,6 +1419,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, idx, dma->buf_count - 1);return -EINVAL ; } + idx =array_index_nospec (idx, dma->buf_count); buf = dma->buflist[idx];if (buf->file_priv != file_priv) { DRM_ERROR("Process %d freeing buffer not owned\n",
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 2/258 staging: iio: adc: ad7280a: handle error from __ad7280_read32()
From: Slawomir Stepien <[email protected]>
[ Upstream commit 0559ef7fde67bc6c83c6eb6329dbd6649528263e ]
Inside __ad7280_read32(), the spi_sync_transfer() can fail with negative error code. This change will ensure that this error is being passed up in the call stack, so it can be handled.
--- drivers/staging/iio/adc/ad7280a.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/staging/iio/adc/ad7280a.c +13 -4
@@ -256,7 +256,9 @@ static int ad7280_read(struct ad7280_state *st, unsigned int devaddr,if (ret)return ret; -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -294,7 +296,9 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,ad7280_delay (st); -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -327,7 +331,9 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,ad7280_delay (st);for (i =0 ; i < cnt; i++) { -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -370,7 +376,10 @@ static int ad7280_chain_setup(struct ad7280_state *st)return ret;for (n =0 ; n <=AD7280A_MAX_CHAIN ; n++) { -__ad7280_read32 (st, &val); + ret =__ad7280_read32 (st, &val); +if (ret) +return ret; +if (val ==0 )return n -1 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 3/258 drm/vgem: Fix vgem_init to get drm device available.
In reply to Sasha LevinFrom: Deepak Sharma <[email protected]>
[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ]
Modify vgem_init to take platform dev as parent in drm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.
v2: rebase, address checkpatch typo and line over 80 characters
--- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +8 -8
@@ -471,31 +471,31 @@ static int __init vgem_init(void)if (!vgem_device)return -ENOMEM ; - ret =drm_dev_init (&vgem_device->drm, &vgem_driver,NULL ); -if (ret) - goto out_free; - vgem_device->platform =platform_device_register_simple ("vgem" ,-1 ,NULL ,0 );if (IS_ERR (vgem_device->platform)) { ret =PTR_ERR (vgem_device->platform); - goto out_fini; + goto out_free; }dma_coerce_mask_and_coherent (&vgem_device->platform->dev,DMA_BIT_MASK (64 )); + ret =drm_dev_init (&vgem_device->drm, &vgem_driver, + &vgem_device->platform->dev); +if (ret) + goto out_unregister;/* Final step: expose the device/driver to userspace */ ret =drm_dev_register (&vgem_device->drm,0 );if (ret) - goto out_unregister; + goto out_fini;return 0 ; -out_unregister: -platform_device_unregister (vgem_device->platform); out_fini:drm_dev_fini (&vgem_device->drm); +out_unregister: +platform_device_unregister (vgem_device->platform); out_free:kfree (vgem_device);return ret;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 4/258 pinctrl: bcm2835: Use raw spinlock for RT compatibility
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 3c7b30f704b6f5e53eed6bf89cf2c8d1b38b02c0 ]
The BCM2835 pinctrl driver acquires a spinlock in its ->irq_enable, ->irq_disable and ->irq_set_type callbacks. Spinlocks become sleeping locks with CONFIG_PREEMPT_RT_FULL=y, therefore invocation of one of the callbacks in atomic context may cause a hard lockup if at least two GPIO pins in the same bank are used as interrupts. The issue doesn't occur with just a single interrupt pin per bank because the lock is never contended. I'm experiencing such lockups with GPIO 8 and 28 used as level-triggered interrupts, i.e. with ->irq_disable being invoked on reception of every IRQ.
The critical section protected by the spinlock is very small (one bitop and one RMW of an MMIO register), hence converting to a raw spinlock seems a better trade-off than converting the driver to threaded IRQ handling (which would increase latency to handle an interrupt).
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +8 -8
@@ -90,7 +90,7 @@ struct bcm2835_pinctrl {struct gpio_chip gpio_chip;struct pinctrl_gpio_range gpio_range; -spinlock_t irq_lock[BCM2835_NUM_BANKS ]; +raw_spinlock_t irq_lock[BCM2835_NUM_BANKS ]; };/* pins are just named GPIO0..GPIO53 */
@@ -461,10 +461,10 @@ static void bcm2835_gpio_irq_enable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);set_bit (offset, &pc->enabled_irq_map[bank]);bcm2835_gpio_irq_config (pc, gpio, true); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); }static void bcm2835_gpio_irq_disable (struct irq_data *data)
@@ -476,12 +476,12 @@ static void bcm2835_gpio_irq_disable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);bcm2835_gpio_irq_config (pc, gpio, false);/* Clear events that were latched prior to clearing event sources */ bcm2835_gpio_set_bit (pc,GPEDS0 , gpio);clear_bit (offset, &pc->enabled_irq_map[bank]); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); } static int __bcm2835_gpio_irq_set_type_disabled(struct bcm2835_pinctrl *pc,
@@ -584,7 +584,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)unsigned long flags;int ret; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);if (test_bit (offset, &pc->enabled_irq_map[bank])) ret =__bcm2835_gpio_irq_set_type_enabled (pc, gpio, type);
@@ -596,7 +596,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)else irq_set_handler_locked (data, handle_level_irq); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags);return ret; }
@@ -1047,7 +1047,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)for_each_set_bit (offset, &events,32 )bcm2835_gpio_wr (pc,GPEDS0 + i *4 ,BIT (offset)); -spin_lock_init (&pc->irq_lock[i]); +raw_spin_lock_init (&pc->irq_lock[i]); } err =gpiochip_add_data (&pc->gpio_chip, pc);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 5/258 ASoC: Intel: mrfld: fix uninitialized variable access
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1539c7f23f256120f89f8b9ec53160790bce9ed2 ]
Randconfig testing revealed a very old bug, with gcc-8:
sound/soc/intel/atom/sst/sst_loader.c: In function 'sst_load_fw':sound/soc/intel/atom/sst/sst_loader.c:357:5: error: 'fw' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (fw == NULL) {
^sound/soc/intel/atom/sst/sst_loader.c:354:25: note: 'fw' was declared here
const struct firmware *fw;
We must check the return code of request_firmware() before we look at the pointer result that may be uninitialized when the function fails.
--- sound/soc/intel/atom/sst/sst_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/atom/sst/sst_loader.c +4 -4
@@ -354,14 +354,14 @@ static int sst_request_fw(struct intel_sst_drv *sst)const struct firmware *fw; retval =request_firmware (&fw, sst->firmware_name, sst->dev); -if (fw ==NULL ) { -dev_err (sst->dev,"fw is returning as null\n" ); -return -EINVAL ; - }if (retval) {dev_err (sst->dev,"request fw failed %d\n" , retval);return retval; } +if (fw ==NULL ) { +dev_err (sst->dev,"fw is returning as null\n" ); +return -EINVAL ; + }mutex_lock (&sst->sst_lock); retval =sst_cache_and_parse_fw (sst, fw);mutex_unlock (&sst->sst_lock);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 6/258 gpiolib: Fix possible use after free on label
In reply to Sasha LevinFrom: Muchun Song <[email protected]>
[ Upstream commit 18534df419041e6c1f4b41af56ee7d41f757815c ]
gpiod_request_commit() copies the pointer to the label passed as an argument only to be used later. But there's a chance the caller could immediately free the passed string(e.g., local variable). This could trigger a use after free when we use gpio label(e.g., gpiochip_unlock_as_irq(), gpiochip_is_requested()).
To be on the safe side: duplicate the string with kstrdup_const() so that if an unaware user passes an address to a stack-allocated buffer, we won't get the arbitrary label.
Also fix gpiod_set_consumer_name().
--- drivers/gpio/gpiolib.c | 25 +++++++++++++++++++++---- include/linux/gpio/consumer.h | 6 ++++-- 2 files changed, 25 insertions(+), 6 deletions(-)
drivers/gpio/gpiolib.c +21 -4
@@ -2271,6 +2271,12 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)unsigned long flags;unsigned offset; +if (label) { + label =kstrdup_const (label,GFP_KERNEL ); +if (!label) +return -ENOMEM ; + } +spin_lock_irqsave (&gpio_lock, flags);/* NOTE: gpio_request() can be called in early boot,
@@ -2281,6 +2287,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)desc_set_label (desc, label ? :"?" ); status =0 ; }else { +kfree_const (label); status = -EBUSY ; goto done; }
@@ -2297,6 +2304,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)if (status <0 ) {desc_set_label (desc,NULL ); +kfree_const (label);clear_bit (FLAG_REQUESTED , &desc->flags); goto done; }
@@ -2392,6 +2400,7 @@ static bool gpiod_free_commit(struct gpio_desc *desc) chip->free (chip,gpio_chip_hwgpio (desc));spin_lock_irqsave (&gpio_lock, flags); } +kfree_const (desc->label);desc_set_label (desc,NULL );clear_bit (FLAG_ACTIVE_LOW , &desc->flags);clear_bit (FLAG_REQUESTED , &desc->flags);
@@ -3213,11 +3222,19 @@ EXPORT_SYMBOL_GPL(gpiod_cansleep);* @desc: gpio to set the consumer name on * @name: the new consumer name */ -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) { -VALIDATE_DESC_VOID (desc); -/* Just overwrite whatever the previous name was */ - desc->label = name; +VALIDATE_DESC (desc); +if (name) { + name =kstrdup_const (name,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + } + +kfree_const (desc->label); +desc_set_label (desc, name); + +return 0 ; }EXPORT_SYMBOL_GPL (gpiod_set_consumer_name);
include/linux/gpio/consumer.h +4 -2
@@ -142,7 +142,7 @@ int gpiod_is_active_low(const struct gpio_desc *desc);int gpiod_cansleep (const struct gpio_desc *desc);int gpiod_to_irq (const struct gpio_desc *desc); -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name); +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name);/* Convert between the old gpio_ and new gpiod_ interfaces */ struct gpio_desc *gpio_to_desc (unsigned gpio);
@@ -465,10 +465,12 @@ static inline int gpiod_to_irq(const struct gpio_desc *desc)return -EINVAL ; } -static inline void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +static inline int gpiod_set_consumer_name (struct gpio_desc *desc, +const char *name) {/* GPIO can never have been requested */ WARN_ON (1 ); +return -EINVAL ; }static inline struct gpio_desc *gpio_to_desc (unsigned gpio)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/258 drm/sun4i: Initialize registers in tcon-top driver
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit c96d62215fb540e2ae61de44cb7caf4db50958e3 ]
It turns out that TCON TOP registers in H6 SoC have non-zero reset value. This may cause issues if bits are not changed during configuration.
To prevent that, initialize registers to 0.
--- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +7 -0
@@ -168,6 +168,13 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, goto err_assert_reset; } +/* +* At least on H6, some registers have some bits set by default +* which may cause issues. Clear them here. +*/ +writel (0 , regs +TCON_TOP_PORT_SEL_REG ); +writel (0 , regs +TCON_TOP_GATE_SRC_REG ); +/* * TCON TOP has two muxes, which select parent clock for each TCON TV * channel clock. Parent could be either TCON TV or TVE clock. For now
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 8/258 genirq/affinity: Spread IRQs to all available NUMA nodes
In reply to Sasha LevinFrom: Long Li <[email protected]>
[ Upstream commit b82592199032bf7c778f861b936287e37ebc9f62 ]
If the number of NUMA nodes exceeds the number of MSI/MSI-X interrupts which are allocated for a device, the interrupt affinity spreading code fails to spread them across all nodes.
The reason is, that the spreading code starts from node 0 and continues up to the number of interrupts requested for allocation. This leaves the nodes past the last interrupt unused.
This results in interrupt concentration on the first nodes which violates the assumption of the block layer that all nodes are covered evenly. As a consequence the NUMA nodes above the number of interrupts are all assigned to hardware queue 0 and therefore NUMA node 0, which results in bad performance and has CPU hotplug implications, because queue 0 gets shut down when the last CPU of node 0 is offlined.
Go over all NUMA nodes and assign them round-robin to all requested interrupts to solve this.
[ tglx: Massaged changelog ]
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -117,12 +117,11 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,*/ if (numvecs <= nodes) {for_each_node_mask (n, nodemsk) { -cpumask_copy (masks + curvec, node_to_cpumask[n]); -if (++done == numvecs) -break ; +cpumask_or (masks + curvec, masks + curvec, node_to_cpumask[n]);if (++curvec == last_affv) curvec = affd->pre_vectors; } + done = numvecs; goto out; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 9/258 gpu: ipu-v3: image-convert: Prevent race between run and unprepare
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit 819bec35c8c9706185498c9222bd244e0781ad35 ]
Prevent possible race by parallel threads between ipu_image_convert_run() and ipu_image_convert_unprepare(). This involves setting ctx->aborting to true unconditionally so that no new job runs can be queued during unprepare, and holding the ctx->aborting flag until the context is freed.
Note that the "normal" ipu_image_convert_abort() case (e.g. not during context unprepare) should clear the ctx->aborting flag after aborting any active run and clearing the context's pending queue. This is because it should be possible to continue to use the conversion context and queue more runs after an abort.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +7 -3
@@ -1524,7 +1524,7 @@ int ipu_image_convert_queue(struct ipu_image_convert_run *run)EXPORT_SYMBOL_GPL (ipu_image_convert_queue);/* Abort any active or pending conversions for this context */ -void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +static void __ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) {struct ipu_image_convert_chan *chan = ctx->chan;struct ipu_image_convert_priv *priv = chan->priv;
@@ -1551,7 +1551,7 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) need_abort = (run_count || active_run); - ctx->aborting = need_abort; + ctx->aborting = true;spin_unlock_irqrestore (&chan->irqlock, flags);
@@ -1572,7 +1572,11 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx)dev_warn (priv->ipu->dev,"%s: timeout\n" , __func__);force_abort (ctx); } +} +void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +{ +__ipu_image_convert_abort (ctx); ctx->aborting = false; }EXPORT_SYMBOL_GPL (ipu_image_convert_abort);
@@ -1586,7 +1590,7 @@ void ipu_image_convert_unprepare(struct ipu_image_convert_ctx *ctx)bool put_res;/* make sure no runs are hanging around */ -ipu_image_convert_abort (ctx); +__ipu_image_convert_abort (ctx);dev_dbg (priv->ipu->dev,"%s: task %u: removing ctx %p\n" , __func__, chan->ic_task, ctx);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 10/258 nds32: Fix gcc 8.0 compiler option incompatible.
In reply to Sasha LevinFrom: Nickhu <[email protected]>
[ Upstream commit 4c3d6174e0e17599549f636ec48ddf78627a17fe ]
When the kernel configs of ftrace and frame pointer options are
choosed, the compiler option of kernel will incompatible.
Error message:
nds32le-linux-gcc: error: -pg and -fomit-frame-pointer are incompatible
--- arch/nds32/mm/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/nds32/mm/Makefile +5 -1
@@ -4,4 +4,8 @@ obj-y := extable.o tlb.o \ obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o -CFLAGS_proc-n13.o += -fomit-frame-pointer + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE) +endif +CFLAGS_proc.o += -fomit-frame-pointer
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 11/258 wil6210: fix reset flow for Talyn-mb
In reply to Sasha LevinFrom: Alexei Avshalom Lazar <[email protected]>
[ Upstream commit d083b2e2b7db5cca1791643d036e6597af27f49b ]
With current reset flow, Talyn sometimes get stuck causing PCIe enumeration to fail. Fix this by removing some reset flow operations that are not relevant for Talyn.
Setting bit 15 in RGF_HP_CTRL is WBE specific and is not in use for all wil6210 devices.
For Sparrow, BIT_HPAL_PERST_FROM_PAD and BIT_CAR_PERST_RST were set as a WA an HW issue.
--- drivers/net/wireless/ath/wil6210/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +7 -4
@@ -995,10 +995,13 @@ static int wil_target_reset(struct wil6210_priv *wil, int no_flash)wil_dbg_misc (wil,"Resetting \"%s\"...\n" , wil->hw_name); -/* Clear MAC link up */ -wil_s (wil,RGF_HP_CTRL ,BIT (15 )); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_HPAL_PERST_FROM_PAD ); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); +if (wil->hw_version <HW_VER_TALYN ) { +/* Clear MAC link up */ +wil_s (wil,RGF_HP_CTRL ,BIT (15 )); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 , +BIT_HPAL_PERST_FROM_PAD ); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); + }wil_halt_cpu (wil);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 12/258 wil6210: fix memory leak in wil_find_tx_bcast_2
In reply to Sasha LevinFrom: Lior David <[email protected]>
[ Upstream commit 664497400c89a4d40aee51bcf48bbd2e4dc71104 ]
A successful call to wil_tx_ring takes skb reference so it will only be freed in wil_tx_complete. Consume the skb in wil_find_tx_bcast_2 to prevent memory leak.
--- drivers/net/wireless/ath/wil6210/txrx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/wil6210/txrx.c +2 -0
@@ -1313,6 +1313,8 @@ static struct wil_ring *wil_find_tx_bcast_2(struct wil6210_priv *wil,wil_dbg_txrx (wil,"BCAST DUP -> ring %d\n" , i);wil_set_da_for_vring (wil, skb2, i);wil_tx_ring (wil, vif, v2, skb2); +/* successful call to wil_tx_ring takes skb2 ref */ +dev_kfree_skb_any (skb2); }else {wil_err (wil,"skb_copy failed\n" ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 13/258 ath10k: assign 'n_cipher_suites' for WCN3990
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 2bd345cd2bfc0bd44528896313c0b45f087bdf67 ]
Commit 2ea9f12cefe4 ("ath10k: add new cipher suite support") added a new n_cipher_suites HW param with a fallback value and a warning log. Commit 03a72288c546 ("ath10k: wmi: add hw params entry for wcn3990") later added WCN3990 HW entries, but it missed the n_cipher_suites.
Rather than seeing this warning every boot
ath10k_snoc 18800000.wifi: invalid hw_params.n_cipher_suites 0
let's provide the appropriate value.
--- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/core.c +1 -0
@@ -532,6 +532,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .hw_ops = &wcn3990_ops, .decap_align_bytes = 1, .num_peers = TARGET_HL_10_TLV_NUM_PEERS, + .n_cipher_suites = 8, .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT, .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES, .target_64bit = true,
Signature · 7 lines
2.19.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 14/258 ath9k: dynack: use authentication messages for 'late' ack
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link
--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/dynack.c +2 -1
@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 15/258 scsi: lpfc: Correct LCB RJT handling
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ]
When LCB's are rejected, if beaconing was already in progress, the Reason Code Explanation was not being set. Should have been set to command in progress.
--- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +3 -0
@@ -5701,6 +5701,9 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) stat = (struct ls_rjt *)(pcmd +sizeof (uint32_t )); stat->un.b.lsRjtRsnCode =LSRJT_UNABLE_TPC ; +if (shdr_add_status ==ADD_STATUS_OPERATION_ALREADY_ACTIVE ) + stat->un.b.lsRjtRsnCodeExp =LSEXP_CMD_IN_PROGRESS ; + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitLSRJT++; rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 16/258 scsi: mpt3sas: Call sas_remove_host before removing the target devices
In reply to Sasha LevinFrom: Suganath Prabu <[email protected]>
[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ]
Call sas_remove_host() before removing the target devices in the driver's .remove() callback function(i.e. during driver unload time). So that driver can provide a way to allow SYNC CACHE, START STOP unit commands etc. (which are issued from SML) to the target drives during driver unload time.
Once sas_remove_host() is called before removing the target drives then driver can just clean up the resources allocated for target devices and no need to call sas_port_delete_phy(), sas_port_delete() API's as these API's internally called from sas_remove_host().
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -9809,6 +9809,7 @@ static void scsih_remove(struct pci_dev *pdev)/* release all the volumes */ _scsih_ir_shutdown (ioc); +sas_remove_host (shost);list_for_each_entry_safe (raid_device, next, &ioc->raid_device_list, list) {if (raid_device->starget) {
@@ -9851,7 +9852,6 @@ static void scsih_remove(struct pci_dev *pdev) ioc->sas_hba.num_phys =0 ; } -sas_remove_host (shost);mpt3sas_base_detach (ioc);spin_lock (&gioc_lock);list_del (&ioc->list);
drivers/scsi/mpt3sas/mpt3sas_transport.c +5 -2
@@ -834,10 +834,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, mpt3sas_port->remote_identify.sas_address, mpt3sas_phy->phy_id); mpt3sas_phy->phy_belongs_to_port =0 ; -sas_port_delete_phy (mpt3sas_port->port, mpt3sas_phy->phy); +if (!ioc->remove_host) +sas_port_delete_phy (mpt3sas_port->port, + mpt3sas_phy->phy);list_del (&mpt3sas_phy->port_siblings); } -sas_port_delete (mpt3sas_port->port); +if (!ioc->remove_host) +sas_port_delete (mpt3sas_port->port);kfree (mpt3sas_port); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/258 scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ]
After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to re-establish the login. An nlp_type check in the LOGO completion handler failed to restart discovery for NVME targets. Revised the nlp_type check for NVME as well as SCSI.
While reviewing the LOGO handling a few other issues were seen and were addressed:
- Better lock synchronization around ndlp data types
- When the ABTS times out, unregister the RPI before sending the LOGO so that all local exchange contexts are cleared and nothing received while awaiting LOGO/PLOGI handling will be accepted.
- LOGO handling optimized to:
Wait only R_A_TOV for a response.
It doesn't need to be retried on timeout. If there wasn't a
response, a PLOGI will be sent, thus an implicit logout applies as well when the other port sees it.
If there is a response, any kind of response is considered "good"
and the XRI quarantined for a exchange qualifier window.
- PLOGI is issued as soon a LOGO state is resolved.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +21 -28
@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, icmd->ulpCommand =CMD_ELS_REQUEST64_CR ;if (elscmd ==ELS_CMD_FLOGI ) icmd->ulpTimeout =FF_DEF_RATOV *2 ; +else if (elscmd ==ELS_CMD_LOGO ) + icmd->ulpTimeout = phba->fc_ratov;else icmd->ulpTimeout = phba->fc_ratov *2 ; }else {
@@ -2682,16 +2684,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* The LOGO will not be retried on failure. A LOGO was +* issued to the remote rport and a ACC or RJT or no Answer are +* all acceptable. Note the failure and move forward with +* discovery. The PLOGI will retry. +*/ if (irsp->ulpStatus) { -/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { -/* ELS command is being retried */ - skip_recovery =1 ; - goto out; - }/* LOGO failed */ lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"2756 LOGO failure DID:%06X Status:x%x/x%x\n" , +"2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n" , ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ]);/* Do not call DSM for lpfc_els_abort'ed ELS cmds */
@@ -2737,7 +2738,8 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* For any other port type, the rpi is unregistered as an implicit * LOGO. */ -if ((ndlp->nlp_type &NLP_FCP_TARGET ) && (skip_recovery ==0 )) { +if (ndlp->nlp_type & (NLP_FCP_TARGET |NLP_NVME_TARGET ) && + skip_recovery ==0 ) {lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;
@@ -2770,6 +2772,8 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* will be stored into the context1 field of the IOCB for the completion * callback function to the LOGO ELS command. * +* Callers of this routine are expected to unregister the RPI first +* * Return code * 0 - successfully issued logo * 1 - failed to issue logo
@@ -2811,22 +2815,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue LOGO: did:x%x" , ndlp->nlp_DID, 0, 0); -/* -* If we are issuing a LOGO, we may try to recover the remote NPort -* by issuing a PLOGI later. Even though we issue ELS cmds by the -* VPI, if we have a valid RPI, and that RPI gets unreg'ed while -* that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI -* for that ELS cmd. To avoid this situation, lets get rid of the -* RPI right now, before any ELS cmds are sent. -*/ -spin_lock_irq (shost->host_lock); - ndlp->nlp_flag |=NLP_ISSUE_LOGO ; -spin_unlock_irq (shost->host_lock); -if (lpfc_unreg_rpi (vport, ndlp)) { -lpfc_els_free_iocb (phba, elsiocb); -return 0 ; - } - phba->fc_stat.elsXmitLOGO++; elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;spin_lock_irq (shost->host_lock);
@@ -2834,7 +2822,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (shost->host_lock); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;
@@ -2842,6 +2829,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_els_free_iocb (phba, elsiocb);return 1 ; } + +spin_lock_irq (shost->host_lock); + ndlp->nlp_prev_state = ndlp->nlp_state; +spin_unlock_irq (shost->host_lock); +lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; }
@@ -9505,7 +9497,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, "rport in state 0x%x\n", ndlp->nlp_state);return ; } - lpfc_printf_log(phba, KERN_INFO, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, + LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, "3094 Start rport recovery on shost id 0x%x " "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " "flags 0x%x\n",
@@ -9518,8 +9511,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,*/ spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE ; + ndlp->nlp_flag |=NLP_ISSUE_LOGO ;spin_unlock_irqrestore (shost->host_lock, flags); -lpfc_issue_els_logo (vport, ndlp,0 ); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE ); +lpfc_unreg_rpi (vport, ndlp); }
drivers/scsi/lpfc/lpfc_nportdisc.c +5 -0
@@ -836,7 +836,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if (!(ndlp->nlp_flag &NLP_RPI_REGISTERED )) { +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);return 0 ; }
@@ -851,7 +853,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)return 1 ; } } + +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);lpfc_unreg_rpi (vport, ndlp);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/258 platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
In reply to Sasha LevinFrom: João Paulo Rechi Vita <[email protected]>
[ Upstream commit b3f2f3799a972d3863d0fdc2ab6287aef6ca631f ]
When the OS registers to handle events from the display off hotkey the EC will send a notification with 0x35 for every key press, independent of the backlight state.
The behavior of this key on Windows, with the ATKACPI driver from Asus installed, is turning off the backlight of all connected displays with a fading effect, and any cursor input or key press turning the backlight back on. The key press or cursor input that wakes up the display is also passed through to the application under the cursor or under focus.
The key that matches this behavior the closest is KEY_SCREENLOCK.
--- drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/asus-nb-wmi.c +1 -0
@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ + { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 19/258 ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
In reply to Sasha LevinFrom: Yufen Wang <[email protected]>
[ Upstream commit 82c08c3e7f171aa7f579b231d0abbc1d62e91974 ]
In case panic() and panic() called at the same time on different CPUS. For example:
CPU 0:
panic()
__crash_kexec
machine_crash_shutdown
crash_smp_send_stop
machine_kexec
BUG_ON(num_online_cpus() > 1);CPU 1:
panic()
local_irq_disable
panic_smp_self_stop
If CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop(), kdump fails. CPU1 can't receive the ipi irq, CPU1 will be always online. To fix this problem, this patch split out the panic_smp_self_stop() and add set_cpu_online(smp_processor_id(), false).
--- arch/arm/kernel/smp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm/kernel/smp.c +15 -0
@@ -693,6 +693,21 @@ void smp_send_stop(void)pr_warn ("SMP: failed to stop secondary CPUs\n" ); } +/* In case panic() and panic() called at the same time on CPU1 and CPU2, +* and CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop() +* CPU1 can't receive the ipi irqs from CPU2, CPU1 will be always online, +* kdump fails. So split out the panic_smp_self_stop() and add +* set_cpu_online(smp_processor_id(), false). +*/ +void panic_smp_self_stop (void ) +{ +pr_debug ("CPU %u will stop doing anything useful since another CPU has paniced\n" , +smp_processor_id ()); +set_cpu_online (smp_processor_id (), false); +while (1 ) +cpu_relax (); +} +/* * not supported here */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/258 clk: boston: fix possible memory leak in clk_boston_setup()
In reply to Sasha LevinFrom: Yi Wang <[email protected]>
[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ]
Smatch report warnings:drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell'
'onecell' is malloced in clk_boston_setup(), but not be freed before leaving from the error handling cases.
--- drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clk/imgtec/clk-boston.c +8 -3
@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) hw =clk_hw_register_fixed_rate (NULL ,"input" ,NULL ,0 , in_freq);if (IS_ERR (hw)) {pr_err ("failed to register input clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_INPUT ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"sys" ,"input" ,0 , sys_freq);if (IS_ERR (hw)) {pr_err ("failed to register sys clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_SYS ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"cpu" ,"input" ,0 , cpu_freq);if (IS_ERR (hw)) {pr_err ("failed to register cpu clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_CPU ] = hw; err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, onecell);if (err)pr_err ("failed to add DT provider: %d\n" , err); + +return ; + +error: +kfree (onecell); }/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/258 dlm: Don't swamp the CPU with callbacks queued during recovery
In reply to Sasha LevinFrom: Bob Peterson <[email protected]>
[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]
Before this patch, recovery would cause all callbacks to be delayed, put on a queue, and afterward they were all queued to the callback work queue. This patch does the same thing, but occasionally takes a break after 25 of them so it won't swamp the CPU at the expense of other RT processes like corosync.
--- fs/dlm/ast.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/dlm/ast.c +10 -0
@@ -292,6 +292,8 @@ void dlm_callback_suspend(struct dlm_ls *ls)flush_workqueue (ls->ls_callback_wq); } +#define MAX_CB_QUEUE 25 +void dlm_callback_resume (struct dlm_ls *ls) {struct dlm_lkb *lkb, *safe;
@@ -302,15 +304,23 @@ void dlm_callback_resume(struct dlm_ls *ls)if (!ls->ls_callback_wq)return ; +more:mutex_lock (&ls->ls_cb_mutex);list_for_each_entry_safe (lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {list_del_init (&lkb->lkb_cb_list);queue_work (ls->ls_callback_wq, &lkb->lkb_cb_work); count++; +if (count ==MAX_CB_QUEUE ) +break ; }mutex_unlock (&ls->ls_cb_mutex);if (count)log_rinfo (ls,"dlm_callback_resume %d" , count); +if (count ==MAX_CB_QUEUE ) { + count =0 ; +cond_resched (); + goto more; + } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/258 x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ]
In the expression "word1 << 16", word1 starts as u16, but is promoted to a signed int, then sign-extended to resource_size_t, which is probably not what was intended. Cast to resource_size_t to avoid the sign extension.
This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI:
Fix Broadcom CNB20LE unintended sign extension") back in 2014.
Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension")
--- arch/x86/pci/broadcom_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/broadcom_bus.c +2 -2
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) word1 =read_pci_config_16 (bus, slot, func,0xc0 ); word2 =read_pci_config_16 (bus, slot, func,0xc2 );if (word1 != word2) { - res.start = (word1 <<16 ) |0x0000 ; - res.end = (word2 <<16 ) |0xffff ; + res.start = ((resource_size_t ) word1 <<16 ) |0x0000 ; + res.end = ((resource_size_t ) word2 <<16 ) |0xffff ; res.flags =IORESOURCE_MEM ;update_res (info, res.start, res.end, res.flags,0 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 23/258 powerpc/pseries: add of_node_put() in dlpar_detach_node()
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit 5b3f5c408d8cc59b87e47f1ab9803dbd006e4a91 ]
The previous commit, "of: overlay: add missing of_node_get() in __of_attach_node_sysfs" added a missing of_node_get() to __of_attach_node_sysfs(). This results in a refcount imbalance for nodes attached with dlpar_attach_node(). The calling sequence from dlpar_attach_node() to __of_attach_node_sysfs() is:
dlpar_attach_node()
of_attach_node()
__of_attach_node_sysfs()For more detailed description of the node refcount, see commit 68baf692c435 ("powerpc/pseries: Fix of_node_put() underflow during DLPAR remove").
--- arch/powerpc/platforms/pseries/dlpar.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/pseries/dlpar.c +2 -0
@@ -272,6 +272,8 @@ int dlpar_detach_node(struct device_node *dn)if (rc)return rc; +of_node_put (dn); +return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 24/258 srcu: Prevent __call_srcu() counter wrap with read-side critical section
In reply to Sasha LevinFrom: "Paul E. McKenney" <[email protected]>
[ Upstream commit 0607ba8403c4cdb253f8c5200ecf654dfb7790cc ]
Ever since cdf7abc4610a ("srcu: Allow use of Tiny/Tree SRCU from both process and interrupt context"), it has been permissible to use SRCU read-side critical sections in interrupt context. This allows __call_srcu() to use SRCU read-side critical sections to prevent a new SRCU grace period from ending before the call to either srcu_funnel_gp_start() or srcu_funnel_exp_start completes, thus preventing SRCU grace-period counter overflow during that time.
Note that this does not permit removal of the counter-wrap checks in srcu_gp_end(). These check are necessary to handle the case where a given CPU does not interact at all with SRCU for an extended time period.
This commit therefore adds an SRCU read-side critical section to __call_srcu() in order to prevent grace period counter wrap during the funnel-locking process.
--- kernel/rcu/srcutree.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/rcu/srcutree.c +3 -0
@@ -853,6 +853,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, rcu_callback_t func, bool do_norm) {unsigned long flags; +int idx;bool needexp = false;bool needgp = false;unsigned long s;
@@ -866,6 +867,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp,return ; } rhp->func = func; + idx =srcu_read_lock (sp);local_irq_save (flags); sdp =this_cpu_ptr (sp->sda);spin_lock_rcu_node (sdp);
@@ -887,6 +889,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp,srcu_funnel_gp_start (sp, sdp, s, do_norm); else if (needexp) srcu_funnel_exp_start(sp, sdp->mynode, s); +srcu_read_unlock (sp ,idx ); }/**
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/258 of: overlay: do not duplicate properties from overlay for new nodes
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit 8814dc46bd9e347d4de55ec5bf8f16ea54470499 ]
When allocating a new node, add_changeset_node() was duplicating the properties from the respective node in the overlay instead of allocating a node with no properties.
When this patch is applied the errors reported by the devictree unittest from patch "of: overlay: add tests to validate kfrees from overlay removal" will no longer occur. These error messages are of the form:
"OF: ERROR: ..."
and the unittest results will change from:
### dt-test ### end of unittest - 203 passed, 7 failed
to
### dt-test ### end of unittest - 210 passed, 0 failed
--- drivers/of/overlay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/overlay.c +1 -1
@@ -368,7 +368,7 @@ static int add_changeset_node(struct overlay_changeset *ovcs,break ;if (!tchild) { - tchild =__of_node_dup (node, node_kbasename); + tchild =__of_node_dup (NULL , node_kbasename);if (!tchild)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/258 crypto: aes_ti - disable interrupts while accessing S-box
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit 0a6a40c2a8c184a2fb467efacfb1cd338d719e0b ]
In the "aes-fixed-time" AES implementation, disable interrupts while accessing the S-box, in order to make cache-timing attacks more difficult. Previously it was possible for the CPU to be interrupted while the S-box was loaded into L1 cache, potentially evicting the cachelines and causing later table lookups to be time-variant.
In tests I did on x86 and ARM, this doesn't affect performance significantly. Responsiveness is potentially a concern, but interrupts are only disabled for a single AES block.
Note that even after this change, the implementation still isn't necessarily guaranteed to be constant-time; see
https://cr.yp.to/antiforgery/cachetiming-20050414.pdf for a discussion of the many difficulties involved in writing truly constant-time AES software. But it's valuable to make such attacks more difficult.
--- crypto/Kconfig | 3 ++- crypto/aes_ti.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
crypto/Kconfig +2 -1
@@ -1056,7 +1056,8 @@ config CRYPTO_AES_TI 8 for decryption), this implementation only uses just two S-boxes of 256 bytes each, and attempts to eliminate data dependent latencies by prefetching the entire table into the cache at the start of each - block. + block. Interrupts are also disabled to avoid races where cachelines + are evicted when the CPU is interrupted to do something else. config CRYPTO_AES_586 tristate "AES cipher algorithms (i586)"
crypto/aes_ti.c +18 -0
@@ -269,6 +269,7 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_enc +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_enc[0 ] ^get_unaligned_le32 (in);
@@ -276,6 +277,12 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_enc[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_enc[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_sbox[0 ] ^ __aesti_sbox[128 ]; st0[1 ] ^= __aesti_sbox[32 ] ^ __aesti_sbox[160 ]; st0[2 ] ^= __aesti_sbox[64 ] ^ __aesti_sbox[192 ];
@@ -300,6 +307,8 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static void aesti_decrypt (struct crypto_tfm *tfm,u8 *out,const u8 *in)
@@ -308,6 +317,7 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_dec +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_dec[0 ] ^get_unaligned_le32 (in);
@@ -315,6 +325,12 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_dec[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_dec[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_inv_sbox[0 ] ^ __aesti_inv_sbox[128 ]; st0[1 ] ^= __aesti_inv_sbox[32 ] ^ __aesti_inv_sbox[160 ]; st0[2 ] ^= __aesti_inv_sbox[64 ] ^ __aesti_inv_sbox[192 ];
@@ -339,6 +355,8 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (inv_subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (inv_subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (inv_subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static struct crypto_alg aes_alg = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 27/258 drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
In reply to Sasha LevinFrom: Boris Brezillon <[email protected]>
[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ]
For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens.
The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment).
--- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +7 -5
@@ -315,12 +315,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)vc4_get_scaling_mode (vc4_state->src_h[1 ], vc4_state->crtc_h); -/* YUV conversion requires that horizontal scaling be enabled, -* even on a plane that's otherwise 1:1. Looks like only PPF -* works in that case, so let's pick that one. +/* YUV conversion requires that horizontal scaling be enabled +* on the UV plane even if vc4_get_scaling_mode() returned +* VC4_SCALING_NONE (which can happen when the down-scaling +* ratio is 0.5). Let's force it to VC4_SCALING_PPF in this +* case. */ -if (vc4_state->is_unity) - vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; +if (vc4_state->x_scaling[1 ] ==VC4_SCALING_NONE ) + vc4_state->x_scaling[1 ] =VC4_SCALING_PPF ; }else { vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 28/258 serial: fsl_lpuart: clear parity enable bit when disable parity
In reply to Sasha LevinFrom: Andy Duan <[email protected]>
[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ]
Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1477,6 +1477,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,else cr1 &= ~UARTCR1_PT ; } + }else { + cr1 &= ~UARTCR1_PE ; }/* ask the core to calculate the divisor */
@@ -1688,6 +1690,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,else ctrl &= ~UARTCTRL_PT ; } + }else { + ctrl &= ~UARTCTRL_PE ; }/* ask the core to calculate the divisor */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/258 serial: core: Allow processing sysrq at port unlock time
In reply to Sasha LevinFrom: Douglas Anderson <[email protected]>
[ Upstream commit d6e1935819db0c91ce4a5af82466f3ab50d17346 ]
Right now serial drivers process sysrq keys deep in their character receiving code. This means that they've already grabbed their port->lock spinlock. This can end up getting in the way if we've go to do serial stuff (especially kgdb) in response to the sysrq.
Serial drivers have various hacks in them to handle this. Looking at '8250_port.c' you can see that the console_write() skips locking if we're in the sysrq handler. Looking at 'msm_serial.c' you can see that the port lock is dropped around uart_handle_sysrq_char().
It turns out that these hacks aren't exactly perfect. If you have lockdep turned on and use something like the 8250_port hack you'll get a splat that looks like:
WARNING: possible circular locking dependency detected [...] is trying to acquire lock:
... (console_owner){-.-.}, at: console_unlock+0x2e0/0x5e4
but task is already holding lock:
... (&port_lock_key){-.-.}, at: serial8250_handle_irq+0x30/0xe4
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&port_lock_key){-.-.}:
_raw_spin_lock_irqsave+0x58/0x70
serial8250_console_write+0xa8/0x250
univ8250_console_write+0x40/0x4c
console_unlock+0x528/0x5e4
register_console+0x2c4/0x3b0
uart_add_one_port+0x350/0x478
serial8250_register_8250_port+0x350/0x3a8
dw8250_probe+0x67c/0x754
platform_drv_probe+0x58/0xa4
really_probe+0x150/0x294
driver_probe_device+0xac/0xe8
__driver_attach+0x98/0xd0
bus_for_each_dev+0x84/0xc8
driver_attach+0x2c/0x34
bus_add_driver+0xf0/0x1ec
driver_register+0xb4/0x100
__platform_driver_register+0x60/0x6c
dw8250_platform_driver_init+0x20/0x28
...-> #0 (console_owner){-.-.}:
lock_acquire+0x1e8/0x214
console_unlock+0x35c/0x5e4
vprintk_emit+0x230/0x274
vprintk_default+0x7c/0x84
vprintk_func+0x190/0x1bc
printk+0x80/0xa0
__handle_sysrq+0x104/0x21c
handle_sysrq+0x30/0x3c
serial8250_read_char+0x15c/0x18c
serial8250_rx_chars+0x34/0x74
serial8250_handle_irq+0x9c/0xe4
dw8250_handle_irq+0x98/0xcc
serial8250_interrupt+0x50/0xe8
...other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&port_lock_key);
lock(console_owner);
lock(&port_lock_key);
lock(console_owner);*** DEADLOCK ***
The hack used in 'msm_serial.c' doesn't cause the above splats but it seems a bit ugly to unlock / lock our spinlock deep in our irq handler.
It seems like we could defer processing the sysrq until the end of the interrupt handler right after we've unlocked the port. With this scheme if a whole batch of sysrq characters comes in one irq then we won't handle them all, but that seems like it should be a fine compromise.
--- include/linux/serial_core.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
include/linux/serial_core.h +36 -1
@@ -173,6 +173,7 @@ struct uart_port {struct console *cons;/* struct console, if any */ #if defined(CONFIG_SERIAL_CORE_CONSOLE ) || defined(SUPPORT_SYSRQ )unsigned long sysrq;/* sysrq timeout */ +unsigned int sysrq_ch;/* char for sysrq */ #endif /* flags must be updated while holding port mutex */
@@ -482,8 +483,42 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) }return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) +{ +if (port->sysrq) { +if (ch &&time_before (jiffies, port->sysrq)) { + port->sysrq_ch = ch; + port->sysrq =0 ; +return 1 ; + } + port->sysrq =0 ; + } +return 0 ; +} +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +int sysrq_ch; + + sysrq_ch = port->sysrq_ch; + port->sysrq_ch =0 ; + +spin_unlock_irqrestore (&port->lock, irqflags); + +if (sysrq_ch) +handle_sysrq (sysrq_ch); +}#else -#define uart_handle_sysrq_char (port,ch) ({ (void)port; 0; }) +static inline int +uart_handle_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +spin_unlock_irqrestore (&port->lock, irqflags); +}#endif /*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/258 ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
In reply to Sasha LevinFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]
If a gettime64 call fails, return the error and avoid copying data back to user.
--- drivers/ptp/ptp_chardev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_chardev.c +4 -1
@@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64 (ptp->info, &ts); + err = ptp->info->gettime64 (ptp->info, &ts); +if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++;
@@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)break ; } +out:kfree (sysoff);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 31/258 MIPS: Boston: Disable EG20T prefetch
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ]
The Intel EG20T Platform Controller Hub used on the MIPS Boston development board supports prefetching memory to optimize DMA transfers. Unfortunately for unknown reasons this doesn't work well with some MIPS CPUs such as the P6600, particularly when using an I/O Coherence Unit (IOCU) to provide cache-coherent DMA. In these systems it is common for DMA data to be lost, resulting in broken access to EG20T devices such as the MMC or SATA controllers.
Support for a DT property to configure the prefetching was added a while back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from device tree if passed") but we never added the DT snippet to make use of it. Add that now in order to disable the prefetching & fix DMA on the affected systems.
Patchwork: https://patchwork.linux-mips.org/patch/21068/
--- arch/mips/boot/dts/img/boston.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -141,6 +141,12 @@ #size-cells = <2>; #interrupt-cells = <1>; + eg20t_phub@2,0,0 { + compatible = "pci8086,8801"; + reg = <0x00020000 0 0 0 0>; + intel,eg20t-prefetch = <0>; + }; + eg20t_mac@2,0,1 { compatible = "pci8086,8802"; reg = <0x00020100 0 0 0 0>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 32/258 dpaa2-ptp: defer probe when portal allocation failed
In reply to Sasha LevinFrom: Ioana Ciornei <[email protected]>
[ Upstream commit 5500598abbfb5b46201b9768bd9ea873a5eeaece ]
The fsl_mc_portal_allocate can fail when the requested MC portals are not yet probed by the fsl_mc_allocator. In this situation, the driver should defer the probe.
--- drivers/staging/fsl-dpaa2/rtc/rtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/fsl-dpaa2/rtc/rtc.c +4 -1
@@ -142,7 +142,10 @@ static int rtc_probe(struct fsl_mc_device *mc_dev) err =fsl_mc_portal_allocate (mc_dev,0 , &mc_dev->mc_io);if (err) { -dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); +if (err == -ENXIO ) + err = -EPROBE_DEFER ; +else +dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); goto err_exit; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 33/258 sctp: Fix SKB list traversal in sctp_intl_store_ordered().
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit e15e067d0656625c77c52b4e5f0cfbf0c0c3583f ]
Same change as made to sctp_intl_store_reasm().
To be fully correct, an iterator has an undefined value when something like skb_queue_walk() naturally terminates.
This will actually matter when SKB queues are converted over to list_head.
Formalize what this code ends up doing with the current implementation.
--- net/sctp/stream_interleave.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/sctp/stream_interleave.c +12 -5
@@ -383,7 +383,7 @@ static void sctp_intl_store_ordered(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) {struct sctp_ulpevent *cevent; -struct sk_buff *pos; +struct sk_buff *pos, *loc; pos =skb_peek_tail (&ulpq->lobby);if (!pos) {
@@ -403,18 +403,25 @@ static void sctp_intl_store_ordered(struct sctp_ulpq *ulpq,return ; } + loc =NULL ; skb_queue_walk(&ulpq->lobby, pos) { cevent = (struct sctp_ulpevent *)pos->cb; -if (cevent->stream > event->stream) +if (cevent->stream > event->stream) { + loc = pos;break ; - + }if (cevent->stream = event->stream && -MID_lt (event->mid, cevent->mid)) +MID_lt (event->mid, cevent->mid)) { + loc = pos;break ; + } } -__skb_queue_before (&ulpq->lobby, pos,sctp_event2skb (event)); +if (!loc) +__skb_queue_tail (&ulpq->lobby,sctp_event2skb (event)); +else +__skb_queue_before (&ulpq->lobby, loc,sctp_event2skb (event)); } static void sctp_intl_retrieve_ordered(struct sctp_ulpq *ulpq,
Signature · 1 line
2.19.1
Marcelo Ricardo Leitner
maintainerRe: [PATCH AUTOSEL 4.19 033/258] sctp: Fix SKB list traversal in sctp_intl_store_ordered().
Quoted 6 lines · Sasha Levin
From: "David S. Miller" <[email protected]>
[ Upstream commit
e15e067d0656625c77c52b4e5f0cfbf0c0c3583f]Same change as made to
sctp_intl_store_reasm().
Quoted 8 lines
To be fully correct, an iterator has an undefined value when something like
skb_queue_walk()naturally terminates.This will actually matter when SKB queues are converted over to
list_head.Formalize what this code ends up doing with the current implementation.
Hi Sasha,
This one too then.
Thanks,
Marcelo
Sasha Levin
maintainerPATCH 34/258 sctp: Fix SKB list traversal in sctp_intl_store_reasm().
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit 348bbc25c40844c5efa083a3842c7f53d70a815e ]
To be fully correct, an iterator has an undefined value when something like skb_queue_walk() naturally terminates.
This will actually matter when SKB queues are converted over to list_head.
Formalize what this code ends up doing with the current implementation.
--- net/sctp/stream_interleave.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/sctp/stream_interleave.c +12 -5
@@ -140,7 +140,7 @@ static void sctp_intl_store_reasm(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) {struct sctp_ulpevent *cevent; -struct sk_buff *pos; +struct sk_buff *pos, *loc; pos =skb_peek_tail (&ulpq->reasm);if (!pos) {
@@ -166,23 +166,30 @@ static void sctp_intl_store_reasm(struct sctp_ulpq *ulpq,return ; } + loc =NULL ; skb_queue_walk(&ulpq->reasm, pos) { cevent =sctp_skb2event (pos);if (event->stream < cevent->stream || (event->stream = cevent->stream && -MID_lt (event->mid, cevent->mid))) +MID_lt (event->mid, cevent->mid))) { + loc = pos;break ; - + }if (event->stream = cevent->stream && event->mid = cevent->mid && !(cevent->msg_flags &SCTP_DATA_FIRST_FRAG ) && (event->msg_flags &SCTP_DATA_FIRST_FRAG || - event->fsn < cevent->fsn)) + event->fsn < cevent->fsn)) { + loc = pos;break ; + } } -__skb_queue_before (&ulpq->reasm, pos,sctp_event2skb (event)); +if (!loc) +__skb_queue_tail (&ulpq->reasm,sctp_event2skb (event)); +else +__skb_queue_before (&ulpq->reasm, loc,sctp_event2skb (event)); } static struct sctp_ulpevent *sctp_intl_retrieve_partial(
Signature · 1 line
2.19.1
Marcelo Ricardo Leitner
maintainerRe: [PATCH AUTOSEL 4.19 034/258] sctp: Fix SKB list traversal in sctp_intl_store_reasm().
Quoted 4 lines · Sasha Levin
From: "David S. Miller" <[email protected]>
[ Upstream commit
348bbc25c40844c5efa083a3842c7f53d70a815e]
Quoted 8 lines
To be fully correct, an iterator has an undefined value when something like
skb_queue_walk()naturally terminates.This will actually matter when SKB queues are converted over to
list_head.Formalize what this code ends up doing with the current implementation.
I don't think this patch is really needed for -stable without the SKB queue convertion, but okay.
Marcelo
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 034/258] sctp: Fix SKB list traversal in sctp_intl_store_reasm().
Quoted 8 lines · Marcelo Ricardo Leitner
Quoted 7 lines · Sasha Levin
From: "David S. Miller" <[email protected]>
[ Upstream commit
348bbc25c40844c5efa083a3842c7f53d70a815e]To be fully correct, an iterator has an undefined value when something like
skb_queue_walk()naturally terminates.
Quoted 8 lines
Quoted 5 lines
This will actually matter when SKB queues are converted over to
list_head.Formalize what this code ends up doing with the current implementation.
I don't think this patch is really needed for -stable without the SKB queue convertion, but okay.
I'll drop it. I'm not sure why this sctp patch wasn't filtered out as davem deals with net/. Sorry for the noise.
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 35/258 iwlwifi: fw: do not set sgi bits for HE connection
In reply to Sasha LevinFrom: Naftali Goldstein <[email protected]>
[ Upstream commit 5c2dbebb446539eb9640bf59a02756d6e7f1fc53 ]
If the association supports HE, HT/VHT rates will never be used for Tx and therefore there's no need to set the sgi-per-channel-width-support bits, so don't set them in this case.
--- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +4 -0
@@ -98,8 +98,12 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta) {struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; +struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;u8 supp =0 ; +if (he_cap && he_cap->has_he) +return 0 ; +if (ht_cap->cap &IEEE80211_HT_CAP_SGI_20 ) supp |=BIT (IWL_TLC_MNG_CH_WIDTH_20MHZ );if (ht_cap->cap &IEEE80211_HT_CAP_SGI_40 )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 36/258 staging:iio:ad2s90: Make probe handle spi_setup failure
In reply to Sasha LevinFrom: Matheus Tavares <[email protected]>
[ Upstream commit b3a3eafeef769c6982e15f83631dcbf8d1794efb ]
Previously, ad2s90_probe ignored the return code from spi_setup, not handling its possible failure. This patch makes ad2s90_probe check if the code is an error code and, if so, do the following:
- Call dev_err with an appropriate error message.
- Return the spi_setup's error code.
Note: The 'return ret' statement could be out of the 'if' block, but this whole block will be moved up in the function in the patch:
'staging:iio:ad2s90: Move device registration to the end of probe'.
--- drivers/staging/iio/resolver/ad2s90.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s90.c +6 -1
@@ -85,7 +85,12 @@ static int ad2s90_probe(struct spi_device *spi)/* need 600ns between CS and the first falling edge of SCLK */ spi->max_speed_hz =830000 ; spi->mode =SPI_MODE_3 ; -spi_setup (spi); + ret =spi_setup (spi); + +if (ret <0 ) { +dev_err (&spi->dev,"spi_setup failed!\n" ); +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 37/258 fpga: altera-cvp: Fix registration for CvP incapable devices
In reply to Sasha LevinFrom: Andreas Puhm <[email protected]>
[ Upstream commit 68f60538daa4bc3da5d0764d46f391916fba20fd ]
The probe function needs to verify the CvP enable bit in order to properly determine if FPGA Manager functionality can be safely enabled.
--- drivers/fpga/altera-cvp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/fpga/altera-cvp.c +9 -0
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,struct altera_cvp_conf *conf;struct fpga_manager *mgr;u16 cmd, val; +u32 regval;int ret;/*
@@ -416,6 +417,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,return -ENODEV ; } +pci_read_config_dword (pdev,VSE_CVP_STATUS , ®val); +if (!(regval &VSE_CVP_STATUS_CVP_EN )) { +dev_err (&pdev->dev, +"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n" , + regval); +return -ENODEV ; + } + conf =devm_kzalloc (&pdev->dev,sizeof (*conf),GFP_KERNEL );if (!conf)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 38/258 Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
In reply to Sasha LevinFrom: Dexuan Cui <[email protected]>
[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ]
The patch fixes:
hv_kvp_daemon.c: In function 'kvp_set_ip_info':
hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes into a destination of size 4096
The "(unsigned int)str_len" is to avoid:
hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/hv/hv_kvp_daemon.c +13 -2
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)FILE *file;char cmd[PATH_MAX ];char *mac_addr; +int str_len;/* * Set the configuration for the specified interface with
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)* invoke the external script to do its magic. */ -snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , -"hv_set_ifconfig" , if_file); + str_len =snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , +"hv_set_ifconfig" , if_file); +/* +* This is a little overcautious, but it's necessary to suppress some +* false warnings from gcc 8.0.1. +*/ +if (str_len <=0 || (unsigned int )str_len >=sizeof (cmd)) { +syslog (LOG_ERR ,"Cmd '%s' (len=%d) may be too long" , + cmd, str_len); +return HV_E_FAIL ; + } +if (system (cmd)) {syslog (LOG_ERR ,"Failed to execute cmd '%s'; error: %d %s" , cmd, errno,strerror (errno));
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 39/258 fpga: altera-cvp: fix 'bad IO access' on x86_64
In reply to Sasha LevinFrom: Anatolij Gustschin <[email protected]>
[ Upstream commit 187fade88ca0ff2df9d360ca751d948d73db7095 ]
If mapping the CvP BAR fails, we still can configure the FPGA via PCI config space access. In this case the iomap pointer is NULL. On x86_64, passing NULL address to pci_iounmap() generates "Bad IO access at port 0x0" output with stack call trace. Fix it.
--- drivers/fpga/altera-cvp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/fpga/altera-cvp.c +4 -2
@@ -480,7 +480,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,return 0 ; err_unmap: -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR ); err_disable: cmd &= ~PCI_COMMAND_MEMORY ;
@@ -495,7 +496,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)u16 cmd;fpga_mgr_unregister (mgr); -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR );pci_read_config_word (pdev,PCI_COMMAND , &cmd); cmd &= ~PCI_COMMAND_MEMORY ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 40/258 vbox: fix link error with 'gcc -Og'
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b8ae30a7020d61e0504529adf45abb08fa5c59f5 ]
With the new CONFIG_CC_OPTIMIZE_FOR_DEBUGGING option, we get a link error in the vboxguest driver, when that fails to optimize out the call to the compat handler:
drivers/virt/vboxguest/vboxguest_core.o: In function `vbg_ioctl_hgcm_call':
vboxguest_core.c:(.text+0x1f6e): undefined reference to `vbg_hgcm_call32'
Another compile-time check documents better what we want and avoids the error.
--- drivers/virt/vboxguest/vboxguest_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virt/vboxguest/vboxguest_core.c +1 -1
@@ -1312,7 +1312,7 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev,return -EINVAL ; } -if (f32bit) +if (IS_ENABLED (CONFIG_COMPAT ) && f32bit) ret = vbg_hgcm_call32(gdev, client_id, call->function, call->timeout_ms, VBG_IOCTL_HGCM_CALL_PARMS32(call),
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 41/258 platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 6ad16b78a039b45294b1ad5d69c14ac57b2fe706 ]
EC_MKBP_EVENT_SENSOR_FIFO events can be triggered for a variety of reasons, and there are very few cases in which they should be treated as wakeup interrupts (particularly, when a certain MOTIONSENSE_MODULE_FLAG_* is set, but this is not even supported in the mainline cros_ec_sensor driver yet). Most of the time, they are benign sensor readings. In any case, the top-level cros_ec device doesn't know enough to determine that they should wake the system, and so it should not report the event. This would be the job of the cros_ec_sensors driver to parse.
This patch adds checks to cros_ec_get_next_event() such that it doesn't signal 'wakeup' for events of type EC_MKBP_EVENT_SENSOR_FIFO.
This patch is particularly relevant on devices like Scarlet (Rockchip RK3399 tablet, known as Acer Chromebook Tab 10), where the EC firmware reports sensor events much more frequently. This was causing /sys/power/wakeup_count to increase very frequently, often needlessly interrupting our ability to suspend the system.
--- drivers/platform/chrome/cros_ec_proto.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/platform/chrome/cros_ec_proto.c +15 -3
@@ -575,6 +575,7 @@ static int get_keyboard_state_event(struct cros_ec_device *ec_dev)int cros_ec_get_next_event (struct cros_ec_device *ec_dev,bool *wake_event) { +u8 event_type;u32 host_event;int ret;
@@ -594,11 +595,22 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event)return ret;if (wake_event) { + event_type = ec_dev->event_data.event_type; host_event =cros_ec_get_host_event (ec_dev); -/* Consider non-host_event as wake event */ - *wake_event = !host_event || - !!(host_event & ec_dev->host_event_wake_mask); +/* +* Sensor events need to be parsed by the sensor sub-device. +* Defer them, and don't report the wakeup here. +*/ +if (event_type ==EC_MKBP_EVENT_SENSOR_FIFO ) + *wake_event = false; +/* Masked host-events should not count as wake events. */ +else if (host_event && + !(host_event & ec_dev->host_event_wake_mask)) + *wake_event = false; +/* Consider all other events as wake events. */ +else + *wake_event = true; }return ret;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 42/258 i40e: prevent overlapping tx_timeout recover
In reply to Sasha LevinFrom: Alan Brady <[email protected]>
[ Upstream commit d5585b7b6846a6d0f9517afe57be3843150719da ]
If a TX hang occurs, we attempt to recover by incrementally resetting. If we're starved for CPU time, it's possible the reset doesn't actually complete (or even fire) before another tx_timeout fires causing us to fly through the different resets without actually doing them.
This adds a bit to set and check if a timeout recovery is already pending and, if so, bail out of tx_timeout. The bit will get cleared at the end of i40e_rebuild when reset is complete.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -122,6 +122,7 @@ enum i40e_state_t { __I40E_MDD_EVENT_PENDING, __I40E_VFLR_EVENT_PENDING, __I40E_RESET_RECOVERY_PENDING, + __I40E_TIMEOUT_RECOVERY_PENDING, __I40E_MISC_IRQ_REQUESTED, __I40E_RESET_INTR_RECEIVED, __I40E_REINIT_REQUESTED,
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -336,6 +336,10 @@ static void i40e_tx_timeout(struct net_device *netdev) (pf->tx_timeout_last_recovery + netdev->watchdog_timeo))) return; /* don't do any new action before the next timeout */ +/* don't kick off another recovery if one is already pending */ +if (test_and_set_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state)) +return ; +if (tx_ring) { head =i40e_get_head (tx_ring);/* Read interrupt register */
@@ -9566,6 +9570,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)clear_bit (__I40E_RESET_FAILED, pf->state); clear_recovery:clear_bit (__I40E_RESET_RECOVERY_PENDING, pf->state); +clear_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state); }/**
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 43/258 scsi: hisi_sas: change the time of SAS SSP connection
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 15bc43f31a074076f114e0b87931e3b220b7bff1 ]
Currently the time of SAS SSP connection is 1ms, which means the link connection will fail if no IO response after this period.
For some disks handling large IO (such as 512k), 1ms is not enough, so change it to 5ms.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -492,7 +492,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)hisi_sas_phy_write32 (hisi_hba, i,PHYCTRL_OOB_RESTART_MSK ,0x1 );hisi_sas_phy_write32 (hisi_hba, i,STP_LINK_TIMER ,0x7f7a120 );hisi_sas_phy_write32 (hisi_hba, i,CON_CFG_DRIVER ,0x2a0a01 ); - +hisi_sas_phy_write32 (hisi_hba, i,SAS_SSP_CON_TIMER_CFG ,0x32 );/* used for 12G negotiate */ hisi_sas_phy_write32 (hisi_hba, i,COARSETUNE_TIME ,0x1e ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 44/258 staging: iio: ad7780: update voltage on read
In reply to Sasha LevinFrom: Renato Lui Geh <[email protected]>
[ Upstream commit 336650c785b62c3bea7c8cf6061c933a90241f67 ]
The ad7780 driver previously did not read the correct device output, as it read an outdated value set at initialization. It now updates its voltage on read.
--- drivers/staging/iio/adc/ad7780.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/iio/adc/ad7780.c +5 -1
@@ -87,12 +87,16 @@ static int ad7780_read_raw(struct iio_dev *indio_dev, long m) {struct ad7780_state *st =iio_priv (indio_dev); +int voltage_uv;switch (m) {case IIO_CHAN_INFO_RAW :return ad_sigma_delta_single_conversion (indio_dev, chan, val);case IIO_CHAN_INFO_SCALE : - *val = st->int_vref_mv * st->gain; + voltage_uv =regulator_get_voltage (st->reg); +if (voltage_uv <0 ) +return voltage_uv; + *val = (voltage_uv /1000 ) * st->gain; *val2 = chan->scan_type.realbits -1 ;return IIO_VAL_FRACTIONAL_LOG2 ;case IIO_CHAN_INFO_OFFSET :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 45/258 usbnet: smsc95xx: fix rx packet alignment
In reply to Sasha LevinFrom: Ben Dooks <[email protected]>
[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ]
The smsc95xx driver already takes into account the NET_IP_ALIGN parameter when setting up the receive packet data, which means we do not need to worry about aligning the packets in the usbnet driver.
Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now passed to the ip_rcv() routine with the start on an aligned address.
Tested on Raspberry Pi B3.
--- drivers/net/usb/smsc95xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/smsc95xx.c +1 -0
@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->features |=NETIF_F_RXCSUM ; dev->net->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM ; +set_bit (EVENT_NO_IP_ALIGN , &dev->flags);smsc95xx_init_mac_address (dev);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 46/258 drm/rockchip: fix for mailbox read size
In reply to Sasha LevinFrom: Damian Kos <[email protected]>
[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ]
Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is used by them, can read only up to 255 bytes at once. Normally, it's not a big issue as DPCD or EDID reads won't (hopefully) exceed that value.
The real issue here is the revocation list read during the HDCP authentication process. (problematic use case:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152)
The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + 4 bytes of an additional info).
In other words - CTSes with HDCP Repeater won't pass without this fix. Oh, and the driver will most likely stop working (best case scenario).
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, }static int cdn_dp_mailbox_read_receive (struct cdn_dp_device *dp, -u8 *buff,u8 buff_size) +u8 *buff,u16 buff_size) {u32 i;int ret;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 47/258 ARM: OMAP2+: hwmod: Fix some section annotations
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ]
When building the kernel with Clang, the following section mismatch warnings appears:
WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from the function _setup() to the function .init.text:_setup_iclk_autoidle() The function _setup() references
the function __init _setup_iclk_autoidle().
This is often because _setup lacks a __init
annotation or the annotation of _setup_iclk_autoidle is wrong.
WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from the function _setup() to the function .init.text:_setup_reset() The function _setup() references
the function __init _setup_reset().
This is often because _setup lacks a __init
annotation or the annotation of _setup_reset is wrong.
WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from the function _setup() to the function .init.text:_setup_postsetup() The function _setup() references
the function __init _setup_postsetup().
This is often because _setup lacks a __init
annotation or the annotation of _setup_postsetup is wrong.
_setup is used in omap_hwmod_allocate_module, which isn't marked __init and looks like it shouldn't be, meaning to fix these warnings, those functions must be moved out of the init section, which this patch does.
--- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +3 -3
@@ -2397,7 +2397,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)* a stub; implementing this properly requires iclk autoidle usecounting in * the clock code. No return value. */ -static void __init _setup_iclk_autoidle (struct omap_hwmod *oh) +static void _setup_iclk_autoidle (struct omap_hwmod *oh) {struct omap_hwmod_ocp_if *os;
@@ -2428,7 +2428,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)* reset. Returns 0 upon success or a negative error code upon * failure. */ -static int __init _setup_reset (struct omap_hwmod *oh) +static int _setup_reset (struct omap_hwmod *oh) {int r;
@@ -2489,7 +2489,7 @@ static int __init _setup_reset(struct omap_hwmod *oh)* * No return value. */ -static void __init _setup_postsetup (struct omap_hwmod *oh) +static void _setup_postsetup (struct omap_hwmod *oh) {u8 postsetup_state;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 48/258 drm/amd/display: fix gamma not being applied correctly
In reply to Sasha LevinFrom: Murton Liu <[email protected]>
[ Upstream commit 8ce504b9389be846bcdf512ed5be8f661b3bf097 ]
[why]
Gamma was always being set as identity on SDR monitor, leading to no changes in gamma. This caused nightlight to not apply correctly.
[how]
Added a default gamma structure to compare against in the sdr case.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +2 -1
@@ -1190,7 +1190,8 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx, tf = plane_state->in_transfer_func;if (plane_state->gamma_correction && - !plane_state->gamma_correction->is_identity + !dpp_base->ctx->dc->debug.always_use_regamma + && !plane_state->gamma_correction->is_identity &&dce_use_lut (plane_state->format)) dpp_base->funcs->dpp_program_input_lut (dpp_base, plane_state->gamma_correction);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 49/258 drm/amd/display: calculate stream->phy_pix_clk before clock mapping
In reply to Sasha LevinFrom: Yogesh Mohan Marimuthu <[email protected]>
[ Upstream commit 08e1c28dd521c7b08d1b0af0bae9fb22ccc012a4 ]
[why]phy_pix_clk is one of the variable used to check if one PLL can be shared with displays having common mode set configuration. As of now phy_pix_clock varialbe is calculated in function dc_validate_stream(). dc_validate_stream() function is called after clocks are assigned for the new display. Due to this during hotplug, when PLL sharing conditions are checked for new display phy_pix_clk variable will be 0 and for displays that are already enabled phy_pix_clk will have some value. Hence PLL will not be shared and if the display hardware doesn't have any more PLL to assign, mode set will fail due to resource unavailability.
[how]
Instead of only calculating the phy_pix_clk variable after the PLL is assigned for new display, this patch calculates phy_pix_clk also during the before assigning the PLL for new display.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
@@ -1917,6 +1917,8 @@ enum dc_status resource_map_pool_resources(} */ +calculate_phy_pix_clks (stream); +/* acquire new resources */ pipe_idx =acquire_first_free_pipe (&context->res_ctx, pool, stream);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 50/258 bpf: libbpf: retry map creation without the name
In reply to Sasha LevinFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit 23499442c319412aa8e54e7a939e2eb531bdd77d ]
Since commit 88cda1c9da02 ("bpf: libbpf: Provide basic API support to specify BPF obj name"), libbpf unconditionally sets bpf_attr->name for maps. Pre v4.14 kernels don't know about map names and return an error about unexpected non-zero data. Retry sys_bpf without a map name to cover older kernels.
v2 changes:
* check for errno == EINVAL as suggested by Daniel Borkmann
--- tools/lib/bpf/bpf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/lib/bpf/bpf.c +10 -1
@@ -77,6 +77,7 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) {__u32 name_len = create_attr->name ?strlen (create_attr->name) :0 ;union bpf_attr attr; +int ret;memset (&attr,'\0' ,sizeof (attr));
@@ -94,7 +95,15 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) attr.map_ifindex = create_attr->map_ifindex; attr.inner_map_fd = create_attr->inner_map_fd; -return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + ret =sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); +if (ret <0 && errno ==EINVAL && create_attr->name) { +/* Retry the same syscall, but without the name. +* Pre v4.14 kernels don't support map names. +*/ +memset (attr.map_name,0 ,sizeof (attr.map_name)); +return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + } +return ret; } int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 51/258 net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
In reply to Sasha LevinFrom: Saeed Mahameed <[email protected]>
[ Upstream commit 1e86ace4c140fd5a693e266c9b23409358f25381 ]
Currently the cpu affinity hint mask for completion EQs is stored and read from the wrong place, since reading and storing is done from the same index, there is no actual issue with that, but internal irq_info for completion EQs stars at MLX5_EQ_VEC_COMP_BASE offset in irq_info array, this patch changes the code to use the correct offset to store and read the IRQ affinity hint.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++++++++------ include/linux/mlx5/driver.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -1758,7 +1758,7 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq)static int mlx5e_get_cpu (struct mlx5e_priv *priv,int ix) { -return cpumask_first (priv->mdev->priv.irq_info[ix].mask); +return cpumask_first (priv->mdev->priv.irq_info[ix +MLX5_EQ_VEC_COMP_BASE ].mask); } static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,
drivers/net/ethernet/mellanox/mlx5/core/main.c +8 -6
@@ -640,18 +640,19 @@ u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev)static int mlx5_irq_set_affinity_hint (struct mlx5_core_dev *mdev,int i) {struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int vecidx =MLX5_EQ_VEC_COMP_BASE + i; +int irq =pci_irq_vector (mdev->pdev, vecidx); -if (!zalloc_cpumask_var (&priv->irq_info[i].mask,GFP_KERNEL )) { +if (!zalloc_cpumask_var (&priv->irq_info[vecidx].mask,GFP_KERNEL )) {mlx5_core_warn (mdev,"zalloc_cpumask_var failed" );return -ENOMEM ; }cpumask_set_cpu (cpumask_local_spread (i, priv->numa_node), - priv->irq_info[i].mask); + priv->irq_info[vecidx].mask);if (IS_ENABLED (CONFIG_SMP ) && -irq_set_affinity_hint (irq, priv->irq_info[i].mask)) +irq_set_affinity_hint (irq, priv->irq_info[vecidx].mask))mlx5_core_warn (mdev,"irq_set_affinity_hint failed, irq 0x%.4x" , irq);return 0 ;
@@ -659,11 +660,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)static void mlx5_irq_clear_affinity_hint (struct mlx5_core_dev *mdev,int i) { +int vecidx =MLX5_EQ_VEC_COMP_BASE + i;struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int irq =pci_irq_vector (mdev->pdev, vecidx);irq_set_affinity_hint (irq,NULL ); -free_cpumask_var (priv->irq_info[i].mask); +free_cpumask_var (priv->irq_info[vecidx].mask); }static int mlx5_irq_set_affinity_hints (struct mlx5_core_dev *mdev)
include/linux/mlx5/driver.h +1 -1
@@ -1321,7 +1321,7 @@ enum {static inline const struct cpumask *mlx5_get_vector_affinity_hint (struct mlx5_core_dev *dev,int vector) { -return dev->priv.irq_info[vector].mask; +return dev->priv.irq_info[vector +MLX5_EQ_VEC_COMP_BASE ].mask; }#endif /* MLX5_DRIVER_H */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 52/258 modpost: validate symbol names also in find_elf_symbol
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ]
If an ARM mapping symbol shares an address with a valid symbol, find_elf_symbol can currently return the mapping symbol instead, as the symbol is not validated. This can result in confusing warnings:
WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference from the function set_reset_devices() to the variable .init.text:$x.0
This change adds a call to is_valid_name to find_elf_symbol, similarly to how it's already used in find_elf_symbol2.
--- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
scripts/mod/modpost.c +26 -24
@@ -1204,6 +1204,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch,return 1 ; } +static inline int is_arm_mapping_symbol (const char *str) +{ +return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) + && (str[2 ] =='\0' || str[2 ] =='.' ); +} + +/* +* If there's no name there, ignore it; likewise, ignore it if it's +* one of the magic symbols emitted used by current ARM tools. +* +* Otherwise if find_symbols_between() returns those symbols, they'll +* fail the whitelist tests and cause lots of false alarms ... fixable +* only by merging __exit and __init sections into __text, bloating +* the kernel (which is especially evil on embedded platforms). +*/ +static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) +{ +const char *name = elf->strtab + sym->st_name; + +if (!name || !strlen (name)) +return 0 ; +return !is_arm_mapping_symbol (name); +} +/** * Find symbol based on relocation record info. * In some cases the symbol supplied is a valid symbol so
@@ -1229,6 +1253,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,continue ;if (ELF_ST_TYPE (sym->st_info) ==STT_SECTION )continue ; +if (!is_valid_name (elf, sym)) +continue ;if (sym->st_value == addr)return sym;/* Find a symbol nearby - addr are maybe negative */
@@ -1247,30 +1273,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,return NULL ; } -static inline int is_arm_mapping_symbol (const char *str) -{ -return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) - && (str[2 ] =='\0' || str[2 ] =='.' ); -} - -/* -* If there's no name there, ignore it; likewise, ignore it if it's -* one of the magic symbols emitted used by current ARM tools. -* -* Otherwise if find_symbols_between() returns those symbols, they'll -* fail the whitelist tests and cause lots of false alarms ... fixable -* only by merging __exit and __init sections into __text, bloating -* the kernel (which is especially evil on embedded platforms). -*/ -static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) -{ -const char *name = elf->strtab + sym->st_name; - -if (!name || !strlen (name)) -return 0 ; -return !is_arm_mapping_symbol (name); -} -/* * Find symbols before or equal addr and after addr - in the section sec. * If we find two symbols with equal offset prefer one with a valid name.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 53/258 perf tools: Add Hygon Dhyana support
In reply to Sasha LevinFrom: Pu Wen <[email protected]>
[ Upstream commit 4787eff3fa88f62fede6ed7afa06477ae6bf984d ]
The tool perf is useful for the performance analysis on the Hygon Dhyana platform. But right now there is no Hygon support for it to analyze the KVM guest os data. So add Hygon Dhyana support to it by checking vendor string to share the code path of AMD.
--- tools/perf/arch/x86/util/kvm-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/kvm-stat.c +1 -1
@@ -156,7 +156,7 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)if (strstr (cpuid,"Intel" )) { kvm->exit_reasons = vmx_exit_reasons; kvm->exit_reasons_isa ="VMX" ; - }else if (strstr (cpuid,"AMD" )) { + }else if (strstr (cpuid,"AMD" ) ||strstr (cpuid,"Hygon" )) { kvm->exit_reasons = svm_exit_reasons; kvm->exit_reasons_isa ="SVM" ; }else
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 54/258 soc/tegra: Don't leak device tree node reference
In reply to Sasha LevinFrom: Yangtao Li <[email protected]>
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it.
--- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/tegra/common.c +5 -1
@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = {bool soc_is_tegra (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (tegra_machine_match, root) !=NULL ; + match =of_match_node (tegra_machine_match, root); +of_node_put (root); + +return match !=NULL ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 55/258 media: rc: ensure close() is called on rc_unregister_device
In reply to Sasha LevinFrom: Sean Young <[email protected]>
[ Upstream commit 8e782fcf78275f505194e767c515202d4fd274bc ]
If userspace has an open file descriptor on the rc input device or lirc device when rc_unregister_device() is called, then the rc close() is never called.
This ensures that the receiver is turned off on the nuvoton-cir driver during shutdown.
--- drivers/media/rc/rc-main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/rc-main.c +2 -0
@@ -1956,6 +1956,8 @@ void rc_unregister_device(struct rc_dev *dev)rc_free_rx_device (dev);mutex_lock (&dev->lock); +if (dev->users && dev->close) + dev->close (dev); dev->registered = false;mutex_unlock (&dev->lock);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 56/258 media: video-i2c: avoid accessing released memory area when removing driver
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit c764da98a600a4b068d25c77164f092f159cecec ]
The video device release() callback for video-i2c driver frees the whole struct video_i2c_data. If there is no user left for the video device when video_unregister_device() is called, the release callback is executed.
However, in video_i2c_remove() some fields (v4l2_dev, lock, and queue_lock) in struct video_i2c_data are still accessed after video_unregister_device() is called.
This fixes the use after free by moving the code from video_i2c_remove() to the release() callback.
--- drivers/media/i2c/video-i2c.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/i2c/video-i2c.c +6 -5
@@ -510,7 +510,12 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = {static void video_i2c_release (struct video_device *vdev) { -kfree (video_get_drvdata (vdev)); +struct video_i2c_data *data =video_get_drvdata (vdev); + +v4l2_device_unregister (&data->v4l2_dev); +mutex_destroy (&data->lock); +mutex_destroy (&data->queue_lock); +kfree (data); } static int video_i2c_probe(struct i2c_client *client,
@@ -608,10 +613,6 @@ static int video_i2c_remove(struct i2c_client *client)struct video_i2c_data *data =i2c_get_clientdata (client);video_unregister_device (&data->vdev); -v4l2_device_unregister (&data->v4l2_dev); - -mutex_destroy (&data->lock); -mutex_destroy (&data->queue_lock);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 57/258 media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
In reply to Sasha LevinFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit 8ea0f2ba0fa3f91ea1b8d823a54b042026ada6b3 ]
of_parse_phandle() returns the device node with refcount incremented. There are two nodes that are used temporary in mtk_vcodec_init_enc_pm(), but their refcounts are not decremented.
The patch adds one of_node_put() and fixes returning error codes.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +6 -4
@@ -41,25 +41,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) node =of_parse_phandle (dev->of_node,"mediatek,larb" ,0 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenc = &pdev->dev; node =of_parse_phandle (dev->of_node,"mediatek,larb" ,1 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenclt = &pdev->dev;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 58/258 staging: erofs: fix the definition of DBG_BUGON
In reply to Sasha LevinFrom: Gao Xiang <[email protected]>
[ Upstream commit eef168789866514e5d4316f030131c9fe65b643f ]
It's better not to positively BUG_ON the kernel, however developers need a way to locate issues as soon as possible.
DBG_BUGON is introduced and it could only crash when EROFS_FS_DEBUG (EROFS developping feature) is on. It is helpful for developers to find and solve bugs quickly by eng builds.
Previously, DBG_BUGON is defined as ((void)0) if EROFS_FS_DEBUG is off, but some unused variable warnings as follows could occur:
drivers/staging/erofs/unzip_vle.c: In function `init_alway:':drivers/staging/erofs/unzip_vle.c:61:33: warning: unused variable `work' [-Wunused-variable]
struct z_erofs_vle_work *const work =
^~~~
Fix it to #define DBG_BUGON(x) ((void)(x)).
--- drivers/staging/erofs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/erofs/internal.h +1 -1
@@ -39,7 +39,7 @@#define debugln (x, ...) ((void)0)#define dbg_might_sleep () ((void)0) -#define DBG_BUGON (...) ((void)0) +#define DBG_BUGON (x) ((void)(x))#endif #ifdef CONFIG_EROFS_FAULT_INJECTION
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 59/258 x86/resctrl: Fixup the user-visible strings
In reply to Sasha LevinFrom: Babu Moger <[email protected]>
[ Upstream commit 723f1a0dd8e26a7523ba068204bee11c95ded38d ]
Fix the messages in rdt_last_cmd_printf() and rdt_last_cmd_puts() to make them more meaningful and consistent.
[ bp: s/cpu/CPU/; s/mem\W/memory ]
--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++++++------- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++++++++---------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 ++++++++++----------- 3 files changed, 46 insertions(+), 46 deletions(-)
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +11 -11
@@ -71,7 +71,7 @@ int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,unsigned long bw_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -97,12 +97,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) ret =kstrtoul (buf,16 , &val);if (ret) { -rdt_last_cmd_printf ("non-hex character in mask %s\n" , buf); +rdt_last_cmd_printf ("Non-hex character in the mask %s\n" , buf);return false; }if (val ==0 || val > r->default_ctrl) { -rdt_last_cmd_puts ("mask out of range\n" ); +rdt_last_cmd_puts ("Mask out of range\n" );return false; }
@@ -110,12 +110,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) zero_bit =find_next_zero_bit (&val, cbm_len, first_bit);if (find_next_bit (&val, cbm_len, zero_bit) < cbm_len) { -rdt_last_cmd_printf ("mask %lx has non-consecutive 1-bits\n" , val); +rdt_last_cmd_printf ("The mask %lx has non-consecutive 1-bits\n" , val);return false; }if ((zero_bit - first_bit) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("Need at least %d bits in mask\n" , +rdt_last_cmd_printf ("Need at least %d bits in the mask\n" , r->cache.min_cbm_bits);return false; }
@@ -135,7 +135,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,u32 cbm_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -145,7 +145,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP &&rdtgroup_pseudo_locked_in_hierarchy (d)) { -rdt_last_cmd_printf ("pseudo-locked region in hierarchy\n" ); +rdt_last_cmd_printf ("Pseudo-locked region in hierarchy\n" );return -EINVAL ; }
@@ -164,14 +164,14 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,* either is exclusive. */ if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, true)) { -rdt_last_cmd_printf ("overlaps with exclusive group\n" ); +rdt_last_cmd_printf ("Overlaps with exclusive group\n" );return -EINVAL ; }if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, false)) {if (rdtgrp->mode ==RDT_MODE_EXCLUSIVE || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { -rdt_last_cmd_printf ("overlaps with other group\n" ); +rdt_last_cmd_printf ("0verlaps with other group\n" );return -EINVAL ; } }
@@ -293,7 +293,7 @@ static int rdtgroup_parse_resource(char *resname, char *tok,if (!strcmp (resname, r->name) && rdtgrp->closid < r->num_closid)return parse_line (tok, r, rdtgrp); } -rdt_last_cmd_printf ("unknown/unsupported resource name '%s'\n" , resname); +rdt_last_cmd_printf ("Unknown or unsupported resource name '%s'\n" , resname);return -EINVAL ; }
@@ -326,7 +326,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret = -EINVAL ; -rdt_last_cmd_puts ("resource group is pseudo-locked\n" ); +rdt_last_cmd_puts ("Resource group is pseudo-locked\n" ); goto out; }
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +17 -17
@@ -221,7 +221,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)for_each_cpu (cpu, &plr->d->cpu_mask) { pm_req =kzalloc (sizeof (*pm_req),GFP_KERNEL );if (!pm_req) { -rdt_last_cmd_puts ("fail allocating mem for PM QoS\n" ); +rdt_last_cmd_puts ("Failure to allocate memory for PM QoS\n" ); ret = -ENOMEM ; goto out_err; }
@@ -230,7 +230,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)DEV_PM_QOS_RESUME_LATENCY , 30);if (ret <0 ) { -rdt_last_cmd_printf ("fail to add latency req cpu%d\n" , +rdt_last_cmd_printf ("Failed to add latency req CPU%d\n" , cpu);kfree (pm_req); ret =-1 ;
@@ -297,7 +297,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) plr->cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (plr->cpu)) { -rdt_last_cmd_printf ("cpu %u associated with cache not online\n" , +rdt_last_cmd_printf ("CPU %u associated with cache not online\n" , plr->cpu); ret = -ENODEV ; goto out_region;
@@ -315,7 +315,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) } ret =-1 ; -rdt_last_cmd_puts ("unable to determine cache line size\n" ); +rdt_last_cmd_puts ("Unable to determine cache line size\n" ); out_region:pseudo_lock_region_clear (plr);return ret;
@@ -369,14 +369,14 @@ static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)* KMALLOC_MAX_SIZE. */ if (plr->size >KMALLOC_MAX_SIZE ) { -rdt_last_cmd_puts ("requested region exceeds maximum size\n" ); +rdt_last_cmd_puts ("Requested region exceeds maximum size\n" ); ret = -E2BIG ; goto out_region; } plr->kmem =kzalloc (plr->size,GFP_KERNEL );if (!plr->kmem) { -rdt_last_cmd_puts ("unable to allocate memory\n" ); +rdt_last_cmd_puts ("Unable to allocate memory\n" ); ret = -ENOMEM ; goto out_region; }
@@ -673,7 +673,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)* default closid associated with it. */ if (rdtgrp == &rdtgroup_default) { -rdt_last_cmd_puts ("cannot pseudo-lock default group\n" ); +rdt_last_cmd_puts ("Cannot pseudo-lock default group\n" );return -EINVAL ; }
@@ -715,17 +715,17 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)*/ prefetch_disable_bits =get_prefetch_disable_bits ();if (prefetch_disable_bits ==0 ) { -rdt_last_cmd_puts ("pseudo-locking not supported\n" ); +rdt_last_cmd_puts ("Pseudo-locking not supported\n" );return -EINVAL ; }if (rdtgroup_monitor_in_progress (rdtgrp)) { -rdt_last_cmd_puts ("monitoring in progress\n" ); +rdt_last_cmd_puts ("Monitoring in progress\n" );return -EINVAL ; }if (rdtgroup_tasks_assigned (rdtgrp)) { -rdt_last_cmd_puts ("tasks assigned to resource group\n" ); +rdt_last_cmd_puts ("Tasks assigned to resource group\n" );return -EINVAL ; }
@@ -735,13 +735,13 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp) }if (rdtgroup_locksetup_user_restrict (rdtgrp)) { -rdt_last_cmd_puts ("unable to modify resctrl permissions\n" ); +rdt_last_cmd_puts ("Unable to modify resctrl permissions\n" );return -EIO ; } ret =pseudo_lock_init (rdtgrp);if (ret) { -rdt_last_cmd_puts ("unable to init pseudo-lock region\n" ); +rdt_last_cmd_puts ("Unable to init pseudo-lock region\n" ); goto out_release; }
@@ -778,7 +778,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" );return ret; } rdtgrp->mon.rmid = ret;
@@ -1234,7 +1234,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) "pseudo_lock/%u", plr->cpu);if (IS_ERR (thread)) { ret =PTR_ERR (thread); -rdt_last_cmd_printf ("locking thread returned error %d\n" , ret); +rdt_last_cmd_printf ("Locking thread returned error %d\n" , ret); goto out_cstates; }
@@ -1252,13 +1252,13 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)* the cleared, but not freed, plr struct resulting in an * empty pseudo-locking loop. */ -rdt_last_cmd_puts ("locking thread interrupted\n" ); +rdt_last_cmd_puts ("Locking thread interrupted\n" ); goto out_cstates; } ret =pseudo_lock_minor_get (&new_minor);if (ret <0 ) { -rdt_last_cmd_puts ("unable to obtain a new minor number\n" ); +rdt_last_cmd_puts ("Unable to obtain a new minor number\n" ); goto out_cstates; }
@@ -1290,7 +1290,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)if (IS_ERR (dev)) { ret =PTR_ERR (dev); -rdt_last_cmd_printf ("failed to create character device: %d\n" , +rdt_last_cmd_printf ("Failed to create character device: %d\n" , ret); goto out_debugfs; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +18 -18
@@ -335,7 +335,7 @@ static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,/* Check whether cpus belong to parent ctrl group */ cpumask_andnot (tmpmask, newmask, &prgrp->cpu_mask);if (cpumask_weight (tmpmask)) { -rdt_last_cmd_puts ("can only add CPUs to mongroup that belong to parent\n" ); +rdt_last_cmd_puts ("Can only add CPUs to mongroup that belong to parent\n" );return -EINVAL ; }
@@ -460,14 +460,14 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,rdt_last_cmd_clear ();if (!rdtgrp) { ret = -ENOENT ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto unlock; }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -477,7 +477,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, ret =cpumask_parse (buf, newmask);if (ret) { -rdt_last_cmd_puts ("bad cpu list/mask\n" ); +rdt_last_cmd_puts ("Bad CPU list/mask\n" ); goto unlock; }
@@ -485,7 +485,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,cpumask_andnot (tmpmask, newmask, cpu_online_mask);if (cpumask_weight (tmpmask)) { ret = -EINVAL ; -rdt_last_cmd_puts ("can only assign online cpus\n" ); +rdt_last_cmd_puts ("Can only assign online CPUs\n" ); goto unlock; }
@@ -564,7 +564,7 @@ static int __rdtgroup_move_task(struct task_struct *tsk,*/ atomic_dec (&rdtgrp->waitcount);kfree (callback); -rdt_last_cmd_puts ("task exited\n" ); +rdt_last_cmd_puts ("Task exited\n" ); }else {/* * For ctrl_mon groups move both closid and rmid.
@@ -682,7 +682,7 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -1042,14 +1042,14 @@ static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)list_for_each_entry (d, &r->domains, list) {if (rdtgroup_cbm_overlaps (r, d, d->ctrl_val[closid], rdtgrp->closid, false)) { -rdt_last_cmd_puts ("schemata overlaps\n" ); +rdt_last_cmd_puts ("Schemata overlaps\n" );return false; } } }if (!has_cache) { -rdt_last_cmd_puts ("cannot be exclusive without CAT/CDP\n" ); +rdt_last_cmd_puts ("Cannot be exclusive without CAT/CDP\n" );return false; }
@@ -1090,7 +1090,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out;if (mode ==RDT_MODE_PSEUDO_LOCKED ) { -rdt_last_cmd_printf ("cannot change pseudo-locked group\n" ); +rdt_last_cmd_printf ("Cannot change pseudo-locked group\n" ); ret = -EINVAL ; goto out; }
@@ -1119,7 +1119,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out; rdtgrp->mode =RDT_MODE_PSEUDO_LOCKSETUP ; }else { -rdt_last_cmd_printf ("unknown/unsupported mode\n" ); +rdt_last_cmd_printf ("Unknown orunsupported mode\n" ); ret = -EINVAL ; }
@@ -2403,7 +2403,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) tmp_cbm = d->new_ctrl;if (bitmap_weight (&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("no space on %s:%d\n" , +rdt_last_cmd_printf ("No space on %s:%d\n" , r->name, d->id);return -ENOSPC ; }
@@ -2420,7 +2420,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)continue ; ret =update_domains (r, rdtgrp->closid);if (ret <0 ) { -rdt_last_cmd_puts ("failed to initialize allocations\n" ); +rdt_last_cmd_puts ("Failed to initialize allocations\n" );return ret; } rdtgrp->mode =RDT_MODE_SHAREABLE ;
@@ -2443,7 +2443,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,rdt_last_cmd_clear ();if (!prdtgrp) { ret = -ENODEV ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto out_unlock; }
@@ -2451,7 +2451,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, (prdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || prdtgrp->mode == RDT_MODE_PSEUDO_LOCKED)) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto out_unlock; }
@@ -2459,7 +2459,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, rdtgrp =kzalloc (sizeof (*rdtgrp),GFP_KERNEL );if (!rdtgrp) { ret = -ENOSPC ; -rdt_last_cmd_puts ("kernel out of memory\n" ); +rdt_last_cmd_puts ("Kernel out of memory\n" ); goto out_unlock; } *r = rdtgrp;
@@ -2500,7 +2500,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" ); goto out_destroy; } rdtgrp->mon.rmid = ret;
@@ -2588,7 +2588,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, kn = rdtgrp->kn; ret =closid_alloc ();if (ret <0 ) { -rdt_last_cmd_puts ("out of CLOSIDs\n" ); +rdt_last_cmd_puts ("Out of CLOSIDs\n" ); goto out_common_fail; } closid = ret;
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 4.19 059/258] x86/resctrl: Fixup the user-visible strings
Hi Sasha,
Quoted 6 lines · Sasha Levin
From: Babu Moger <[email protected]>
[ Upstream commit
723f1a0dd8e26a7523ba068204bee11c95ded38d]Fix the messages in
rdt_last_cmd_printf()andrdt_last_cmd_puts()to make them more meaningful and consistent.
It is not clear to me why this patch is considered for stable since it just changes user visible strings to be more consistent.
If user visible string consistency/correctness is of concern and is what prompted its consideration then please also consider to include upstream commit456824896de2b68df40b3ea5777ef49dc6cc8fda "x86/resctrl: Use rdt_last_cmd_puts() where possible" that fixes two typos that was introduced in this commit. This may introduce difficultly though since the file layout changed between the kernel versions these patches are found in.
Reinette
Quoted 455 lines
[ bp: s/cpu/CPU/; s/mem\W/memory ]
Signed-off-by Babu Moger <[email protected]>Signed-off-by Borislav Petkov <[email protected]>Cc Andrew Morton <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Brijesh Singh <[email protected]>Cc "Chang S. Bae" <[email protected]>Cc David Miller <[email protected]>Cc David Woodhouse <[email protected]>Cc Dmitry Safonov <[email protected]>Cc Fenghua Yu <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Ingo Molnar <[email protected]>Cc Jann Horn <[email protected]>Cc Joerg Roedel <[email protected]>Cc Jonathan Corbet <[email protected]>Cc Josh Poimboeuf <[email protected]>Cc Kate Stewart <[email protected]>Cc "Kirill A. Shutemov" <[email protected]>Cc <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Philippe Ombredanne <[email protected]>Cc Pu Wen <[email protected]>Cc <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Cc Reinette Chatre <[email protected]>Cc Rian Hunter <[email protected]>Cc Sherry Hurwitz <[email protected]>Cc Suravee Suthikulpanit <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Thomas Lendacky <[email protected]>Cc Tony Luck <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++++++------- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++++++++---------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 ++++++++++----------- 3 files changed, 46 insertions(+), 46 deletions(-)arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +11
-11@@ -71,7 +71,7 @@ int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,unsigned long bw_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }@@ -97,12 +97,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) ret =kstrtoul (buf,16 , &val);if (ret) { -rdt_last_cmd_printf ("non-hex character in mask %s\n" , buf); +rdt_last_cmd_printf ("Non-hex character in the mask %s\n" , buf);return false; }if (val ==0 || val > r->default_ctrl) { -rdt_last_cmd_puts ("mask out of range\n" ); +rdt_last_cmd_puts ("Mask out of range\n" );return false; }@@ -110,12 +110,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) zero_bit =find_next_zero_bit (&val, cbm_len, first_bit);if (find_next_bit (&val, cbm_len, zero_bit) < cbm_len) { -rdt_last_cmd_printf ("mask %lx has non-consecutive 1-bits\n" , val); +rdt_last_cmd_printf ("The mask %lx has non-consecutive 1-bits\n" , val);return false; }if ((zero_bit - first_bit) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("Need at least %d bits in mask\n" , +rdt_last_cmd_printf ("Need at least %d bits in the mask\n" , r->cache.min_cbm_bits);return false; }@@ -135,7 +135,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,u32 cbm_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }@@ -145,7 +145,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP &&rdtgroup_pseudo_locked_in_hierarchy (d)) { -rdt_last_cmd_printf ("pseudo-locked region in hierarchy\n" ); +rdt_last_cmd_printf ("Pseudo-locked region in hierarchy\n" );return -EINVAL ; }@@ -164,14 +164,14 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,* either is exclusive. */ if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, true)) { -rdt_last_cmd_printf ("overlaps with exclusive group\n" ); +rdt_last_cmd_printf ("Overlaps with exclusive group\n" );return -EINVAL ; }if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, false)) {if (rdtgrp->mode ==RDT_MODE_EXCLUSIVE || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { -rdt_last_cmd_printf ("overlaps with other group\n" ); +rdt_last_cmd_printf ("0verlaps with other group\n" );return -EINVAL ; } }@@ -293,7 +293,7 @@ static int rdtgroup_parse_resource(char *resname, char *tok,if (!strcmp (resname, r->name) && rdtgrp->closid < r->num_closid)return parse_line (tok, r, rdtgrp); } -rdt_last_cmd_printf ("unknown/unsupported resource name '%s'\n" , resname); +rdt_last_cmd_printf ("Unknown or unsupported resource name '%s'\n" , resname);return -EINVAL ; }@@ -326,7 +326,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret = -EINVAL ; -rdt_last_cmd_puts ("resource group is pseudo-locked\n" ); +rdt_last_cmd_puts ("Resource group is pseudo-locked\n" ); goto out; }arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +17
-17@@ -221,7 +221,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)for_each_cpu (cpu, &plr->d->cpu_mask) { pm_req =kzalloc (sizeof (*pm_req),GFP_KERNEL );if (!pm_req) { -rdt_last_cmd_puts ("fail allocating mem for PM QoS\n" ); +rdt_last_cmd_puts ("Failure to allocate memory for PM QoS\n" ); ret = -ENOMEM ; goto out_err; }@@ -230,7 +230,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)DEV_PM_QOS_RESUME_LATENCY , 30);if (ret <0 ) { -rdt_last_cmd_printf ("fail to add latency req cpu%d\n" , +rdt_last_cmd_printf ("Failed to add latency req CPU%d\n" , cpu);kfree (pm_req); ret =-1 ;@@ -297,7 +297,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) plr->cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (plr->cpu)) { -rdt_last_cmd_printf ("cpu %u associated with cache not online\n" , +rdt_last_cmd_printf ("CPU %u associated with cache not online\n" , plr->cpu); ret = -ENODEV ; goto out_region;@@ -315,7 +315,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) } ret =-1 ; -rdt_last_cmd_puts ("unable to determine cache line size\n" ); +rdt_last_cmd_puts ("Unable to determine cache line size\n" ); out_region:pseudo_lock_region_clear (plr);return ret;@@ -369,14 +369,14 @@ static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)* KMALLOC_MAX_SIZE. */ if (plr->size >KMALLOC_MAX_SIZE ) { -rdt_last_cmd_puts ("requested region exceeds maximum size\n" ); +rdt_last_cmd_puts ("Requested region exceeds maximum size\n" ); ret = -E2BIG ; goto out_region; } plr->kmem =kzalloc (plr->size,GFP_KERNEL );if (!plr->kmem) { -rdt_last_cmd_puts ("unable to allocate memory\n" ); +rdt_last_cmd_puts ("Unable to allocate memory\n" ); ret = -ENOMEM ; goto out_region; }@@ -673,7 +673,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)* default closid associated with it. */ if (rdtgrp == &rdtgroup_default) { -rdt_last_cmd_puts ("cannot pseudo-lock default group\n" ); +rdt_last_cmd_puts ("Cannot pseudo-lock default group\n" );return -EINVAL ; }@@ -715,17 +715,17 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)*/ prefetch_disable_bits =get_prefetch_disable_bits ();if (prefetch_disable_bits ==0 ) { -rdt_last_cmd_puts ("pseudo-locking not supported\n" ); +rdt_last_cmd_puts ("Pseudo-locking not supported\n" );return -EINVAL ; }if (rdtgroup_monitor_in_progress (rdtgrp)) { -rdt_last_cmd_puts ("monitoring in progress\n" ); +rdt_last_cmd_puts ("Monitoring in progress\n" );return -EINVAL ; }if (rdtgroup_tasks_assigned (rdtgrp)) { -rdt_last_cmd_puts ("tasks assigned to resource group\n" ); +rdt_last_cmd_puts ("Tasks assigned to resource group\n" );return -EINVAL ; }@@ -735,13 +735,13 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp) }if (rdtgroup_locksetup_user_restrict (rdtgrp)) { -rdt_last_cmd_puts ("unable to modify resctrl permissions\n" ); +rdt_last_cmd_puts ("Unable to modify resctrl permissions\n" );return -EIO ; } ret =pseudo_lock_init (rdtgrp);if (ret) { -rdt_last_cmd_puts ("unable to init pseudo-lock region\n" ); +rdt_last_cmd_puts ("Unable to init pseudo-lock region\n" ); goto out_release; }@@ -778,7 +778,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" );return ret; } rdtgrp->mon.rmid = ret;@@ -1234,7 +1234,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) "pseudo_lock/%u", plr->cpu);if (IS_ERR (thread)) { ret =PTR_ERR (thread); -rdt_last_cmd_printf ("locking thread returned error %d\n" , ret); +rdt_last_cmd_printf ("Locking thread returned error %d\n" , ret); goto out_cstates; }@@ -1252,13 +1252,13 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)* the cleared, but not freed, plr struct resulting in an * empty pseudo-locking loop. */ -rdt_last_cmd_puts ("locking thread interrupted\n" ); +rdt_last_cmd_puts ("Locking thread interrupted\n" ); goto out_cstates; } ret =pseudo_lock_minor_get (&new_minor);if (ret <0 ) { -rdt_last_cmd_puts ("unable to obtain a new minor number\n" ); +rdt_last_cmd_puts ("Unable to obtain a new minor number\n" ); goto out_cstates; }@@ -1290,7 +1290,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)if (IS_ERR (dev)) { ret =PTR_ERR (dev); -rdt_last_cmd_printf ("failed to create character device: %d\n" , +rdt_last_cmd_printf ("Failed to create character device: %d\n" , ret); goto out_debugfs; }arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +18
-18@@ -335,7 +335,7 @@ static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,/* Check whether cpus belong to parent ctrl group */ cpumask_andnot (tmpmask, newmask, &prgrp->cpu_mask);if (cpumask_weight (tmpmask)) { -rdt_last_cmd_puts ("can only add CPUs to mongroup that belong to parent\n" ); +rdt_last_cmd_puts ("Can only add CPUs to mongroup that belong to parent\n" );return -EINVAL ; }@@ -460,14 +460,14 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,rdt_last_cmd_clear ();if (!rdtgrp) { ret = -ENOENT ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto unlock; }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }@@ -477,7 +477,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, ret =cpumask_parse (buf, newmask);if (ret) { -rdt_last_cmd_puts ("bad cpu list/mask\n" ); +rdt_last_cmd_puts ("Bad CPU list/mask\n" ); goto unlock; }@@ -485,7 +485,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,cpumask_andnot (tmpmask, newmask, cpu_online_mask);if (cpumask_weight (tmpmask)) { ret = -EINVAL ; -rdt_last_cmd_puts ("can only assign online cpus\n" ); +rdt_last_cmd_puts ("Can only assign online CPUs\n" ); goto unlock; }@@ -564,7 +564,7 @@ static int __rdtgroup_move_task(struct task_struct *tsk,*/ atomic_dec (&rdtgrp->waitcount);kfree (callback); -rdt_last_cmd_puts ("task exited\n" ); +rdt_last_cmd_puts ("Task exited\n" ); }else {/* * For ctrl_mon groups move both closid and rmid. @@ -682,7 +682,7 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }@@ -1042,14 +1042,14 @@ static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)list_for_each_entry (d, &r->domains, list) {if (rdtgroup_cbm_overlaps (r, d, d->ctrl_val[closid], rdtgrp->closid, false)) { -rdt_last_cmd_puts ("schemata overlaps\n" ); +rdt_last_cmd_puts ("Schemata overlaps\n" );return false; } } }if (!has_cache) { -rdt_last_cmd_puts ("cannot be exclusive without CAT/CDP\n" ); +rdt_last_cmd_puts ("Cannot be exclusive without CAT/CDP\n" );return false; }@@ -1090,7 +1090,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out;if (mode ==RDT_MODE_PSEUDO_LOCKED ) { -rdt_last_cmd_printf ("cannot change pseudo-locked group\n" ); +rdt_last_cmd_printf ("Cannot change pseudo-locked group\n" ); ret = -EINVAL ; goto out; }@@ -1119,7 +1119,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out; rdtgrp->mode =RDT_MODE_PSEUDO_LOCKSETUP ; }else { -rdt_last_cmd_printf ("unknown/unsupported mode\n" ); +rdt_last_cmd_printf ("Unknown orunsupported mode\n" ); ret = -EINVAL ; }@@ -2403,7 +2403,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) tmp_cbm = d->new_ctrl;if (bitmap_weight (&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("no space on %s:%d\n" , +rdt_last_cmd_printf ("No space on %s:%d\n" , r->name, d->id);return -ENOSPC ; }@@ -2420,7 +2420,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)continue ; ret =update_domains (r, rdtgrp->closid);if (ret <0 ) { -rdt_last_cmd_puts ("failed to initialize allocations\n" ); +rdt_last_cmd_puts ("Failed to initialize allocations\n" );return ret; } rdtgrp->mode =RDT_MODE_SHAREABLE ;@@ -2443,7 +2443,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,rdt_last_cmd_clear ();if (!prdtgrp) { ret = -ENODEV ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto out_unlock; }@@ -2451,7 +2451,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, (prdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || prdtgrp->mode == RDT_MODE_PSEUDO_LOCKED)) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto out_unlock; }@@ -2459,7 +2459,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, rdtgrp =kzalloc (sizeof (*rdtgrp),GFP_KERNEL );if (!rdtgrp) { ret = -ENOSPC ; -rdt_last_cmd_puts ("kernel out of memory\n" ); +rdt_last_cmd_puts ("Kernel out of memory\n" ); goto out_unlock; } *r = rdtgrp;@@ -2500,7 +2500,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" ); goto out_destroy; } rdtgrp->mon.rmid = ret;@@ -2588,7 +2588,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, kn = rdtgrp->kn; ret =closid_alloc ();if (ret <0 ) { -rdt_last_cmd_puts ("out of CLOSIDs\n" ); +rdt_last_cmd_puts ("Out of CLOSIDs\n" ); goto out_common_fail; } closid = ret;
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 059/258] x86/resctrl: Fixup the user-visible strings
Quoted 13 lines · Reinette Chatre
Hi Sasha,
Quoted 6 lines · Sasha Levin
From: Babu Moger <[email protected]>
[ Upstream commit
723f1a0dd8e26a7523ba068204bee11c95ded38d]Fix the messages in
rdt_last_cmd_printf()andrdt_last_cmd_puts()to make them more meaningful and consistent.It is not clear to me why this patch is considered for stable since it just changes user visible strings to be more consistent.
Quoted 8 lines
If user visible string consistency/correctness is of concern and is what prompted its consideration then please also consider to include upstream commit
456824896de2b68df40b3ea5777ef49dc6cc8fda"x86/resctrl: Userdt_last_cmd_puts()where possible" that fixes two typos that was introduced in this commit. This may introduce difficultly though since the file layout changed between the kernel versions these patches are found in.
I've dropped it, it shouldn't have been included to begin with.
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 60/258 clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit a5ac1ead32c9aac285f6436e09b4f6111996e9b8 ]
The cpu_div3 clock (cpu_in divided by 3) generates a signal with a duty cycle of 33%. The CPU clock however requires a clock signal with a duty cycle of 50% to run stable.cpu_div3 was observed to be problematic when cycling through all available CPU frequencies (with additional patches on top of this one) while running "stress --cpu 4" in the background. This caused sporadic hangs where the whole system would fully lock up.
Amlogic's 3.10 kernel code also does not use the cpu_div3 clock either when changing the CPU clock.
--- drivers/clk/meson/meson8b.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/clk/meson/meson8b.c +9 -2
@@ -596,20 +596,27 @@ static struct clk_regmap meson8b_cpu_scale_div = { }, }; +static u32 mux_table_cpu_scale_out_sel[] = {0 ,1 ,3 };static struct clk_regmap meson8b_cpu_scale_out_sel = { .data = &(struct clk_regmap_mux_data ){ .offset =HHI_SYS_CPU_CLK_CNTL0 , .mask =0x3 , .shift =2 , + .table = mux_table_cpu_scale_out_sel, }, .hw.init = &(struct clk_init_data ){ .name ="cpu_scale_out_sel" , .ops = &clk_regmap_mux_ro_ops, +/* +* NOTE: We are skipping the parent with value 0x2 (which is +* "cpu_div3") because it results in a duty cycle of 33% which +* makes the system unstable and can result in a lockup of the +* whole system. +*/ .parent_names = (const char *[]) {"cpu_in_sel" ,"cpu_div2" , -"cpu_div3" ,"cpu_scale_div" }, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , }, };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 61/258 clk: meson: meson8b: fix the width of the cpu_scale_div clock
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit a8662eadd1032018f31e37deda811790b2326662 ]
According to the public S805 datasheet HHI_SYS_CPU_CLK_CNTL1[29:20] is the register for the CPU scale_div clock. This matches the code in Amlogic's 3.10 GPL kernel sources:
N = (aml_read_reg32(P_HHI_SYS_CPU_CLK_CNTL1) >> 20) & 0x3FF;
This means that the divider register is 10 bit wide instead of 9 bits. So far this is not a problem since all u-boot versions I have seen are not using the cpu_scale_div clock at all (instead they are configuring the CPU clock to run off cpu_in_sel directly).
The fixes tag points to the latest rework of the CPU clocks. However, even before the rework it was wrong. Commit 7a29a869434e8b ("clk: meson:
Add support for Meson clock controller") defines MESON_N_WIDTH as 9 (in drivers/clk/meson/clk-cpu.c). But since the old clk-cpu implementation this only carries the fixes tag for the CPU clock rewordk.
--- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +1 -1
@@ -583,7 +583,7 @@ static struct clk_regmap meson8b_cpu_scale_div = { .data = &(struct clk_regmap_div_data){ .offset =HHI_SYS_CPU_CLK_CNTL1 , .shift =20 , - .width =9 , + .width =10 , .table = cpu_scale_table, .flags =CLK_DIVIDER_ALLOW_ZERO , },
Signature · 7 lines
2.19.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 62/258 clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 0dad1ec65bc30a549aba38d34a727309bbf41bc8 ]
We don't want the common clock framework to disable the "cpu_clk" if it's not used by any device. The cpufreq-dt driver does not enable the CPU clocks. However, even if it would we would still want the CPU clock to be enabled at all times because the CPU clock is also required even if we disable CPU frequency scaling on a specific board.
The reason why we want the CPU clock to be enabled is a clock further up in the tree:
Since commit 6f888e7bc7bd58 ("clk: meson: clk-pll: add enable bit") the sys_pll can be disabled. However, since the CPU clock is derived from sys_pll we don't want sys_pll to get disabled. The common clock framework takes care of that for us by enabling all parent clocks of our CPU clock when we mark the CPU clock with CLK_IS_CRITICAL.
Until now this is not a problem yet because all clocks in the CPU clock's tree (including sys_pll) are read-only. However, once we allow modifications to the clocks in that tree we will need this.
--- drivers/clk/meson/meson8b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +2 -1
@@ -634,7 +634,8 @@ static struct clk_regmap meson8b_cpu_clk = { "cpu_scale_out_sel" }, .num_parents = 2, .flags = (CLK_SET_RATE_PARENT | - CLK_SET_RATE_NO_REPARENT), +CLK_SET_RATE_NO_REPARENT | + CLK_IS_CRITICAL), }, };
Signature · 7 lines
2.19.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 63/258 ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit aea0a897af9e44c258e8ab9296fad417f1bc063a ]
Fix smatch warning:
drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn:
passing zero to 'ERR_PTR'
'err' should be set while device_create_with_groups and pps_register_source fails
--- drivers/ptp/ptp_clock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +4 -1
@@ -253,8 +253,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, ptp->dev =device_create_with_groups (ptp_class, parent, ptp->devid, ptp, ptp->pin_attr_groups,"ptp%d" , ptp->index); -if (IS_ERR (ptp->dev)) +if (IS_ERR (ptp->dev)) { + err =PTR_ERR (ptp->dev); goto no_device; + }/* Register a new PPS source. */ if (info->pps) {
@@ -265,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, pps.owner = info->owner; ptp->pps_source =pps_register_source (&pps,PTP_PPS_DEFAULTS );if (!ptp->pps_source) { + err = -EINVAL ;pr_err ("failed to register pps source\n" ); goto no_pps; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 64/258 dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit aeaebcc17cdf37065d2693865eeb1ff1c7dc5bf3 ]
Clang warns:
drivers/dma/xilinx/zynqmp_dma.c:166:4: warning: attribute 'aligned' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]
}; __aligned(64)
^./include/linux/compiler_types.h:200:38: note: expanded from macro '__aligned'
^
1 warning generated.
As Nick pointed out in the previous version of this patch, the author likely intended for this struct to be 8-byte (64-bit) aligned, not 64-byte, which is the default. Remove the hanging __aligned attribute.
--- drivers/dma/xilinx/zynqmp_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/xilinx/zynqmp_dma.c +1 -1
@@ -163,7 +163,7 @@ struct zynqmp_dma_desc_ll {u32 ctrl;u64 nxtdscraddr;u64 rsvd; -};__aligned(64) +};/** * struct zynqmp_dma_desc_sw - Per Transaction structure
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 65/258 powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
In reply to Sasha LevinFrom: Mathieu Malaterre <[email protected]>
[ Upstream commit beba24ac59133cb36ecd03f9af9ccb11971ee20e ]
When both CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y and CONFIG_UBSAN=y are set, link step typically produce numberous warnings about orphan section:
+ powerpc-linux-gnu-ld -EB -m elf32ppc -Bstatic --orphan-handling=warn --build-id --gc-sections -X -o .tmp_vmlinux1 -T ./arch/powerpc/kernel/vmlinux.lds --who le-archive built-in.a --no-whole-archive --start-group lib/lib.a --end-group
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data393' from init/main.o' being placed in section `.data..Lubsan_data393'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data394' from init/main.o' being placed in section `.data..Lubsan_data394'.
...
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type11' from init/main.o' being placed in section `.data..Lubsan_type11'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type12' from init/main.o' being placed in section `.data..Lubsan_type12'.
...
This commit remove those warnings produced at W=1.
--- arch/powerpc/kernel/vmlinux.lds.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/vmlinux.lds.S +4 -0
@@ -296,6 +296,10 @@ SECTIONS #ifdef CONFIG_PPC32 .data : AT(ADDR(.data) - LOAD_OFFSET) { DATA_DATA +#ifdef CONFIG_UBSAN + *(.data..Lubsan_data*) + *(.data..Lubsan_type*) +#endif *(.data.rel*) *(SDATA_MAIN) *(.sdata2)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 66/258 iio: adc: meson-saradc: check for devm_kasprintf failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit aad172b017617994343e36d8659c69e14cd694fd ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_sar_adc_clk_init() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/iio/adc/meson_saradc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/adc/meson_saradc.c +6 -0
@@ -589,6 +589,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =0 ; init.ops = &clk_divider_ops; clk_parents[0 ] =__clk_get_name (priv->clkin);
@@ -608,6 +611,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =CLK_SET_RATE_PARENT ; init.ops = &clk_gate_ops; clk_parents[0 ] =__clk_get_name (priv->adc_div_clk);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 67/258 iio: adc: meson-saradc: fix internal clock names
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ]
Before this patch we are registering the internal clocks (for example on Meson8b, where the SAR ADC IP block implements the divider and gate clocks) with the following names:
- /soc/cbus@c1100000/adc@8680#adc_div
- /soc/cbus@c1100000/adc@8680#adc_en
This is bad because the common clock framework uses the clock to create a directory in <debugfs>/clk. With such name, the directory creation (silently) fails and the debugfs entry ends up being created at the debugfs root.
With this change, the new clock names are:
- c1108680.adc#adc_div
- c1108680.adc#adc_en
This matches the clock naming scheme used in the PWM, Ethernet and MMC drivers. It also fixes the problem with debugfs.
The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson:
Fix mux clock names").
--- drivers/iio/adc/meson_saradc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/meson_saradc.c +4 -4
@@ -587,8 +587,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,struct clk_init_data init;const char *clk_parents[1 ]; - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_div" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
@@ -609,8 +609,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,if (WARN_ON (IS_ERR (priv->adc_div_clk)))return PTR_ERR (priv->adc_div_clk); - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_en" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 68/258 iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 7f6232e69539971cf9eaed07a6c14ab4a2361133 ]
Various 2-in-1's use KIOX010A and KIOX020A as HIDs for 2 KXCJ91008 accelerometers. The KIOX010A HID is for the one in the base and the KIOX020A for the accelerometer in the keyboard.
Since userspace does not have a way yet to deal with (or ignore) the accelerometer in the keyboard, this commit just adds the KIOX010A HID for now so that display rotation will work.
Related: https://github.com/hadess/iio-sensor-proxy/issues/166
--- drivers/iio/accel/kxcjk-1013.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
@@ -1490,6 +1490,7 @@ static const struct acpi_device_id kx_acpi_match[] = { {"KXCJ1008", KXCJ91008}, {"KXCJ9000", KXCJ91008}, {"KIOX000A", KXCJ91008}, + {"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */ {"KXTJ1009", KXTJ21009}, {"SMO8500", KXCJ91008}, { },
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 69/258 media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ]
The v4l2_dv_timings_cap struct is used to do sanity checks when setting and enumerating DV timings, ensuring that only valid timings as per the HW capabilities are allowed.
However, many drivers just filled in 0 for the minimum width, height or pixelclock frequency. This can cause timings with e.g. 0 as width and height to be accepted, which will in turn lead to a potential division by zero.
Fill in proper values are minimum boundaries. 640x350 was chosen since it is the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the v4l2-dv-timings.h header).
--- drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 ++-- drivers/media/i2c/adv7842.c | 4 ++-- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
drivers/media/i2c/ad9389b.c +1 -1
@@ -578,7 +578,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7511.c +1 -1
@@ -130,7 +130,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, + V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT, ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
drivers/media/i2c/adv7604.c +2 -2
@@ -766,7 +766,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -777,7 +777,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7842.c +2 -2
@@ -663,7 +663,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -674,7 +674,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/tc358743.c +1 -1
@@ -59,7 +59,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = {/* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 },/* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */ - V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE |
drivers/media/i2c/ths8200.c +1 -1
@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, -V4L2_INIT_BT_TIMINGS (0 ,1920 ,0 ,1080 ,25000000 ,148500000 , +V4L2_INIT_BT_TIMINGS (640 ,1920 ,350 ,1080 ,25000000 ,148500000 , V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 70/258 ACPI: SPCR: Consider baud rate 0 as preconfigured state
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit b413b1abeb21b4a152c0bf8d1379efa30759b6e3 ]
Since SPCR 1.04 [1] the baud rate of 0 means a preconfigured state of UART. Assume firmware or bootloader configures console correctly.
--- drivers/acpi/spcr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/spcr.c +11 -0
@@ -148,6 +148,13 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) }switch (table->baud_rate) { +case 0 : +/* +* SPCR 1.04 defines 0 as a preconfigured state of UART. +* Assume firmware or bootloader configures console correctly. +*/ + baud_rate =0 ; +break ;case 3 : baud_rate =9600 ;break ;
@@ -196,6 +203,10 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)* UART so don't attempt to change to the baud rate state * in the table because driver cannot calculate the dividers */ + baud_rate =0 ; + } + +if (!baud_rate) {snprintf (opts,sizeof (opts),"%s,%s,0x%llx" , uart, iotype, table->serial_port.address); }else {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 71/258 staging: pi433: fix potential null dereference
In reply to Sasha LevinFrom: Michael Straube <[email protected]>
[ Upstream commit 64c4c4ca6c129a4191e8e1e91b2d5d9b8d08c518 ]
Add a test for successful call to cdev_alloc() to avoid potential null dereference. Issue reported by smatch.
--- drivers/staging/pi433/pi433_if.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/pi433/pi433_if.c +4 -0
@@ -1255,6 +1255,10 @@ static int pi433_probe(struct spi_device *spi)/* create cdev */ device->cdev =cdev_alloc (); +if (!device->cdev) { +dev_dbg (device->dev,"allocation of cdev failed" ); + goto cdev_failed; + } device->cdev->owner =THIS_MODULE ;cdev_init (device->cdev, &pi433_fops); retval =cdev_add (device->cdev, device->devt,1 );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 72/258 f2fs: move dir data flush to write checkpoint process
In reply to Sasha LevinFrom: Yunlei He <[email protected]>
[ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ]
This patch move dir data flush to write checkpoint process, by doing this, it may reduce some time for dir fsync.
pre:
-f2fs_do_sync_file enter
-file_write_and_wait_range <- flush & wait -write_checkpoint
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
now:
-f2fs_do_sync_file enter
-write_checkpoint
-block_operations <- flush dir & no wait
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
--- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/file.c +3 -0
@@ -220,6 +220,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,trace_f2fs_sync_file_enter (inode); +if (S_ISDIR (inode->i_mode)) + goto go_write; +/* if fdatasync is triggered, let's do in-place-update */ if (datasync ||get_dirty_pages (inode) <=SM_I (sbi)->min_fsync_blocks)set_inode_flag (inode,FI_NEED_IPU );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 73/258 f2fs: avoid build warn of fall_through
In reply to Sasha LevinFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
In file included from fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (set)
^ fs/f2fs/f2fs.h:2390:2: note: here
case FI_DATA_EXIST:
^~~~
Exposed by my use of -Wimplicit-fallthrough
--- fs/f2fs/f2fs.h | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/f2fs.h +1 -0
@@ -2311,6 +2311,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,case FI_NEW_INODE :if (set)return ; +/* fall through */ case FI_DATA_EXIST :case FI_INLINE_DOTS :case FI_PIN_FILE :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 74/258 f2fs: fix race between write_checkpoint and write_begin
In reply to Sasha LevinFrom: Sheng Yong <[email protected]>
[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ]
The following race could lead to inconsistent SIT bitmap:
Task A Task B
====== ======f2fs_write_checkpoint
block_operations
f2fs_lock_all
down_write(node_change)
down_write(node_write)
... sync ...
up_write(node_change)
f2fs_file_write_iter
set_inode_flag(FI_NO_PREALLOC)
......
f2fs_write_begin(index=0, has inline data)
prepare_write_begin
__do_map_lock(AIO) => down_read(node_change)
f2fs_convert_inline_page => update SIT
__do_map_lock(AIO) => up_read(node_change) f2fs_flush_sit_entries <= inconsistent SIT finish write checkpoint sudden-power-off
If SPO occurs after checkpoint is finished, SIT bitmap will be set incorrectly.
--- fs/f2fs/data.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +10 -2
@@ -2259,6 +2259,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,bool locked = false;struct extent_info ei = {0 ,0 ,0 };int err =0 ; +int flag;/* * we already allocated all the blocks, so we don't need to get
@@ -2268,9 +2269,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, !is_inode_flag_set(inode, FI_NO_PREALLOC))return 0 ; +/* f2fs_lock_op avoids race between write CP and convert_inline_page */ +if (f2fs_has_inline_data (inode) && pos + len >MAX_INLINE_DATA (inode)) + flag =F2FS_GET_BLOCK_DEFAULT ; +else + flag =F2FS_GET_BLOCK_PRE_AIO ; +if (f2fs_has_inline_data (inode) || (pos &PAGE_MASK ) >=i_size_read (inode)) { -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +__do_map_lock (sbi, flag, true); locked = true; } restart:
@@ -2308,6 +2315,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,f2fs_put_dnode (&dn);__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +WARN_ON (flag !=F2FS_GET_BLOCK_PRE_AIO ); locked = true; goto restart; }
@@ -2321,7 +2329,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,f2fs_put_dnode (&dn); unlock_out:if (locked) -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +__do_map_lock (sbi, flag, false);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 75/258 f2fs: fix wrong return value of f2fs_acl_create
In reply to Sasha LevinFrom: Tiezhu Yang <[email protected]>
[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() should return -EIO instead of -ENOMEM, this patch makes it consistent with posix_acl_create() which has been fixed in commit beaf226b863a ("posix_acl: don't ignore return value of posix_acl_create_masq()").
--- fs/f2fs/acl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/acl.c +8 -6
@@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return PTR_ERR (p); clone =f2fs_acl_clone (p,GFP_NOFS ); -if (!clone) - goto no_mem; +if (!clone) { + ret = -ENOMEM ; + goto release_acl; + } ret =f2fs_acl_create_masq (clone, mode);if (ret <0 ) - goto no_mem_clone; + goto release_clone;if (ret ==0 )posix_acl_release (clone);
@@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return 0 ; -no_mem_clone: +release_clone:posix_acl_release (clone); -no_mem: +release_acl:posix_acl_release (p); -return -ENOMEM ; +return ret; } int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 76/258 i2c: sh_mobile: add support for r8a77990 (R-Car E3)
In reply to Sasha LevinFrom: Simon Horman <[email protected]>
[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ]
Add support for the IIC code for the r8a77990 (R-Car E3).
It is not considered compatible with existing fallback bindings due to the documented absence of automatic transmission registers.
These registers are currently not used by the driver and thus the provides the same behaviour for "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic". The point of declaring incompatibility is to allow for automatic transmission register support to be added to "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -808,6 +808,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {},
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 77/258 arm64: io: Ensure calls to delay routines are ordered against prior readX()
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ]
A relatively standard idiom for ensuring that a pair of MMIO writes to a device arrive at that device with a specified minimum delay between them is as follows:
writel_relaxed(42, dev_base + CTL1); readl(dev_base + CTL1); udelay(10); writel_relaxed(42, dev_base + CTL2);
the intention being that the read-back from the device will push the prior write to CTL1, and the udelay will hold up the write to CTL1 until at least 10us have elapsed.
Unfortunately, on arm64 where the underlying delay loop is implemented as a read of the architected counter, the CPU does not guarantee ordering from the readl() to the delay loop and therefore the delay loop could in theory be speculated and not provide the desired interval between the two writes.
Fix this in a similar manner to PowerPC by introducing a dummy control dependency on the output of readX() which, combined with the ISB in the read of the architected counter, guarantees that a subsequent delay loop can not be executed until the readX() has returned its result.
--- arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/arm64/include/asm/io.h +23 -8
@@ -106,7 +106,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb () rmb() +#define __iormb (v) \ +({ \ + unsigned long tmp; \ + \ + rmb(); \ + \ +/* \ +* Create a dummy control dependency from the IO read to any \ +* later instructions. This ensures that a subsequent call to \ +* udelay() will be ordered due to the ISB in get_cycles(). \ +*/ \ + asmvolatile ("eor %0, %1, %1\n" \ +"cbnz %0, ." \ + :"=r" (tmp) :"r" (v) :"memory" ); \ +}) +#define __iowmb () wmb()#define mmiowb () do { } while (0)
@@ -131,10 +146,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)* following Normal memory access. Writes are ordered relative to any prior * Normal memory access. */ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) +#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) +#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) +#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) +#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; })#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); })#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); })
@@ -185,9 +200,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);/* * io{read,write}{16,32,64}be() macros */ -#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) -#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) -#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) +#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) +#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) +#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; })#define iowrite16be (v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })#define iowrite32be (v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 78/258 net: aquantia: return 'err' if set MPI_DEINIT state fails
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 4e3c7c00bba0636b97eb23d582c20b0f5d95ce20 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c:260:7:
warning: variable 'err' set but not used [-Wunused-but-set-variable]
'err' should be returned while set MPI_DEINIT state fails in hw_atl_utils_soft_reset.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
@@ -262,6 +262,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,HW_ATL_MPI_STATE_ADR ) &HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT ,10 ,1000U ); +if (err) +return err; }if (self->rbl_enabled)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 79/258 sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
In reply to Sasha LevinFrom: Young Xiao <[email protected]>
[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ]
__vdc_tx_trigger should only loop on EAGAIN a finite number of times.
See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail.
--- drivers/block/sunvdc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/sunvdc.c +5 -0
@@ -45,6 +45,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);#define WAITING_FOR_GEN_CMD 0x04#define WAITING_FOR_ANY -1 +#define VDC_MAX_RETRIES 10 +static struct workqueue_struct *sunvdc_wq;struct vdc_req_entry {
@@ -431,6 +433,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) .end_idx = dr->prod, };int err, delay; +int retries =0 ; hdr.seq = dr->snd_nxt; delay =1 ;
@@ -443,6 +446,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)udelay (delay);if ((delay <<=1 ) >128 ) delay =128 ; +if (retries++ >VDC_MAX_RETRIES ) +break ; }while (err == -EAGAIN );if (err == -ENOTCONN )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 80/258 soc: bcm: brcmstb: Don't leak device tree node reference
In reply to Sasha LevinFrom: Yangtao Li <[email protected]>
[ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_brcmstb() doesn't do that, so fix it.
[treding: slightly rewrite to avoid inline comparison]
--- drivers/soc/bcm/brcmstb/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/common.c +5 -1
@@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = {bool soc_is_brcmstb (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (brcmstb_machine_match, root) !=NULL ; + match =of_match_node (brcmstb_machine_match, root); +of_node_put (root); + +return match !=NULL ; }u32 brcmstb_get_family_id (void )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 81/258 nfsd4: fix crash on writing v4_end_grace before nfsd startup
In reply to Sasha LevinFrom: "J. Bruce Fields" <[email protected]>
[ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ]
Anatoly Trosinenko reports that this:
1) Checkout fresh master Linux branch (tested with commit e195ca6cb)
2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build
3) From kvm-xfstests shell:
results in NULL dereference in locks_end_grace.
Check that nfsd has been started before trying to end the grace period.
--- fs/nfsd/nfsctl.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfsctl.c +2 -0
@@ -1126,6 +1126,8 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)case 'Y' :case 'y' :case '1' : +if (nn->nfsd_serv) +return -EBUSY ;nfsd4_end_grace (nn);break ;default :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 82/258 drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit aa394b0dd68cb00c483e151dcd84713d4d517ed1 ]
drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to the context given in the argument and leaves it in state after it quits. The lifetime of state and context are not guaranteed to be the same, so we shouldn't leave that pointer hanging around. This patch resets the context to NULL to avoid any oopses.
Changes in v2:
- Added to the set
--- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +6 -2
@@ -3192,7 +3192,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend);int drm_atomic_helper_commit_duplicated_state (struct drm_atomic_state *state,struct drm_modeset_acquire_ctx *ctx) { -int i; +int i, ret;struct drm_plane *plane;struct drm_plane_state *new_plane_state;struct drm_connector *connector;
@@ -3211,7 +3211,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,for_each_new_connector_in_state (state, connector, new_conn_state, i) state->connectors[i].old_state = connector->state; -return drm_atomic_commit (state); + ret =drm_atomic_commit (state); + + state->acquire_ctx =NULL ; + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_commit_duplicated_state);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 83/258 drm: Move drm_mode_setcrtc() local re-init to failure path
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit c232e9f41b136c141df9938024e521191a7b910d ]
Instead of always re-initializing the variables we need to clean up on out, move the re-initialization into the branch that goes back to retry label.
This is a lateral move right now, but will allow us to pull out the modeset locking into common code. I kept this change separate to make things easier to review.
Changes in v2:
- None
--- drivers/gpu/drm/drm_crtc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_crtc.c +9 -7
@@ -567,9 +567,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,struct drm_mode_crtc *crtc_req = data;struct drm_crtc *crtc;struct drm_plane *plane; -struct drm_connector **connector_set, *connector; -struct drm_framebuffer *fb; -struct drm_display_mode *mode; +struct drm_connector **connector_set =NULL , *connector; +struct drm_framebuffer *fb =NULL ; +struct drm_display_mode *mode =NULL ;struct drm_mode_set set;uint32_t __user *set_connectors_ptr;struct drm_modeset_acquire_ctx ctx;
@@ -598,10 +598,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,mutex_lock (&crtc->dev->mode_config.mutex);drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: - connector_set =NULL ; - fb =NULL ; - mode =NULL ; - ret =drm_modeset_lock_all_ctx (crtc->dev, &ctx);if (ret) goto out;
@@ -763,6 +759,12 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, }kfree (connector_set);drm_mode_destroy (dev, mode); + +/* In case we need to retry... */ + connector_set =NULL ; + fb =NULL ; + mode =NULL ; +if (ret == -EDEADLK ) { ret =drm_modeset_backoff (&ctx);if (!ret)
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 4.19 083/258] drm: Move drm_mode_setcrtc() local re-init to failure path
Quoted 12 lines · Sasha Levin
From: Sean Paul <[email protected]>
[ Upstream commit
c232e9f41b136c141df9938024e521191a7b910d]Instead of always re-initializing the variables we need to clean up on out, move the re-initialization into the branch that goes back to retry label.
This is a lateral move right now, but will allow us to pull out the modeset locking into common code. I kept this change separate to make things easier to review.
Quoted 7 lines
Changes in v2:
- NoneReviewed-by Daniel Vetter <[email protected]>Signed-off-by Sean Paul <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This probably doesn't need to get pulled back to stable. It was a pre-cursor for some new helper macros that also don't need to be pulled back.
(Same comment for the 4.20 version)
Sean
Quoted 52 lines
--- drivers/gpu/drm/drm_crtc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_crtc.c +9
-7@@ -567,9 +567,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,struct drm_mode_crtc *crtc_req = data;struct drm_crtc *crtc;struct drm_plane *plane; -struct drm_connector **connector_set, *connector; -struct drm_framebuffer *fb; -struct drm_display_mode *mode; +struct drm_connector **connector_set =NULL , *connector; +struct drm_framebuffer *fb =NULL ; +struct drm_display_mode *mode =NULL ;struct drm_mode_set set;uint32_t __user *set_connectors_ptr;struct drm_modeset_acquire_ctx ctx;@@ -598,10 +598,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,mutex_lock (&crtc->dev->mode_config.mutex);drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: - connector_set =NULL ; - fb =NULL ; - mode =NULL ; - ret =drm_modeset_lock_all_ctx (crtc->dev, &ctx);if (ret) goto out;@@ -763,6 +759,12 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, }kfree (connector_set);drm_mode_destroy (dev, mode); + +/* In case we need to retry... */ + connector_set =NULL ; + fb =NULL ; + mode =NULL ; +if (ret == -EDEADLK ) { ret =drm_modeset_backoff (&ctx);if (!ret)Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 083/258] drm: Move drm_mode_setcrtc() local re-init to failure path
Quoted 21 lines · Sean Paul
Quoted 12 lines · Sasha Levin
From: Sean Paul <[email protected]>
[ Upstream commit
c232e9f41b136c141df9938024e521191a7b910d]Instead of always re-initializing the variables we need to clean up on out, move the re-initialization into the branch that goes back to retry label.
This is a lateral move right now, but will allow us to pull out the modeset locking into common code. I kept this change separate to make things easier to review.
Quoted 7 lines
Changes in v2:
- NoneReviewed-by Daniel Vetter <[email protected]>Signed-off-by Sean Paul <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 4 lines
This probably doesn't need to get pulled back to stable. It was a pre-cursor for some new helper macros that also don't need to be pulled back.
(Same comment for the 4.20 version)
Now dropped, thank you.
Sasha Levin
maintainerPATCH 84/258 perf: arm_spe: handle devm_kasprintf() failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to 'name' is not safe if unchecked. If NULL is passed in for name then perf_pmu_register() would not fail but rather silently jump to skip_type which is not the intent here. As perf_pmu_register() may also return -ENOMEM returning -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here as well.
--- drivers/perf/arm_spe_pmu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/perf/arm_spe_pmu.c +5 -0
@@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) idx =atomic_inc_return (&pmu_idx); name =devm_kasprintf (dev,GFP_KERNEL ,"%s_%d" ,PMUNAME , idx); +if (!name) { +dev_err (dev,"failed to allocate name for pmu %d\n" , idx); +return -ENOMEM ; + } +return perf_pmu_register (&spe_pmu->pmu, name,-1 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 85/258 arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ]
As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines are ordered against prior readX()"), MMIO reads smaller than 64 bits fail to compile under clang because we end up mixing 32-bit and 64-bit register operands for the same data processing instruction:
./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths]
return readb(addr);
^
./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb'
^
./include/asm-generic/io.h:695:9: note: use constraint modifier "w"
./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb'
^
./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb'
asm volatile("eor %0, %1, %1\n" \
^Fix the build by casting the macro argument to 'unsigned long' when used as an input to the inline asm.
--- arch/arm64/include/asm/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/io.h +2 -1
@@ -119,7 +119,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)*/ \ asmvolatile ("eor %0, %1, %1\n" \"cbnz %0, ." \ - :"=r" (tmp) :"r" (v) :"memory" ); \ + :"=r" (tmp) :"r" ((unsigned long )(v)) \ + :"memory" ); \ })#define __iowmb () wmb()
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 86/258 Thermal: do not clear passive state during system sleep
In reply to Sasha LevinFrom: Wei Wang <[email protected]>
[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ]
commit ff140fea847e ("Thermal: handle thermal zone device properly during system sleep") added PM hook to call thermal zone reset during sleep. However resetting thermal zone will also clear the passive state and thus cancel the polling queue which leads the passive cooling device state not being cleared properly after sleep.
thermal_pm_notify => thermal_zone_device_reset set passive to 0 thermal_zone_trip_update will skip update passive as `old_target == instance->target'.monitor_thermal_zone => thermal_zone_device_set_polling will cancel tz->poll_queue, so the cooling device state will not be changed afterwards.
--- drivers/thermal/thermal_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +8 -4
@@ -451,16 +451,20 @@ static void update_temperature(struct thermal_zone_device *tz) tz->last_temperature, tz->temperature); } -static void thermal_zone_device_reset (struct thermal_zone_device *tz) +static void thermal_zone_device_init (struct thermal_zone_device *tz) {struct thermal_instance *pos; - tz->temperature =THERMAL_TEMP_INVALID ; - tz->passive =0 ;list_for_each_entry (pos, &tz->thermal_instances, tz_node) pos->initialized = false; } +static void thermal_zone_device_reset (struct thermal_zone_device *tz) +{ + tz->passive =0 ; +thermal_zone_device_init (tz); +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
@@ -1502,7 +1506,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { -thermal_zone_device_reset (tz); +thermal_zone_device_init (tz);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 87/258 thermal: Fix locking in cooling device sysfs update cur_state
In reply to Sasha LevinFrom: Thara Gopinath <[email protected]>
[ Upstream commit 68000a0d983f539c95ebe5dccd4f29535c7ac0af ]
Sysfs interface to update cooling device cur_state does not currently holding cooling device lock sometimes leading to stale values in cur_state if getting updated simultanelously from user space and thermal framework. Adding the proper locking code fixes this issue.
--- drivers/thermal/thermal_sysfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/thermal/thermal_sysfs.c +7 -4
@@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; +mutex_lock (&cdev->lock); + result = cdev->ops->set_cur_state (cdev, state); -if (result) -return result; -thermal_cooling_device_stats_update (cdev, state); -return count; +if (!result) +thermal_cooling_device_stats_update (cdev, state); + +mutex_unlock (&cdev->lock); +return result ? result : count; } static struct device_attribute
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 88/258 firmware/efi: Add NULL pointer checks in efivars API functions
In reply to Sasha LevinFrom: Arend van Spriel <[email protected]>
[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ]
Since commit:
ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
we have a device driver accessing the efivars API. Several functions in the efivars API assume __efivars is set, i.e., that they will be accessed only after efivars_register() has been called. However, the following NULL pointer access was reported calling efivar_entry_size() from the brcmfmac device driver:
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = 60bfa5f1 [00000008] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM ... Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events request_firmware_work_func PC is at efivar_entry_size+0x28/0x90 LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] pc : [<c0c40718>] lr : [<bf2a3ef4>] psr: a00d0113 sp : ede7fe28 ip : ee983410 fp : c1787f30 r10: 00000000 r9 : 00000000 r8 : bf2b2258 r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: ad16804a DAC: 00000051
Disassembly showed that the local static variable __efivars is NULL, which is not entirely unexpected given that it is a non-EFI platform.
So add a NULL pointer check to efivar_entry_size(), and to related functions while at it. In efivars_register() a couple of sanity checks are added as well.
--- drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 21 deletions(-)
drivers/firmware/efi/vars.c +78 -21
@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable);static efi_status_t check_var_size (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size)static efi_status_t check_var_size_nonblocking (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *),void *data,bool duplicates,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;unsigned long variable_name_size =1024 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;int err =0 ; +if (!__efivars) +return -EFAULT ; + + ops = __efivars->ops; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry)*/ int __efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -0 ,0 ,NULL ); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL );return efi_status_to_err (status); }
@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete);*/ int efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->set_variable (entry->var.VariableName, &entry->var.VendorGuid,0 ,0 ,NULL );
@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete);int efivar_entry_set (struct efivar_entry *entry,u32 attributes,unsigned long size,void *data,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;efi_char16_t *name = entry->var.VariableName;efi_guid_t vendor = entry->var.VendorGuid;if (down_interruptible (&efivars_lock))return -EINTR ; + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops;if (head &&efivar_entry_find (name, vendor, head, false)) {up (&efivars_lock);return -EEXIST ;
@@ -687,12 +715,17 @@ static int efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, u32 attributes, unsigned long size, void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_trylock (&efivars_lock))return -EBUSY ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + status =check_var_size_nonblocking (attributes, size +ucs2_strsize (name,1024 ));if (status !=EFI_SUCCESS ) {
@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,return -ENOSPC ; } + ops = __efivars->ops; status = ops->set_variable_nonblocking (name, &vendor, attributes, size, data);
@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,int efivar_entry_set_safe (efi_char16_t *name,efi_guid_t vendor,u32 attributes,bool block,unsigned long size,void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; +if (!__efivars) +return -EINVAL ; + + ops = __efivars->ops;if (!ops->query_variable_store)return -ENOSYS ;
@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find);*/ int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; *size =0 ;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->get_variable (entry->var.VariableName, &entry->var.VendorGuid,NULL , size,NULL );up (&efivars_lock);
@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size);int __efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);return efi_status_to_err (status); }
@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get);int efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);up (&efivars_lock);return efi_status_to_err (status);
@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get);int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes,unsigned long *size,void *data,bool *set) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_char16_t *name = entry->var.VariableName;efi_guid_t *vendor = &entry->var.VendorGuid;efi_status_t status;
@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { + err = -EINVAL ; + goto out; + } +/* * Ensure that the available space hasn't shrunk below the safe level */
@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, } } + ops = __efivars->ops; + status = ops->set_variable (name, vendor, attributes, *size, data);if (status !=EFI_SUCCESS ) { err =efi_status_to_err (status);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 89/258 s390/zcrypt: improve special ap message cmd handling
In reply to Sasha LevinFrom: Harald Freudenberger <[email protected]>
[ Upstream commit be534791011100d204602e2e0496e9e6ce8edf63 ]
There exist very few ap messages which need to have the 'special' flag enabled. This flag tells the firmware layer to do some pre- and maybe postprocessing. However, it may happen that this special flag is enabled but the firmware is unable to deal with this kind of message and thus returns with reply code 0x41. For example older firmware may not know the newest messages triggered by the zcrypt device driver and thus react with reject and the named reply code. Unfortunately this reply code is not known to the zcrypt error routines and thus default behavior is to switch the ap queue offline.
This patch now makes the ap error routine aware of the reply code and so userspace is informed about the bad processing result but the queue is not switched to offline state any more.
--- arch/s390/include/uapi/asm/zcrypt.h | 4 ++-- drivers/s390/crypto/zcrypt_error.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/zcrypt.h +2 -2
@@ -147,8 +147,8 @@ struct ica_xcRB {* @cprb_len: CPRB header length [0x0020] * @cprb_ver_id: CPRB version id. [0x04] * @pad_000: Alignment pad bytes -* @flags: Admin cmd [0x80] or functional cmd [0x00] -* @func_id: Function id / subtype [0x5434] +* @flags: Admin bit [0x80], Special bit [0x20] +* @func_id: Function id / subtype [0x5434] "T4" * @source_id: Source id [originator id] * @target_id: Target id [usage/ctrl domain id] * @ret_code: Return code
drivers/s390/crypto/zcrypt_error.h +2 -0
@@ -52,6 +52,7 @@ struct error_hdr {#define REP82_ERROR_FORMAT_FIELD 0x29#define REP82_ERROR_INVALID_COMMAND 0x30#define REP82_ERROR_MALFORMED_MSG 0x40 +#define REP82_ERROR_INVALID_SPECIAL_CMD 0x41#define REP82_ERROR_INVALID_DOMAIN_PRECHECK 0x42#define REP82_ERROR_RESERVED_FIELDO 0x50/* old value */ #define REP82_ERROR_WORD_ALIGNMENT 0x60
@@ -90,6 +91,7 @@ static inline int convert_error(struct zcrypt_queue *zq,case REP88_ERROR_MESSAGE_MALFORMD :case REP82_ERROR_INVALID_DOMAIN_PRECHECK :case REP82_ERROR_INVALID_DOMAIN_PENDING : +case REP82_ERROR_INVALID_SPECIAL_CMD :// REP88_ERROR_INVALID_KEY // '82' CEX2A // REP88_ERROR_OPERAND // '84' CEX2A // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 90/258 mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 6bf4a8e902aad7df55d7f2b10b850cfa3f880996 ]
Fix IBI_R11 configuration on non-radar channels for mt76x0e driver. This patch improve system stability under heavy load. Moreover use IBI_R11 name and remove magic numbers for 0x212c register
--- drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c +6 -2
@@ -799,7 +799,7 @@ static void mt76x2_dfs_set_bbp_params(struct mt76x2_dev *dev)/* enable detection*/ mt76_wr (dev,MT_BBP (DFS ,0 ),MT_DFS_CH_EN <<16 ); -mt76_wr (dev,0x212c ,0x0c350001 ); +mt76_wr (dev,MT_BBP (IBI ,11 ),0x0c350001 ); }void mt76x2_dfs_adjust_agc (struct mt76x2_dev *dev)
@@ -842,7 +842,11 @@ void mt76x2_dfs_init_params(struct mt76x2_dev *dev)mt76_wr (dev,MT_BBP (DFS ,0 ),0 );/* clear detector status */ mt76_wr (dev,MT_BBP (DFS ,1 ),0xf ); -mt76_wr (dev,0x212c ,0 ); +if (mt76_chip (&dev->mt76) ==0x7610 || +mt76_chip (&dev->mt76) ==0x7630 ) +mt76_wr (dev,MT_BBP (IBI ,11 ),0xfde8081 ); +else +mt76_wr (dev,MT_BBP (IBI ,11 ),0 );mt76x2_irq_disable (dev,MT_INT_GPTIMER ); mt76_rmw_field(dev, MT_INT_TIMER_EN,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 91/258 arm64: ftrace: don't adjust the LR value
In reply to Sasha LevinFrom: Mark Rutland <[email protected]>
[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ]
The core ftrace code requires that when it is handed the PC of an instrumented function, this PC is the address of the instrumented instruction. This is necessary so that the core ftrace code can identify the specific instrumentation site. Since the instrumented function will be a BL, the address of the instrumented function is LR - 4 at entry to the ftrace code.
This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, which acquire the PC of the instrumented function.
The mcount_get_lr helper is used to acquire the LR of the instrumented function, whose value does not require this adjustment, and cannot be adjusted to anything meaningful. No adjustment of this value is made on other architectures, including arm. However, arm64 adjusts this value by 4.
This patch brings arm64 in line with other architectures and removes the adjustment of the LR value.
--- arch/arm64/kernel/entry-ftrace.S | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/entry-ftrace.S +0 -1
@@ -79,7 +79,6 @@ .macro mcount_get_lr reg ldr \reg, [x29] ldr \reg, [\reg, #8] - mcount_adjust_addr \reg, \reg .endm .macro mcount_get_lr_addr reg
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 92/258 drm/v3d: Fix prime imports of buffers from other drivers.
In reply to Sasha LevinFrom: Eric Anholt <[email protected]>
[ Upstream commit 62d1a752874962f072de8a779e960fcd2ab4847b ]
v3d_bo_get_pages() checks this to decide to map the imported buffer instead of the backing shmem file. The caller was about to set this value anyway, and there's no error path in between. Ideally we wouldn't even allocate the shmem file for our imports, but that's a more invasive fix.
--- drivers/gpu/drm/v3d/v3d_bo.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/v3d/v3d_bo.c +1 -0
@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, bo->resv = attach->dmabuf->resv; bo->sgt = sgt; + obj->import_attach = attach;v3d_bo_get_pages (bo);v3d_mmu_insert_ptes (bo);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 93/258 ARM: dts: mmp2: fix TWSI2
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ]
Marvell keeps their MMP2 datasheet secret, but there are good clues that TWSI2 is not on 0xd4025000 on that platform, not does it use IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:
arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58
I'm taking a somewhat educated guess that is probably a copy & paste error from PXA168 or PXA910 and that the real controller in fact hides at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.
I'm also copying some properties from TWSI1 that were missing or incorrect.
Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.
--- arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mmp2.dtsi +6 -3
@@ -220,12 +220,15 @@ status = "disabled"; }; - twsi2: i2c@d4025000 { + twsi2: i2c@d4031000 { compatible = "mrvl,mmp-twsi"; - reg = <0xd4025000 0x1000>; - interrupts = <58>; + reg = <0xd4031000 0x1000>; + interrupt-parent = <&intcmux17>; + interrupts = <0>; clocks = <&soc_clocks MMP2_CLK_TWSI1>; resets = <&soc_clocks MMP2_CLK_TWSI1>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 94/258 nfp: add locking around representor changes
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 71844fac1ed459024dd2a448d63d5b28b8c87daa ]
Up until now we never needed to keep a networking locks around representors accesses, we only accessed them when device was reconfigured (under nfp pf->lock) or on fast path (under RCU). Now we want to be able to iterate over all representors during notifications, so make sure representor assignment is done under RTNL lock.
--- drivers/net/ethernet/netronome/nfp/abm/main.c | 4 ++++ drivers/net/ethernet/netronome/nfp/nfp_app.c | 2 ++ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/ethernet/netronome/nfp/abm/main.c +4 -0
@@ -415,7 +415,9 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink, reprs =nfp_reprs_get_locked (app, rtype);WARN (nfp_repr_get_locked (app, reprs, alink->id),"duplicate repr" ); +rtnl_lock ();rcu_assign_pointer (reprs->reprs[alink->id], netdev); +rtnl_unlock (); nfp_info(app->cpp, "%s Port %d Representor(%s) created\n", ptype == NFP_PORT_PF_PORT ? "PCIe" : "Phys",
@@ -441,7 +443,9 @@ nfp_abm_kill_repr(struct nfp_app *app, struct nfp_abm_link *alink, netdev =nfp_repr_get_locked (app, reprs, alink->id);if (!netdev)return ; +rtnl_lock ();rcu_assign_pointer (reprs->reprs[alink->id],NULL ); +rtnl_unlock ();synchronize_rcu ();/* Cast to make sure nfp_repr_clean_and_free() takes a nfp_repr */ nfp_repr_clean_and_free ((struct nfp_repr *)netdev_priv (netdev));
drivers/net/ethernet/netronome/nfp/nfp_app.c +2 -0
@@ -156,7 +156,9 @@ nfp_app_reprs_set(struct nfp_app *app, enum nfp_repr_type type,struct nfp_reprs *old; old =nfp_reprs_get_locked (app, type); +rtnl_lock ();rcu_assign_pointer (app->reprs[type], reprs); +rtnl_unlock ();return old; }
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +2 -0
@@ -472,7 +472,9 @@ int nfp_reprs_resync_phys_ports(struct nfp_app *app)continue ;nfp_app_repr_preclean (app, netdev); +rtnl_lock ();rcu_assign_pointer (reprs->reprs[i],NULL ); +rtnl_unlock ();synchronize_rcu ();nfp_repr_clean (repr); }
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 4.19 094/258] nfp: add locking around representor changes
Quoted 11 lines · Sasha Levin
From: Jakub Kicinski <[email protected]>
[ Upstream commit
71844fac1ed459024dd2a448d63d5b28b8c87daa]Up until now we never needed to keep a networking locks around representors accesses, we only accessed them when device was reconfigured (under nfp
pf->lock) or on fast path (under RCU). Now we want to be able to iterate over all representors during notifications, so make sure representor assignment is done under RTNL lock.
Quoted 4 lines
Signed-off-by Jakub Kicinski <[email protected]>Reviewed-by John Hurley <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Hi Sasha!
There is no need for backporting this unless 51a6588e8c08 ("nfp: add offloads on representors") is also back ported (which is a feature).
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 094/258] nfp: add locking around representor changes
Quoted 17 lines · Jakub Kicinski
Quoted 11 lines · Sasha Levin
From: Jakub Kicinski <[email protected]>
[ Upstream commit
71844fac1ed459024dd2a448d63d5b28b8c87daa]Up until now we never needed to keep a networking locks around representors accesses, we only accessed them when device was reconfigured (under nfp
pf->lock) or on fast path (under RCU). Now we want to be able to iterate over all representors during notifications, so make sure representor assignment is done under RTNL lock.Quoted 4 lines
Signed-off-by Jakub Kicinski <[email protected]>Reviewed-by John Hurley <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 4 lines
Hi Sasha!
There is no need for backporting this unless
51a6588e8c08("nfp: add offloads on representors") is also back ported (which is a feature).
I'll drop it. Thanks for the heads-up.
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 95/258 ARM: mmp/mmp2: dt: enable the clock
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ]
The device-tree booted MMP2 needs to enable the timer clock, otherwise it would stop ticking when the boot finishes.
It can also use the clock rate from the clk, the non-DT boards need to keep using the hardcoded rates.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ 4 files changed, 23 insertions(+), 15 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq); +extern void timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ); +timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ); +timer_init (IRQ_PXA168_TIMER1 ,6500000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/time.c +20 -12
@@ -22,6 +22,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clk.h> #include <linux/io.h> #include <linux/irq.h>
@@ -38,12 +39,6 @@#include "cputype.h" #include "clock.h" -#ifdef CONFIG_CPU_MMP2 -#define MMP_CLOCK_FREQ 6500000 -#else -#define MMP_CLOCK_FREQ 3250000 -#endif -#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE#define MAX_DELTA (0xfffffffe)
@@ -189,19 +184,18 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq) +void __init timer_init (int irq,unsigned long rate) {timer_config (); -sched_clock_register (mmp_read_sched_clock,32 ,MMP_CLOCK_FREQ ); +sched_clock_register (mmp_read_sched_clock,32 , rate); ckevt.cpumask =cpumask_of (0 );setup_irq (irq, &timer_irq); -clocksource_register_hz (&cksrc,MMP_CLOCK_FREQ ); -clockevents_config_and_register (&ckevt,MMP_CLOCK_FREQ , -MIN_DELTA ,MAX_DELTA ); +clocksource_register_hz (&cksrc, rate); +clockevents_config_and_register (&ckevt, rate,MIN_DELTA ,MAX_DELTA ); }#ifdef CONFIG_OF
@@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = {void __init mmp_dt_init_timer (void ) {struct device_node *np; +struct clk *clk;int irq, ret; +unsigned long rate; np =of_find_matching_node (NULL , mmp_timer_dt_ids);if (!np) {
@@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) goto out; } + clk =of_clk_get (np,0 ); +if (!IS_ERR (clk)) { + ret =clk_prepare_enable (clk); +if (ret) + goto out; + rate =clk_get_rate (clk) /2 ; + }else if (cpu_is_pj4 ()) { + rate =6500000 ; + }else { + rate =3250000 ; + } + irq =irq_of_parse_and_map (np,0 );if (!irq) { ret = -EINVAL ;
@@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq); +timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 96/258 ARM: dts: aspeed: add missing memory unit-address
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]
The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so '/memory' in the board files create a duplicate node. We're probably getting lucky that the bootloader fixes up the memory node that the kernel ends up using. Add the unit-address so it's merged with the base node.
Found with DT json-schema checks.
--- arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -2
@@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
@@ -322,4 +322,3 @@ &adc { status = "okay"; }; -
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +1 -1
@@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 97/258 x86/fpu: Add might_fault() to user_insn()
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ]
Every user of user_insn() passes an user memory pointer to this macro.
Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed.
[ bp: Space it out to make it more visible. ]
--- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/fpu/internal.h +3 -0
@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 98/258 media: i2c: TDA1997x: select CONFIG_HDMI
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 79e89e36dc8a47ef965a35b484d737a5227feed1 ]
Without CONFIG_HDMI, we get a link error for this driver:
drivers/media/i2c/tda1997x.o: In function `tda1997x_parse_infoframe':
tda1997x.c:(.text+0x2195): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text+0x21b6): undefined reference to hdmi_infoframe_log' drivers/media/i2c/tda1997x.o: In function `tda1997x_log_infoframe':
tda1997x.c:(.text.unlikely+0x13d3): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text.unlikely+0x1426): undefined reference to hdmi_infoframe_log'
All other drivers in this directory that use HDMI select CONFIG_HDMI, so do the same here:
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -61,6 +61,7 @@ config VIDEO_TDA1997X depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API depends on SND_SOC select SND_PCM + select HDMI ---help--- V4L2 subdevice driver for the NXP TDA1997x HDMI receivers.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 99/258 media: DaVinci-VPBE: fix error handling in vpbe_initialize()
In reply to Sasha LevinFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]
If vpbe_set_default_output() or vpbe_set_default_mode() fails, vpbe_initialize() returns error code without releasing resources.
The patch adds error handling for that case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +5 -2
@@ -740,7 +740,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , def_output); -return ret; + goto fail_kfree_amp; }printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode);
@@ -748,12 +748,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , def_mode); -return ret; + goto fail_kfree_amp; } vpbe_dev->initialized =1 ;/* TBD handling of bootargs for default output and mode */ return 0 ; +fail_kfree_amp: +mutex_lock (&vpbe_dev->lock); +kfree (vpbe_dev->amp); fail_kfree_encoders:kfree (vpbe_dev->encoders); fail_dev_unregister:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 100/258 smack: fix access permissions for keyring
In reply to Sasha LevinFrom: Zoran Markovic <[email protected]>
[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ]
Function smack_key_permission() only issues smack requests for the following operations:
- KEY_NEED_READ (issues MAY_READ)
- KEY_NEED_WRITE (issues MAY_WRITE)
- KEY_NEED_LINK (issues MAY_WRITE)
- KEY_NEED_SETATTR (issues MAY_WRITE)
A blank smack request is issued in all other cases, resulting in smack access being granted if there is any rule defined between subject and object, or denied with -EACCES otherwise.
Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. Fix the logic in the unlikely case when both MAY_READ and MAY_WRITE are needed. Validate access permission field for valid contents.
--- security/smack/smack_lsm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
security/smack/smack_lsm.c +9 -3
@@ -4333,6 +4333,12 @@ static int smack_key_permission(key_ref_t key_ref,int request =0 ;int rc; +/* +* Validate requested permissions +*/ +if (perm & ~KEY_NEED_ALL ) +return -EINVAL ; + keyp =key_ref_to_ptr (key_ref);if (keyp ==NULL )return -EINVAL ;
@@ -4356,10 +4362,10 @@ static int smack_key_permission(key_ref_t key_ref, ad.a.u.key_struct.key = keyp->serial; ad.a.u.key_struct.key_desc = keyp->description;#endif -if (perm &KEY_NEED_READ ) - request =MAY_READ ; +if (perm & (KEY_NEED_READ |KEY_NEED_SEARCH |KEY_NEED_VIEW )) + request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) - request =MAY_WRITE ; + request |=MAY_WRITE ; rc =smk_access (tkp, keyp->security, request, &ad); rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc);return rc;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 101/258 xtensa: xtfpga.dtsi: fix dtc warnings about SPI
In reply to Sasha LevinFrom: Max Filippov <[email protected]>
[ Upstream commit f37598be4e3896359e87c824be57ddddc280cc3f ]
Rename SPI controller node in the XTFPGA DTS to spi@... This fixes the following build warnings:
arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'
--- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/boot/dts/xtfpga.dtsi +1 -1
@@ -103,7 +103,7 @@ }; }; - spi0: spi-master@0d0a0000 { + spi0: spi@0d0a0000 { compatible = "cdns,xtfpga-spi"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 102/258 usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
In reply to Sasha LevinFrom: Anurag Kumar Vulisha <[email protected]>
[ Upstream commit b7a4fbe2300a8965ea760c7e871507b84aea17f6 ]
Availability of TRB's is calculated using dwc3_calc_trbs_left(), which determines total available TRB's based on the HWO bit set in a TRB.
In the present code, __dwc3_prepare_one_trb() is called with a TRB which needs to be prepared for transfer. This __dwc3_prepare_one_trb() calls dwc3_calc_trbs_left() to determine total available TRBs and set IOC bit if the total available TRBs are zero. Since the present working TRB (which is passed as an argument to __dwc3_prepare_one_trb() ) doesn't yet have the HWO bit set before calling dwc3_calc_trbs_left(), there are chances that dwc3_calc_trbs_left() wrongly calculates this present working TRB as free(since the HWO bit is not yet set) and returns the total available TRBs as greater than zero (including the present working TRB). This could be a problem.
This patch corrects the above mentioned problem in __dwc3_prepare_one_trb() by increementing the dep->trb_enqueue at the last (after preparing the TRB) instead of increementing at the start and setting the IOC bit only if the total available TRBs returned by dwc3_calc_trbs_left() is 1 . Since we are increementing the dep->trb_enqueue at the last, the present working TRB is also considered as available by dwc3_calc_trbs_left() and non zero value is returned . So, according to the modified logic, when the total available TRBs is equal to 1 that means the total available TRBs in the pool are 0.
--- drivers/usb/dwc3/gadget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +3 -3
@@ -910,8 +910,6 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,struct usb_gadget *gadget = &dwc->gadget;enum usb_device_speed speed = gadget->speed; -dwc3_ep_inc_enq (dep); - trb->size =DWC3_TRB_SIZE_LENGTH (length); trb->bpl =lower_32_bits (dma); trb->bph =upper_32_bits (dma);
@@ -990,7 +988,7 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, }if ((!no_interrupt && !chain) || - (dwc3_calc_trbs_left (dep) ==0 )) + (dwc3_calc_trbs_left (dep) ==1 )) trb->ctrl |=DWC3_TRB_CTRL_IOC ;if (chain)
@@ -1001,6 +999,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, trb->ctrl |=DWC3_TRB_CTRL_HWO ; +dwc3_ep_inc_enq (dep); +trace_dwc3_prepare_trb (dep, trb); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 103/258 usb: dwc2: Disable power down feature on Samsung SoCs
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 35a6054132286a4ab92b536595093b82e6bdfcbc ]
Power down feature of DWC2 module integrated in Samsung SoCs doesn't work properly or needs some additional handling in PHY or SoC glue layer, so disable it for now. Without disabling power down, DWC2 causes random memory trashes and fails enumeration if there is no USB link to host on driver probe.
--- drivers/usb/dwc2/params.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/dwc2/params.c +9 -1
@@ -71,6 +71,13 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg) p->power_down = false; } +static void dwc2_set_s3c6400_params (struct dwc2_hsotg *hsotg) +{ +struct dwc2_core_params *p = &hsotg->params; + + p->power_down =0 ; +} +static void dwc2_set_rk_params (struct dwc2_hsotg *hsotg) {struct dwc2_core_params *p = &hsotg->params;
@@ -151,7 +158,8 @@ const struct of_device_id dwc2_of_match_table[] = { { .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params }, { .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params }, { .compatible = "snps,dwc2" }, - { .compatible = "samsung,s3c6400-hsotg" }, + { .compatible = "samsung,s3c6400-hsotg", + .data = dwc2_set_s3c6400_params }, { .compatible = "amlogic,meson8-usb", .data = dwc2_set_amlogic_params }, { .compatible = "amlogic,meson8b-usb",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 104/258 usb: hub: delay hub autosuspend if USB3 port is still link training
In reply to Sasha LevinFrom: Mathias Nyman <[email protected]>
[ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ]
When initializing a hub we want to give a USB3 port in link training the same debounce delay time before autosuspening the hub as already trained, connected enabled ports.
USB3 ports won't reach the enabled state with "current connect status" and "connect status change" bits set until the USB3 link training finishes.
Catching the port in link training (polling) and adding the debounce delay prevents unnecessary failed attempts to autosuspend the hub.
--- drivers/usb/core/hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/core/hub.c +10 -0
@@ -1111,6 +1111,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } +/* +* Add debounce if USB3 link is in polling/link training state. +* Link will automatically transition to Enabled state after +* link training completes. +*/ +if (hub_is_superspeed (hdev) && + ((portstatus &USB_PORT_STAT_LINK_STATE ) == +USB_SS_PORT_LS_POLLING )) + need_debounce_delay = true; +/* Clear status-change flags; we'll debounce later */ if (portchange &USB_PORT_STAT_C_CONNECTION ) { need_debounce_delay = true;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 105/258 timekeeping: Use proper seqcount initializer
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit ce10a5b3954f2514af726beb78ed8d7350c5e41c ]
tk_core.seq is initialized open coded, but that misses to initialize the lockdep map when lockdep is enabled. Lockdep splats involving tk_core seq consequently lack a name and are hard to read.
Use the proper initializer which takes care of the lockdep map initialization.
[ tglx: Massaged changelog ]
--- kernel/time/timekeeping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/timekeeping.c +3 -1
@@ -50,7 +50,9 @@ enum timekeeping_adv_mode {static struct {seqcount_t seq;struct timekeeper timekeeper; -} tk_core____cacheline_aligned ; +} tk_core____cacheline_aligned = { + .seq =SEQCNT_ZERO (tk_core.seq), +};static DEFINE_RAW_SPINLOCK (timekeeper_lock);static struct timekeeper shadow_timekeeper;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 106/258 usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
In reply to Sasha LevinFrom: Chunfeng Yun <[email protected]>
[ Upstream commit a0678e2eed41e81004308693ac84ea95614b0920 ]
Fix the issue: device doesn't accept LGO_U1/U2:
1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2
by default;
2. enable/disable controller to initiate requests for transition into
U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE;--- drivers/usb/mtu3/mtu3_core.c | 4 +++- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/usb/mtu3/mtu3_core.c +3 -1
@@ -578,8 +578,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* disable LGO_U1/U2 by default */ mtu3_clrbits (mbase,U3D_LINK_POWER_CONTROL , -SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE |SW_U1_REQUEST_ENABLE |SW_U2_REQUEST_ENABLE ); +/* enable accept LGO_U1/U2 link command from host */ +mtu3_setbits (mbase,U3D_LINK_POWER_CONTROL , +SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE );/* device responses to u3_exit from host automatically */ mtu3_clrbits (mbase,U3D_LTSSM_CTRL ,SOFT_U3_EXIT_EN );/* automatically build U2 link when U3 detect fail */
drivers/usb/mtu3/mtu3_gadget_ep0.c +4 -4
@@ -336,9 +336,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U1_ACCEPT_ENABLE ; + lpc |=SW_U1_REQUEST_ENABLE ;else - lpc &= ~SW_U1_ACCEPT_ENABLE ; + lpc &= ~SW_U1_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u1_enable = !!set;
@@ -351,9 +351,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U2_ACCEPT_ENABLE ; + lpc |=SW_U2_REQUEST_ENABLE ;else - lpc &= ~SW_U2_ACCEPT_ENABLE ; + lpc &= ~SW_U2_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u2_enable = !!set;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 107/258 clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 6e6da2039c82271dd873b9ad2b902a692a7dd554 ]
All the audio interfaces on Allwinner SoCs need to change their module clocks during operation, to switch between support for 44.1 kHz and 48 kHz family sample rates. The clock rate for the module clocks is governed by their upstream audio PLL. The module clocks themselves only have a gate, and sometimes a divider or mux. Thus any rate changes need to be propagated upstream.
Set the CLK_SET_RATE_PARENT flag for all audio module clocks to achieve this.
--- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-a33.c +3 -3
@@ -366,10 +366,10 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,static const char *const i2s_parents[] = {"pll-audio-8x" ,"pll-audio-4x" ,"pll-audio-2x" ,"pll-audio" }; static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents, - 0x0b0, 16, 2, BIT(31), 0); + 0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents, - 0x0b4, 16, 2, BIT(31), 0); + 0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);/* TODO: the parent for most of the USB clocks is not known */ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M",
@@ -446,7 +446,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", static SUNXI_CCU_GATE(ac_dig_clk, "ac-dig", "pll-audio", 0x140, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(ac_dig_4x_clk, "ac-dig-4x", "pll-audio-4x", - 0x140, BIT(30), 0); + 0x140, BIT(30), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", 0x144, BIT(31), 0);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 108/258 media: imx274: select REGMAP_I2C
In reply to Sasha LevinFrom: Luca Ceresoli <[email protected]>
[ Upstream commit 4f9d7225c70dd9d3f406b79e60f8dbd2cd5ae743 ]
The imx274 driver uses regmap and the build will fail without it.
Fixes:
drivers/media/i2c/imx274.c:142:21: error: variable ‘imx274_regmap_config’ has initializer but incomplete type
static const struct regmap_config imx274_regmap_config = {
^~~~~~~~~~~~~
drivers/media/i2c/imx274.c:1869:19: error: implicit declaration of function ‘devm_regmap_init_i2c’ [-Werror=implicit-function-declaration]
imx274->regmap = devm_regmap_init_i2c(client, &imx274_regmap_config);
^~~~~~~~~~~~~~~~~~~~and others.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -611,6 +611,7 @@ config VIDEO_IMX274 tristate "Sony IMX274 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT + select REGMAP_I2C ---help--- This is a V4L2 sensor driver for the Sony IMX274 CMOS image sensor.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 109/258 drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2)
In reply to Sasha LevinFrom: Alex Deucher <[email protected]>
[ Upstream commit de4aaab5cc9770a8c4dc13d9bfb6a83b06bba57e ]
Adjust limits for newer polaris variants.
v2: fix polaris11 kicker (Jerry)
--- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +15 -2
@@ -1528,8 +1528,21 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) efuse = efuse >>24 ;if (hwmgr->chip_id ==CHIP_POLARIS10 ) { - min =1000 ; - max =2300 ; +if (hwmgr->is_kicker) { + min =1200 ; + max =2500 ; + }else { + min =1000 ; + max =2300 ; + } + }else if (hwmgr->chip_id ==CHIP_POLARIS11 ) { +if (hwmgr->is_kicker) { + min =900 ; + max =2100 ; + }else { + min =1100 ; + max =2100 ; + } }else { min =1100 ; max =2100 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 110/258 tipc: fix node keep alive interval calculation
In reply to Sasha LevinFrom: Hoang Le <[email protected]>
[ Upstream commit f5d6c3e5a359c0507800e7ac68d565c21de9b5a1 ]
When setting LINK tolerance, node timer interval will be calculated base on the LINK with lowest tolerance.
But when calculated, the old node timer interval only updated if current setting value (tolerance/4) less than old ones regardless of number of links as well as links' lowest tolerance value.
This caused to two cases missing if tolerance changed as following:
Case 1:
1.1/ There is one link (L1) available in the system
1.2/ Set L1's tolerance from 1500ms => lower (i.e 500ms) 1.3/ Then, fallback to default (1500ms) or higher (i.e 2000ms)
Expected:
node timer interval is 1500/4=375ms after 1.3
Result:
node timer interval will not being updated after changing tolerance at 1.3 since its value 1500/4=375ms is not less than 500/4=125ms at 1.2.
Case 2:
2.1/ There are two links (L1, L2) available in the system 2.2/ L1 and L2 tolerance value are 2000ms as initial 2.3/ Set L2's tolerance from 2000ms => lower 1500ms 2.4/ Disable link L2 (bring down its bearer)
Expected:
node timer interval is 2000ms/4=500ms after 2.4
Result:
node timer interval will not being updated after disabling L2 since its value 2000ms/4=500ms is still not less than 1500/4=375ms at 2.3 although L2 is already not available in the system.
To fix this, we start the node interval calculation by initializing it to a value larger than any conceivable calculated value. This way, the link with the lowest tolerance will always determine the calculated value.
--- net/tipc/node.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tipc/node.c +6 -0
@@ -624,6 +624,12 @@ static void tipc_node_timeout(struct timer_list *t)__skb_queue_head_init (&xmitq); +/* Initial node interval to value larger (10 seconds), then it will be +* recalculated with link lowest tolerance +*/ +tipc_node_read_lock (n); + n->keepalive_intv =10000 ; +tipc_node_read_unlock (n);for (bearer_id =0 ; remains && (bearer_id <MAX_BEARERS ); bearer_id++) {tipc_node_read_lock (n); le = &n->links[bearer_id];
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 111/258 driver core: Move async_synchronize_full call
In reply to Sasha LevinFrom: Alexander Duyck <[email protected]>
[ Upstream commit c37d721c68ad88925ba0e72f6e14acb829a8c6bb ]
Move the async_synchronize_full call out of __device_release_driver and into driver_detach.
The idea behind this is that the async_synchronize_full call will only guarantee that any existing async operations are flushed. This doesn't do anything to guarantee that a hotplug event that may occur while we are doing the release of the driver will not be asynchronously scheduled.
By moving this into the driver_detach path we can avoid potential deadlocks as we aren't holding the device lock at this point and we should not have the driver we want to flush loaded so the flush will take care of any asynchronous events the driver we are detaching might have scheduled.
--- drivers/base/dd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/dd.c +3 -3
@@ -926,9 +926,6 @@ static void __device_release_driver(struct device *dev, struct device *parent) drv = dev->driver;if (drv) { -if (driver_allows_async_probing (drv)) -async_synchronize_full (); -while (device_links_busy (dev)) {device_unlock (dev);if (parent && dev->bus->need_parent_lock)
@@ -1034,6 +1031,9 @@ void driver_detach(struct device_driver *drv)struct device_private *dev_prv;struct device *dev; +if (driver_allows_async_probing (drv)) +async_synchronize_full (); +for (;;) {spin_lock (&drv->p->klist_devices.k_lock);if (list_empty (&drv->p->klist_devices.k_list)) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 112/258 kobject: return error code if writing /sys/.../uevent fails
In reply to Sasha LevinFrom: Peter Rajnoha <[email protected]>
[ Upstream commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ]
Propagate error code back to userspace if writing the /sys/.../uevent file fails. Before, the write operation always returned with success, even if we failed to recognize the input string or if we failed to generate the uevent itself.
With the error codes properly propagated back to userspace, we are able to react in userspace accordingly by not assuming and awaiting a uevent that is not delivered.
--- drivers/base/bus.c | 12 ++++++++---- drivers/base/core.c | 8 +++++++- kernel/module.c | 6 ++++-- 3 files changed, 19 insertions(+), 7 deletions(-)
drivers/base/bus.c +8 -4
@@ -614,8 +614,10 @@ static void remove_probe_files(struct bus_type *bus)static ssize_t uevent_store (struct device_driver *drv,const char *buf,size_t count) { -kobject_synth_uevent (&drv->p->kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&drv->p->kobj, buf, count); +return rc ? rc : count; }static DRIVER_ATTR_WO (uevent);
@@ -831,8 +833,10 @@ static void klist_devices_put(struct klist_node *n)static ssize_t bus_uevent_store (struct bus_type *bus,const char *buf,size_t count) { -kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); +return rc ? rc : count; } static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
drivers/base/core.c +7 -1
@@ -1067,8 +1067,14 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,static ssize_t uevent_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -if (kobject_synth_uevent (&dev->kobj, buf, count)) +int rc; + + rc =kobject_synth_uevent (&dev->kobj, buf, count); + +if (rc) {dev_err (dev,"uevent: failed to send synthetic uevent\n" ); +return rc; + }return count; }
kernel/module.c +4 -2
@@ -1207,8 +1207,10 @@ static ssize_t store_uevent(struct module_attribute *mattr,struct module_kobject *mk, const char *buffer, size_t count) { - kobject_synth_uevent(&mk->kobj, buffer, count); -return count; + int rc; + + rc =kobject_synth_uevent (&mk->kobj, buffer, count); +return rc ? rc : count; } struct module_attribute module_uevent =
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 113/258 IB/hfi1: Unreserve a reserved request when it is completed
In reply to Sasha LevinFrom: Kaike Wan <[email protected]>
[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ]
Currently, When a reserved operation is completed, its entry in the send queue will not be unreserved, which leads to the miscalculation of qp->s_avail and thus the triggering of a WARN_ON call trace. This patch fixes the problem by unreserving the reserved operation when it is completed.
--- drivers/infiniband/hw/hfi1/rc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/rc.c +2 -0
@@ -1157,6 +1157,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)if (cmp_psn (wqe->lpsn, qp->s_sending_psn) >=0 &&cmp_psn (qp->s_sending_psn, qp->s_sending_hpsn) <=0 )break ; +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
@@ -1209,6 +1210,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp,u32 s_last;rvt_put_swqe (wqe); +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 114/258 usb: dwc3: trace: add missing break statement to make compiler happy
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 54d48183d21e03f780053d7129312049cb5dd591 ]
The missed break statement in the outer switch makes the code fall through always and thus always same value will be printed.
Besides that, compiler warns about missed fall through marker:
drivers/usb/dwc3/./trace.h: In function ‘trace_raw_output_dwc3_log_trb’:drivers/usb/dwc3/./trace.h:246:4: warning: this statement may fall through [-Wimplicit-fallthrough=]
switch (pcm) {
^~~~~~Add the missing break statement to work correctly without compilation warnings.
--- drivers/usb/dwc3/trace.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/trace.h +2 -0
@@ -251,9 +251,11 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, s ="2x " ;break ;case 3 : +default : s ="3x " ;break ; } +break ;default : s ="" ; } s; }),
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 115/258 gpio: mt7621: report failure of devm_kasprintf()
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 59d646c775d6ae688ee90fda9f2a4270c47b7490 ]
kasprintf() may return NULL on failure of internal allocation thus the assigned label is not safe if not explicitly checked. On error mediatek_gpio_bank_probe() returns negative values so -ENOMEM in the (unlikely) failure case should be fine here.
--- drivers/gpio/gpio-mt7621.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-mt7621.c +2 -0
@@ -244,6 +244,8 @@ mediatek_gpio_bank_probe(struct device *dev, rg->chip.of_xlate = mediatek_gpio_xlate; rg->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"%s-bank%d" ,dev_name (dev), bank); +if (!rg->chip.label) +return -ENOMEM ; ret =devm_gpiochip_add_data (dev, &rg->chip, mtk);if (ret <0 ) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 116/258 gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a109c2dbb571b10bb9969285b646f57309c98251 ]
The error cases of mediatek_gpio_bank_probe() would go unnoticed (except for the dev_err() messages). The probe function should return an error if one of the banks failed to initialize properly indicated by not returning non-0.
--- drivers/gpio/gpio-mt7621.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpio/gpio-mt7621.c +6 -2
@@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct mtk *mtk;int i; +int ret; mtk =devm_kzalloc (dev,sizeof (*mtk),GFP_KERNEL );if (!mtk)
@@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, mtk); mediatek_gpio_irq_chip.name =dev_name (dev); -for (i =0 ; i <MTK_BANK_CNT ; i++) -mediatek_gpio_bank_probe (dev, np, i); +for (i =0 ; i <MTK_BANK_CNT ; i++) { + ret =mediatek_gpio_bank_probe (dev, np, i); +if (ret) +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 117/258 pinctrl: sx150x: handle failure case of devm_kstrdup
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ]
devm_kstrdup() may return NULL if internal allocation failed. Thus using label, name is unsafe without checking. Therefor in the unlikely case of allocation failure, sx150x_probe() simply returns -ENOMEM.
--- drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-sx150x.c +8 -3
@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, }/* Register GPIO controller */ - pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); pctl->gpio.base =-1 ; pctl->gpio.ngpio = pctl->data->npins; pctl->gpio.get_direction = sx150x_gpio_get_direction;
@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, pctl->gpio.of_node = dev->of_node;#endif pctl->gpio.can_sleep = true; + pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); +if (!pctl->gpio.label) +return -ENOMEM ; +/* * Setting multiple pins is not safe when all pins are not * handled by the same regmap register. The oscio pin (present
@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client,/* Add Interrupt support if an irq is specified */ if (client->irq >0 ) { - pctl->irq_chip.name =devm_kstrdup (dev, client->name, -GFP_KERNEL ); pctl->irq_chip.irq_mask = sx150x_irq_mask; pctl->irq_chip.irq_unmask = sx150x_irq_unmask; pctl->irq_chip.irq_set_type = sx150x_irq_set_type; pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; + pctl->irq_chip.name =devm_kstrdup (dev, client->name, +GFP_KERNEL ); +if (!pctl->irq_chip.name) +return -ENOMEM ; pctl->irq.masked = ~0 ; pctl->irq.sense =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 118/258 iommu/amd: Fix amd_iommu=force_isolation
In reply to Sasha LevinFrom: Yu Zhao <[email protected]>
[ Upstream commit c12b08ebbe16f0d3a96a116d86709b04c1ee8e74 ]
The parameter is still there but it's ignored. We need to check its value before deciding to go into passthrough mode for AMD IOMMU v2 capable device.
We occasionally use this parameter to force v2 capable device into translation mode to debug memory corruption that we suspect is caused by DMA writes.
To address the following comment from Joerg Roedel on the first version, v2 capability of device is completely ignored.
Quoted 2 lines
This breaks the
iommu_v2use-case, as it needs a direct mapping for the devices that support it.
And from Documentation/admin-guide/kernel-parameters.txt:
This option does not override iommu=pt
--- drivers/iommu/amd_iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +8 -1
@@ -438,7 +438,14 @@ static int iommu_init_device(struct device *dev) dev_data->alias =get_alias (dev); -if (dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) { +/* +* By default we use passthrough mode for IOMMUv2 capable device. +* But if amd_iommu=force_isolation is set (e.g. to debug DMA to +* invalid address), we ignore the capability for the device so +* it'll be forced to go into translation mode. +*/ +if ((iommu_pass_through || !amd_iommu_force_isolation) && +dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) {struct amd_iommu *iommu; iommu = amd_iommu_rlookup_table[dev_data->devid];
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 119/258 ARM: dts: Fix OMAP4430 SDP Ethernet startup
In reply to Sasha LevinFrom: Russell King - ARM Linux <[email protected]>
[ Upstream commit 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 ]
It was noticed that unbinding and rebinding the KSZ8851 ethernet resulted in the driver reporting "failed to read device ID" at probe. Probing the reset line with a 'scope while repeatedly attempting to bind the driver in a shell loop revealed that the KSZ8851 RSTN pin is constantly held at zero, meaning the device is held in reset, and does not respond on the SPI bus.
Experimentation with the startup delay on the regulator set to 50ms shows that the reset is positively released after 20ms.
Schematics for this board are not available, and the traces are buried in the inner layers of the board which makes tracing where the RSTN pin extremely difficult. We can only guess that the RSTN pin is wired to a reset generator chip driven off the ethernet supply, which fits the observed behaviour.
Include this delay in the regulator startup delay - effectively treating the reset as a "supply stable" indicator.
This can not be modelled as a delay in the KSZ8851 driver since the reset generation is board specific - if the RSTN pin had been wired to a GPIO, reset could be released earlier via the already provided support in the KSZ8851 driver.
This also got confirmed by Peter Ujfalusi <[email protected]> based on Blaze schematics that should be very close to SDP4430:
TPS22902YFPR is used as the regulator switch (gpio48 controlled):
Convert arm boot_lock to raw The VOUT is routed to TPS3808G01DBV. (SCH Note: Threshold set at 90%. Vsense: 0.405V).
According to the TPS3808 data sheet the RESET delay time when Ct is open (this is the case in the schema): MIN/TYP/MAX: 12/20/28 ms.
--- arch/arm/boot/dts/omap4-sdp.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap4-sdp.dts +1 -0
@@ -33,6 +33,7 @@ gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ enable-active-high; regulator-boot-on; + startup-delay-us = <25000>; }; vbat: fixedregulator-vbat {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 120/258 mips: bpf: fix encoding bug for mm_srlv32_op
In reply to Sasha LevinFrom: Jiong Wang <[email protected]>
[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ]
For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90.
Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav.
v1->v2:
- Keep mm_srlv32_op sorted by value.
--- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/uapi/asm/inst.h +1 -1
@@ -369,8 +369,8 @@ enum mm_32a_minor_op { mm_ext_op =0x02c , mm_pool32axf_op =0x03c , mm_srl32_op =0x040 , + mm_srlv32_op =0x050 , mm_sra_op =0x080 , - mm_srlv32_op =0x090 , mm_rotr_op =0x0c0 , mm_lwxs_op =0x118 , mm_addu32_op = 0x150,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 121/258 media: coda: fix H.264 deblocking filter controls
In reply to Sasha LevinFrom: Philipp Zabel <[email protected]>
[ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]
Add support for the third loop filter mode V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.
The filter offset controls are signed values in the -6 to 6 range and are stored into the slice header fields slice_alpha_c0_offset_div2 and slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are double their value, in range of -12 to 12.
Rename variables to more closely match the nomenclature in the H.264 specification.
--- drivers/media/platform/coda/coda-bit.c | 19 +++++++++---------- drivers/media/platform/coda/coda-common.c | 15 +++++++-------- drivers/media/platform/coda/coda.h | 6 +++--- drivers/media/platform/coda/coda_regs.h | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-)
drivers/media/platform/coda/coda-bit.c +9 -10
@@ -991,16 +991,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)else coda_write (dev,CODA_STD_H264 ,CODA_CMD_ENC_SEQ_COD_STD ); -if (ctx->params.h264_deblk_enabled) { - value = ((ctx->params.h264_deblk_alpha & -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | - ((ctx->params.h264_deblk_beta & -CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET ); - }else { - value =1 <<CODA_264PARAM_DISABLEDEBLK_OFFSET ; - } + value = ((ctx->params.h264_disable_deblocking_filter_idc & +CODA_264PARAM_DISABLEDEBLK_MASK ) << +CODA_264PARAM_DISABLEDEBLK_OFFSET ) | + ((ctx->params.h264_slice_alpha_c0_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | + ((ctx->params.h264_slice_beta_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET );coda_write (dev, value,CODA_CMD_ENC_SEQ_264_PARA );break ;case V4L2_PIX_FMT_JPEG :
drivers/media/platform/coda/coda-common.c +7 -8
@@ -1793,14 +1793,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) ctx->params.h264_max_qp = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA : - ctx->params.h264_deblk_alpha = ctrl->val; + ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA : - ctx->params.h264_deblk_beta = ctrl->val; + ctx->params.h264_slice_beta_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE : - ctx->params.h264_deblk_enabled = (ctrl->val == -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); + ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_PROFILE :/* TODO: switch between baseline and constrained baseline */
@@ -1882,13 +1881,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_MAX_QP ,0 ,51 ,1 ,51 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std_menu (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED ,0x0 , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); +V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY , +0x0 ,V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE, V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
drivers/media/platform/coda/coda.h +3 -3
@@ -115,9 +115,9 @@ struct coda_params {u8 h264_inter_qp;u8 h264_min_qp;u8 h264_max_qp; -u8 h264_deblk_enabled; -u8 h264_deblk_alpha; -u8 h264_deblk_beta; +u8 h264_disable_deblocking_filter_idc; +s8 h264_slice_alpha_c0_offset_div2; +s8 h264_slice_beta_offset_div2;u8 h264_profile_idc;u8 h264_level_idc;u8 mpeg4_intra_qp;
drivers/media/platform/coda/coda_regs.h +1 -1
@@ -292,7 +292,7 @@#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f#define CODA_264PARAM_DISABLEDEBLK_OFFSET 6 -#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01 +#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01#define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 122/258 ARM: dts: Fix up the D-Link DIR-685 MTD partition info
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ]
The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains:
dev: size erasesize name
mtd0: 01e7ff40 00020000 "rootfs"
mtd1: 01f40000 00020000 "upgrade"
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd4: 00040000 00020000 "RedBoot"
mtd5: 00020000 00020000 "LangPack"
mtd6: 02000000 00020000 "flash"
Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered.
Remains:
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd5: 00020000 00020000 "LangPack"
Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000.
--- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/gemini-dlink-dir-685.dts +6 -10
@@ -274,20 +274,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 123/258 tracing: Have trace_stack nr_entries compare not be so subtle
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ca16b0fbb05242f18da9d810c07d3882ffed831c ]
Dan Carpenter reviewed the trace_stack.c code and figured he found an off by one bug.
"From reviewing the code, it seems possible for
stack_trace_max.nr_entries to be set to .max_entries and in that case we would be reading one element beyond the end of the stack_dump_trace[] array. If it's not set to .max_entries then the bug doesn't affect runtime."
Although it looks to be the case, it is not. Because we have:
static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES+1] =
{ [0 ... (STACK_TRACE_ENTRIES)] = ULONG_MAX }; struct stack_trace stack_trace_max = {
.max_entries = STACK_TRACE_ENTRIES - 1,
.entries = &stack_dump_trace[0],};
And:
stack_trace_max.nr_entries = x; for (; x < i; x++) stack_dump_trace[x] = ULONG_MAX;
Even if nr_entries equals max_entries, indexing with it into the stack_dump_trace[] array will not overflow the array. But if it is the case, the second part of the conditional that tests stack_dump_trace[nr_entries] to ULONG_MAX will always be true.
By applying Dan's patch, it removes the subtle aspect of it and makes the if conditional slightly more efficient.
--- kernel/trace/trace_stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_stack.c +1 -1
@@ -286,7 +286,7 @@ __next(struct seq_file *m, loff_t *pos) {long n = *pos -1 ; -if (n > stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX ) +if (n >= stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX )return NULL ; m->private = (void *)n;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 124/258 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0832e93632c61987d504e251b927a2be769dd21a ]
When a driver fails to bind because a resource it still missing it's not helpful to report this as (usually) probing is repeated later.
--- drivers/input/misc/rotary_encoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/input/misc/rotary_encoder.c +4 -2
@@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev) encoder->gpios =devm_gpiod_get_array (dev,NULL ,GPIOD_IN );if (IS_ERR (encoder->gpios)) { -dev_err (dev,"unable to get gpios\n" ); -return PTR_ERR (encoder->gpios); + err =PTR_ERR (encoder->gpios); +if (err != -EPROBE_DEFER ) +dev_err (dev,"unable to get gpios: %d\n" , err); +return err; }if (encoder->gpios->ndescs <2 ) {dev_err (dev,"not enough gpios found\n" );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 125/258 watchdog: renesas_wdt: don't set divider while watchdog is running
In reply to Sasha LevinFrom: Wolfram Sang <[email protected]>
[ Upstream commit e990e12741877e9bfac402ca468f4007a75f6e2a ]
The datasheet says we must stop the timer before changing the clock divider. This can happen when the restart handler is called while the watchdog is running.
--- drivers/watchdog/renesas_wdt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/watchdog/renesas_wdt.c +7 -2
@@ -77,12 +77,17 @@ static int rwdt_init_timeout(struct watchdog_device *wdev)static int rwdt_start (struct watchdog_device *wdev) {struct rwdt_priv *priv =watchdog_get_drvdata (wdev); +u8 val;pm_runtime_get_sync (wdev->parent); -rwdt_write (priv,0 ,RWTCSRB ); -rwdt_write (priv, priv->cks,RWTCSRA ); +/* Stop the timer before we modify any register */ + val =readb_relaxed (priv->base +RWTCSRA ) & ~RWTCSRA_TME ; +rwdt_write (priv, val,RWTCSRA ); +rwdt_init_timeout (wdev); +rwdt_write (priv, priv->cks,RWTCSRA ); +rwdt_write (priv,0 ,RWTCSRB );while (readb_relaxed (priv->base +RWTCSRA ) &RWTCSRA_WRFLG )cpu_relax ();
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 126/258 ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
In reply to Sasha LevinFrom: Andrey Smirnov <[email protected]>
[ Upstream commit 79da07dec740a42c70963ebacbd2bf8866af9e20 ]
TPA6130A2 SD pin on RDU1 is not really controlled by SoC and instead is only meant to notify the system that audio was "muted" by external actors. To accommodate that, drop "power-gpio" property of hpa1 node as well as specify a name for that GPIO so that userspace can access it.
--- arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx51-zii-rdu1.dts +13 -4
@@ -477,6 +477,15 @@ }; &gpio1 { + gpio-line-names = "", "", "", "", + "", "", "", "", + "", "hp-amp-shutdown-b", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", ""; + unused-sd3-wp-gpio { /* * See pinctrl_esdhc1 below for more details on this
@@ -501,9 +510,6 @@ hpa1: amp@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ampgpio>; - power-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_3p3v>; };
@@ -677,7 +683,10 @@ }; &iomuxc { - pinctrl_ampgpio: ampgpiogrp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + pinctrl_hog: hoggrp { fsl,pins = < MX51_PAD_GPIO1_9__GPIO1_9 0x5e >;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 127/258 usb: dwc3: gadget: Disable CSP for stream OUT ep
In reply to Sasha LevinFrom: Tejas Joglekar <[email protected]>
[ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ]
In stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. So we don't want controller to carry on transfers when short packet is received. So disable the CSP for stream capable endpoint.
This is based on the 3.30a Programming guide, where table 3-1 device descriptor structure field definitions says for CSP bit If this bit is 0, the controller generates an XferComplete event and remove the stream. So if we keep CSP as 1 then switching between streams would not happen as in stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned.
--- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +6 -2
@@ -979,9 +979,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, usb_endpoint_type(dep->endpoint.desc)); } -/* always enable Continue on Short Packet */ +/* +* Enable Continue on Short Packet +* when endpoint is not a stream capable +*/ if (usb_endpoint_dir_out (dep->endpoint.desc)) { - trb->ctrl |=DWC3_TRB_CTRL_CSP ; +if (!dep->stream_capable) + trb->ctrl |=DWC3_TRB_CTRL_CSP ;if (short_not_ok) trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 128/258 iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
In reply to Sasha LevinFrom: Zhen Lei <[email protected]>
[ Upstream commit 84a9a75774961612d0c7dd34a1777e8f98a65abd ]
The GITS_TRANSLATER MMIO doorbell register in the ITS hardware is architected to be 4 bytes in size, yet on hi1620 and earlier, Hisilicon have allocated the adjacent 4 bytes to carry some IMPDEF sideband information which results in an 8-byte MSI payload being delivered when signalling an interrupt:
MSIAddr:
|----4bytes----|----4bytes----| | MSIData | IMPDEF |
This poses no problem for the ITS hardware because the adjacent 4 bytes are reserved in the memory map. However, when delivering MSIs to memory, as we do in the SMMUv3 driver for signalling the completion of a SYNC command, the extended payload will corrupt the 4 bytes adjacent to the "sync_count" member in struct arm_smmu_device. Fortunately, the current layout allocates these bytes to padding, but this is fragile and we should make this explicit.
--- drivers/iommu/arm-smmu-v3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +5 -1
@@ -586,7 +586,11 @@ struct arm_smmu_device {struct arm_smmu_strtab_cfg strtab_cfg; -u32 sync_count; +/* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ +union { +u32 sync_count; +u64 padding; + };/* IOMMU core code handle */ struct iommu_device iommu;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 129/258 iommu/arm-smmu: Add support for qcom,smmu-v2 variant
In reply to Sasha LevinFrom: Vivek Gautam <[email protected]>
[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ]
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
--- drivers/iommu/arm-smmu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/arm-smmu.c +3 -0
@@ -118,6 +118,7 @@ enum arm_smmu_implementation {GENERIC_SMMU ,ARM_MMU500 ,CAVIUM_SMMUV2 , + QCOM_SMMUV2, }; struct arm_smmu_s2cr {
@@ -1912,6 +1913,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);ARM_SMMU_MATCH_DATA (arm_mmu401,ARM_SMMU_V1_64K ,GENERIC_SMMU );ARM_SMMU_MATCH_DATA (arm_mmu500,ARM_SMMU_V2 ,ARM_MMU500 );ARM_SMMU_MATCH_DATA (cavium_smmuv2,ARM_SMMU_V2 ,CAVIUM_SMMUV2 ); +ARM_SMMU_MATCH_DATA (qcom_smmuv2,ARM_SMMU_V2 ,QCOM_SMMUV2 );static const struct of_device_id arm_smmu_of_match[] = { { .compatible ="arm,smmu-v1" , .data = &smmu_generic_v1 },
@@ -1920,6 +1922,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, { }, };MODULE_DEVICE_TABLE (of, arm_smmu_of_match);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 130/258 iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ]
After removing an entry from a queue (e.g. reading an event in arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer pointer to free the queue slot back to the SMMU. A memory barrier is required here so that all reads targetting the queue entry have completed before the consumer pointer is updated.
The implementation of queue_inc_cons() relies on a writel() to complete the previous reads, but this is incorrect because writel() is only guaranteed to complete prior writes. This patch replaces the call to writel() with an mb(); writel_relaxed() sequence, which gives us the read->write ordering which we require.
--- drivers/iommu/arm-smmu-v3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +7 -1
@@ -688,7 +688,13 @@ static void queue_inc_cons(struct arm_smmu_queue *q)u32 cons = (Q_WRP (q, q->cons) |Q_IDX (q, q->cons)) +1 ; q->cons =Q_OVF (q, q->cons) |Q_WRP (q, cons) |Q_IDX (q, cons); -writel (q->cons, q->cons_reg); + +/* +* Ensure that all CPU accesses (reads and writes) to the queue +* are complete before we update the cons pointer. +*/ +mb (); +writel_relaxed (q->cons, q->cons_reg); }static int queue_sync_prod (struct arm_smmu_queue *q)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 131/258 sata_rcar: fix deferred probing
In reply to Sasha LevinFrom: Sergei Shtylyov <[email protected]>
[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/sata_rcar.c +3 -1
@@ -895,7 +895,9 @@ static int sata_rcar_probe(struct platform_device *pdev)int ret =0 ; irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) +if (irq <0 ) +return irq; +if (!irq)return -EINVAL ; priv =devm_kzalloc (dev,sizeof (struct sata_rcar_priv ),GFP_KERNEL );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 132/258 clk: imx6sl: ensure MMDC CH0 handshake is bypassed
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit 0efcc2c0fd2001a83240a8c3d71f67770484917e ]
Same as other i.MX6 SoCs, ensure unused MMDC channel's handshake is bypassed, this is to make sure no request signal will be generated when periphe_clk_sel is changed or SRC warm reset is triggered.
--- drivers/clk/imx/clk-imx6sl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/imx/clk-imx6sl.c +6 -0
@@ -17,6 +17,8 @@#include "clk.h" +#define CCDR 0x4 +#define BM_CCM_CCDR_MMDC_CH0_MASK (1 << 17)#define CCSR 0xc#define BM_CCSR_PLL1_SW_CLK_SEL (1 << 2)#define CACRR 0x10
@@ -409,6 +411,10 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clks[IMX6SL_CLK_USDHC3 ] =imx_clk_gate2 ("usdhc3" ,"usdhc3_podf" , base +0x80 ,6 ); clks[IMX6SL_CLK_USDHC4 ] =imx_clk_gate2 ("usdhc4" ,"usdhc4_podf" , base +0x80 ,8 ); +/* Ensure the MMDC CH0 handshake is bypassed */ +writel_relaxed (readl_relaxed (base +CCDR ) | +BM_CCM_CCDR_MMDC_CH0_MASK , base +CCDR ); +imx_check_clocks (clks,ARRAY_SIZE (clks)); clk_data.clks = clks;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 133/258 platform/x86: mlx-platform: Fix tachometer registers
In reply to Sasha LevinFrom: Vadim Pasternak <[email protected]>
[ Upstream commit edd45cba5ed7f53974475ddc9a1453c2c87b3328 ]
Shift by one the registers for tachometers (7 - 12).
This fix is relevant for the same new systems MQMB7, MSN37, MSN34, which are about to be released to the customers.
At the moment, none of them is at customers sites. The customers will not suffer from this change.
This fix is necessary, because register used before for tachometer 7 has been than reserved for the second PWM for newer systems, which are not supported yet in mlx-platform driver. So registers of tachometers 7-12 have been shifted by one.
--- drivers/platform/x86/mlx-platform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/platform/x86/mlx-platform.c +6 -6
@@ -83,12 +83,12 @@#define MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET 0xe7#define MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET 0xe8#define MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET 0xe9 -#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xea -#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xeb -#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xec -#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xed -#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xee -#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xeb +#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xec +#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xed +#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee +#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0#define MLXPLAT_CPLD_LPC_IO_RANGE 0x100#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 134/258 cpuidle: big.LITTLE: fix refcount leak
In reply to Sasha LevinFrom: Yangtao Li <[email protected]>
[ Upstream commit 9456823c842f346c74265fcd98d008d87a7eb6f5 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. bl_idle_init() doesn't do that, so fix it.
--- drivers/cpuidle/cpuidle-big_little.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-big_little.c +6 -1
@@ -167,6 +167,7 @@ static int __init bl_idle_init(void) {int ret;struct device_node *root =of_find_node_by_path ("/" ); +const struct of_device_id *match_id;if (!root)return -ENODEV ;
@@ -174,7 +175,11 @@ static int __init bl_idle_init(void)/* * Initialize the driver just for a compliant set of machines */ -if (!of_match_node (compatible_machine_match, root)) + match_id =of_match_node (compatible_machine_match, root); + +of_node_put (root); + +if (!match_id)return -ENODEV ;if (!mcpm_is_available ())
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 135/258 OPP: Use opp_table->regulators to verify no regulator case
In reply to Sasha LevinFrom: Viresh Kumar <[email protected]>
[ Upstream commit 90e3577b5feb42bac1269e16bb3d2bdd8f6df40f ]
The value of opp_table->regulator_count is not very consistent right now and it may end up being 0 while we do have a "opp-microvolt" property in the OPP table. It was kept that way as we used to check if any regulators are set with the OPP core for a device or not using value of regulator_count.
Lets use opp_table->regulators for that purpose as the meaning of regulator_count is going to change in the later patches.
--- drivers/opp/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/opp/core.c +7 -4
@@ -191,12 +191,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)if (IS_ERR (opp_table))return 0 ; - count = opp_table->regulator_count; -/* Regulator may not be required for the device */ -if (!count) +if (!opp_table->regulators) goto put_opp_table; + count = opp_table->regulator_count; + uV =kmalloc_array (count,sizeof (*uV),GFP_KERNEL );if (!uV) goto put_opp_table;
@@ -976,6 +976,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,struct regulator *reg;int i; +if (!opp_table->regulators) +return true; +for (i =0 ; i < opp_table->regulator_count; i++) { reg = opp_table->regulators[i];
@@ -1263,7 +1266,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table)struct dev_pm_set_opp_data *data;int len, count = opp_table->regulator_count; -if (WARN_ON (!count)) +if (WARN_ON (!opp_table->regulators))return -EINVAL ;/* space for set_opp_data */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 136/258 tee: optee: avoid possible double list_del()
In reply to Sasha LevinFrom: Zhizhou Zhang <[email protected]>
[ Upstream commit b2d102bd0146d9eb1fa630ca0cd19a15ef2f74c8 ]
This bug occurs when:
- a new request arrives, one thread(let's call it A) is pending in optee_supp_req() with req->busy is initial value false.
- tee-supplicant is killed, then optee_supp_release() is called, this function calls list_del(&req->link), and set supp->ctx to NULL. And it also wake up process A.
- process A continues, it firstly checks supp->ctx which is NULL, then checks req->busy which is false, at last run list_del(&req->link). This triggers double list_del() and results kernel panic.
For solve this problem, we rename req->busy to req->in_queue, and associate it with state of whether req is linked to supp->reqs. So we can just only check req->in_queue to make decision calling list_del() or not.
--- drivers/tee/optee/supp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/tee/optee/supp.c +7 -6
@@ -19,7 +19,7 @@struct optee_supp_req {struct list_head link; -bool busy; +bool in_queue;u32 func;u32 ret;size_t num_params;
@@ -54,7 +54,6 @@ void optee_supp_release(struct optee_supp *supp)/* Abort all request retrieved by supplicant */ idr_for_each_entry (&supp->idr, req, id) { - req->busy = false;idr_remove (&supp->idr, id); req->ret =TEEC_ERROR_COMMUNICATION ;complete (&req->c);
@@ -63,6 +62,7 @@ void optee_supp_release(struct optee_supp *supp)/* Abort all queued requests */ list_for_each_entry_safe (req, req_tmp, &supp->reqs, link) {list_del (&req->link); + req->in_queue = false; req->ret =TEEC_ERROR_COMMUNICATION ;complete (&req->c); }
@@ -103,6 +103,7 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,/* Insert the request in the request list */ mutex_lock (&supp->mutex);list_add_tail (&req->link, &supp->reqs); + req->in_queue = true;mutex_unlock (&supp->mutex);/* Tell an eventual waiter there's a new request */
@@ -130,9 +131,10 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,* will serve all requests in a timely manner and * interrupting then wouldn't make sense. */ - interruptable = !req->busy; -if (!req->busy) +if (req->in_queue) {list_del (&req->link); + req->in_queue = false; + } }mutex_unlock (&supp->mutex);
@@ -176,7 +178,7 @@ static struct optee_supp_req *supp_pop_entry(struct optee_supp *supp,return ERR_PTR (-ENOMEM );list_del (&req->link); - req->busy = true; + req->in_queue = false;return req; }
@@ -318,7 +320,6 @@ static struct optee_supp_req *supp_pop_req(struct optee_supp *supp,if ((num_params - nm) != req->num_params)return ERR_PTR (-EINVAL ); - req->busy = false;idr_remove (&supp->idr, id); supp->req_id =-1 ; *num_meta = nm;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 137/258 drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
In reply to Sasha LevinFrom: Abhinav Kumar <[email protected]>
[ Upstream commit c1866d44d149a1ea5c303632114fb6aa08cfd263 ]
Fix the dsi clock names in the DSI 10nm PLL driver to match the names in the dispcc driver as those are according to the clock plan of the chipset.
Changes in v2:
- Update the clock diagram with the new clock name
--- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +4 -4
@@ -17,7 +17,7 @@* | | * | | * +---------+ | +----------+ | +----+ -* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0pllbyte +* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0_phy_pll_out_byteclk * +---------+ | +----------+ | +----+ * | | * | | dsi0_pll_by_2_bit_clk
@@ -25,7 +25,7 @@* | | +----+ | |\ dsi0_pclk_mux * | |--| /2 |--o--| \ | * | | +----+ | \ | +---------+ -* | --------------| |--o--| div_7_4 |-- dsi0pll +* | --------------| |--o--| div_7_4 |-- dsi0_phy_pll_out_dsiclk * |------------------------------| / +---------+ * | +-----+ | / * -----------| /4? |--o----------|/
@@ -690,7 +690,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpllbyte" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_byteclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pll_bit_clk" , pll_10nm->id);/* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
@@ -739,7 +739,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpll" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_dsiclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pclk_mux" , pll_10nm->id);/* PIX CLK DIV : DIV_CTRL_7_4*/
Signature · 6 lines
2.19.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 138/258 drm/msm: dpu: Only check flush register against pending flushes
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit 5f79e03b1f7c1b2cf0019ce6365fe5d52629813d ]
There exists a case where a flush of a plane/dma may have been triggered & started from an async commit. If that plane/dma is subsequently disabled by the next commit, the flush register will continue to hold the flush bit for the disabled plane. Since the bit remains active, pending_kickoff_cnt will never decrement and we'll miss frame_done events.
This patch limits the check of flush_register to include only those bits which have been updated with the latest commit.
Changes in v2:
- None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +1 -1
@@ -331,7 +331,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)if (hw_ctl && hw_ctl->ops.get_flush_register) flush_register = hw_ctl->ops.get_flush_register (hw_ctl); -if (flush_register ==0 ) +if (!(flush_register & hw_ctl->ops.get_pending_flush (hw_ctl))) new_cnt =atomic_add_unless (&phys_enc->pending_kickoff_cnt,-1 ,0 );spin_unlock_irqrestore (phys_enc->enc_spinlock, lock_flags);
Signature · 6 lines
2.19.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 139/258 lightnvm: pblk: fix resubmission of overwritten write err lbas
In reply to Sasha LevinFrom: Hans Holmberg <[email protected]>
[ Upstream commit c12fa401ac8c94a74aff68bb5736b3f1dc695fa8 ]
Make sure we only look up valid lba addresses on the resubmission path.
If an lba is invalidated in the write buffer, that sector will be submitted to disk (as it is already mapped to a ppa), and that write might fail, resulting in a crash when trying to look up the lba in the mapping table (as the lba is marked as invalid).
--- drivers/lightnvm/pblk-write.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/lightnvm/pblk-write.c +5 -3
@@ -158,9 +158,11 @@ static void pblk_prepare_resubmit(struct pblk *pblk, unsigned int sentry, w_ctx = &entry->w_ctx;/* Check if the lba has been overwritten */ - ppa_l2p =pblk_trans_map_get (pblk, w_ctx->lba); -if (!pblk_ppa_comp (ppa_l2p, entry->cacheline)) - w_ctx->lba =ADDR_EMPTY ; +if (w_ctx->lba !=ADDR_EMPTY ) { + ppa_l2p =pblk_trans_map_get (pblk, w_ctx->lba); +if (!pblk_ppa_comp (ppa_l2p, entry->cacheline)) + w_ctx->lba =ADDR_EMPTY ; + }/* Mark up the entry as submittable again */ flags =READ_ONCE (w_ctx->flags);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 140/258 lightnvm: pblk: add lock protection to list operations
In reply to Sasha LevinFrom: Hua Su <[email protected]>
[ Upstream commit fde201a466c6ad5efd72cb54fdf2cefa8b6c6ad7 ]
Protect the list_add on the pblk_line_init_bb() error path in case this code is used for some other purpose in the future.
--- drivers/lightnvm/pblk-core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/lightnvm/pblk-core.c +10 -3
@@ -1252,15 +1252,22 @@ int pblk_line_recov_alloc(struct pblk *pblk, struct pblk_line *line) ret =pblk_line_alloc_bitmaps (pblk, line);if (ret) -return ret; + goto fail;if (!pblk_line_init_bb (pblk, line,0 )) { -list_add (&line->list, &l_mg->free_list); -return -EINTR ; + ret = -EINTR ; + goto fail; }pblk_rl_free_lines_dec (&pblk->rl, line, true);return 0 ; + +fail: +spin_lock (&l_mg->free_lock); +list_add (&line->list, &l_mg->free_list); +spin_unlock (&l_mg->free_lock); + +return ret; }void pblk_line_recov_close (struct pblk *pblk,struct pblk_line *line)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 141/258 i2c-axxia: check for error conditions first
In reply to Sasha LevinFrom: "Adamski, Krzysztof (Nokia - PL/Wroclaw)" <[email protected]>
[ Upstream commit 4f5c85fe3a60ace555d09898166af372547f97fc ]
It was observed that when using seqentional mode contrary to the documentation, the SS bit (which is supposed to only be set if automatic/sequence command completed normally), is sometimes set together with NA (NAK in address phase) causing transfer to falsely be considered successful.
My assumption is that this does not happen during manual mode since the controller is stopping its work the moment it sets NA/ND bit in status register. This is not the case in Automatic/Sequentional mode where it is still working to send STOP condition and the actual status we get depends on the time when the ISR is run.
This patch changes the order of checking status bits in ISR - error conditions are checked first and only if none of them occurred, the transfer may be considered successful. This is required to introduce using of sequentional mode in next patch.
--- drivers/i2c/busses/i2c-axxia.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-axxia.c +16 -16
@@ -296,22 +296,7 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)i2c_int_disable (idev,MST_STATUS_TFL ); } -if (status &MST_STATUS_SCC ) { -/* Stop completed */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_SNS ) { -/* Transfer done */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) -axxia_i2c_empty_rx_fifo (idev); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_TSS ) { -/* Transfer timeout */ - idev->msg_err = -ETIMEDOUT ; -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (unlikely (status &MST_STATUS_ERR )) { +if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );if (status &MST_STATUS_AL )
@@ -328,6 +313,21 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)readl (idev->base +MST_TX_BYTES_XFRD ), readl(idev->base + MST_TX_XFER));complete (&idev->msg_complete); + }else if (status &MST_STATUS_SCC ) { +/* Stop completed */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_SNS ) { +/* Transfer done */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) +axxia_i2c_empty_rx_fifo (idev); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); } out:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 142/258 phy: sun4i-usb: add support for missing USB PHY index
In reply to Sasha LevinFrom: Icenowy Zheng <[email protected]>
[ Upstream commit 2659392e5c08dff626e6db1d739adff58a94604d ]
The new Allwinner H6 SoC's USB2 PHY has two holes -- USB1 (which is a 3.0 port with dedicated PHY) and USB2 (which doesn't exist at all).
Add support for this kind of missing USB PHY index.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +7 -0
@@ -126,6 +126,7 @@ struct sun4i_usb_phy_cfg {bool dedicated_clocks;bool enable_pmu_unk1;bool phy0_dual_route; +int missing_phys; };struct sun4i_usb_phy_data {
@@ -646,6 +647,9 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev,if (args->args[0 ] >= data->cfg->num_phys)return ERR_PTR (-ENODEV ); +if (data->cfg->missing_phys &BIT (args->args[0 ])) +return ERR_PTR (-ENODEV ); +return data->phys[args->args[0 ]].phy; }
@@ -741,6 +745,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)struct sun4i_usb_phy *phy = data->phys + i;char name[16 ]; +if (data->cfg->missing_phys &BIT (i)) +continue ; +snprintf (name,sizeof (name),"usb%d_vbus" , i); phy->vbus =devm_regulator_get_optional (dev, name);if (IS_ERR (phy->vbus)) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 143/258 mlxsw: spectrum_acl: Limit priority value
In reply to Sasha LevinFrom: Nir Dotan <[email protected]>
[ Upstream commit d7263ab35be25505ab57ebecd93cbc5dba8be717 ]
In Spectrum-2, higher priority value wins and priority valid values are in the range of {1,cap_kvd_size-1}. mlxsw_sp_acl_tcam_priority_get converts from lower-bound priorities alike tc flower to Spectrum-2 HW range. Up until now tc flower did not provide priority 0 or reached the maximal value, however multicast routing does provide priority 0.
Therefore, Change mlxsw_sp_acl_tcam_priority_get to verify priority is in the correct range. Make sure priority is never set to zero and never exceeds the maximal allowed value.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +3 -2
@@ -95,8 +95,9 @@ int mlxsw_sp_acl_tcam_priority_get(struct mlxsw_sp *mlxsw_sp,if (!MLXSW_CORE_RES_VALID (mlxsw_sp->core,KVD_SIZE ))return -EIO ; - max_priority =MLXSW_CORE_RES_GET (mlxsw_sp->core,KVD_SIZE ); -if (rulei->priority > max_priority) +/* Priority range is 1..cap_kvd_size-1. */ + max_priority =MLXSW_CORE_RES_GET (mlxsw_sp->core,KVD_SIZE ) -1 ; +if (rulei->priority >= max_priority)return -EINVAL ;/* Unlike in TC, in HW, higher number means higher priority. */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 144/258 udf: Fix BUG on corrupted inode
In reply to Sasha LevinFrom: Jan Kara <[email protected]>
[ Upstream commit d288d95842f1503414b7eebce3773bac3390457e ]
When inode is corrupted so that extent type is invalid, some functions (such as udf_truncate_extents()) will just BUG. Check that extent type is valid when loading the inode to memory.
--- fs/udf/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/udf/inode.c +6 -0
@@ -1357,6 +1357,12 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) iinfo->i_alloc_type =le16_to_cpu (fe->icbTag.flags) &ICBTAG_FLAG_AD_MASK ; +if (iinfo->i_alloc_type !=ICBTAG_FLAG_AD_SHORT && + iinfo->i_alloc_type !=ICBTAG_FLAG_AD_LONG && + iinfo->i_alloc_type !=ICBTAG_FLAG_AD_IN_ICB ) { + ret = -EIO ; + goto out; + } iinfo->i_unique =0 ; iinfo->i_lenEAttr =0 ; iinfo->i_lenExtents =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 145/258 switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
In reply to Sasha LevinFrom: Joey Zhang <[email protected]>
[ Upstream commit e4a7dca5de625018b29417ecc39dc5037d9a5a36 ]
In the ioctl_event_ctl() SWITCHTEC_IOCTL_EVENT_IDX_ALL case, we call event_ctl() several times with the same "ctl" struct. Each call clobbers ctl.flags, which leads to the problem that we may not actually enable or disable all events as the user requested.
Preserve the event flag value with a temporary variable.
--- drivers/pci/switch/switchtec.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/switch/switchtec.c +3 -0
@@ -800,6 +800,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, {int ret;int nr_idxs; +unsigned int event_flags;struct switchtec_ioctl_event_ctl ctl;if (copy_from_user (&ctl, uctl,sizeof (ctl)))
@@ -821,7 +822,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,else return -EINVAL ; + event_flags = ctl.flags;for (ctl.index =0 ; ctl.index < nr_idxs; ctl.index++) { + ctl.flags = event_flags; ret =event_ctl (stdev, &ctl);if (ret <0 )return ret;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 146/258 selftests/bpf: use __bpf_constant_htons in test_prog.c
In reply to Sasha LevinFrom: Stanislav Fomichev <sdf at google.com>
[ Upstream commit a0517a0f7ef23550b4484c37e2b9c2d32abebf64 ]
For some reason, my older GCC (< 4.8) isn't smart enough to optimize the !__builtin_constant_p() branch in bpf_htons, I see:
error: implicit declaration of function '__builtin_bswap16'
Let's use __bpf_constant_htons as suggested by Daniel Borkmann.
I tried to use simple htons, but it produces the following:
test_progs.c:54:17: error: braced-group within expression allowed only inside a function
.eth.h_proto = htons(ETH_P_IP),
--- tools/testing/selftests/bpf/test_progs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/test_progs.c +4 -4
@@ -51,10 +51,10 @@ static struct {struct iphdr iph;struct tcphdr tcp; }__packed pkt_v4 = { - .eth.h_proto =bpf_htons (ETH_P_IP ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IP ), .iph.ihl =5 , .iph.protocol =6 , - .iph.tot_len =bpf_htons (MAGIC_BYTES ), + .iph.tot_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
@@ -64,9 +64,9 @@ static struct {struct ipv6hdr iph;struct tcphdr tcp; }__packed pkt_v6 = { - .eth.h_proto =bpf_htons (ETH_P_IPV6 ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IPV6 ), .iph.nexthdr =6 , - .iph.payload_len =bpf_htons (MAGIC_BYTES ), + .iph.payload_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 147/258 ARM: pxa: avoid section mismatch warning
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 88af3209aa0881aa5ffd99664b6080a4be5f24e5 ]
WARNING: vmlinux.o(.text+0x19f90): Section mismatch in reference from the function littleton_init_lcd() to the function .init.text:pxa_set_fb_info() The function littleton_init_lcd() references
the function __init pxa_set_fb_info().
This is often because littleton_init_lcd lacks a __init
annotation or the annotation of pxa_set_fb_info is wrong.
WARNING: vmlinux.o(.text+0xf824): Section mismatch in reference from the function zeus_register_ohci() to the function .init.text:pxa_set_ohci_info() The function zeus_register_ohci() references
the function __init pxa_set_ohci_info().
This is often because zeus_register_ohci lacks a __init
annotation or the annotation of pxa_set_ohci_info is wrong.
WARNING: vmlinux.o(.text+0xf95c): Section mismatch in reference from the function cm_x300_init_u2d() to the function .init.text:pxa3xx_set_u2d_info() The function cm_x300_init_u2d() references
the function __init pxa3xx_set_u2d_info().
This is often because cm_x300_init_u2d lacks a __init
annotation or the annotation of pxa3xx_set_u2d_info is wrong.
--- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/cm-x300.c +1 -1
@@ -558,7 +558,7 @@ static struct pxa3xx_u2d_platform_data cm_x300_u2d_platform_data = { .exit = cm_x300_u2d_exit, }; -static void cm_x300_init_u2d (void ) +static void __init cm_x300_init_u2d (void ) {pxa3xx_set_u2d_info (&cm_x300_u2d_platform_data); }
arch/arm/mach-pxa/littleton.c +1 -1
@@ -184,7 +184,7 @@ static struct pxafb_mach_info littleton_lcd_info = { .lcd_conn = LCD_COLOR_TFT_16BPP, }; -static void littleton_init_lcd (void ) +static void __init littleton_init_lcd (void ) {pxa_set_fb_info (NULL , &littleton_lcd_info); }
arch/arm/mach-pxa/zeus.c +1 -1
@@ -559,7 +559,7 @@ static struct pxaohci_platform_data zeus_ohci_platform_data = { .flags = ENABLE_PORT_ALL | POWER_SENSE_LOW, }; -static void zeus_register_ohci (void ) +static void __init zeus_register_ohci (void ) {/* Port 2 is shared between host and client interface. */ UP2OCR =UP2OCR_HXOE |UP2OCR_HXS |UP2OCR_DMPDE |UP2OCR_DPPDE ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 148/258 ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
In reply to Sasha LevinFrom: Fabio Estevam <[email protected]>
[ Upstream commit add6883619a9e3bf9658eaff1a547354131bbcd9 ]
eukrea-tlv320.c machine driver runs on non-DT platforms and include <asm/mach-types.h> header file in order to be able to use some machine_is_eukrea_xxx() macros.
Building it for ARM64 causes the following build error:
sound/soc/fsl/eukrea-tlv320.c:28:10: fatal error: asm/mach-types.h: No such file or directory
Avoid this error by not allowing to build the SND_SOC_EUKREA_TLV320 driver when ARM64 is selected.
This is needed in preparation for the i.MX8M support.
--- sound/soc/fsl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/Kconfig +1 -1
@@ -221,7 +221,7 @@ config SND_SOC_PHYCORE_AC97 config SND_SOC_EUKREA_TLV320 tristate "Eukrea TLV320" - depends on ARCH_MXC && I2C + depends on ARCH_MXC && !ARM64 && I2C select SND_SOC_TLV320AIC23_I2C select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 149/258 ARM: mmp: fix timer_init calls
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ]
The change to passing the timer frequency as a function argument was a good idea, but caused a build failure for one user that was missed in the update:
arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer':arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration]
Change that as well to fix the build error, and rename the function to put it into a proper namespace and make it clearer what is actually going on.
I saw that the high 6500000 HZ frequency was previously only set with CONFIG_MMP2, but is now also used with MMP (pxa910), so I'm changing that back here. Please make sure that the frequencies are all correct now.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq,unsigned long rate); +extern void mmp_timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_PXA168_TIMER1 ,3250000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/pxa910.c +1 -1
@@ -116,7 +116,7 @@ void __init pxa910_timer_init(void)__raw_writel (APBC_APBCLK |APBC_RST ,APBC_TIMERS );__raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA910_AP1_TIMER1 ); +mmp_timer_init (IRQ_PXA910_AP1_TIMER1 ,3250000 ); }/* on-chip devices */
arch/arm/mach-mmp/time.c +2 -2
@@ -184,7 +184,7 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq,unsigned long rate) +void __init mmp_timer_init (int irq,unsigned long rate) {timer_config ();
@@ -239,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq, rate); +mmp_timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 150/258 KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
In reply to Sasha LevinFrom: Suraj Jitindar Singh <[email protected]>
[ Upstream commit 693ac10a88a2219bde553b2e8460dbec97e594e6 ]
The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the availability of in kernel tce acceleration for vfio. However it is currently the case that this is only available on a powernv machine, not for a pseries machine.
Thus make this capability dependent on having the cpu feature CPU_FTR_HVMODE.
[[email protected] - fixed compilation for Book E.]
--- arch/powerpc/kvm/powerpc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/powerpc.c +4 -1
@@ -543,8 +543,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)#ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_SPAPR_TCE :case KVM_CAP_SPAPR_TCE_64 : -/* fallthrough */ + r =1 ; +break ;case KVM_CAP_SPAPR_TCE_VFIO : + r = !!cpu_has_feature (CPU_FTR_HVMODE ); +break ;case KVM_CAP_PPC_RTAS :case KVM_CAP_PPC_FIXUP_HCALL :case KVM_CAP_PPC_ENABLE_HCALL :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 151/258 mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
In reply to Sasha LevinFrom: Phil Elwell <[email protected]>
[ Upstream commit 07d405769afea5718529fc9e341f0b13b3189b6f ]
If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. The resulting operations leave the FSM stuck in READWAIT, a state which persists until the MMC framework resets the controller, by which point the root filesystem is likely to have been unmounted.
A less heavyweight solution is to detect the condition and nudge the FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
--- drivers/mmc/host/bcm2835.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mmc/host/bcm2835.c +9 -0
@@ -772,6 +772,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host)if (!(sdhsts &SDHSTS_CRC7_ERROR ) || (host->cmd->opcode !=MMC_SEND_OP_COND )) { +u32 edm, fsm; +if (sdhsts &SDHSTS_CMD_TIME_OUT ) { host->cmd->error = -ETIMEDOUT ; }else {
@@ -780,6 +782,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host)bcm2835_dumpregs (host); host->cmd->error = -EILSEQ ; } + edm =readl (host->ioaddr +SDEDM ); + fsm = edm &SDEDM_FSM_MASK ; +if (fsm ==SDEDM_FSM_READWAIT || + fsm ==SDEDM_FSM_WRITESTART1 ) +/* Kick the FSM out of its wait */ +writel (edm |SDEDM_FORCE_DATA_MODE , + host->ioaddr +SDEDM );bcm2835_finish_request (host);return ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 152/258 mmc: bcm2835: reset host on timeout
In reply to Sasha LevinFrom: Michal Suchanek <[email protected]>
[ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ]
The bcm2835 mmc host tends to lock up for unknown reason so reset it on timeout. The upper mmc block layer tries retransimitting with single blocks which tends to work out after a long wait.
This is better than giving up and leaving the machine broken for no obvious reason.
--- drivers/mmc/host/bcm2835.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/bcm2835.c +3 -0
@@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc)if (host->dma_chan)dmaengine_terminate_sync (host->dma_chan); + host->dma_chan =NULL ;bcm2835_reset_internal (host); }
@@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work)dev_err (dev,"timeout waiting for hardware interrupt.\n" );bcm2835_dumpregs (host); +bcm2835_reset (host->mmc); +if (host->data) { host->data->error = -ETIMEDOUT ;bcm2835_finish_data (host);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 153/258 mmc: meson-mx-sdio: check devm_kasprintf for failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit b0d06f1cb0e2079a3c64fb6e27c19d9a55c723a1 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_mx_mmc_register_clks() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/mmc/host/meson-mx-sdio.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/host/meson-mx-sdio.c +6 -0
@@ -596,6 +596,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#fixed_factor" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_fixed_factor_ops; init.flags =0 ; init.parent_names = &clk_fixed_factor_parent;
@@ -612,6 +615,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) clk_div_parent =__clk_get_name (host->fixed_factor_clk); init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#div" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_divider_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = &clk_div_parent;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 154/258 memstick: Prevent memstick host from getting runtime suspended during card detection
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit e03e303edf1c63e6dd455ccd568c74e93ef3ba8c ]
We can use MEMSTICK_POWER_{ON,OFF} along with pm_runtime_{get,put} helpers to let memstick host support runtime pm.
The rpm count may go down to zero before the memstick host powers on, so the host can be runtime suspended.
So before doing card detection, increment the rpm count to avoid the host gets runtime suspended. Balance the rpm count after card detection is done.
--- drivers/memstick/core/memstick.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/memstick/core/memstick.c +3 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #define DRIVER_NAME "memstick"
@@ -436,6 +437,7 @@ static void memstick_check(struct work_struct *work)struct memstick_dev *card;dev_dbg (&host->dev,"memstick_check started\n" ); +pm_runtime_get_noresume (host->dev.parent);mutex_lock (&host->lock);if (!host->card) {if (memstick_power_on (host))
@@ -479,6 +481,7 @@ static void memstick_check(struct work_struct *work) host->set_param (host,MEMSTICK_POWER ,MEMSTICK_POWER_OFF );mutex_unlock (&host->lock); +pm_runtime_put (host->dev.parent);dev_dbg (&host->dev,"memstick_check finished\n" ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 155/258 mmc: sdhci-of-esdhc: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit ea6d027312111c6d96309ad1a684b33cb37e6764 ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-of-esdhc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +12 -4
@@ -526,8 +526,12 @@ static void esdhc_clock_enable(struct sdhci_host *host, bool enable)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); val =ESDHC_CLOCK_STABLE ; -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) & val)) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) & val) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));break ;
@@ -591,8 +595,12 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE ) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));return ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 156/258 mmc: sdhci-omap: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 9f0ea0bda1d06120b053bb0c283f54afec59293d ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-omap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-omap.c +12 -4
@@ -220,8 +220,12 @@ static void sdhci_omap_conf_bus_power(struct sdhci_omap_host *omap_host,/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
@@ -653,8 +657,12 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 157/258 mmc: sdhci-xenon: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 0e6e7c2ff397e1bbebc882ca3132148aaaef1ddd ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-xenon-phy.c | 10 +++++++--- drivers/mmc/host/sdhci-xenon.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-xenon-phy.c +7 -3
@@ -357,9 +357,13 @@ static int xenon_emmc_phy_enable_dll(struct sdhci_host *host)/* Wait max 32 ms */ timeout =ktime_add_ms (ktime_get (),32 ); -while (!(sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & -XENON_DLL_LOCK_STATE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & +XENON_DLL_LOCK_STATE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Wait for DLL Lock time-out\n" );return -ETIMEDOUT ; }
drivers/mmc/host/sdhci-xenon.c +7 -3
@@ -34,9 +34,13 @@ static int xenon_enable_internal_clk(struct sdhci_host *host)sdhci_writel (host, reg,SDHCI_CLOCK_CONTROL );/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!((reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL )) - &SDHCI_CLOCK_INT_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (reg &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Internal clock never stabilised.\n" );return -ETIMEDOUT ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 158/258 mmc: jz4740: Get CD/WP GPIOs from descriptors
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 0c901c0566fb4edc2631c3786e5085a037be91f8 ]
Modifty the JZ4740 driver to retrieve card detect and write protect GPIO pins from GPIO descriptors instead of hard-coded global numbers. Augment the only board file using this in the process and cut down on passed in platform data.
Preserve the code setting the caps2 flags for CD and WP as active low or high since the slot GPIO code currently ignores the gpiolib polarity inversion semantice and uses the raw accessors to read the GPIO lines, but set the right polarity flags in the descriptor table for jz4740.
--- .../mips/include/asm/mach-jz4740/jz4740_mmc.h | 2 -- arch/mips/jz4740/board-qi_lb60.c | 12 ++++++++--- drivers/mmc/host/jz4740_mmc.c | 20 +++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-)
arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +0 -2
@@ -4,8 +4,6 @@struct jz4740_mmc_platform_data {int gpio_power; -int gpio_card_detect; -int gpio_read_only;unsigned card_detect_active_low:1 ;unsigned read_only_active_low:1 ;unsigned power_active_low:1 ;
arch/mips/jz4740/board-qi_lb60.c +9 -3
@@ -43,7 +43,6 @@#include "clock.h" /* GPIOs */ -#define QI_LB60_GPIO_SD_CD JZ_GPIO_PORTD(0)#define QI_LB60_GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2)#define QI_LB60_GPIO_KEYOUT (x) (JZ_GPIO_PORTC(10) + (x))
@@ -386,12 +385,18 @@ static struct platform_device qi_lb60_gpio_keys = { };static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { - .gpio_card_detect =QI_LB60_GPIO_SD_CD , - .gpio_read_only =-1 , .gpio_power =QI_LB60_GPIO_SD_VCC_EN_N , .power_active_low =1 , }; +static struct gpiod_lookup_table qi_lb60_mmc_gpio_table = { + .dev_id ="jz4740-mmc.0" , + .table = { +GPIO_LOOKUP ("GPIOD" ,0 ,"cd" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +/* beeper */ static struct pwm_lookup qi_lb60_pwm_lookup[] = { PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0,
@@ -500,6 +505,7 @@ static int __init qi_lb60_init_platform_devices(void)gpiod_add_lookup_table (&qi_lb60_audio_gpio_table);gpiod_add_lookup_table (&qi_lb60_nand_gpio_table);gpiod_add_lookup_table (&qi_lb60_spigpio_gpio_table); +gpiod_add_lookup_table (&qi_lb60_mmc_gpio_table);spi_register_board_info (qi_lb60_spi_board_info,ARRAY_SIZE (qi_lb60_spi_board_info));
drivers/mmc/host/jz4740_mmc.c +10 -10
@@ -983,17 +983,17 @@ static int jz4740_mmc_request_gpios(struct mmc_host *mmc,if (!pdata->read_only_active_low) mmc->caps2 |=MMC_CAP2_RO_ACTIVE_HIGH ; -if (gpio_is_valid (pdata->gpio_card_detect)) { - ret =mmc_gpio_request_cd (mmc, pdata->gpio_card_detect,0 ); -if (ret) -return ret; - } +/* +* Get optional card detect and write protect GPIOs, +* only back out on probe deferral. +*/ + ret =mmc_gpiod_request_cd (mmc,"cd" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret; -if (gpio_is_valid (pdata->gpio_read_only)) { - ret =mmc_gpio_request_ro (mmc, pdata->gpio_read_only); -if (ret) -return ret; - } + ret =mmc_gpiod_request_ro (mmc,"wp" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret;return jz4740_mmc_request_gpio (&pdev->dev, pdata->gpio_power,"MMC read only" , true, pdata->power_active_low);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 159/258 usb: renesas_usbhs: add support for RZ/G2E
In reply to Sasha LevinFrom: Fabrizio Castro <[email protected]>
[ Upstream commit 1d6e81a288e28d8d0e38e0501a324216f79bba35 ]
HS-USB found in RZ/G2E (a.k.a. r8a774c0) is very similar to the one found in R-Car E3 (a.k.a. r8a77990), as it needs to release the PLL reset by the UGCTRL register like R-Car E3, therefore add r8a774c0 support in a similar fashion to what was done for the r8a77990.
--- drivers/usb/renesas_usbhs/common.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/renesas_usbhs/common.c +4 -0
@@ -457,6 +457,10 @@ static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)* platform functions */ static const struct of_device_id usbhs_of_match[] = { + { + .compatible ="renesas,usbhs-r8a774c0" , + .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL , + }, { .compatible ="renesas,usbhs-r8a7790" , .data = (void *)USBHS_TYPE_RCAR_GEN2 ,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 160/258 btrfs: harden agaist duplicate fsid on scanned devices
In reply to Sasha LevinFrom: Anand Jain <[email protected]>
[ Upstream commit a9261d4125c97ce8624e9941b75dee1b43ad5df9 ]
It's not that impossible to imagine that a device OR a btrfs image is copied just by using the dd or the cp command. Which in case both the copies of the btrfs will have the same fsid. If on the system with automount enabled, the copied FS gets scanned.
We have a known bug in btrfs, that we let the device path be changed after the device has been mounted. So using this loop hole the new copied device would appears as if its mounted immediately after it's been copied.
For example:
Initially.. /dev/mmcblk0p4 is mounted as /
$ lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT mmcblk0 179:0 0 29.2G 0 disk |-mmcblk0p4 179:4 0 4G 0 part / |-mmcblk0p2 179:2 0 500M 0 part /boot |-mmcblk0p3 179:3 0 256M 0 part [SWAP] `-mmcblk0p1 179:1 0 256M 0 part /boot/efi
$ btrfs fi show
Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba
Total devices 1 FS bytes used 1.40GiB
devid 1 size 4.00GiB used 3.00GiB path /dev/mmcblk0p4Copy mmcblk0 to sda
$ dd if=/dev/mmcblk0 of=/dev/sda
And immediately after the copy completes the change in the device superblock is notified which the automount scans using btrfs device scan and the new device sda becomes the mounted root device.
$ lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT sda 8:0 1 14.9G 0 disk |-sda4 8:4 1 4G 0 part / |-sda2 8:2 1 500M 0 part |-sda3 8:3 1 256M 0 part `-sda1 8:1 1 256M 0 part mmcblk0 179:0 0 29.2G 0 disk |-mmcblk0p4 179:4 0 4G 0 part |-mmcblk0p2 179:2 0 500M 0 part /boot |-mmcblk0p3 179:3 0 256M 0 part [SWAP] `-mmcblk0p1 179:1 0 256M 0 part /boot/efi
$ btrfs fi show /
Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba
Total devices 1 FS bytes used 1.40GiB
devid 1 size 4.00GiB used 3.00GiB path /dev/sda4The bug is quite nasty that you can't either unmount /dev/sda4 or /dev/mmcblk0p4. And the problem does not get solved until you take sda out of the system on to another system to change its fsid using the 'btrfstune -u' command.
--- fs/btrfs/volumes.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
fs/btrfs/volumes.c +29 -0
@@ -850,6 +850,35 @@ static noinline struct btrfs_device *device_list_add(const char *path,return ERR_PTR (-EEXIST ); } +/* +* We are going to replace the device path for a given devid, +* make sure it's the same device if the device is mounted +*/ +if (device->bdev) { +struct block_device *path_bdev; + + path_bdev =lookup_bdev (path); +if (IS_ERR (path_bdev)) { +mutex_unlock (&fs_devices->device_list_mutex); +return ERR_CAST (path_bdev); + } + +if (device->bdev != path_bdev) { +bdput (path_bdev); +mutex_unlock (&fs_devices->device_list_mutex); +btrfs_warn_in_rcu (device->fs_info, +"duplicate device fsid:devid for %pU:%llu old:%s new:%s" , + disk_super->fsid, devid, +rcu_str_deref (device->name), path); +return ERR_PTR (-EEXIST ); + } +bdput (path_bdev); +btrfs_info_in_rcu (device->fs_info, +"device fsid %pU devid %llu moved old:%s new:%s" , + disk_super->fsid, devid, +rcu_str_deref (device->name), path); + } + name =rcu_string_strdup (path,GFP_NOFS );if (!name) {mutex_unlock (&fs_devices->device_list_mutex);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 161/258 btrfs: reada: reorder dev-replace locks before radix tree preload
In reply to Sasha LevinFrom: David Sterba <[email protected]>
[ Upstream commit ceb21a8db48559fd0809e03c4df9eb37743d9170 ]
The device-replace read lock is going to use rw semaphore in followup commits. The semaphore might sleep which is not possible in the radix tree preload section. The lock nesting is now:
* device replace
* radix tree preload
* readahead spinlock
--- fs/btrfs/reada.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/btrfs/reada.c +7 -5
@@ -376,26 +376,28 @@ static struct reada_extent *reada_find_extent(struct btrfs_fs_info *fs_info, goto error; } +/* Insert extent in reada tree + all per-device trees, all or nothing */ +btrfs_dev_replace_read_lock (&fs_info->dev_replace); ret =radix_tree_preload (GFP_KERNEL ); -if (ret) +if (ret) { +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; + } -/* insert extent in reada_tree + all per-device trees, all or nothing */ -btrfs_dev_replace_read_lock (&fs_info->dev_replace);spin_lock (&fs_info->reada_lock); ret =radix_tree_insert (&fs_info->reada_tree, index, re);if (ret == -EEXIST ) { re_exist =radix_tree_lookup (&fs_info->reada_tree, index); re_exist->refcnt++;spin_unlock (&fs_info->reada_lock); -btrfs_dev_replace_read_unlock (&fs_info->dev_replace);radix_tree_preload_end (); +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; }if (ret) {spin_unlock (&fs_info->reada_lock); -btrfs_dev_replace_read_unlock (&fs_info->dev_replace);radix_tree_preload_end (); +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; }radix_tree_preload_end ();
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 162/258 serial: sh-sci: Fix locking in sci_submit_rx()
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit dd1f2250da95e87cb3e612858f94b14f99445a7c ]
Some callers of sci_submit_rx() hold the port spinlock, others don't. During fallback to PIO, the driver needs to obtain the port spinlock. If the lock was already held, spinlock recursion is detected, causing a
deadlock: BUG: spinlock recursion on CPU#0.
Fix this by adding a flag parameter to sci_submit_rx() for the caller to indicate the port spinlock is already held, so spinlock recursion can be avoided.
Move the spin_lock_irqsave() up, so all DMA disable steps are protected, which is safe as the recently introduced dmaengine_terminate_async() can be called in atomic context.
--- drivers/tty/serial/sh-sci.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/tty/serial/sh-sci.c +9 -7
@@ -1331,7 +1331,7 @@ static void sci_tx_dma_release(struct sci_port *s)dma_release_channel (chan); } -static void sci_submit_rx (struct sci_port *s) +static void sci_submit_rx (struct sci_port *s,bool port_lock_held) {struct dma_chan *chan = s->chan_rx;struct uart_port *port = &s->port;
@@ -1362,16 +1362,18 @@ static void sci_submit_rx(struct sci_port *s)return ; fail: +/* Switch to PIO */ +if (!port_lock_held) +spin_lock_irqsave (&port->lock, flags);if (i)dmaengine_terminate_async (chan);for (i =0 ; i <2 ; i++) s->cookie_rx[i] = -EINVAL ; s->active_rx = -EINVAL ; -/* Switch to PIO */ -spin_lock_irqsave (&port->lock, flags); s->chan_rx =NULL ;sci_start_rx (port); -spin_unlock_irqrestore (&port->lock, flags); +if (!port_lock_held) +spin_unlock_irqrestore (&port->lock, flags); }static void work_fn_tx (struct work_struct *work)
@@ -1491,7 +1493,7 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t) }if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB ) -sci_submit_rx (s); +sci_submit_rx (s, true);/* Direct new serial port interrupts back to CPU */ scr =serial_port_in (port,SCSCR );
@@ -1617,7 +1619,7 @@ static void sci_request_dma(struct uart_port *port) s->chan_rx_saved = s->chan_rx = chan;if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB ) -sci_submit_rx (s); +sci_submit_rx (s, false); } }
@@ -1667,7 +1669,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr) scr |=SCSCR_RDRQE ; }else { scr &= ~SCSCR_RIE ; -sci_submit_rx (s); +sci_submit_rx (s, false); }serial_port_out (port,SCSCR , scr);/* Clear current interrupt */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 163/258 serial: sh-sci: Resume PIO in sci_rx_interrupt() on DMA failure
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 71ab1c0336c71ace5725740f200beca9667a339f ]
On (H)SCIF, sci_submit_rx() is called in the receive interrupt handler. Hence if DMA submission fails, the interrupt handler should resume handling reception using PIO, else no more data is received.
Make sci_submit_rx() return an error indicator, so the receive interrupt handler can act appropriately.
--- drivers/tty/serial/sh-sci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/tty/serial/sh-sci.c +8 -3
@@ -1331,7 +1331,7 @@ static void sci_tx_dma_release(struct sci_port *s)dma_release_channel (chan); } -static void sci_submit_rx (struct sci_port *s,bool port_lock_held) +static int sci_submit_rx (struct sci_port *s,bool port_lock_held) {struct dma_chan *chan = s->chan_rx;struct uart_port *port = &s->port;
@@ -1359,7 +1359,7 @@ static void sci_submit_rx(struct sci_port *s, bool port_lock_held) s->active_rx = s->cookie_rx[0 ];dma_async_issue_pending (chan); -return ; +return 0 ; fail:/* Switch to PIO */
@@ -1374,6 +1374,7 @@ static void sci_submit_rx(struct sci_port *s, bool port_lock_held)sci_start_rx (port);if (!port_lock_held)spin_unlock_irqrestore (&port->lock, flags); +return -EAGAIN ; }static void work_fn_tx (struct work_struct *work)
@@ -1668,8 +1669,10 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)disable_irq_nosync (irq); scr |=SCSCR_RDRQE ; }else { +if (sci_submit_rx (s, false) <0 ) + goto handle_pio; + scr &= ~SCSCR_RIE ; -sci_submit_rx (s, false); }serial_port_out (port,SCSCR , scr);/* Clear current interrupt */
@@ -1681,6 +1684,8 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)return IRQ_HANDLED ; } + +handle_pio:#endif if (s->rx_trigger >1 && s->rx_fifo_timeout >0 ) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 164/258 tty: serial: samsung: Properly set flags in autoCTS mode
In reply to Sasha LevinFrom: Beomho Seo <[email protected]>
[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ]
Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support") has changed the way the autoCTS mode is handled.
According to that change, serial drivers which enable H/W autoCTS mode must set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling TX. This patch adds proper handling of UPSTAT_AUTOCTS flag.
--- drivers/tty/serial/samsung.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/samsung.c +3 -0
@@ -1365,11 +1365,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,wr_regl (port,S3C2410_ULCON , ulcon);wr_regl (port,S3C2410_UBRDIV , quot); + port->status &= ~UPSTAT_AUTOCTS ; + umcon =rd_regl (port,S3C2410_UMCON );if (termios->c_cflag &CRTSCTS ) { umcon |=S3C2410_UMCOM_AFC ;/* Disable RTS when RX FIFO contains 63 bytes */ umcon &= ~S3C2412_UMCON_AFC_8 ; + port->status =UPSTAT_AUTOCTS ; }else { umcon &= ~S3C2410_UMCOM_AFC ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 165/258 perf test: Fix perf_event_attr test failure
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 741dad88dde296999da30332157ca47f0543747d ]
Fix inconsistent use of tabs and spaces error:
# perf test 16 -v
16: Setup struct perf_event_attr :
--- start ---
test child forked, pid 20224
File "/usr/libexec/perf-core/tests/attr.py", line 119
log.warning("expected %s=%s, got %s" % (t, self[t], other[t]))
^
TabError: inconsistent use of tabs and spaces in indentation
test child finished with -1
---- end ----
Setup struct perf_event_attr: FAILED!--- tools/perf/tests/attr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/attr.py +1 -1
@@ -116,7 +116,7 @@ class Event(dict): if not self.has_key(t) or not other.has_key(t): continue if not data_equal(self[t], other[t]): - log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) + log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) # Test file description needs to have following sections: # [config]
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 166/258 perf dso: Fix unchecked usage of strncpy()
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit fca5085c15255bbde203b7322c15f07ebb12f63e ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
In function 'decompress_kmodule',
inlined from 'dso__decompress_kmodule_fd' at util/dso.c:305:9:
util/dso.c:298:3: error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
strncpy(pathname, tmpbuf, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CC /tmp/build/perf/util/values.o
CC /tmp/build/perf/util/debug.occ1: all warnings being treated as errors
--- tools/perf/util/dso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dso.c +1 -1
@@ -295,7 +295,7 @@ static int decompress_kmodule(struct dso *dso, const char *name,unlink (tmpbuf);if (pathname && (fd >=0 )) -strncpy (pathname, tmpbuf, len); +strlcpy (pathname, tmpbuf, len);return fd; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 167/258 perf header: Fix unchecked usage of strncpy()
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 7572588085a13d5db02bf159542189f52fdb507e ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/header.c: In function 'perf_event__synthesize_event_update_unit':
util/header.c:3586:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
strncpy(ev->data, evsel->unit, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/header.c:3579:16: note: length computed here
size_t size = strlen(evsel->unit);
^~~~~~~~~~~~~~~~~~~--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -3521,7 +3521,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool,if (ev ==NULL )return -ENOMEM ; -strncpy (ev->data, evsel->unit, size); +strlcpy (ev->data, evsel->unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 168/258 btrfs: use tagged writepage to mitigate livelock of snapshot
In reply to Sasha LevinFrom: Ethan Lien <[email protected]>
[ Upstream commit 3cd24c698004d2f7668e0eb9fc1f096f533c791b ]
Snapshot is expected to be fast. But if there are writers steadily creating dirty pages in our subvolume, the snapshot may take a very long time to complete. To fix the problem, we use tagged writepage for snapshot flusher as we do in the generic write_cache_pages(), so we can omit pages dirtied after the snapshot command.
This does not change the semantics regarding which data get to the snapshot, if there are pages being dirtied during the snapshotting operation. There's a sync called before snapshot is taken in old/new case, any IO in flight just after that may be in the snapshot but this depends on other system effects that might still sync the IO.
We do a simple snapshot speed test on a Intel D-1531 box:
fio --ioengine=libaio --iodepth=32 --bs=4k --rw=write --size=64G --direct=0 --thread=1 --numjobs=1 --time_based --runtime=120 --filename=/mnt/sub/testfile --name=job1 --group_reporting & sleep 5; time btrfs sub snap -r /mnt/sub /mnt/snap; killall fio
original: 1m58sec patched: 6.54sec
This is the best case for this patch since for a sequential write case, we omit nearly all pages dirtied after the snapshot command.
For a multi writers, random write test:
fio --ioengine=libaio --iodepth=32 --bs=4k --rw=randwrite --size=64G --direct=0 --thread=1 --numjobs=4 --time_based --runtime=120 --filename=/mnt/sub/testfile --name=job1 --group_reporting & sleep 5; time btrfs sub snap -r /mnt/sub /mnt/snap; killall fio
original: 15.83sec patched: 10.35sec
The improvement is smaller compared to the sequential write case, since we omit only half of the pages dirtied after snapshot command.
--- fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/ctree.h | 2 +- fs/btrfs/extent_io.c | 17 +++++++++++++++-- fs/btrfs/inode.c | 11 +++++++---- fs/btrfs/ioctl.c | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-)
fs/btrfs/btrfs_inode.h +1 -0
@@ -29,6 +29,7 @@ enum {BTRFS_INODE_IN_DELALLOC_LIST ,BTRFS_INODE_READDIO_NEED_LOCK ,BTRFS_INODE_HAS_PROPS , + BTRFS_INODE_SNAPSHOT_FLUSH, };/* in memory btrfs inode */
fs/btrfs/ctree.h +1 -1
@@ -3155,7 +3155,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, struct inode *inode, u64 new_size, u32 min_type); -int btrfs_start_delalloc_inodes (struct btrfs_root *root); +int btrfs_start_delalloc_snapshot (struct btrfs_root *root);int btrfs_start_delalloc_roots (struct btrfs_fs_info *fs_info,int nr); int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end, unsigned int extra_bits,
fs/btrfs/extent_io.c +15 -2
@@ -3928,12 +3928,25 @@ static int extent_write_cache_pages(struct address_space *mapping, range_whole =1 ; scanned =1 ; } -if (wbc->sync_mode ==WB_SYNC_ALL ) + +/* +* We do the tagged writepage as long as the snapshot flush bit is set +* and we are the first one who do the filemap_flush() on this inode. +* +* The nr_to_write == LONG_MAX is needed to make sure other flushers do +* not race in and drop the bit. +*/ +if (range_whole && wbc->nr_to_write ==LONG_MAX && +test_and_clear_bit (BTRFS_INODE_SNAPSHOT_FLUSH , + &BTRFS_I (inode)->runtime_flags)) + wbc->tagged_writepages =1 ; + +if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages) tag =PAGECACHE_TAG_TOWRITE ;else tag =PAGECACHE_TAG_DIRTY ; retry: -if (wbc->sync_mode ==WB_SYNC_ALL ) +if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages)tag_pages_for_writeback (mapping, index, end); done_index = index; while (!done && !nr_to_write_done && (index <= end) &&
fs/btrfs/inode.c +7 -4
@@ -10005,7 +10005,7 @@ static struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode* some fairly slow code that needs optimization. This walks the list * of all the inodes with pending delalloc and forces them to disk. */ -static int start_delalloc_inodes (struct btrfs_root *root,int nr) +static int start_delalloc_inodes (struct btrfs_root *root,int nr,bool snapshot) {struct btrfs_inode *binode;struct inode *inode;
@@ -10033,6 +10033,9 @@ static int start_delalloc_inodes(struct btrfs_root *root, int nr) }spin_unlock (&root->delalloc_lock); +if (snapshot) +set_bit (BTRFS_INODE_SNAPSHOT_FLUSH , + &binode->runtime_flags); work =btrfs_alloc_delalloc_work (inode);if (!work) {iput (inode);
@@ -10066,7 +10069,7 @@ static int start_delalloc_inodes(struct btrfs_root *root, int nr)return ret; } -int btrfs_start_delalloc_inodes (struct btrfs_root *root) +int btrfs_start_delalloc_snapshot (struct btrfs_root *root) {struct btrfs_fs_info *fs_info = root->fs_info;int ret;
@@ -10074,7 +10077,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root)if (test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state))return -EROFS ; - ret =start_delalloc_inodes (root,-1 ); + ret =start_delalloc_inodes (root,-1 , true);if (ret >0 ) ret =0 ;return ret;
@@ -10103,7 +10106,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr) &fs_info->delalloc_roots);spin_unlock (&fs_info->delalloc_root_lock); - ret =start_delalloc_inodes (root, nr); + ret =start_delalloc_inodes (root, nr, false);btrfs_put_fs_root (root);if (ret <0 ) goto out;
fs/btrfs/ioctl.c +1 -1
@@ -778,7 +778,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,wait_event (root->subv_writers->wait,percpu_counter_sum (&root->subv_writers->counter) ==0 ); - ret =btrfs_start_delalloc_inodes (root); + ret =btrfs_start_delalloc_snapshot (root);if (ret) goto dec_and_free;
Signature · 1 line
2.19.1